Changeset: 3bb27f57d3d2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3bb27f57d3d2
Modified Files:
monetdb5/mal/mal_resolve.c
sql/test/SQLite_regress/sqllogictest/Tests/select1.test.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/select1.test.stable.out.int128
sql/test/SQLite_regress/sqllogictest/Tests/select2.test.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/select2.test.stable.out.int128
sql/test/SQLite_regress/sqllogictest/Tests/select3.test.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/select3.test.stable.out.int128
testing/Mtest.py.in
Branch: embedded
Log Message:
merge with default
diffs (truncated from 21325 to 300 lines):
diff --git a/monetdb5/mal/mal_resolve.c b/monetdb5/mal/mal_resolve.c
--- a/monetdb5/mal/mal_resolve.c
+++ b/monetdb5/mal/mal_resolve.c
@@ -525,11 +525,11 @@ resolveType(int dsttype, int srctype)
if (tracefcn) {
int i2 = getColumnIndex(dsttype);
char *tpe1, *tpe2, *tpe3;
- tpe2 = getTypeName(t1);
- tpe4 = getTypeName(t2);
- tpe6 = getTypeName(t3);
+ tpe1 = getTypeName(t1);
+ tpe2 = getTypeName(t2);
+ tpe3 = getTypeName(t3);
mnstr_printf(GDKout, "resolved to bat[:oid,:%s]
bat[:oid,:%s]->bat[:oid,%s:%d]\n",
- tpe2, tpe4, tpe6, i2);
+ tpe1, tpe2, tpe3, i2);
GDKfree(tpe1);
GDKfree(tpe2);
GDKfree(tpe3);
diff --git a/sql/test/SQLite_regress/sqllogictest/Tests/select1.test.stable.out
b/sql/test/SQLite_regress/sqllogictest/Tests/select1.test.stable.out
--- a/sql/test/SQLite_regress/sqllogictest/Tests/select1.test.stable.out
+++ b/sql/test/SQLite_regress/sqllogictest/Tests/select1.test.stable.out
@@ -408,8 +408,8 @@ Ready.
# OR b>c
# ORDER BY 1,4,3,2,5
#;
-% .t1, .L2, .L3, .L4, .L5 # table_name
-% a, L2, L3, L4, L5 # name
+% .t1, .L1, .L2, .L3, .L4 # table_name
+% a, L1, L2, L3, L4 # name
% int, wrd, bigint, bigint, smallint # type
% 3, 1, 2, 2, 3 # length
[ 104, 0, -2, 4, 555 ]
@@ -701,8 +701,8 @@ Ready.
# WHERE c BETWEEN b-2 AND d+2
# ORDER BY 1,2,3
#;
-% .t1, .L1, .L3 # table_name
-% c, L1, L3 # name
+% .t1, .L1, .L2 # table_name
+% c, L1, L2 # name
% int, bigint, wrd # type
% 3, 2, 2 # length
[ 102, 4, 0 ]
@@ -803,8 +803,8 @@ Ready.
# FROM t1
# ORDER BY 4,3,5,1,6,2,7
#;
-% .L1, .t1, .L3, .L4, .t1, .L5, .L6 # table_name
-% L1, c, L3, L4, b, L5, L6 # name
+% .L1, .t1, .L2, .L3, .t1, .L4, .L5 # table_name
+% L1, c, L2, L3, b, L4, L5 # name
% smallint, int, wrd, bigint, int, smallint, bigint # type
% 3, 3, 2, 2, 3, 3, 3 # length
[ 333, 134, 6, -4, 130, 444, 391 ]
@@ -953,8 +953,8 @@ Ready.
# WHERE d NOT BETWEEN 110 AND 150
# ORDER BY 1,4,5,6,2,3
#;
-% .t1, .L2, .L3, .L4, .L5, .t1 # table_name
-% e, L2, L3, L4, L5, c # name
+% .t1, .L1, .L2, .L3, .L4, .t1 # table_name
+% e, L1, L2, L3, L4, c # name
% int, wrd, bigint, smallint, bigint, int # type
% 3, 2, 2, 3, 2, 3 # length
[ 103, 0, 4, 555, 1, 102 ]
@@ -1148,8 +1148,8 @@ Ready.
# OR c>d
# ORDER BY 3,2,1,4,5
#;
-% .L1, .t1, .L2, .L4, .L5 # table_name
-% L1, b, L2, L4, L5 # name
+% .L1, .t1, .L2, .L3, .L4 # table_name
+% L1, b, L2, L3, L4 # name
% smallint, int, bigint, wrd, smallint # type
% 3, 3, 3, 2, 3 # length
[ 555, 100, 304, 0, 444 ]
@@ -1519,8 +1519,8 @@ Ready.
# OR (e>a AND e<b)
# ORDER BY 4,1,3,2
#;
-% .L1, .L2, .L4, .L5 # table_name
-% L1, L2, L4, L5 # name
+% .L1, .L2, .L3, .L4 # table_name
+% L1, L2, L3, L4 # name
% bigint, bigint, wrd, bigint # type
% 2, 3, 1, 2 # length
[ -3, 579, 0, -2 ]
@@ -1586,8 +1586,8 @@ Ready.
# OR (a>b-2 AND a<b+2)
# ORDER BY 2,6,3,5,4,1
#;
-% .L1, .L3, .L4, .t1, .L6, .L7 # table_name
-% L1, L3, L4, b, L6, L7 # name
+% .L1, .L2, .L3, .t1, .L4, .L5 # table_name
+% L1, L2, L3, b, L4, L5 # name
% smallint, wrd, bigint, int, wrd, bigint # type
% 3, 1, 2, 3, 2, 3 # length
[ 333, 0, -1, 105, 1, 317 ]
@@ -1686,8 +1686,8 @@ Ready.
# WHERE EXISTS(SELECT 1 FROM t1 AS x WHERE x.b<t1.b)
# ORDER BY 1,5,3,2,4
#;
-% .L1, .L2, .L3, .L4, .L6 # table_name
-% L1, L2, L3, L4, L6 # name
+% .L1, .L2, .L3, .L4, .L5 # table_name
+% L1, L2, L3, L4, L5 # name
% smallint, bigint, int, bigint, wrd # type
% 3, 2, 3, 1, 1 # length
[ 111, -1, 245, 2, 0 ]
@@ -2157,8 +2157,8 @@ Ready.
# WHERE d NOT BETWEEN 110 AND 150
# ORDER BY 1,3,4,2
#;
-% .t1, .L1, .L3, .L5 # table_name
-% e, L1, L3, L5 # name
+% .t1, .L1, .L3, .L4 # table_name
+% e, L1, L3, L4 # name
% int, bigint, bigint, wrd # type
% 3, 2, 4, 2 # length
[ 103, -2, 1000, 0 ]
@@ -2769,8 +2769,8 @@ Ready.
# FROM t1
# ORDER BY 4,5,1,3,7,6,2
#;
-% .L1, .L2, .t1, .L4, .L5, .t1, .t1 # table_name
-% L1, L2, b, L4, L5, a, e # name
+% .L1, .L2, .t1, .L3, .L4, .t1, .t1 # table_name
+% L1, L2, b, L3, L4, a, e # name
% smallint, bigint, int, wrd, bigint, int, int # type
% 3, 2, 3, 1, 2, 3, 3 # length
[ 111, 2, 249, 0, -4, 245, 246 ]
@@ -2855,8 +2855,8 @@ Ready.
# WHERE (e>c OR e<d)
# ORDER BY 2,1,3
#;
-% .L1, .L2, .L4 # table_name
-% L1, L2, L4 # name
+% .L1, .L2, .L3 # table_name
+% L1, L2, L3 # name
% smallint, bigint, wrd # type
% 3, 3, 1 # length
[ 444, 304, 0 ]
@@ -3139,8 +3139,8 @@ Ready.
# OR b>c
# ORDER BY 1,3,5,2,4
#;
-% .L1, .t1, .L3, .L5, .L6 # table_name
-% L1, c, L3, L5, L6 # name
+% .L1, .t1, .L3, .L4, .L5 # table_name
+% L1, c, L3, L4, L5 # name
% bigint, int, bigint, wrd, bigint # type
% 2, 3, 4, 2, 2 # length
[ -4, 244, 486, 28, 3 ]
@@ -3183,8 +3183,8 @@ Ready.
# OR (e>c OR e<d)
# ORDER BY 4,6,5,1,3,7,2
#;
-% .L1, .L2, .L3, .L5, .L6, .L7, .t1 # table_name
-% L1, L2, L3, L5, L6, L7, d # name
+% .L1, .L2, .L3, .L4, .L5, .L6, .t1 # table_name
+% L1, L2, L3, L4, L5, L6, d # name
% bigint, smallint, bigint, wrd, int, bigint, int # type
% 2, 3, 3, 1, 3, 2, 3 # length
[ 1, 333, 455, 0, 153, -4, 154 ]
@@ -3355,8 +3355,8 @@ Ready.
# AND (c<=d-2 OR c>=d+2)
# ORDER BY 6,2,4,3,1,7,5
#;
-% .L1, .L2, .L3, .L5, .L6, .t1, .t1 # table_name
-% L1, L2, L3, L5, L6, d, a # name
+% .L1, .L2, .L3, .L4, .L5, .t1, .t1 # table_name
+% L1, L2, L3, L4, L5, d, a # name
% int, smallint, bigint, wrd, bigint, int, int # type
% 3, 3, 3, 2, 2, 3, 3 # length
[ 107, 333, 317, 1, 2, 108, 107 ]
@@ -4107,8 +4107,8 @@ Ready.
# AND d NOT BETWEEN 110 AND 150
# ORDER BY 1,3,6,2,5,4
#;
-% .L1, .L2, .t1, .L4, .L5, .L6 # table_name
-% L1, L2, a, L4, L5, L6 # name
+% .L1, .L2, .t1, .L3, .L4, .L5 # table_name
+% L1, L2, a, L3, L4, L5 # name
% bigint, bigint, int, wrd, bigint, smallint # type
% 2, 3, 3, 2, 2, 3 # length
[ -1, 666, 220, 24, 2, 222 ]
@@ -4593,8 +4593,8 @@ Ready.
# WHERE b>c
# ORDER BY 1,2,3
#;
-% .t1, .t1, .L2 # table_name
-% b, d, L2 # name
+% .t1, .t1, .L1 # table_name
+% b, d, L1 # name
% int, int, wrd # type
% 3, 3, 1 # length
[ 124, 122, 0 ]
@@ -5147,8 +5147,8 @@ Ready.
# WHERE (a>b-2 AND a<b+2)
# ORDER BY 1,2
#;
-% .L1, .L3 # table_name
-% L1, L3 # name
+% .L1, .L2 # table_name
+% L1, L2 # name
% bigint, wrd # type
% 2, 1 # length
[ -4, 0 ]
@@ -6065,8 +6065,8 @@ Ready.
# AND d NOT BETWEEN 110 AND 150
# ORDER BY 7,2,1,5,6,4,3
#;
-% .t1, .L1, .L2, .t1, .L4, .L5, .L6 # table_name
-% c, L1, L2, e, L4, L5, L6 # name
+% .t1, .L1, .L2, .t1, .L3, .L4, .L5 # table_name
+% c, L1, L2, e, L3, L4, L5 # name
% int, smallint, bigint, int, wrd, bigint, smallint # type
% 3, 3, 3, 3, 1, 2, 3 # length
[ 166, 333, 502, 165, 0, 1, 333 ]
@@ -6119,8 +6119,8 @@ Ready.
# AND c>d
# ORDER BY 6,5,4,2,3,1
#;
-% .t1, .L2, .L4, .L5, .L6, .L10 # table_name
-% e, L2, L4, L5, L6, L10 # name
+% .t1, .L1, .L3, .L4, .L5, .L6 # table_name
+% e, L1, L3, L4, L5, L6 # name
% int, wrd, bigint, smallint, bigint, wrd # type
% 3, 2, 3, 3, 1, 1 # length
[ 210, 22, 426, 222, 2, 0 ]
@@ -6676,8 +6676,8 @@ Ready.
# WHERE d>e
# ORDER BY 1,3,2,4,5
#;
-% .L1, .L3, .t1, .t1, .L4 # table_name
-% L1, L3, b, c, L4 # name
+% .L1, .L2, .t1, .t1, .L3 # table_name
+% L1, L2, b, c, L3 # name
% bigint, wrd, int, int, int # type
% 3, 1, 3, 3, 3 # length
[ 335, 0, 112, 113, 111 ]
@@ -7195,8 +7195,8 @@ Ready.
# OR (e>a AND e<b)
# ORDER BY 7,4,1,2,6,5,3
#;
-% .t1, .L2, .L3, .t1, .L4, .t1, .L5 # table_name
-% c, L2, L3, e, L4, d, L5 # name
+% .t1, .L1, .L2, .t1, .L3, .t1, .L4 # table_name
+% c, L1, L2, e, L3, d, L4 # name
% int, wrd, int, int, smallint, int, bigint # type
% 3, 2, 3, 3, 3, 3, 2 # length
[ 247, 29, 245, 246, 111, 248, -4 ]
@@ -7915,8 +7915,8 @@ Ready.
# AND (a>b-2 AND a<b+2)
# ORDER BY 3,5,6,7,2,1,4
#;
-% .L1, .L3, .L5, .L6, .t1, .L7, .L10 # table_name
-% L1, L3, L5, L6, b, L7, L10 # name
+% .L1, .L3, .L4, .L5, .t1, .L6, .L7 # table_name
+% L1, L3, L4, L5, b, L6, L7 # name
% bigint, bigint, wrd, bigint, int, bigint, bigint # type
% 2, 4, 2, 3, 3, 1, 2 # length
[ -1, 1120, 2, 335, 112, 1, -1 ]
@@ -8043,8 +8043,8 @@ Ready.
# FROM t1
# ORDER BY 2,4,5,1,3
#;
-% .L1, .L2, .L3, .L5, .t1 # table_name
-% L1, L2, L3, L5, a # name
+% .L1, .L2, .L3, .L4, .t1 # table_name
+% L1, L2, L3, L4, a # name
% smallint, bigint, int, wrd, int # type
% 3, 2, 3, 1, 3 # length
[ 444, -4, 245, 0, 245 ]
@@ -9069,8 +9069,8 @@ Ready.
# FROM t1
# ORDER BY 1,2,3,4,5
#;
-% .L2, .L4, .L5, .t1, .L6 # table_name
-% L2, L4, L5, a, L6 # name
+% .L2, .L3, .L4, .t1, .L5 # table_name
+% L2, L3, L4, a, L5 # name
% bigint, wrd, bigint, int, bigint # type
% 4, 2, 2, 3, 2 # length
[ 358, 15, 4, 179, 1 ]
@@ -9570,8 +9570,8 @@ Ready.
# WHERE (e>a AND e<b)
# ORDER BY 2,1
#;
-% .t1, .L2 # table_name
-% a, L2 # name
+% .t1, .L1 # table_name
+% a, L1 # name
% int, wrd # type
% 3, 2 # length
[ 115, 3 ]
@@ -10152,8 +10152,8 @@ Ready.
# OR c>d
# ORDER BY 1,2
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
