Changeset: 40410aa47953 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=40410aa47953
Added Files:
sql/test/pg_regress/Tests/vacuum.stable.out.single
Modified Files:
MonetDB.spec
sql/backends/monet5/sql_scenario.c
Branch: default
Log Message:
Merge with Apr2019 branch.
diffs (217 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -946,7 +946,7 @@ fi
# to reduce the number of warnings during compilation.
%ifarch aarch64
if gcc -v 2>&1 | grep -q 'gcc version 4\.'; then
- CFLAGS="${CFLAGS:-$(echo %optflags | sed
's/-fstack-protector-strong//')"
+ CFLAGS="${CFLAGS:-$(echo %optflags | sed
's/-fstack-protector-strong//')}"
else
CFLAGS="${CFLAGS:-%optflags -Wno-format-truncation}"
fi
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -705,8 +705,10 @@ SQLinitClientFromMAL(Client c)
{
str msg = MAL_SUCCEED;
- if ((msg = SQLinitClient(c)) != MAL_SUCCEED)
+ if ((msg = SQLinitClient(c)) != MAL_SUCCEED) {
+ c->mode = FINISHCLIENT;
return msg;
+ }
mvc* m = ((backend*) c->sqlcontext)->mvc;
diff --git a/sql/test/pg_regress/Tests/vacuum.stable.out.single
b/sql/test/pg_regress/Tests/vacuum.stable.out.single
new file mode 100644
--- /dev/null
+++ b/sql/test/pg_regress/Tests/vacuum.stable.out.single
@@ -0,0 +1,185 @@
+stdout of test 'vacuum` in directory 'sql/test/pg_regress` itself:
+
+
+# 17:11:18 >
+# 17:11:18 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38959" "--set"
"mapi_usock=/var/tmp/mtest-1142/.s.monetdb.38959" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/dinther/INSTALL/var/MonetDB/mTests_sql_test_pg_regress" "--set"
"mal_listing=0"
+# 17:11:18 >
+
+# MonetDB 5 server v11.18.0
+# This is an unreleased version
+# Serving database 'mTests_sql_test_pg_regress', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 15.356 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://uwakai.da.cwi.nl:38959/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-1142/.s.monetdb.38959
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 17:11:19 >
+# 17:11:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-1142" "--port=38959"
+# 17:11:19 >
+
+#--
+#-- VACUUM
+#--
+#CREATE TABLE vactst (i INT);
+#INSERT INTO vactst VALUES (1);
+[ 1 ]
+#INSERT INTO vactst SELECT * FROM vactst;
+[ 1 ]
+#INSERT INTO vactst SELECT * FROM vactst;
+[ 2 ]
+#INSERT INTO vactst SELECT * FROM vactst;
+[ 4 ]
+#INSERT INTO vactst SELECT * FROM vactst;
+[ 8 ]
+#INSERT INTO vactst SELECT * FROM vactst;
+[ 16 ]
+#INSERT INTO vactst SELECT * FROM vactst;
+[ 32 ]
+#INSERT INTO vactst SELECT * FROM vactst;
+[ 64 ]
+#INSERT INTO vactst SELECT * FROM vactst;
+[ 128 ]
+#INSERT INTO vactst SELECT * FROM vactst;
+[ 256 ]
+#INSERT INTO vactst SELECT * FROM vactst;
+[ 512 ]
+#INSERT INTO vactst SELECT * FROM vactst;
+[ 1024 ]
+#INSERT INTO vactst VALUES (0);
+[ 1 ]
+#SELECT count(*) FROM vactst;
+% .L3 # table_name
+% L3 # name
+% bigint # type
+% 4 # length
+[ 2049 ]
+#SELECT i, count(*) AS count FROM vactst GROUP BY i ORDER BY i;
+% sys.vactst, sys.L4 # table_name
+% i, count # name
+% int, bigint # type
+% 1, 4 # length
+[ 0, 1 ]
+[ 1, 2048 ]
+#SELECT count(*) FROM vactst WHERE i <> 0;
+% sys.L3 # table_name
+% L3 # name
+% bigint # type
+% 4 # length
+[ 2048 ]
+#DELETE FROM vactst WHERE i <> 0;
+[ 2048 ]
+#SELECT * FROM vactst;
+% sys.vactst # table_name
+% i # name
+% int # type
+% 1 # length
+[ 0 ]
+#select "schema", "table", "column", type, count, typewidth, columnsize,
heapsize, hashes, "imprints", sorted from sys.storage(current_schema, 'vactst');
+% .L3, .L3, .L3, .L3, .L3, .L3, .L3, .L3, .L3, .L3,
.L3 # table_name
+% schema, table, column, type, count, typewidth, columnsize,
heapsize, hashes, imprints, sorted # name
+% varchar, varchar, varchar, varchar, bigint, int,
bigint, bigint, bigint, bigint, boolean # type
+% 3, 6, 1, 3, 4, 1, 4, 1, 1, 1,
5 # length
+[ "sys", "vactst", "i", "int", 2049, 4, 8196, 0,
0, 0, false ]
+#select "schema", "table", "column", type, count, typewidth, columnsize,
heapsize, hashes, "imprints", sorted from sys.storage(current_schema, 'vactst');
+% .L3, .L3, .L3, .L3, .L3, .L3, .L3, .L3, .L3, .L3,
.L3 # table_name
+% schema, table, column, type, count, typewidth, columnsize,
heapsize, hashes, imprints, sorted # name
+% varchar, varchar, varchar, varchar, bigint, int,
bigint, bigint, bigint, bigint, boolean # type
+% 3, 6, 1, 3, 1, 1, 1, 1, 1, 1,
5 # length
+[ "sys", "vactst", "i", "int", 1, 4, 4, 0,
0, 0, true ]
+#UPDATE vactst SET i = i + 1;
+[ 1 ]
+#INSERT INTO vactst SELECT * FROM vactst;
+[ 1 ]
+#INSERT INTO vactst SELECT * FROM vactst;
+[ 2 ]
+#INSERT INTO vactst SELECT * FROM vactst;
+[ 4 ]
+#INSERT INTO vactst SELECT * FROM vactst;
+[ 8 ]
+#INSERT INTO vactst SELECT * FROM vactst;
+[ 16 ]
+#INSERT INTO vactst SELECT * FROM vactst;
+[ 32 ]
+#INSERT INTO vactst SELECT * FROM vactst;
+[ 64 ]
+#INSERT INTO vactst SELECT * FROM vactst;
+[ 128 ]
+#INSERT INTO vactst SELECT * FROM vactst;
+[ 256 ]
+#INSERT INTO vactst SELECT * FROM vactst;
+[ 512 ]
+#INSERT INTO vactst SELECT * FROM vactst;
+[ 1024 ]
+#INSERT INTO vactst SELECT * FROM vactst;
+[ 2048 ]
+#INSERT INTO vactst SELECT * FROM vactst;
+[ 4096 ]
+#INSERT INTO vactst SELECT * FROM vactst;
+[ 8192 ]
+#INSERT INTO vactst SELECT * FROM vactst;
+[ 16384 ]
+#INSERT INTO vactst SELECT * FROM vactst;
+[ 32768 ]
+#INSERT INTO vactst SELECT * FROM vactst;
+[ 65536 ]
+#INSERT INTO vactst SELECT * FROM vactst;
+[ 131072 ]
+#INSERT INTO vactst SELECT * FROM vactst;
+[ 262144 ]
+#INSERT INTO vactst SELECT * FROM vactst;
+[ 524288 ]
+#INSERT INTO vactst VALUES (0);
+[ 1 ]
+#SELECT count(*) FROM vactst;
+% .L3 # table_name
+% L3 # name
+% bigint # type
+% 7 # length
+[ 1048577 ]
+#SELECT i, count(*) AS count FROM vactst GROUP BY i ORDER BY i;
+% sys.vactst, sys.L4 # table_name
+% i, count # name
+% int, bigint # type
+% 1, 7 # length
+[ 0, 1 ]
+[ 1, 1048576 ]
+#SELECT count(*) FROM vactst WHERE i <> 0;
+% sys.L3 # table_name
+% L3 # name
+% bigint # type
+% 7 # length
+[ 1048576 ]
+#DELETE FROM vactst WHERE i <> 0;
+[ 1048576 ]
+#select "schema", "table", "column", type, count, typewidth, columnsize,
heapsize, hashes, "imprints", sorted from sys.storage(current_schema, 'vactst');
+% .L3, .L3, .L3, .L3, .L3, .L3, .L3, .L3, .L3, .L3,
.L3 # table_name
+% schema, table, column, type, count, typewidth, columnsize,
heapsize, hashes, imprints, sorted # name
+% varchar, varchar, varchar, varchar, bigint, int,
bigint, bigint, bigint, bigint, boolean # type
+% 3, 6, 1, 3, 7, 1, 7, 1, 1, 1,
5 # length
+[ "sys", "vactst", "i", "int", 1048577, 4,
4194308, 0, 0, 0, false ]
+#select "schema", "table", "column", type, count, typewidth, columnsize,
heapsize, hashes, "imprints", sorted from sys.storage(current_schema, 'vactst');
+% .L3, .L3, .L3, .L3, .L3, .L3, .L3, .L3, .L3, .L3,
.L3 # table_name
+% schema, table, column, type, count, typewidth, columnsize,
heapsize, hashes, imprints, sorted # name
+% varchar, varchar, varchar, varchar, bigint, int,
bigint, bigint, bigint, bigint, boolean # type
+% 3, 6, 1, 3, 1, 1, 1, 1, 1, 1,
5 # length
+[ "sys", "vactst", "i", "int", 1, 4, 4, 0,
0, 0, true ]
+#DELETE FROM vactst;
+[ 1 ]
+#SELECT * FROM vactst;
+% sys.vactst # table_name
+% i # name
+% int # type
+% 1 # length
+#DROP TABLE vactst;
+
+# 17:11:19 >
+# 17:11:19 > "Done."
+# 17:11:19 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
