db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r808601 - in /db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts: RealDistinctScanStatistics.java RealHashScanStatistics.java RealTableScanStatistics.java
Date Thu, 27 Aug 2009 20:13:39 GMT
Author: dag
Date: Thu Aug 27 20:13:39 2009
New Revision: 808601

URL: http://svn.apache.org/viewvc?rev=808601&view=rev
Log:
DERBY-4087 Clean up debug printing of the abstract syntax trees after parsing, binding and
optimization 

Temporary roll-back of changes (808523) to the statistics printing,
because they broke some old harness tests to change. It will take a
while to establish correctness of new masters, so rolling back for
now. Expect to roll forward again soon, though.


Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScanStatistics.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashScanStatistics.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealTableScanStatistics.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScanStatistics.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScanStatistics.java?rev=808601&r1=808600&r2=808601&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScanStatistics.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealDistinctScanStatistics.java
Thu Aug 27 20:13:39 2009
@@ -28,7 +28,6 @@
 import org.apache.derby.impl.sql.execute.xplain.XPLAINUtil;
 import org.apache.derby.iapi.sql.execute.xplain.XPLAINVisitor;
 import org.apache.derby.iapi.reference.SQLState;
-import org.apache.derby.iapi.util.StringUtil;
 
 import java.util.Enumeration;
 import java.util.Hashtable;
@@ -195,17 +194,17 @@
 			scanInfo +
 			subIndent + MessageService.getTextMessage(
 												SQLState.RTS_START_POSITION) +
-			":\n" + StringUtil.ensureIndent(startPosition, depth + 2) + "\n" +
+						":\n" + startPosition + 
 			subIndent + MessageService.getTextMessage(
 												SQLState.RTS_STOP_POSITION) +
-			":\n" + StringUtil.ensureIndent(stopPosition, depth + 2) + "\n" +
+						":\n" + stopPosition +
 			subIndent + MessageService.getTextMessage(
 												SQLState.RTS_SCAN_QUALS) +
-			":\n" + StringUtil.ensureIndent(scanQualifiers, depth + 2) + "\n" +
-			subIndent + MessageService.getTextMessage(
+						":\n" + scanQualifiers + "\n" +
+			subIndent +
+						MessageService.getTextMessage(
 												SQLState.RTS_NEXT_QUALS) +
-			":\n" + StringUtil.ensureIndent(nextQualifiers, depth + 2) + "\n" +
-
+						":\n" + nextQualifiers + "\n" +
 			// RESOLVE - estimated row count and cost will eventually 
 			// be displayed for all nodes
 			dumpEstimatedCosts(subIndent);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashScanStatistics.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashScanStatistics.java?rev=808601&r1=808600&r2=808601&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashScanStatistics.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealHashScanStatistics.java
Thu Aug 27 20:13:39 2009
@@ -23,7 +23,6 @@
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
 import org.apache.derby.iapi.util.PropertyUtil;
-import org.apache.derby.iapi.util.StringUtil;
 
 import org.apache.derby.iapi.services.i18n.MessageService;
 import org.apache.derby.iapi.reference.SQLState;
@@ -226,18 +225,17 @@
 					"") + "\n" +
 			scanInfo +
 			subIndent + MessageService.getTextMessage(
-				SQLState.RTS_START_POSITION) +
-			": \n" + StringUtil.ensureIndent(startPosition, depth + 2) + "\n" +
+												SQLState.RTS_START_POSITION) +
+					": \n" + startPosition + 
 			subIndent + MessageService.getTextMessage(
 												SQLState.RTS_STOP_POSITION) +
-			": \n" + StringUtil.ensureIndent(stopPosition, depth + 2) + "\n" +
+					": \n" + stopPosition +
 			subIndent + MessageService.getTextMessage(
 													SQLState.RTS_SCAN_QUALS) +
-			":\n" + StringUtil.ensureIndent(scanQualifiers, depth + 2) + "\n" +
+					":\n" + scanQualifiers + "\n" +
 			subIndent + MessageService.getTextMessage(
 													SQLState.RTS_NEXT_QUALS) +
-			":\n" + StringUtil.ensureIndent(nextQualifiers, depth + 2) + "\n" +
-
+					":\n" + nextQualifiers + "\n" +
 			// RESOLVE - estimated row count and cost will eventually 
 			// be displayed for all nodes
 			dumpEstimatedCosts(subIndent);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealTableScanStatistics.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealTableScanStatistics.java?rev=808601&r1=808600&r2=808601&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealTableScanStatistics.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/rts/RealTableScanStatistics.java
Thu Aug 27 20:13:39 2009
@@ -1,4 +1,4 @@
-/*
+ /*
 
    Derby - Class org.apache.derby.impl.sql.execute.rts.RealTableScanStatistics
 
@@ -23,7 +23,6 @@
 
 import org.apache.derby.iapi.services.io.StoredFormatIds;
 import org.apache.derby.iapi.util.PropertyUtil;
-import org.apache.derby.iapi.util.StringUtil;
 
 import org.apache.derby.iapi.services.i18n.MessageService;
 import org.apache.derby.iapi.reference.SQLState;
@@ -218,13 +217,12 @@
 			scanInfo +
 			subIndent + MessageService.getTextMessage(
 												SQLState.RTS_START_POSITION) +
-			": \n" + StringUtil.ensureIndent(startPosition, depth + 2) + "\n" +
+				": \n" + startPosition + 
 			subIndent + MessageService.getTextMessage(
 												SQLState.RTS_STOP_POSITION) +
-			": \n" + StringUtil.ensureIndent(stopPosition, depth + 2) + "\n" +
+				": \n" + stopPosition +
 			subIndent + MessageService.getTextMessage(SQLState.RTS_QUALS) +
-			": \n" + StringUtil.ensureIndent(qualifiers, depth + 2) + "\n" +
-
+				":\n" + qualifiers + "\n" +
 			// RESOLVE - estimated row count and cost will eventually 
 			// be displayed for all nodes
 			dumpEstimatedCosts(subIndent);



Mime
View raw message