MonetDB: default - Approved output and reverted restrict change....

[Pedro Ferreira]

Changeset: 7254e888f753 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7254e888f753
Modified Files:
        monetdb5/modules/mal/pcre.c
        sql/test/SQLancer/Tests/sqlancer04.stable.out
Branch: default
Log Message:

Approved output and reverted restrict change. MSVC still dislikes it.

Sorry Sjoerd :)


diffs (57 lines):

diff --git a/monetdb5/modules/mal/pcre.c b/monetdb5/modules/mal/pcre.c
--- a/monetdb5/modules/mal/pcre.c
+++ b/monetdb5/modules/mal/pcre.c
@@ -1628,7 +1628,7 @@ BATPCRElike3(Client cntxt, MalBlkPtr mb,
                 input_is_a_bat = isaBatType(getArgType(mb, pci, 1)), 
pattern_is_a_bat = isaBatType(getArgType(mb, pci, 2));
        bat *r = getArgReference_bat(stk, pci, 0);
        BUN q = 0;
-       bit *restrict ret = NULL;
+       bit *ret = NULL;
 #ifdef HAVE_LIBPCRE
        pcre *re = NULL;
        pcre_extra *ex = NULL;
diff --git a/sql/test/SQLancer/Tests/sqlancer04.stable.out 
b/sql/test/SQLancer/Tests/sqlancer04.stable.out
--- a/sql/test/SQLancer/Tests/sqlancer04.stable.out
+++ b/sql/test/SQLancer/Tests/sqlancer04.stable.out
@@ -227,6 +227,22 @@ stdout of test 'sqlancer04` in directory
 #"2m^OqPm/3DḞZ02"
 #"2m^OqPm/3DḞZ02"
 [ 5    ]
+#SELECT 1 FROM t1 WHERE COALESCE(FALSE, t1.c0 = '0' AND t1.c0 LIKE t1.c0);
+% .%2 # table_name
+% %2 # name
+% tinyint # type
+% 1 # length
+#SELECT SUM(agg0) FROM (
+#SELECT ALL sum(ALL abs(INTERVAL '1507781126' SECOND)) as agg0 FROM t1
+#WHERE COALESCE(FALSE, (((((((((((t1.c0) NOT BETWEEN ASYMMETRIC (t1.c0) AND 
(t1.c0))AND(((t1.c0)>=(t1.c0)))))AND(NOT 
(TRUE))))AND(((t1.c0)LIKE(t1.c0)))))AND(((t1.c0)NOT 
ILIKE(t1.c0)))))OR(COALESCE(FALSE, FALSE))))
+#UNION ALL
+#SELECT sum(ALL abs(INTERVAL '1507781126' SECOND)) as agg0 FROM t1
+#WHERE NOT (COALESCE(FALSE, (((((((((((t1.c0) NOT BETWEEN ASYMMETRIC (t1.c0) 
AND (t1.c0))AND(((t1.c0)>=(t1.c0)))))AND(NOT 
(TRUE))))AND(((t1.c0)LIKE(t1.c0)))))AND(((t1.c0)NOT 
ILIKE(t1.c0)))))OR(COALESCE(FALSE, FALSE)))))
+% .%16 # table_name
+% %16 # name
+% sec_interval # type
+% 14 # length
+[ 7538905630.000       ]
 #ROLLBACK;
 #CREATE TABLE "sys"."t1" ("c1" DOUBLE);
 #COPY 7 RECORDS INTO "sys"."t1" FROM stdin USING DELIMITERS E'\t',E'\n','"';
@@ -238,6 +254,18 @@ stdout of test 'sqlancer04` in directory
 #0.6184216877785851
 #0.6479886625655562
 [ 7    ]
+#SELECT 1 FROM t1 WHERE COALESCE(1, CAST(t1.c1 AS INT) & COALESCE(1101847419, 
2)); --inputs not same size error
+% .%3 # table_name
+% %3 # name
+% tinyint # type
+% 1 # length
+[ 1    ]
+[ 1    ]
+[ 1    ]
+[ 1    ]
+[ 1    ]
+[ 1    ]
+[ 1    ]
 #DROP TABLE "sys"."t1";
 
 # 09:44:50 >  
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list