Changeset: 6b54c415dec0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/6b54c415dec0
Branch: default
Log Message:
merged with Jun2023
diffs (232 lines):
diff --git a/clients/odbc/tests/ODBCStmtAttr.c
b/clients/odbc/tests/ODBCStmtAttr.c
--- a/clients/odbc/tests/ODBCStmtAttr.c
+++ b/clients/odbc/tests/ODBCStmtAttr.c
@@ -188,12 +188,19 @@ main(int argc, char **argv)
"Set SQL_ATTR_MAX_LENGTH: 2147483641\n"
"Get SQL_ATTR_MAX_LENGTH: 0\n"
" which is different from 2147483641 !!\n");
+#if (SIZEOF_LONG_INT == 8)
GetSetReGetStmtAttr(stmt, SQL_ATTR_MAX_LENGTH, -1, /* test also
what happens with a negative value */
"Get SQL_ATTR_MAX_LENGTH: 0\n"
"Set SQL_ATTR_MAX_LENGTH: 18446744073709551615\n"
"Get SQL_ATTR_MAX_LENGTH: 0\n"
" which is different from 18446744073709551615 !!\n");
-
+#else
+ GetSetReGetStmtAttr(stmt, SQL_ATTR_MAX_LENGTH, -1, /* test also
what happens with a negative value */
+ "Get SQL_ATTR_MAX_LENGTH: 0\n"
+ "Set SQL_ATTR_MAX_LENGTH: 4294967295\n"
+ "Get SQL_ATTR_MAX_LENGTH: 0\n"
+ " which is different from 4294967295 !!\n");
+#endif
GetSetReGetStmtAttr(stmt, SQL_ATTR_MAX_ROWS, 0,
"Get SQL_ATTR_MAX_ROWS: 0\n"
"Set SQL_ATTR_MAX_ROWS: 0\n"
@@ -208,11 +215,19 @@ main(int argc, char **argv)
"Set SQL_ATTR_MAX_ROWS: 2147483642\n"
"Get SQL_ATTR_MAX_ROWS: 0\n"
" which is different from 2147483642 !!\n");
+#if (SIZEOF_LONG_INT == 8)
GetSetReGetStmtAttr(stmt, SQL_ATTR_MAX_ROWS, -2, /* test also
what happens with a negative value */
"Get SQL_ATTR_MAX_ROWS: 0\n"
"Set SQL_ATTR_MAX_ROWS: 18446744073709551614\n"
"Get SQL_ATTR_MAX_ROWS: 0\n"
" which is different from 18446744073709551614 !!\n");
+#else
+ GetSetReGetStmtAttr(stmt, SQL_ATTR_MAX_ROWS, -2, /* test also
what happens with a negative value */
+ "Get SQL_ATTR_MAX_ROWS: 0\n"
+ "Set SQL_ATTR_MAX_ROWS: 4294967294\n"
+ "Get SQL_ATTR_MAX_ROWS: 0\n"
+ " which is different from 4294967294 !!\n");
+#endif
GetSetReGetStmtAttr(stmt, SQL_ATTR_QUERY_TIMEOUT, 0,
"Get SQL_ATTR_QUERY_TIMEOUT: 0\n"
@@ -229,11 +244,19 @@ main(int argc, char **argv)
"Set SQL_ATTR_QUERY_TIMEOUT: 2147483643\n"
"Get SQL_ATTR_QUERY_TIMEOUT: 2147483647\n"
" which is different from 2147483643 !!\n");
+#if (SIZEOF_LONG_INT == 8)
GetSetReGetStmtAttr(stmt, SQL_ATTR_QUERY_TIMEOUT, -3, /* test also
what happens with a negative value */
"Get SQL_ATTR_QUERY_TIMEOUT: 2147483647\n"
"Set SQL_ATTR_QUERY_TIMEOUT: 18446744073709551613\n"
"Get SQL_ATTR_QUERY_TIMEOUT: 2147483647\n"
" which is different from 18446744073709551613 !!\n");
+#else
+ GetSetReGetStmtAttr(stmt, SQL_ATTR_QUERY_TIMEOUT, -3, /* test also
what happens with a negative value */
+ "Get SQL_ATTR_QUERY_TIMEOUT: 2147483647\n"
+ "Set SQL_ATTR_QUERY_TIMEOUT: 4294967293\n"
+ "Get SQL_ATTR_QUERY_TIMEOUT: 2147483647\n"
+ " which is different from 4294967293 !!\n");
+#endif
ret = SQLFreeHandle(SQL_HANDLE_STMT, stmt);
check(ret, SQL_HANDLE_STMT, stmt, "SQLFreeHandle (STMT)");
diff --git a/sql/test/SQLancer/Tests/sqlancer18.test
b/sql/test/SQLancer/Tests/sqlancer18.test
--- a/sql/test/SQLancer/Tests/sqlancer18.test
+++ b/sql/test/SQLancer/Tests/sqlancer18.test
@@ -255,144 +255,10 @@ SELECT CAST(SUM(count) AS BIGINT) FROM (
----
135
-query R rowsort
-SELECT sub0.c2 FROM t2 JOIN (SELECT DISTINCT t2.c2, 3 FROM t2) AS sub0(c2,c3)
on t2.c2 = sub0.c2
+query I rowsort
+SELECT count(sub0.c2) FROM t2 JOIN (SELECT DISTINCT t2.c2, 3 FROM t2) AS
sub0(c2,c3) on t2.c2 = sub0.c2
----
--0.000
--1.000
--1.000
--1087290368.000
--1268147100.000
--1462578700.000
--170186860000000000.000
--2044814500.000
--444399328.000
--5.000
--5.370
--6.000
--707779136.000
--8.000
--809476200.000
--870545200.000
--870545200.000
--870545200.000
--870545200.000
--870545200.000
--870545200.000
--870545200.000
--870545200.000
--870545200.000
--870545200.000
--870545200.000
--870545200.000
--870545200.000
--870545200.000
--870545200.000
--870545200.000
--870545200.000
--870545216.000
--870545216.000
--870545216.000
--946846140.000
-0.000
-0.000
-0.000
-0.000
-0.000
-0.002
-0.029
-0.071
-0.104
-0.121
-0.124
-0.126
-0.172
-0.181
-0.185
-0.188
-0.212
-0.235
-0.244
-0.254
-0.256
-0.283
-0.292
-0.293
-0.293
-0.295
-0.307
-0.311
-0.325
-0.348
-0.356
-0.357
-0.357
-0.360
-0.374
-0.379
-0.384
-0.391
-0.419
-0.438
-0.458
-0.492
-0.493
-0.494
-0.514
-0.517
-0.536
-0.538
-0.550
-0.560
-0.579
-0.581
-0.607
-0.613
-0.624
-0.643
-0.644
-0.656
-0.709
-0.753
-0.755
-0.766
-0.779
-0.792
-0.793
-0.840
-0.842
-0.868
-0.899
-0.911
-0.952
-0.972
-0.974
-1.000
-1.000
-1.000
-110847336.000
-1507661312.000
-1828550000.000
-195935090.000
-195935090.000
-1969755300.000
-2.000
-2070646272.000
-2070646272.000
-3.000
-3.000
-3.142
-4.000
-4.000
-4.000
-5.000
-5.000
-6.000
-6.000
-600810368.000
-7.000
-7.000
-89812210.000
+135
statement ok
ROLLBACK
diff --git a/sql/test/scripts/Tests/copy-into-lz4.test.in
b/sql/test/scripts/Tests/copy-into-lz4.test.in
--- a/sql/test/scripts/Tests/copy-into-lz4.test.in
+++ b/sql/test/scripts/Tests/copy-into-lz4.test.in
@@ -7,10 +7,10 @@ CREATE TABLE testlz4 (a bigint, b real,
statement ok
COPY INTO testlz4 FROM E'$QTSTSRCDIR/testlz4.lz4' USING DELIMITERS
',',E'\n','"' NULL AS ''
-query IRTT rowsort
-SELECT a, b, c, d FROM testlz4 limit 1024
+query ITT rowsort
+SELECT a, c, d FROM testlz4 limit 1024
----
-4096 values hashing to 8301cae381de55e54089cb04f6e56d00
+3072 values hashing to 565adcf384369482e68cab7fe899e89b
statement ok
ROLLBACK
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
