db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r1242612 - in /db/derby/code/branches/10.8: ./ java/client/org/apache/derby/client/net/ java/testing/org/apache/derbyTesting/functionTests/master/ java/testing/org/apache/derbyTesting/functionTests/suites/ java/testing/org/apache/derbyTesti...
Date Thu, 09 Feb 2012 23:54:03 GMT
Author: myrnavl
Date: Thu Feb  9 23:54:02 2012
New Revision: 1242612

URL: http://svn.apache.org/viewvc?rev=1242612&view=rev
Log:
DERBY-3808; Convert subquery.sql to junit
  backport revisions 1242409, and minor revisions 1242413 and 1242460 from  
  trunk.
  With adjustements because one of the changes to subquery.sql was not 
  backported to 10.8.

Added:
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SubqueryTest.java
      - copied, changed from r1242409, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SubqueryTest.java
Removed:
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/master/subquery.out
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/lang/subquery.sql
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/lang/subquery_derby.properties
Modified:
    db/derby/code/branches/10.8/   (props changed)
    db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java   (props
changed)
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/junit/RuntimeStatisticsParser.java

Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  9 23:54:02 2012
@@ -1,2 +1,2 @@
 /db/derby/code/branches/10.7:1061570,1061578,1082235
-/db/derby/code/trunk:1063809,1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1104365,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132747,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1140222,1140744,1141924,1142583,1142635,1145057,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612,1158108,1160593,1160597,1161208,1162737,1163131,1163616,1164358,1164370,1164495,1165221,1166313,1167017,1167226,1167470,1169692,1170470,1171227,1171665,1171672,1173446,1173647,1174436,1174646,1176633,1176636,1177589,1179374,1179546,1180790,1180858,
 1181756,1183463,1183503,1183671,1186020,1186691,1189201,1189222,1203050,1203252,1204128,1207729,1208775,1210846,1212541,1213251,1230480,1239898,1241841,1242098
+/db/derby/code/trunk:1063809,1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1104365,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132747,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1140222,1140744,1141924,1142583,1142635,1145057,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612,1158108,1160593,1160597,1161208,1162737,1163131,1163616,1164358,1164370,1164495,1165221,1166313,1167017,1167226,1167470,1169692,1170470,1171227,1171665,1171672,1173446,1173647,1174436,1174646,1176633,1176636,1177589,1179374,1179546,1180790,1180858,
 1181756,1183463,1183503,1183671,1186020,1186691,1189201,1189222,1203050,1203252,1204128,1207729,1208775,1210846,1212541,1213251,1230480,1239898,1241841,1242098,1242409,1242413,1242460

Propchange: db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  9 23:54:02 2012
@@ -1,2 +1,2 @@
 /db/derby/code/branches/10.7/java/client/org/apache/derby/client/net/NetCursor.java:1061570,1061578,1082235
-/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java:1063809,1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1104365,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132747,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1140222,1140744,1141924,1142583,1142635,1145057,1145961,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612,1158108,1160593,1160597,1161208,1162737,1163131,1163616,1164358,1164370,1164495,1165221,1167017,1167470,1169692,1171665,1171672,1173647,1174436,1176633,1176636,1177589,1179374,1179546,1
 180790,1180858,1181756,1183463,1183671,1186020,1186691,1203252,1210846,1213251,1230480,1239898,1241841,1242098
