Changeset: 2688ebdf440b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2688ebdf440b
Added Files:
sql/test/BugTracker-2016/Tests/analyze-quotes-incorrectly.Bug-4021.sql
sql/test/BugTracker-2016/Tests/analyze-quotes-incorrectly.Bug-4021.stable.err
sql/test/BugTracker-2016/Tests/analyze-quotes-incorrectly.Bug-4021.stable.out
sql/test/BugTracker-2016/Tests/boolean-evaluation.Bug-4025.sql
sql/test/BugTracker-2016/Tests/boolean-evaluation.Bug-4025.stable.err
sql/test/BugTracker-2016/Tests/boolean-evaluation.Bug-4025.stable.out
sql/test/bugs/Tests/select_select_bug.sql
sql/test/bugs/Tests/select_select_bug.stable.err
sql/test/bugs/Tests/select_select_bug.stable.out
Modified Files:
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
clients/odbc/driver/SQLConnect.c
clients/odbc/driver/SQLTables.c
monetdb5/mal/Tests/tst903.stable.out
monetdb5/mal/Tests/tst904.stable.out
monetdb5/mal/Tests/tst907.stable.out
monetdb5/optimizer/Tests/Mexample.stable.out
monetdb5/optimizer/Tests/inlineFunction2.stable.out
monetdb5/optimizer/Tests/manifold2.stable.out
monetdb5/optimizer/opt_multiplex.c
sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_statistics.c
sql/backends/monet5/sql_upgrades.c
sql/benchmarks/ssbm/Tests/04-explain.stable.out
sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/05-explain.stable.out
sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/06-explain.stable.out
sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/07-explain.stable.out
sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/08-explain.stable.out
sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/09-explain.stable.out
sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/10-explain.stable.out
sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/11-explain.stable.out
sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/12-explain.stable.out
sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/13-explain.stable.out
sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128
sql/benchmarks/tpch/Tests/01-explain.stable.out
sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/01-explain.stable.out.int128
sql/benchmarks/tpch/Tests/02-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out.int128
sql/benchmarks/tpch/Tests/04-explain.stable.out
sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/05-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/05-explain.stable.out.int128
sql/benchmarks/tpch/Tests/07-explain.stable.out
sql/benchmarks/tpch/Tests/07-explain.stable.out.int128
sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
sql/benchmarks/tpch/Tests/09-explain.stable.out
sql/benchmarks/tpch/Tests/09-explain.stable.out.int128
sql/benchmarks/tpch/Tests/10-explain.stable.out
sql/benchmarks/tpch/Tests/10-explain.stable.out.int128
sql/benchmarks/tpch/Tests/11-explain.stable.out
sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
sql/benchmarks/tpch/Tests/12-explain.stable.out
sql/benchmarks/tpch/Tests/12-explain.stable.out.int128
sql/benchmarks/tpch/Tests/13-explain.stable.out
sql/benchmarks/tpch/Tests/15-explain.stable.out.int128
sql/benchmarks/tpch/Tests/16-explain.stable.out
sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/benchmarks/tpch/Tests/21-explain.stable.out
sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/22-explain.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
sql/common/sql_list.c
sql/server/rel_select.c
sql/server/sql_parser.y
sql/server/sql_privileges.c
sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out
sql/test/BugTracker-2016/Tests/All
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out.32bit
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/bugs/Tests/All
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check5.stable.out.int128
sql/test/mergetables/Tests/mergequery.stable.out
sql/test/remote/Tests/partition_elim.stable.out
Branch: python3udf
Log Message:
Merge with default.
diffs (truncated from 8221 to 300 lines):
diff --git a/clients/Tests/SQL-dump.stable.out
b/clients/Tests/SQL-dump.stable.out
--- a/clients/Tests/SQL-dump.stable.out
+++ b/clients/Tests/SQL-dump.stable.out
@@ -5281,6 +5281,7 @@ drop function pcre_replace(string, strin
[ "alpha", "public", 16, "monetdb", 0 ]
[ "date_to_str", "public", 16, "monetdb", 0 ]
[ "degrees", "public", 16, "monetdb", 0 ]
+[ "env", "public", 16, NULL, 0 ]
[ "epoch", "public", 16, "monetdb", 0 ]
[ "epoch", "public", 16, "monetdb", 0 ]
[ "epoch", "public", 16, "monetdb", 0 ]
diff --git a/clients/Tests/SQL-dump.stable.out.int128
b/clients/Tests/SQL-dump.stable.out.int128
--- a/clients/Tests/SQL-dump.stable.out.int128
+++ b/clients/Tests/SQL-dump.stable.out.int128
@@ -5648,6 +5648,7 @@ drop function pcre_replace(string, strin
[ "alpha", "public", 16, "monetdb", 0 ]
[ "date_to_str", "public", 16, "monetdb", 0 ]
[ "degrees", "public", 16, "monetdb", 0 ]
+[ "env", "public", 16, NULL, 0 ]
[ "epoch", "public", 16, "monetdb", 0 ]
[ "epoch", "public", 16, "monetdb", 0 ]
[ "epoch", "public", 16, "monetdb", 0 ]
diff --git a/clients/odbc/driver/SQLConnect.c b/clients/odbc/driver/SQLConnect.c
--- a/clients/odbc/driver/SQLConnect.c
+++ b/clients/odbc/driver/SQLConnect.c
@@ -258,9 +258,7 @@ MNDBConnect(ODBCDbc *dbc,
mapi_setAutocommit(mid, dbc->sql_attr_autocommit ==
SQL_AUTOCOMMIT_ON);
set_timezone(mid);
get_serverinfo(dbc);
- if (dbc->major > 11 ||
- (dbc->major == 11 && dbc->minor >= 5))
- mapi_set_size_header(mid, 1);
+ mapi_set_size_header(mid, 1);
/* set timeout after we're connected */
mapi_timeout(mid, dbc->sql_attr_connection_timeout * 1000);
}
diff --git a/clients/odbc/driver/SQLTables.c b/clients/odbc/driver/SQLTables.c
--- a/clients/odbc/driver/SQLTables.c
+++ b/clients/odbc/driver/SQLTables.c
@@ -232,87 +232,69 @@ MNDBTables(ODBCStmt *stmt,
strcpy(query_end, "with ot as (");
query_end += strlen(query_end);
- if (stmt->Dbc->major < 11 || (stmt->Dbc->major == 11 &&
stmt->Dbc->minor < 21)) {
- strcpy(query_end,
- "select e.value as table_cat, "
- "s.name as table_schem, "
- "t.name as table_name, "
- "case when t.type = 0 and "
- "t.system = false and "
- "t.temporary = 0 and "
- "s.name <> 'tmp' "
- "then cast('TABLE' as varchar(20)) "
- "when t.type = 0 and "
- "t.system = false and "
- "t.temporary = 0 and "
- "s.name = 'tmp' "
- "then cast('GLOBAL TEMPORARY' as
varchar(20)) "
- "when t.type = 0 and "
- "t.system = true and "
- "t.temporary = 0 "
- "then cast('SYSTEM TABLE' as
varchar(20)) "
- "when t.type = 1 and "
- "t.system = true and "
- "t.temporary = 0 "
- "then cast('SYSTEM VIEW' as
varchar(20)) "
- "when t.type = 1 "
- "then cast('VIEW' as varchar(20)) "
- "when t.type = 0 and "
- "t.system = false and "
- "t.temporary = 1 "
- "then cast('LOCAL TEMPORARY' as
varchar(20)) "
- "else cast('INTERNAL TABLE TYPE' as
varchar(20)) end as table_type, "
- "cast(null as varchar(1)) as remarks "
- "from sys.schemas s, "
- "sys.tables t, "
- "sys.env() e "
- "where s.id = t.schema_id and "
- "e.name = 'gdk_dbname'");
- } else {
- strcpy(query_end,
- "select e.value as table_cat, "
- "s.name as table_schem, "
- "t.name as table_name, "
- "case when t.type = 0 and "
- "t.system = false and "
- "t.temporary = 0 and "
- "s.name <> 'tmp' "
- "then cast('TABLE' as varchar(20)) "
- "when t.type = 10 and "
- "t.system = true and "
- "t.temporary = 0 "
- "then cast('SYSTEM TABLE' as
varchar(20)) "
- "when t.type = 11 and "
- "t.system = true and "
- "t.temporary = 0 "
- "then cast('SYSTEM VIEW' as
varchar(20)) "
- "when t.type = 1 "
- "then cast('VIEW' as varchar(20)) "
- "when t.type = 3 "
- "then cast('MERGE TABLE' as
varchar(20)) "
- "when t.type = 4 "
- "then cast('STREAM TABLE' as
varchar(20)) "
- "when t.type = 5 "
- "then cast('REMOTE TABLE' as
varchar(20)) "
- "when t.type = 6 "
- "then cast('REPLICA TABLE' as
varchar(20)) "
- "when t.type = 20 and "
- "t.system = false and "
- "t.temporary = 1 and "
- "s.name = 'tmp' "
- "then cast('GLOBAL TEMPORARY' as
varchar(20)) "
- "when t.type = 30 and "
- "t.system = false and "
- "t.temporary = 1 "
- "then cast('LOCAL TEMPORARY' as
varchar(20)) "
- "else cast('INTERNAL TABLE TYPE' as
varchar(20)) end as table_type, "
- "cast(null as varchar(1)) as remarks "
- "from sys.schemas s, "
- "sys.tables t, "
- "sys.env() e "
- "where s.id = t.schema_id and "
- "e.name = 'gdk_dbname'");
- }
+ strcpy(query_end,
+ "select e.value as table_cat, "
+ "s.name as table_schem, "
+ "t.name as table_name, "
+ "case when t.type = 0 and "
+ "t.system = false and "
+ "t.temporary = 0 and "
+ "s.name <> 'tmp' "
+ "then cast('TABLE' as varchar(20)) "
+/* start <= 11.21.X (at some point this code can be removed) */
+ "when t.type = 0 and "
+ "t.system = false and "
+ "t.temporary = 0 and "
+ "s.name = 'tmp' "
+ "then cast('GLOBAL TEMPORARY' as
varchar(20)) "
+ "when t.type = 0 and "
+ "t.system = true and "
+ "t.temporary = 0 "
+ "then cast('SYSTEM TABLE' as varchar(20)) "
+ "when t.type = 0 and "
+ "t.system = false and "
+ "t.temporary = 1 "
+ "then cast('LOCAL TEMPORARY' as varchar(20))
"
+ "when t.type = 1 and "
+ "t.system = true and "
+ "t.temporary = 0 "
+ "then cast('SYSTEM VIEW' as varchar(20)) "
+/* end <= 11.21.X */
+ "when t.type = 1 "
+ "then cast('VIEW' as varchar(20)) "
+ "when t.type = 3 "
+ "then cast('MERGE TABLE' as varchar(20)) "
+ "when t.type = 4 "
+ "then cast('STREAM TABLE' as varchar(20)) "
+ "when t.type = 5 "
+ "then cast('REMOTE TABLE' as varchar(20)) "
+ "when t.type = 6 "
+ "then cast('REPLICA TABLE' as varchar(20)) "
+ "when t.type = 10 and "
+ "t.system = true and "
+ "t.temporary = 0 "
+ "then cast('SYSTEM TABLE' as varchar(20)) "
+ "when t.type = 11 and "
+ "t.system = true and "
+ "t.temporary = 0 "
+ "then cast('SYSTEM VIEW' as varchar(20)) "
+ "when t.type = 20 and "
+ "t.system = false and "
+ "t.temporary = 1 and "
+ "s.name = 'tmp' "
+ "then cast('GLOBAL TEMPORARY' as
varchar(20)) "
+ "when t.type = 30 and "
+ "t.system = false and "
+ "t.temporary = 1 "
+ "then cast('LOCAL TEMPORARY' as varchar(20))
"
+ "else cast('INTERNAL TABLE TYPE' as
varchar(20)) "
+ "end as table_type, "
+ "cast(null as varchar(1)) as remarks "
+ "from sys.schemas s, "
+ "sys.tables t, "
+ "sys.env() e "
+ "where s.id = t.schema_id and "
+ "e.name = 'gdk_dbname'");
assert(strlen(query) < 1100);
query_end += strlen(query_end);
diff --git a/monetdb5/mal/Tests/tst903.stable.out
b/monetdb5/mal/Tests/tst903.stable.out
--- a/monetdb5/mal/Tests/tst903.stable.out
+++ b/monetdb5/mal/Tests/tst903.stable.out
@@ -139,13 +139,13 @@ exit i;
cnt := aggr.count(z9);
mdb.setDebug(dbgmsk_set);
t0 := alarm.usec();
- X_103 := bat.new(nil:oid,nil:lng);
-barrier (X_107,X_108) := iterator.new(b);
- X_110 := algebra.fetch(c,X_107);
- X_112 := calc.+(X_108,X_110);
- bat.append(X_103,X_112);
- redo (X_107,X_108) := iterator.next(b);
-exit (X_107,X_108);
+ X_103 := bat.new(nil:lng);
+barrier (X_106,X_107) := iterator.new(b);
+ X_109 := algebra.fetch(c,X_106);
+ X_111 := calc.+(X_107,X_109);
+ bat.append(X_103,X_111);
+ redo (X_106,X_107) := iterator.next(b);
+exit (X_106,X_107);
x:bat[:lng] := X_103;
t1 := alarm.usec();
mdb.setDebug(dbgmsk_restore);
diff --git a/monetdb5/mal/Tests/tst904.stable.out
b/monetdb5/mal/Tests/tst904.stable.out
--- a/monetdb5/mal/Tests/tst904.stable.out
+++ b/monetdb5/mal/Tests/tst904.stable.out
@@ -39,12 +39,12 @@ barrier i:lng := 0:lng;
exit i:lng; #[7] (0) 5
io.print(b:bat[:lng]); #[8] (0) IOprint_val 11 <- 3
c:int := 1:int; #[9] (0) 12 <- 13
- X_18:bat[:lng] := bat.new(nil:oid,nil:lng); #[10] (0) CMDBATnew 18
<- 19 20
-barrier (X_22:oid,X_23:lng) := iterator.new(b:bat[:lng]); #[11] (0)
ITRbunIterator 22 23 <- 3
- X_25:lng := calc.+(X_23:lng,c:int); #[12] (0) CMDvarADDsignal 25 <-
23 12
- bat.append(X_18:bat[:lng],X_25:lng); #[13] (0) BKCappend_val_wrap 26
<- 18 25
- redo (X_22:oid,X_23:lng) := iterator.next(b:bat[:lng]); #[14] (0)
ITRbunNext 22 23 <- 3
-exit (X_22:oid,X_23:lng); #[15] (0) 22 23
+ X_18:bat[:lng] := bat.new(nil:lng); #[10] (0) CMDBATnewColumn 18 <-
19
+barrier (X_21:oid,X_22:lng) := iterator.new(b:bat[:lng]); #[11] (0)
ITRbunIterator 21 22 <- 3
+ X_24:lng := calc.+(X_22:lng,c:int); #[12] (0) CMDvarADDsignal 24 <-
22 12
+ bat.append(X_18:bat[:lng],X_24:lng); #[13] (0) BKCappend_val_wrap 25
<- 18 24
+ redo (X_21:oid,X_22:lng) := iterator.next(b:bat[:lng]); #[14] (0)
ITRbunNext 21 22 <- 3
+exit (X_21:oid,X_22:lng); #[15] (0) 21 22
xz:bat[:lng] := X_18:bat[:lng]; #[16] (0) 14 <- 18
io.print(xz:bat[:lng]); #[17] (0) IOprint_val 17 <- 14
end user.foo; #[18] (0)
diff --git a/monetdb5/mal/Tests/tst907.stable.out
b/monetdb5/mal/Tests/tst907.stable.out
--- a/monetdb5/mal/Tests/tst907.stable.out
+++ b/monetdb5/mal/Tests/tst907.stable.out
@@ -36,29 +36,29 @@ function user.foo():void;
b:bat[:int] := bat.new(:int); #[4] (0) CMDBATnewColumn 7 <- 8
bat.append(b:bat[:int],1:int); #[5] (0) BKCappend_val_wrap 9
<- 7 2
io.print("do multiplex three test":str); #[6] (0) IOprint_val 10 <- 11
- X_22:bat[:int] := bat.new(nil:oid,nil:int); #[7] (0) CMDBATnew 22
<- 23 24
-barrier (X_26:oid,X_27:int) := iterator.new(b:bat[:int]); #[8] (0)
ITRbunIterator 26 27 <- 7
- X_29:int := user.three(X_27:int,2:int,3:int); #[9] (0) 29 <- 27 4 5
- bat.append(X_22:bat[:int],X_29:int); #[10] (0) BKCappend_val_wrap 30
<- 22 29
- redo (X_26:oid,X_27:int) := iterator.next(b:bat[:int]); #[11] (0)
ITRbunNext 26 27 <- 7
-exit (X_26:oid,X_27:int); #[12] (0) 26 27
+ X_22:bat[:int] := bat.new(nil:int); #[7] (0) CMDBATnewColumn 22 <-
23
+barrier (X_25:oid,X_26:int) := iterator.new(b:bat[:int]); #[8] (0)
ITRbunIterator 25 26 <- 7
+ X_28:int := user.three(X_26:int,2:int,3:int); #[9] (0) 28 <- 26 4 5
+ bat.append(X_22:bat[:int],X_28:int); #[10] (0) BKCappend_val_wrap 29
<- 22 28
+ redo (X_25:oid,X_26:int) := iterator.next(b:bat[:int]); #[11] (0)
ITRbunNext 25 26 <- 7
+exit (X_25:oid,X_26:int); #[12] (0) 25 26
z:bat[:int] := X_22:bat[:int]; #[13] (0) 12 <- 22
io.print("do multiplex one test":str); #[14] (0) IOprint_val 15 <- 16
- X_34:bat[:int] := bat.new(nil:oid,nil:int); #[15] (0) CMDBATnew 34
<- 23 24
-barrier (X_36:oid,X_37:int) := iterator.new(b:bat[:int]); #[16] (0)
ITRbunIterator 36 37 <- 7
- X_39:int := user.one(X_37:int); #[17] (0) 39 <- 37
- bat.append(X_34:bat[:int],X_39:int); #[18] (0) BKCappend_val_wrap 40
<- 34 39
- redo (X_36:oid,X_37:int) := iterator.next(b:bat[:int]); #[19] (0)
ITRbunNext 36 37 <- 7
-exit (X_36:oid,X_37:int); #[20] (0) 36 37
- z:bat[:int] := X_34:bat[:int]; #[21] (0) 12 <- 34
+ X_33:bat[:int] := bat.new(nil:int); #[15] (0) CMDBATnewColumn 33 <-
23
+barrier (X_35:oid,X_36:int) := iterator.new(b:bat[:int]); #[16] (0)
ITRbunIterator 35 36 <- 7
+ X_38:int := user.one(X_36:int); #[17] (0) 38 <- 36
+ bat.append(X_33:bat[:int],X_38:int); #[18] (0) BKCappend_val_wrap 39
<- 33 38
+ redo (X_35:oid,X_36:int) := iterator.next(b:bat[:int]); #[19] (0)
ITRbunNext 35 36 <- 7
+exit (X_35:oid,X_36:int); #[20] (0) 35 36
+ z:bat[:int] := X_33:bat[:int]; #[21] (0) 12 <- 33
io.print("do multiplex pow test":str); #[22] (0) IOprint_val 18 <- 19
- X_44:bat[:int] := bat.new(nil:oid,nil:int); #[23] (0) CMDBATnew 44
<- 23 24
-barrier (X_46:oid,X_47:int) := iterator.new(b:bat[:int]); #[24] (0)
ITRbunIterator 46 47 <- 7
- X_49:int := user.pow(X_47:int,2:int); #[25] (0) 49 <- 47 4
- bat.append(X_44:bat[:int],X_49:int); #[26] (0) BKCappend_val_wrap 50
<- 44 49
- redo (X_46:oid,X_47:int) := iterator.next(b:bat[:int]); #[27] (0)
ITRbunNext 46 47 <- 7
-exit (X_46:oid,X_47:int); #[28] (0) 46 47
- z:bat[:int] := X_44:bat[:int]; #[29] (0) 12 <- 44
+ X_43:bat[:int] := bat.new(nil:int); #[23] (0) CMDBATnewColumn 43 <-
23
+barrier (X_45:oid,X_46:int) := iterator.new(b:bat[:int]); #[24] (0)
ITRbunIterator 45 46 <- 7
+ X_48:int := user.pow(X_46:int,2:int); #[25] (0) 48 <- 46 4
+ bat.append(X_43:bat[:int],X_48:int); #[26] (0) BKCappend_val_wrap 49
<- 43 48
+ redo (X_45:oid,X_46:int) := iterator.next(b:bat[:int]); #[27] (0)
ITRbunNext 45 46 <- 7
+exit (X_45:oid,X_46:int); #[28] (0) 45 46
+ z:bat[:int] := X_43:bat[:int]; #[29] (0) 12 <- 43
io.print(z:bat[:int]); #[30] (0) IOprint_val 21 <- 12
end user.foo; #[31] (0)
[ 1 ]
diff --git a/monetdb5/optimizer/Tests/Mexample.stable.out
b/monetdb5/optimizer/Tests/Mexample.stable.out
--- a/monetdb5/optimizer/Tests/Mexample.stable.out
+++ b/monetdb5/optimizer/Tests/Mexample.stable.out
@@ -30,12 +30,12 @@ Ready.
function user.foo():void; #[0] (0) 0
b:bat[:int] := bat.new(:int); #[1] (0) CMDBATnewColumn 1 <- 2
bat.append(b:bat[:int],1:int); #[2] (0) BKCappend_val_wrap 3
<- 1 4
- X_8:bat[:int] := bat.new(nil:oid,nil:int); #[3] (0) CMDBATnew 8 <- 9 10
-barrier (X_12:oid,X_13:int) := iterator.new(b:bat[:int]); #[4] (0)
ITRbunIterator 12 13 <- 1
- X_15:int := calc.+(X_13:int,1:int); #[5] (0) CMDvarADDsignal 15 <-
13 4
- bat.append(X_8:bat[:int],X_15:int); #[6] (0) BKCappend_val_wrap 16
<- 8 15
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
