db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r809632 [7/7] - in /db/derby/code/trunk/java: engine/org/apache/derby/iapi/util/ engine/org/apache/derby/impl/sql/execute/rts/ testing/org/apache/derbyTesting/functionTests/master/ testing/org/apache/derbyTesting/functionTests/tests/lang/ t...
Date Mon, 31 Aug 2009 15:47:24 GMT
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/outerjoin.sql
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/outerjoin.sql?rev=809632&r1=809631&r2=809632&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/outerjoin.sql
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/outerjoin.sql
Mon Aug 31 15:47:23 2009
@@ -225,7 +225,7 @@
 insert into tt3 values (1, 2, 3), (2, 3, 4), (3, 4, 5);
 
 call SYSCS_UTIL.SYSCS_SET_RUNTIMESTATISTICS(1);
-maximumdisplaywidth 4500;
+maximumdisplaywidth 10000;
 
 -- no xform, predicate on outer table
 select * from tt1 left outer join tt2 on tt1.c1 = tt2.c2 where tt1.c1 = 3;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/RuntimeStatisticsParser.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/RuntimeStatisticsParser.java?rev=809632&r1=809631&r2=809632&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/RuntimeStatisticsParser.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/RuntimeStatisticsParser.java
Mon Aug 31 15:47:23 2009
@@ -121,19 +121,31 @@
             // start search after "qualifiers:\n"
             String searchString = statistics.substring(startPos + 12);
             StringTokenizer t = new StringTokenizer(searchString, "\n");
+
             while (t.hasMoreTokens()) {
                 String s = t.nextToken();
-                if (s.startsWith("Operator: ")) {
-                    String operator = s.substring(10);
+                StringTokenizer t2 = new StringTokenizer(s, "\t ");
+
+                if (t2.nextToken().equals("Operator:")) {
+                    String operator = t2.nextToken();
+
                     t.nextToken();  // skip "Ordered nulls: ..."
                     t.nextToken();  // skip "Unknown return value: ..."
                     s = t.nextToken();
-                    if (!s.startsWith("Negate comparison result: ")) {
+
+                    t2 = new StringTokenizer(s, "\t ");
+                    String neg = t2.nextToken();
+
+                    if (!neg.equals("Negate")) {
                         throw new AssertionError(
-                            "Expected to find \"Negate comparison result\"");
+                            "Expected to find \"Negate comparison result\", " +
+                            "found: " + neg);
                     }
+                    t2.nextToken(); // skip "comparison"
+                    t2.nextToken(); // skip "result:"
+
                     boolean negated =
-                        Boolean.valueOf(s.substring(26)).booleanValue();
+                        Boolean.valueOf(t2.nextToken()).booleanValue();
                     set.add(new Qualifier(operator, negated));
                 }
             }



Mime
View raw message