You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mk...@apache.org on 2003/03/06 21:42:33 UTC

cvs commit: xml-xalan/java/src/org/apache/xalan/xsltc/util IntegerArray.java

mkwan       2003/03/06 12:42:32

  Modified:    java/src/org/apache/xalan/xsltc/dom Tag: XSLTC_DTM
                        MultiDOM.java NodeSortRecord.java SAXImpl.java
               java/src/org/apache/xalan/xsltc/runtime/output Tag:
                        XSLTC_DTM StreamHTMLOutput.java
                        StreamXMLOutput.java
               java/src/org/apache/xalan/xsltc/util Tag: XSLTC_DTM
                        IntegerArray.java
  Log:
  XSLTC_DTM performance work
  
  A few small improvements. More space efficient version of IntegerArray.clone().
  Rearrange the condition checking in StreamXML(HTML)Output.escapeCharacters().
  Only create one default Collator instance in NodeSortRecord.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.16.10.15 +2 -2      xml-xalan/java/src/org/apache/xalan/xsltc/dom/MultiDOM.java
  
  Index: MultiDOM.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/MultiDOM.java,v
  retrieving revision 1.16.10.14
  retrieving revision 1.16.10.15
  diff -u -r1.16.10.14 -r1.16.10.15
  --- MultiDOM.java	5 Mar 2003 19:23:00 -0000	1.16.10.14
  +++ MultiDOM.java	6 Mar 2003 20:42:31 -0000	1.16.10.15
  @@ -130,7 +130,7 @@
               if (_source == null || _mask != mask) {
                   if (_type == NO_TYPE) {
                       _source = _adapters[dom].getAxisIterator(_axis);
  -                } else if (_axis == Axis.CHILD && _type != DTM.ELEMENT_NODE) {
  +                } else if (_axis == Axis.CHILD) {
                       _source = _adapters[dom].getTypedChildren(_type);
                   } else {
                       _source = _adapters[dom].getTypedAxisIterator(_axis, _type);
  
  
  
  1.8.10.5  +3 -2      xml-xalan/java/src/org/apache/xalan/xsltc/dom/NodeSortRecord.java
  
  Index: NodeSortRecord.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/NodeSortRecord.java,v
  retrieving revision 1.8.10.4
  retrieving revision 1.8.10.5
  diff -u -r1.8.10.4 -r1.8.10.5
  --- NodeSortRecord.java	30 Jan 2003 18:41:47 -0000	1.8.10.4
  +++ NodeSortRecord.java	6 Mar 2003 20:42:32 -0000	1.8.10.5
  @@ -94,7 +94,8 @@
        * A reference to a collator. May be updated by subclass if the stylesheet
        * specifies a different language (will be updated iff _locale is updated).
        */
  -    protected Collator _collator = Collator.getInstance();
  +    protected static final Collator DEFAULT_COLLATOR = Collator.getInstance();
  +    protected Collator _collator = DEFAULT_COLLATOR;
       protected CollatorFactory _collatorFactory;
   
       protected int   _levels = 1;
  
  
  
  1.1.2.40  +2 -2      xml-xalan/java/src/org/apache/xalan/xsltc/dom/Attic/SAXImpl.java
  
  Index: SAXImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/dom/Attic/SAXImpl.java,v
  retrieving revision 1.1.2.39
  retrieving revision 1.1.2.40
  diff -u -r1.1.2.39 -r1.1.2.40
  --- SAXImpl.java	5 Mar 2003 19:23:00 -0000	1.1.2.39
  +++ SAXImpl.java	6 Mar 2003 20:42:32 -0000	1.1.2.40
  @@ -1615,7 +1615,7 @@
         */
   
         // Most common case handled first
  -      if (axis == Axis.CHILD && type != DTM.ELEMENT_NODE) {
  +      if (axis == Axis.CHILD) {
             return new TypedChildrenIterator(type);
         }
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.20.2.3  +4 -3      xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/StreamHTMLOutput.java
  
  Index: StreamHTMLOutput.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/StreamHTMLOutput.java,v
  retrieving revision 1.20.2.2
  retrieving revision 1.20.2.3
  diff -u -r1.20.2.2 -r1.20.2.3
  --- StreamHTMLOutput.java	30 Jan 2003 18:41:49 -0000	1.20.2.2
  +++ StreamHTMLOutput.java	6 Mar 2003 20:42:32 -0000	1.20.2.3
  @@ -475,8 +475,9 @@
   		offset = i + 1;
   		break;
   	    default:
  -		if ((current >= '\u007F' && current < '\u00A0') ||
  -		    (_is8859Encoded && current > '\u00FF'))
  +		if (current >= '\u007F'
  +		    && (current < '\u00A0'
  +		       || (current > '\u00FF' && _is8859Encoded)))
   		{
   		    _buffer.append(ch, offset, i - offset)
   			   .append(CHAR_ESC_START)
  
  
  
  1.22.2.3  +4 -3      xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/StreamXMLOutput.java
  
  Index: StreamXMLOutput.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/output/StreamXMLOutput.java,v
  retrieving revision 1.22.2.2
  retrieving revision 1.22.2.3
  diff -u -r1.22.2.2 -r1.22.2.3
  --- StreamXMLOutput.java	30 Jan 2003 18:41:49 -0000	1.22.2.2
  +++ StreamXMLOutput.java	6 Mar 2003 20:42:32 -0000	1.22.2.3
  @@ -396,8 +396,9 @@
   		offset = i + 1;
   		break;
   	    default:
  -		if ((current >= '\u007F' && current < '\u00A0') ||
  -		    (_is8859Encoded && current > '\u00FF'))
  +		if (current >= '\u007F'
  +		    && (current < '\u00A0'
  +		       || (current > '\u00FF' && _is8859Encoded)))
   		{
   		    _buffer.append(ch, offset, i - offset)
   			   .append(CHAR_ESC_START)
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.14.5  +4 -3      xml-xalan/java/src/org/apache/xalan/xsltc/util/IntegerArray.java
  
  Index: IntegerArray.java
  ===================================================================
  RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/util/IntegerArray.java,v
  retrieving revision 1.1.14.4
  retrieving revision 1.1.14.5
  diff -u -r1.1.14.4 -r1.1.14.5
  --- IntegerArray.java	27 Jan 2003 19:45:27 -0000	1.1.14.4
  +++ IntegerArray.java	6 Mar 2003 20:42:32 -0000	1.1.14.5
  @@ -87,7 +87,8 @@
       }
   
       public Object clone() {
  -	final IntegerArray clone = new IntegerArray(_array);
  +	final IntegerArray clone = new IntegerArray(_free);
  +	System.arraycopy(_array, 0, clone._array, 0, _free);
   	clone._free = _free;
   	return clone;
       }
  @@ -200,7 +201,7 @@
       }
       
       private static int partition(int[] array, int p, int r) {
  -	final int x = array[p];
  +	final int x = array[(p + r) >>> 1];
   	int i = p - 1; int j = r + 1;
   
   	while (true) {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org