+/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java:1063809,1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1104365,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132747,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1140222,1140744,1141924,1142583,1142635,1145057,1145961,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612,1158108,1160593,1160597,1161208,1162737,1163131,1163616,1164358,1164370,1164495,1165221,1167017,1167470,1169692,1171665,1171672,1173647,1174436,1176633,1176636,1177589,1179374,1179546,1
 180790,1180858,1181756,1183463,1183671,1186020,1186691,1203252,1210846,1213251,1230480,1239898,1241841,1242098,1242409,1242413,1242460

Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall?rev=1242612&r1=1242611&r2=1242612&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall
(original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall
Thu Feb  9 23:54:02 2012
@@ -29,7 +29,6 @@ lang/refActions3.sql
 lang/reopenScan.sql
 lang/setOpPlan.sql
 lang/specjPlans.sql
-lang/subquery.sql
 lang/subquery2.sql
 lang/subqueryFlattening.sql
 lang/triggerBeforeTrig.sql

Copied: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SubqueryTest.java
(from r1242409, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SubqueryTest.java)
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SubqueryTest.java?p2=db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SubqueryTest.java&p1=db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SubqueryTest.java&r1=1242409&r2=1242612&rev=1242612&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SubqueryTest.java
(original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SubqueryTest.java
Thu Feb  9 23:54:02 2012
@@ -35,7 +35,6 @@ import org.apache.derbyTesting.junit.Dat
 import org.apache.derbyTesting.junit.JDBC;
 import org.apache.derbyTesting.junit.RuntimeStatisticsParser;
 import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
-import org.apache.derbyTesting.junit.Utilities;
 
 /**
  * Test case for subquery.sql.
@@ -120,6 +119,10 @@ public class SubqueryTest extends BaseJD
         assertStatementError("42X10", st,
             "select * from s where exists (select t.* from t tt)");
 
+        // too many columns in select list
+        assertStatementError("42X39", st,
+            "select * from s where exists (select i, s from t)");
+
         // invalid column reference in select list
         assertStatementError("42X04", st,
             "select * from s where exists (select nosuchcolumn from t)");
@@ -174,14 +177,6 @@ public class SubqueryTest extends BaseJD
                 { "0", "0", "0", "0", "0" }, { "1", "1", "1", "1", "1" } };
         JDBC.assertFullResultSet(rs, expRS, true);
 
-        rs = st.executeQuery(
-            "select * from s where exists (select i, s from t)");
-        expColNames = new String[] { "I", "S", "C", "VC", "B" };
-        JDBC.assertColumnNames(rs, expColNames);
-        expRS = new String[][] { { null, null, null, null, null },
-                { "0", "0", "0", "0", "0" }, { "1", "1", "1", "1", "1" } };
-        JDBC.assertFullResultSet(rs, expRS, true);
-
         // subquery returns empty result set
         rs = st.executeQuery(
             "select * from s where exists (select * from t where i = -1)");
@@ -986,7 +981,6 @@ public class SubqueryTest extends BaseJD
         rs = st.executeQuery("values ConsistencyChecker()");
         expColNames = new String [] {"1"};
         JDBC.assertColumnNames(rs, expColNames);
-        // Utilities.showResultSet(rs);
         if (usingEmbedded()) {
             expRS = new String[][] 
                 { { "No open scans, etc.\n16 dependencies found" } };

Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/junit/RuntimeStatisticsParser.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/junit/RuntimeStatisticsParser.java?rev=1242612&r1=1242611&r2=1242612&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/junit/RuntimeStatisticsParser.java
(original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/junit/RuntimeStatisticsParser.java
Thu Feb  9 23:54:02 2012
@@ -479,7 +479,13 @@ public class RuntimeStatisticsParser {
             
             for (int j=0; j < strings[i].length(); j++) {
                 if (strings[i].charAt(j) == '_') {
-                    sb.append('\t');
+                    // this would mess up if the string has an _ somewhere in
+                    // the middle, e.g. if a table name has an _ in it. So, 
+                    // only do this for the first 15 characters.
+                    if (j < 15)
+                        sb.append('\t');
+                    else
+                        sb.append(strings[i].substring(j));                        
                 } else {
                     sb.append(strings[i].substring(j));
                     break;
@@ -488,18 +494,17 @@ public class RuntimeStatisticsParser {
             strings[i] = sb.toString();
         }
 
-        int matchIdx = 0; // which string to match next
         String window = statistics;
         for (int i = 0; i < strings.length; i++) {
             int pos = window.indexOf(strings[i]);
 
             if (pos == -1) {
                 throw new AssertionError(
-                    "Sequence not found in statistics");
+                    "Sequence " + strings[i] + "not found in statistics");
             }
 
             window = window.substring(pos + 1);
         }
-    }
+    }     
 }
     



Mime
View raw message