Changeset: 9e3d570bd87e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9e3d570bd87e
Modified Files:
sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_01.stable.out
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2016/Tests/storagemodel.stable.out
sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Darwin
sql/test/BugTracker-2016/Tests/storagemodel.stable.out.FreeBSD
sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Windows
sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out
sql/test/BugTracker-2017/Tests/spurious_error.Bug-6344.stable.out
sql/test/BugTracker-2017/Tests/statistics_nils_not_eq_zero.Bug-6331.stable.out
sql/test/mergetables/Tests/mergequery.stable.out
Branch: default
Log Message:
Approvals.
diffs (truncated from 381 to 300 lines):
diff --git a/sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_01.stable.out
b/sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_01.stable.out
--- a/sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_01.stable.out
+++ b/sql/backends/monet5/UDF/pyapi3/Tests/pyloader3_01.stable.out
@@ -52,11 +52,11 @@ Ready.
% sys.mytable, sys.mytable, sys.mytable # table_name
% a, d, s # name
% double, int, clob # type
-% 24, 1, 7 # length
-[ 42, 1, "'hello'" ]
+% 24, 1, 5 # length
+[ 42, 1, NULL ]
[ 46, 4, "hello" ]
-[ 45, 3, "'hello'" ]
-[ 44, 2, "'hello'" ]
+[ 45, 3, NULL ]
+[ 44, 2, NULL ]
#DROP TABLE mytable;
#DROP ALL LOADER myfunc;
#CREATE LOADER myfunc() LANGUAGE PYTHON {
diff --git
a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
---
a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
+++
b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
@@ -40,12 +40,12 @@ function user.s4_1():void;
X_5:int := sql.mvc();
X_9:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str, "name":str,
0:int);
C_6:bat[:oid] := sql.tid(X_5:int, "sys":str, "functions":str);
- C_93:bat[:oid] := algebra.likeselect(X_9:bat[:str], C_6:bat[:oid],
"%optimizers%":str, "":str, false:bit);
+ C_95:bat[:oid] := algebra.likeselect(X_9:bat[:str], C_6:bat[:oid],
"%optimizers%":str, "":str, false:bit);
(C_14:bat[:oid], X_15:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "name":str, 2:int);
- C_94:bat[:oid] := algebra.likeselect(X_15:bat[:str], nil:bat[:oid],
"%optimizers%":str, "":str, false:bit);
+ C_96:bat[:oid] := algebra.likeselect(X_15:bat[:str], nil:bat[:oid],
"%optimizers%":str, "":str, false:bit);
X_12:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"name":str, 1:int);
- C_96:bat[:oid] := algebra.likeselect(X_12:bat[:str], C_6:bat[:oid],
"%optimizers%":str, "":str, false:bit);
- C_29:bat[:oid] := sql.subdelta(C_93:bat[:oid], C_6:bat[:oid],
C_14:bat[:oid], C_94:bat[:oid], C_96:bat[:oid]);
+ C_98:bat[:oid] := algebra.likeselect(X_12:bat[:str], C_6:bat[:oid],
"%optimizers%":str, "":str, false:bit);
+ C_29:bat[:oid] := sql.subdelta(C_95:bat[:oid], C_6:bat[:oid],
C_14:bat[:oid], C_96:bat[:oid], C_98:bat[:oid]);
X_19:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 0:int);
(C_22:bat[:oid], X_23:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "func":str, 2:int);
X_21:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 1:int);
@@ -101,12 +101,12 @@ function user.s6_1():void;
X_5:int := sql.mvc();
X_9:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str, "name":str,
0:int);
C_6:bat[:oid] := sql.tid(X_5:int, "sys":str, "functions":str);
- C_93:bat[:oid] := algebra.likeselect(X_9:bat[:str], C_6:bat[:oid],
"%optimizers%":str, "":str, true:bit);
+ C_95:bat[:oid] := algebra.likeselect(X_9:bat[:str], C_6:bat[:oid],
"%optimizers%":str, "":str, true:bit);
(C_14:bat[:oid], X_15:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "name":str, 2:int);
- C_94:bat[:oid] := algebra.likeselect(X_15:bat[:str], nil:bat[:oid],
"%optimizers%":str, "":str, true:bit);
+ C_96:bat[:oid] := algebra.likeselect(X_15:bat[:str], nil:bat[:oid],
"%optimizers%":str, "":str, true:bit);
X_12:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"name":str, 1:int);
- C_96:bat[:oid] := algebra.likeselect(X_12:bat[:str], C_6:bat[:oid],
"%optimizers%":str, "":str, true:bit);
- C_29:bat[:oid] := sql.subdelta(C_93:bat[:oid], C_6:bat[:oid],
C_14:bat[:oid], C_94:bat[:oid], C_96:bat[:oid]);
+ C_98:bat[:oid] := algebra.likeselect(X_12:bat[:str], C_6:bat[:oid],
"%optimizers%":str, "":str, true:bit);
+ C_29:bat[:oid] := sql.subdelta(C_95:bat[:oid], C_6:bat[:oid],
C_14:bat[:oid], C_96:bat[:oid], C_98:bat[:oid]);
X_19:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 0:int);
(C_22:bat[:oid], X_23:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "func":str, 2:int);
X_21:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 1:int);
@@ -163,12 +163,12 @@ function user.s8_1():void;
X_5:int := sql.mvc();
X_9:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str, "name":str,
0:int);
C_6:bat[:oid] := sql.tid(X_5:int, "sys":str, "functions":str);
- C_93:bat[:oid] := algebra.ilikeselect(X_9:bat[:str], C_6:bat[:oid],
"%optimizers%":str, "":str, false:bit);
+ C_95:bat[:oid] := algebra.ilikeselect(X_9:bat[:str], C_6:bat[:oid],
"%optimizers%":str, "":str, false:bit);
(C_14:bat[:oid], X_15:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "name":str, 2:int);
- C_94:bat[:oid] := algebra.ilikeselect(X_15:bat[:str], nil:bat[:oid],
"%optimizers%":str, "":str, false:bit);
+ C_96:bat[:oid] := algebra.ilikeselect(X_15:bat[:str], nil:bat[:oid],
"%optimizers%":str, "":str, false:bit);
X_12:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"name":str, 1:int);
- C_96:bat[:oid] := algebra.ilikeselect(X_12:bat[:str], C_6:bat[:oid],
"%optimizers%":str, "":str, false:bit);
- C_29:bat[:oid] := sql.subdelta(C_93:bat[:oid], C_6:bat[:oid],
C_14:bat[:oid], C_94:bat[:oid], C_96:bat[:oid]);
+ C_98:bat[:oid] := algebra.ilikeselect(X_12:bat[:str], C_6:bat[:oid],
"%optimizers%":str, "":str, false:bit);
+ C_29:bat[:oid] := sql.subdelta(C_95:bat[:oid], C_6:bat[:oid],
C_14:bat[:oid], C_96:bat[:oid], C_98:bat[:oid]);
X_19:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 0:int);
(C_22:bat[:oid], X_23:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "func":str, 2:int);
X_21:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 1:int);
@@ -223,12 +223,12 @@ function user.s10_1():void;
X_5:int := sql.mvc();
X_9:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str, "name":str,
0:int);
C_6:bat[:oid] := sql.tid(X_5:int, "sys":str, "functions":str);
- C_93:bat[:oid] := algebra.ilikeselect(X_9:bat[:str], C_6:bat[:oid],
"%optimizers%":str, "":str, true:bit);
+ C_95:bat[:oid] := algebra.ilikeselect(X_9:bat[:str], C_6:bat[:oid],
"%optimizers%":str, "":str, true:bit);
(C_14:bat[:oid], X_15:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "name":str, 2:int);
- C_94:bat[:oid] := algebra.ilikeselect(X_15:bat[:str], nil:bat[:oid],
"%optimizers%":str, "":str, true:bit);
+ C_96:bat[:oid] := algebra.ilikeselect(X_15:bat[:str], nil:bat[:oid],
"%optimizers%":str, "":str, true:bit);
X_12:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"name":str, 1:int);
- C_96:bat[:oid] := algebra.ilikeselect(X_12:bat[:str], C_6:bat[:oid],
"%optimizers%":str, "":str, true:bit);
- C_29:bat[:oid] := sql.subdelta(C_93:bat[:oid], C_6:bat[:oid],
C_14:bat[:oid], C_94:bat[:oid], C_96:bat[:oid]);
+ C_98:bat[:oid] := algebra.ilikeselect(X_12:bat[:str], C_6:bat[:oid],
"%optimizers%":str, "":str, true:bit);
+ C_29:bat[:oid] := sql.subdelta(C_95:bat[:oid], C_6:bat[:oid],
C_14:bat[:oid], C_96:bat[:oid], C_98:bat[:oid]);
X_19:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 0:int);
(C_22:bat[:oid], X_23:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "func":str, 2:int);
X_21:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 1:int);
@@ -308,8 +308,8 @@ function user.s20_1():void;
(C_14:bat[:oid], X_15:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "name":str, 2:int);
X_12:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"name":str, 1:int);
X_18:bat[:str] := sql.projectdelta(C_6:bat[:oid], X_9:bat[:str],
C_14:bat[:oid], X_15:bat[:str], X_12:bat[:str]);
- X_98:bat[:bit] := batalgebra.like(X_18:bat[:str], "%optimizers%":str);
- C_32:bat[:oid] := algebra.thetaselect(X_98:bat[:bit], true:bit, "==":str);
+ X_100:bat[:bit] := batalgebra.like(X_18:bat[:str], "%optimizers%":str);
+ C_32:bat[:oid] := algebra.thetaselect(X_100:bat[:bit], true:bit, "==":str);
X_19:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 0:int);
(C_22:bat[:oid], X_23:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "func":str, 2:int);
X_21:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 1:int);
@@ -369,8 +369,8 @@ function user.s22_1():void;
(C_14:bat[:oid], X_15:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "name":str, 2:int);
X_12:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"name":str, 1:int);
X_18:bat[:str] := sql.projectdelta(C_6:bat[:oid], X_9:bat[:str],
C_14:bat[:oid], X_15:bat[:str], X_12:bat[:str]);
- X_98:bat[:bit] := batalgebra.not_like(X_18:bat[:str], "%optimizers%":str);
- C_32:bat[:oid] := algebra.thetaselect(X_98:bat[:bit], true:bit, "==":str);
+ X_100:bat[:bit] := batalgebra.not_like(X_18:bat[:str], "%optimizers%":str);
+ C_32:bat[:oid] := algebra.thetaselect(X_100:bat[:bit], true:bit, "==":str);
X_19:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 0:int);
(C_22:bat[:oid], X_23:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "func":str, 2:int);
X_21:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 1:int);
@@ -430,8 +430,8 @@ function user.s24_1():void;
(C_14:bat[:oid], X_15:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "name":str, 2:int);
X_12:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"name":str, 1:int);
X_18:bat[:str] := sql.projectdelta(C_6:bat[:oid], X_9:bat[:str],
C_14:bat[:oid], X_15:bat[:str], X_12:bat[:str]);
- X_98:bat[:bit] := batalgebra.ilike(X_18:bat[:str], "%optimizers%":str);
- C_32:bat[:oid] := algebra.thetaselect(X_98:bat[:bit], true:bit, "==":str);
+ X_100:bat[:bit] := batalgebra.ilike(X_18:bat[:str], "%optimizers%":str);
+ C_32:bat[:oid] := algebra.thetaselect(X_100:bat[:bit], true:bit, "==":str);
X_19:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 0:int);
(C_22:bat[:oid], X_23:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "func":str, 2:int);
X_21:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 1:int);
@@ -491,8 +491,8 @@ function user.s26_1():void;
(C_14:bat[:oid], X_15:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "name":str, 2:int);
X_12:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"name":str, 1:int);
X_18:bat[:str] := sql.projectdelta(C_6:bat[:oid], X_9:bat[:str],
C_14:bat[:oid], X_15:bat[:str], X_12:bat[:str]);
- X_98:bat[:bit] := batalgebra.not_ilike(X_18:bat[:str], "%optimizers%":str);
- C_32:bat[:oid] := algebra.thetaselect(X_98:bat[:bit], true:bit, "==":str);
+ X_100:bat[:bit] := batalgebra.not_ilike(X_18:bat[:str],
"%optimizers%":str);
+ C_32:bat[:oid] := algebra.thetaselect(X_100:bat[:bit], true:bit, "==":str);
X_19:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 0:int);
(C_22:bat[:oid], X_23:bat[:str]) := sql.bind(X_5:int, "sys":str,
"functions":str, "func":str, 2:int);
X_21:bat[:str] := sql.bind(X_5:int, "sys":str, "functions":str,
"func":str, 1:int);
diff --git a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out
b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out
--- a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out
+++ b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out
@@ -74,7 +74,7 @@ Ready.
[ "sys", "_tables", "id", "int", "writable", 4, 0,
false, 0 ]
[ "sys", "_tables", "name", "varchar", "writable", 9,
0, false, 0 ]
[ "sys", "_tables", "schema_id", "int", "writable", 4,
0, false, 0 ]
-[ "sys", "_tables", "query", "varchar", "writable",
40, 0, false, 0 ]
+[ "sys", "_tables", "query", "varchar", "writable",
55, 0, false, 0 ]
[ "sys", "_tables", "type", "smallint", "writable", 2,
0, false, 0 ]
[ "sys", "_tables", "system", "boolean", "writable",
1, 0, false, 0 ]
[ "sys", "_tables", "commit_action", "smallint",
"writable", 2, 0, false, 0 ]
@@ -99,7 +99,7 @@ Ready.
[ "sys", "_tables", "id", "int", "writable", 4, 0,
false, 0 ]
[ "sys", "_tables", "name", "varchar", "writable", 9,
0, false, 0 ]
[ "sys", "_tables", "schema_id", "int", "writable", 4,
0, false, 0 ]
-[ "sys", "_tables", "query", "varchar", "writable",
40, 0, false, 0 ]
+[ "sys", "_tables", "query", "varchar", "writable",
55, 0, false, 0 ]
[ "sys", "_tables", "type", "smallint", "writable", 2,
0, false, 0 ]
[ "sys", "_tables", "system", "boolean", "writable",
1, 0, false, 0 ]
[ "sys", "_tables", "commit_action", "smallint",
"writable", 2, 0, false, 0 ]
diff --git a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Darwin
b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Darwin
--- a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Darwin
+++ b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Darwin
@@ -72,9 +72,9 @@ Ready.
% clob, clob, clob, clob, clob, int, bigint, boolean,
bigint # type
% 3, 7, 13, 8, 8, 2, 1, 5, 1 # length
[ "sys", "_tables", "id", "int", "writable", 4, 0,
false, 0 ]
-[ "sys", "_tables", "name", "varchar", "writable", 9,
0, false, 0 ]
+[ "sys", "_tables", "name", "varchar", "writable", 10,
0, false, 0 ]
[ "sys", "_tables", "schema_id", "int", "writable", 4,
0, false, 0 ]
-[ "sys", "_tables", "query", "varchar", "writable",
44, 0, false, 0 ]
+[ "sys", "_tables", "query", "varchar", "writable",
60, 0, false, 0 ]
[ "sys", "_tables", "type", "smallint", "writable", 2,
0, false, 0 ]
[ "sys", "_tables", "system", "boolean", "writable",
1, 0, false, 0 ]
[ "sys", "_tables", "commit_action", "smallint",
"writable", 2, 0, false, 0 ]
@@ -97,9 +97,9 @@ Ready.
% clob, clob, clob, clob, clob, int, bigint, boolean,
bigint # type
% 3, 7, 13, 8, 8, 2, 1, 5, 1 # length
[ "sys", "_tables", "id", "int", "writable", 4, 0,
false, 0 ]
-[ "sys", "_tables", "name", "varchar", "writable", 9,
0, false, 0 ]
+[ "sys", "_tables", "name", "varchar", "writable", 10,
0, false, 0 ]
[ "sys", "_tables", "schema_id", "int", "writable", 4,
0, false, 0 ]
-[ "sys", "_tables", "query", "varchar", "writable",
43, 0, false, 0 ]
+[ "sys", "_tables", "query", "varchar", "writable",
59, 0, false, 0 ]
[ "sys", "_tables", "type", "smallint", "writable", 2,
0, false, 0 ]
[ "sys", "_tables", "system", "boolean", "writable",
1, 0, false, 0 ]
[ "sys", "_tables", "commit_action", "smallint",
"writable", 2, 0, false, 0 ]
diff --git a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.FreeBSD
b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.FreeBSD
--- a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.FreeBSD
+++ b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.FreeBSD
@@ -74,7 +74,7 @@ Ready.
[ "sys", "_tables", "id", "int", "writable", 4, 0,
false, 0 ]
[ "sys", "_tables", "name", "varchar", "writable", 9,
0, false, 0 ]
[ "sys", "_tables", "schema_id", "int", "writable", 4,
0, false, 0 ]
-[ "sys", "_tables", "query", "varchar", "writable",
48, 0, false, 0 ]
+[ "sys", "_tables", "query", "varchar", "writable",
66, 0, false, 0 ]
[ "sys", "_tables", "type", "smallint", "writable", 2,
0, false, 0 ]
[ "sys", "_tables", "system", "boolean", "writable",
1, 0, false, 0 ]
[ "sys", "_tables", "commit_action", "smallint",
"writable", 2, 0, false, 0 ]
@@ -99,7 +99,7 @@ Ready.
[ "sys", "_tables", "id", "int", "writable", 4, 0,
false, 0 ]
[ "sys", "_tables", "name", "varchar", "writable", 9,
0, false, 0 ]
[ "sys", "_tables", "schema_id", "int", "writable", 4,
0, false, 0 ]
-[ "sys", "_tables", "query", "varchar", "writable",
47, 0, false, 0 ]
+[ "sys", "_tables", "query", "varchar", "writable",
66, 0, false, 0 ]
[ "sys", "_tables", "type", "smallint", "writable", 2,
0, false, 0 ]
[ "sys", "_tables", "system", "boolean", "writable",
1, 0, false, 0 ]
[ "sys", "_tables", "commit_action", "smallint",
"writable", 2, 0, false, 0 ]
diff --git a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Windows
b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Windows
old mode 100644
new mode 100755
--- a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Windows
+++ b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Windows
@@ -74,7 +74,7 @@ Ready.
[ "sys", "_tables", "id", "int", "writable", 4, 0,
false, 0 ]
[ "sys", "_tables", "name", "varchar", "writable", 9,
0, false, 0 ]
[ "sys", "_tables", "schema_id", "int", "writable", 4,
0, false, 0 ]
-[ "sys", "_tables", "query", "varchar", "writable",
48, 0, false, 0 ]
+[ "sys", "_tables", "query", "varchar", "writable",
66, 0, false, 0 ]
[ "sys", "_tables", "type", "smallint", "writable", 2,
0, false, 0 ]
[ "sys", "_tables", "system", "boolean", "writable",
1, 0, false, 0 ]
[ "sys", "_tables", "commit_action", "smallint",
"writable", 2, 0, false, 0 ]
@@ -99,7 +99,7 @@ Ready.
[ "sys", "_tables", "id", "int", "writable", 4, 0,
false, 0 ]
[ "sys", "_tables", "name", "varchar", "writable", 9,
0, false, 0 ]
[ "sys", "_tables", "schema_id", "int", "writable", 4,
0, false, 0 ]
-[ "sys", "_tables", "query", "varchar", "writable",
47, 0, false, 0 ]
+[ "sys", "_tables", "query", "varchar", "writable",
65, 0, false, 0 ]
[ "sys", "_tables", "type", "smallint", "writable", 2,
0, false, 0 ]
[ "sys", "_tables", "system", "boolean", "writable",
1, 0, false, 0 ]
[ "sys", "_tables", "commit_action", "smallint",
"writable", 2, 0, false, 0 ]
diff --git a/sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out
b/sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out
--- a/sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out
+++ b/sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.out
@@ -44,7 +44,7 @@ Ready.
% 161 # length
function user.s4_1():void;
X_5:void := querylog.define("explain select count(*) from
my_generate_series(1,5) as t1,\nmy_generate_series(1,100) as t2;":str,
"default_pipe":str, 33:int);
-barrier X_98:bit := language.dataflow();
+barrier X_100:bit := language.dataflow();
X_31:bat[:str] := bat.new(nil:str);
X_37:bat[:int] := bat.new(nil:int);
X_35:bat[:int] := bat.new(nil:int);
@@ -67,7 +67,7 @@ barrier X_98:bit := language.dataflow();
X_46:bat[:int] := bat.append(X_37:bat[:int], 0:int);
language.pass(X_21:bat[:lng]);
language.pass(X_22:bat[:lng]);
-exit X_98:bit;
+exit X_100:bit;
sql.resultSet(X_38:bat[:str], X_40:bat[:str], X_42:bat[:str],
X_44:bat[:int], X_46:bat[:int], X_27:bat[:lng]);
end user.s4_1;
#inline actions= 0 time=4 usec
diff --git a/sql/test/BugTracker-2017/Tests/spurious_error.Bug-6344.stable.out
b/sql/test/BugTracker-2017/Tests/spurious_error.Bug-6344.stable.out
--- a/sql/test/BugTracker-2017/Tests/spurious_error.Bug-6344.stable.out
+++ b/sql/test/BugTracker-2017/Tests/spurious_error.Bug-6344.stable.out
@@ -93,15 +93,15 @@ Ready.
[ "id", 8194, "id", 8194, 8194, 11, 8194 ]
[ "file_id", 8194, "file_id", 8194, 8194, 11, 8194 ]
[ "file_id", 8196, "file_id", 8196, 8196, 11, 8196 ]
-[ "width", 8796, "width", 8796, 8796, 11, 8796 ]
-[ "p_partkey", 8903, "p_partkey", 8903, 8903, 11, 8903 ]
-[ "p_partkey", 8902, "p_partkey", 8902, 8902, 11, 8902 ]
-[ "ps_partkey", 8912, "ps_partkey", 8912, 8912, 11, 8912
]
-[ "ps_suppkey", 8912, "ps_suppkey", 8912, 8912, 11, 8912
]
-[ "ps_partkey", 8914, "ps_partkey", 8914, 8914, 11, 8914
]
-[ "ps_partkey", 8911, "ps_partkey", 8911, 8911, 11, 8911
]
-[ "ps_suppkey", 8911, "ps_suppkey", 8911, 8911, 11, 8911
]
-[ "ps_partkey", 8913, "ps_partkey", 8913, 8913, 11, 8913
]
+[ "id", 8294, "id", 8294, 8294, 11, 8294 ]
+[ "id", 8293, "id", 8293, 8293, 11, 8293 ]
+[ "width", 8832, "width", 8832, 8832, 11, 8832 ]
+[ "p_partkey", 8939, "p_partkey", 8939, 8939, 11, 8939 ]
+[ "p_partkey", 8938, "p_partkey", 8938, 8938, 11, 8938 ]
+[ "ps_partkey", 8948, "ps_partkey", 8948, 8948, 11, 8948
]
+[ "ps_suppkey", 8948, "ps_suppkey", 8948, 8948, 11, 8948
]
+[ "ps_partkey", 8950, "ps_partkey", 8950, 8950, 11, 8950
]
+[ "ps_partkey", 8947, "ps_partkey", 8947, 8947, 11, 8947
]
# 13:47:14 >
# 13:47:14 > "Done."
diff --git
a/sql/test/BugTracker-2017/Tests/statistics_nils_not_eq_zero.Bug-6331.stable.out
b/sql/test/BugTracker-2017/Tests/statistics_nils_not_eq_zero.Bug-6331.stable.out
---
a/sql/test/BugTracker-2017/Tests/statistics_nils_not_eq_zero.Bug-6331.stable.out
+++
b/sql/test/BugTracker-2017/Tests/statistics_nils_not_eq_zero.Bug-6331.stable.out
@@ -83,13 +83,13 @@ Ready.
% L3 # name
% bigint # type
% 1 # length
-[ 5 ]
+[ 4 ]
#SELECT count(*) FROM sys.statistics WHERE count > 0 AND (minval = 'nil' OR
maxval = 'nil');
% sys.L4 # table_name
% L3 # name
% bigint # type
% 1 # length
-[ 5 ]
+[ 4 ]
#SELECT count(*) FROM sys.statistics WHERE nils <> 0;
% sys.L4 # table_name
% L3 # name
@@ -101,13 +101,13 @@ Ready.
% L3 # name
% bigint # type
% 1 # length
-[ 5 ]
+[ 4 ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
