Changeset: 25b951244aff for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=25b951244aff
Modified Files:
sql/test/BugTracker-2012/Tests/with_and_exists.Bug-3099.sql
sql/test/BugTracker-2012/Tests/with_and_exists.Bug-3099.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (122 lines):
diff --git a/sql/test/BugTracker-2012/Tests/with_and_exists.Bug-3099.sql
b/sql/test/BugTracker-2012/Tests/with_and_exists.Bug-3099.sql
--- a/sql/test/BugTracker-2012/Tests/with_and_exists.Bug-3099.sql
+++ b/sql/test/BugTracker-2012/Tests/with_and_exists.Bug-3099.sql
@@ -15,12 +15,13 @@ WHERE EXISTS (
AND span1.pre < ancestor.post
AND ancestor.pre < span2.pre
AND span2.pre < ancestor.post)
-AND span1.pre <> span2.pre;
+AND span1.pre <> span2.pre
+ORDER BY pre1, pre2;
WITH
span1 AS ( SELECT pre AS pre1 FROM rank ),
span2 AS ( SELECT pre AS pre2 FROM rank )
-SELECT DISTINCT span1.pre1, span2.pre2
+SELECT DISTINCT span1.pre1 AS pre1, span2.pre2 AS pre2
FROM span1, span2
WHERE EXISTS (
SELECT 1
@@ -29,9 +30,10 @@ WHERE EXISTS (
AND span1.pre1 < ancestor.post
AND ancestor.pre < span2.pre2
AND span2.pre2 < ancestor.post)
-AND span1.pre1 <> span2.pre2;
+AND span1.pre1 <> span2.pre2
+ORDER BY pre1, pre2;
-SELECT DISTINCT span1.pre, span2.pre
+SELECT DISTINCT span1.pre AS pre1, span2.pre AS pre2
FROM rank AS span1, rank AS span2
WHERE EXISTS (
SELECT ancestor.pre
@@ -40,17 +42,19 @@ WHERE EXISTS (
AND span1.pre < ancestor.post
AND ancestor.pre < span2.pre
AND span2.pre < ancestor.post)
-AND span1.pre <> span2.pre;
+AND span1.pre <> span2.pre
+ORDER BY pre1, pre2;
WITH
span1 AS ( SELECT pre FROM rank ),
span2 AS ( SELECT pre FROM rank )
-SELECT DISTINCT span1.pre, span2.pre
+SELECT DISTINCT span1.pre AS pre1, span2.pre AS pre2
FROM span1, span2, rank AS ancestor
WHERE ancestor.pre < span1.pre
AND span1.pre < ancestor.post
AND ancestor.pre < span2.pre
AND span2.pre < ancestor.post
-AND span1.pre <> span2.pre;
+AND span1.pre <> span2.pre
+ORDER BY pre1, pre2;
drop table rank;
diff --git a/sql/test/BugTracker-2012/Tests/with_and_exists.Bug-3099.stable.out
b/sql/test/BugTracker-2012/Tests/with_and_exists.Bug-3099.stable.out
--- a/sql/test/BugTracker-2012/Tests/with_and_exists.Bug-3099.stable.out
+++ b/sql/test/BugTracker-2012/Tests/with_and_exists.Bug-3099.stable.out
@@ -43,8 +43,9 @@ Ready.
# AND span1.pre < ancestor.post
# AND ancestor.pre < span2.pre
# AND span2.pre < ancestor.post)
-#AND span1.pre <> span2.pre;
-% sys.L2, sys.L2 # table_name
+#AND span1.pre <> span2.pre
+#ORDER BY pre1, pre2;
+% sys.L, sys.L # table_name
% pre1, pre2 # name
% int, int # type
% 1, 1 # length
@@ -62,8 +63,9 @@ Ready.
# AND span1.pre1 < ancestor.post
# AND ancestor.pre < span2.pre2
# AND span2.pre2 < ancestor.post)
-#AND span1.pre1 <> span2.pre2;
-% sys.span1, sys.span2 # table_name
+#AND span1.pre1 <> span2.pre2
+#ORDER BY pre1, pre2;
+% sys.L, sys.L # table_name
% pre1, pre2 # name
% int, int # type
% 1, 1 # length
@@ -78,9 +80,10 @@ Ready.
# AND span1.pre < ancestor.post
# AND ancestor.pre < span2.pre
# AND span2.pre < ancestor.post)
-#AND span1.pre <> span2.pre;
-% sys.span1, sys.span2 # table_name
-% pre, pre # name
+#AND span1.pre <> span2.pre
+#ORDER BY pre1, pre2;
+% sys.L, sys.L # table_name
+% pre1, pre2 # name
% int, int # type
% 1, 1 # length
[ 2, 4 ]
@@ -94,9 +97,10 @@ Ready.
#AND span1.pre < ancestor.post
#AND ancestor.pre < span2.pre
#AND span2.pre < ancestor.post
-#AND span1.pre <> span2.pre;
-% sys.span1, sys.span2 # table_name
-% pre, pre # name
+#AND span1.pre <> span2.pre
+#ORDER BY pre1, pre2;
+% sys.L, sys.L # table_name
+% pre1, pre2 # name
% int, int # type
% 1, 1 # length
[ 2, 4 ]
diff --git
a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
+++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
@@ -78,7 +78,7 @@ Operation successful
| X_38 := aggr.count(X_37); |
| X_39 := bat.append(X_26,X_38,true); |
| X_40:wrd := aggr.sum(X_39); |
-| sql.exportValue(1,".L1","L1","wrd",32,0,6,X_40,""); |
+| sql.exportValue(1,".L1","L1","wrd",32,0,7,X_40,"");
|
| end s3_1; |
| # querylog.define("explain select count(*) from
tables\n;","sequential_pipe") |
+-------------------------------------------------------------------------------+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
