Changeset: faf9b94c015d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/faf9b94c015d
Modified Files:
gdk/gdk.h
monetdb_config.h.in
Branch: default
Log Message:
Merge with Jan2022 branch.
diffs (88 lines):
diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -80,7 +80,7 @@ static void logjsonInternal(char *logbuf
* We use the `logadd` function to add data to our buffer (usually key-value
pairs). This macro offers an interface similar
* to printf.
*
- * The first snprintf bellow happens in a statically allocated buffer that
might be much smaller than logcap. We do not
+ * The first snprintf below happens in a statically allocated buffer that
might be much smaller than logcap. We do not
* care. We only need to perform this snprintf to get the actual length of the
string that is to be produced.
*
* There are three cases:
@@ -889,7 +889,7 @@ sqlProfilerEvent(Client cntxt, MalBlkPtr
ev = prepareProfilerEvent(cntxt, mb, stk, pci, 0);
// keep it a short transaction
MT_lock_set(&mal_profileLock);
- if (cntxt->profticks == NULL) {
+ if (cntxt->profticks == NULL) {
MT_lock_unset(&mal_profileLock);
GDKfree(stmt);
return;
diff --git a/monetdb5/optimizer/opt_remap.c b/monetdb5/optimizer/opt_remap.c
--- a/monetdb5/optimizer/opt_remap.c
+++ b/monetdb5/optimizer/opt_remap.c
@@ -330,9 +330,9 @@ terminateMX:
* The comparison multiplex operations with a constant head may be supported
* by reverse of the operation.
*/
-static struct{
- char *src, *dst;
- int len;
+static const struct{
+ const char *src, *dst;
+ const int len;
}OperatorMap[]={
{"<", ">",1},
{">", "<",1},
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -13,7 +13,7 @@
#ifdef _MSC_VER
#if _MSC_VER < 1900
-#error Versions bellow Visual Studio 2015 are no longer supported
+#error Versions below Visual Studio 2015 are no longer supported
#endif
/* Prevent pollution through excessive inclusion of include files by
Windows.h. */
diff --git a/sql/test/sysmon/timeout/Tests/timeout_cross.SQL.py
b/sql/test/sysmon/timeout/Tests/timeout_cross.SQL.py
deleted file mode 100644
--- a/sql/test/sysmon/timeout/Tests/timeout_cross.SQL.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from MonetDBtesting.sqltest import SQLTestCase
-
-with SQLTestCase() as tc:
- tc.connect()
- tc.execute("create table foo(id bigserial, value int);").assertSucceeded()
- tc.execute("create table bar(id bigserial, value int);").assertSucceeded()
- # test cross product
- tc.execute("insert into foo(value) (select * from
generate_series(0,10000));").assertSucceeded()
- tc.execute("insert into bar(value) (select * from
generate_series(0,10000));").assertSucceeded()
- tc.execute("call sys.setquerytimeout(1); select * from foo, bar;")\
- .assertFailed(err_code="HYT00", err_message="Query aborted due to
timeout")
diff --git a/sql/test/sysmon/timeout/Tests/timeout_cross.test
b/sql/test/sysmon/timeout/Tests/timeout_cross.test
new file mode 100644
--- /dev/null
+++ b/sql/test/sysmon/timeout/Tests/timeout_cross.test
@@ -0,0 +1,18 @@
+statement ok
+create table foo(id bigserial, value int)
+
+statement ok
+create table bar(id bigserial, value int)
+
+statement ok
+insert into foo(value) (select * from generate_series(0,10000))
+
+statement ok
+insert into bar(value) (select * from generate_series(0,10000))
+
+statement ok
+call sys.setquerytimeout(1)
+
+statement error HYT00!Query aborted due to timeout
+select * from foo, bar
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
