mkwan 2003/02/03 13:20:17
Modified: java/src/org/apache/xalan/xslt Tag: XSLTC_DTM Process.java
java/src/org/apache/xalan/xsltc/trax Tag: XSLTC_DTM
TransformerFactoryImpl.java TransformerImpl.java
Log:
Comment out the incremental DTM building support in XSLTC_DTM.
The incremental DTM support was added a few weeks ago. We drop
it for the following reasons:
1. It does not work with id-keys and is difficult to
fix in the current model
2. It is much slower than the regular mode.
3. The cost to maintain the broken support becomes bigger when
SAX2DTM2 was introduced.
We may want to revisit this issue in the future.
Revision Changes Path
No revision
No revision
1.47.6.8 +6 -3 xml-xalan/java/src/org/apache/xalan/xslt/Process.java
Index: Process.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xslt/Process.java,v
retrieving revision 1.47.6.7
retrieving revision 1.47.6.8
diff -u -r1.47.6.7 -r1.47.6.8
--- Process.java 3 Feb 2003 20:49:03 -0000 1.47.6.7
+++ Process.java 3 Feb 2003 21:20:13 -0000 1.47.6.8
@@ -548,9 +548,12 @@
}
else if ("-INCREMENTAL".equalsIgnoreCase(argv[i]))
{
- tfactory.setAttribute
- ("http://xml.apache.org/xalan/features/incremental";,
- java.lang.Boolean.TRUE);
+ if (!useXSLTC)
+ tfactory.setAttribute
+ ("http://xml.apache.org/xalan/features/incremental";,
+ java.lang.Boolean.TRUE);
+ else
+ printInvalidXSLTCOption("-INCREMENTAL");
}
else if ("-NOOPTIMIZE".equalsIgnoreCase(argv[i]))
{
No revision
No revision
1.34.2.13 +7 -3
xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerFactoryImpl.java
Index: TransformerFactoryImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerFactoryImpl.java,v
retrieving revision 1.34.2.12
retrieving revision 1.34.2.13
diff -u -r1.34.2.12 -r1.34.2.13
--- TransformerFactoryImpl.java 3 Feb 2003 20:08:02 -0000 1.34.2.12
+++ TransformerFactoryImpl.java 3 Feb 2003 21:20:15 -0000 1.34.2.13
@@ -226,11 +226,11 @@
/**
* The name of the feature for incremental building of the DTM.
*/
- public static String FEATURE_INCREMENTAL =
"http://xml.apache.org/xalan/features/incremental";;
+ // public static String FEATURE_INCREMENTAL =
"http://xml.apache.org/xalan/features/incremental";;
/**
* Set to <code>true</code> when we want to use incremental building of the
DTM.
*/
- protected boolean _incremental = false;
+ // protected boolean _incremental = false;
/**
* Number of indent spaces when indentation is turned on.
@@ -300,9 +300,11 @@
else if (name.equals(AUTO_TRANSLET)) {
return new Boolean(_autoTranslet);
}
+ /*
else if (name.equals(FEATURE_INCREMENTAL)) {
return new Boolean(_incremental);
}
+ */
// Throw an exception for all other attributes
ErrorMsg err = new ErrorMsg(ErrorMsg.JAXP_INVALID_ATTR_ERR, name);
@@ -388,6 +390,7 @@
return;
}
}
+ /*
else if (name.equals(FEATURE_INCREMENTAL)) {
if (value instanceof Boolean) {
_incremental = ((Boolean) value).booleanValue();
@@ -398,6 +401,7 @@
return;
}
}
+ */
else if (name.equals(INDENT_NUMBER)) {
if (value instanceof String) {
try {
1.37.2.15 +6 -6
xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerImpl.java
Index: TransformerImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/trax/TransformerImpl.java,v
retrieving revision 1.37.2.14
retrieving revision 1.37.2.15
diff -u -r1.37.2.14 -r1.37.2.15
--- TransformerImpl.java 3 Feb 2003 20:08:03 -0000 1.37.2.14
+++ TransformerImpl.java 3 Feb 2003 21:20:16 -0000 1.37.2.15
@@ -187,7 +187,7 @@
/**
* A flag indicating whether we use incremental building of the DTM.
*/
- private boolean _isIncremental = false;
+ //private boolean _isIncremental = false;
/**
* A flag indicating whether this transformer implements the identity
@@ -218,7 +218,7 @@
_propertiesClone = (Properties) _properties.clone();
_indentNumber = indentNumber;
_tfactory = tfactory;
- _isIncremental = tfactory._incremental;
+ //_isIncremental = tfactory._incremental;
}
/**
@@ -433,7 +433,7 @@
org.apache.xpath.objects.XMLStringFactoryImpl
.getFactory());
- dtmManager.setIncremental(_isIncremental);
+ //dtmManager.setIncremental(_isIncremental);
dom = (SAXImpl)dtmManager.getDTM(sax, false, wsfilter, true, false,
hasUserReader);
final DOMBuilder builder = ((SAXImpl)dom).getBuilder();
@@ -456,7 +456,7 @@
org.apache.xpath.objects.XMLStringFactoryImpl
.getFactory());
- dtmManager.setIncremental(_isIncremental);
+ //dtmManager.setIncremental(_isIncremental);
dom = (DOMImpl)dtmManager.getDTM(domsrc, false, wsfilter, true,
false, false);
((DOMImpl)dom).setDocumentURI(_sourceSystemId);
@@ -476,7 +476,7 @@
org.apache.xpath.objects.XMLStringFactoryImpl
.getFactory());
- dtmManager.setIncremental(_isIncremental);
+ //dtmManager.setIncremental(_isIncremental);
InputSource input;
if (streamInput != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
