Changeset: 31198df95014 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=31198df95014
Modified Files:
clients/Tests/exports.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.32bit
Branch: mosaic
Log Message:
Approve output
diffs (truncated from 628 to 300 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -262,6 +262,8 @@ gdk_return GDKreleasemmap(void *ptr, siz
gdk_return GDKreleasesem(int sem_id, str *msg);
void GDKreset(int status);
void GDKsetenv(str name, str value);
+void GDKsetmemorylimit(size_t nbytes);
+void GDKsetmemorylimit(size_t nbytes){ GDK_mallocedbytes_limit = nbytes;
ssize_t GDKstrFromStr(unsigned char *dst, const unsigned char *src, ssize_t
len);
str GDKstrdup(const char *s) __attribute__((__warn_unused_result__));
str GDKstrndup(const char *s, size_t n)
__attribute__((__warn_unused_result__));
@@ -1210,6 +1212,7 @@ str IOimport(void *ret, bat *bid, str *f
str IOprint_val(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str IOprintf(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str IOprintfStream(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str IOsetmemorylimit(void *res, lng *nbytes);
str IOtable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str ITRbunIterator(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str ITRbunNext(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
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
@@ -31,37 +31,37 @@ Ready.
% clob # type
% 133 # length
function user.s2_1(A0:str):void;
- X_46:void := querylog.define("explain select name,func from functions
where name like \\'%optimizers%\\';","sequential_pipe",33);
- X_25 := bat.new(nil:str);
- X_32 := bat.append(X_25,"sys.functions");
- X_40 := bat.append(X_32,"sys.functions");
- X_27 := bat.new(nil:str);
- X_34 := bat.append(X_27,"name");
- X_41 := bat.append(X_34,"func");
- X_28 := bat.new(nil:str);
- X_35 := bat.append(X_28,"varchar");
- X_42 := bat.append(X_35,"varchar");
- X_29 := bat.new(nil:int);
- X_37 := bat.append(X_29,256);
- X_43 := bat.append(X_37,8196);
- X_31 := bat.new(nil:int);
- X_39 := bat.append(X_31,0);
- X_45 := bat.append(X_39,0);
- X_2 := sql.mvc();
- X_6:bat[:str] := sql.bind(X_2,"sys","functions","name",0);
- C_3:bat[:oid] := sql.tid(X_2,"sys","functions");
- C_63 := algebra.likesubselect(X_6,C_3,A0,"",false);
- (C_9,r1_9) := sql.bind(X_2,"sys","functions","name",2);
- C_64 := algebra.likesubselect(r1_9,nil:bat[:oid],A0,"",false);
- X_12:bat[:str] := sql.bind(X_2,"sys","functions","name",1);
- C_66 := algebra.likesubselect(X_12,C_3,A0,"",false);
- C_15 := sql.subdelta(C_63,C_3,C_9,C_64,C_66);
- X_17 := sql.projectdelta(C_15,X_6,C_9,r1_9,X_12);
- X_18:bat[:str] := sql.bind(X_2,"sys","functions","func",0);
- (C_20,r1_25) := sql.bind(X_2,"sys","functions","func",2);
- X_22:bat[:str] := sql.bind(X_2,"sys","functions","func",1);
- X_23 := sql.projectdelta(C_15,X_18,C_20,r1_25,X_22);
- sql.resultSet(X_40,X_41,X_42,X_43,X_45,X_17,X_23);
+ X_53:void := querylog.define("explain select name,func from functions
where name like \\'%optimizers%\\';","sequential_pipe",33);
+ X_30 := bat.new(nil:str);
+ X_37 := bat.append(X_30,"sys.functions");
+ X_47 := bat.append(X_37,"sys.functions");
+ X_32 := bat.new(nil:str);
+ X_39 := bat.append(X_32,"name");
+ X_48 := bat.append(X_39,"func");
+ X_33 := bat.new(nil:str);
+ X_41 := bat.append(X_33,"varchar");
+ X_49 := bat.append(X_41,"varchar");
+ X_34 := bat.new(nil:int);
+ X_43 := bat.append(X_34,256);
+ X_50 := bat.append(X_43,8196);
+ X_36 := bat.new(nil:int);
+ X_45 := bat.append(X_36,0);
+ X_52 := bat.append(X_45,0);
+ X_0 := sql.mvc();
+ X_4:bat[:str] := sql.bind(X_0,"sys","functions","name",0);
+ X_1:bat[:oid] := sql.tid(X_0,"sys","functions");
+ X_64 := algebra.likesubselect(X_4,X_1,A0,"",false);
+ (X_7,r1_9) := sql.bind(X_0,"sys","functions","name",2);
+ X_65 := algebra.likesubselect(r1_9,nil:bat[:oid],A0,"",false);
+ X_10:bat[:str] := sql.bind(X_0,"sys","functions","name",1);
+ X_67 := algebra.likesubselect(X_10,X_1,A0,"",false);
+ X_17 := sql.subdelta(X_64,X_1,X_7,X_65,X_67);
+ X_20 := sql.projectdelta(X_17,X_4,X_7,r1_9,X_10);
+ X_21:bat[:str] := sql.bind(X_0,"sys","functions","func",0);
+ (X_23,r1_25) := sql.bind(X_0,"sys","functions","func",2);
+ X_25:bat[:str] := sql.bind(X_0,"sys","functions","func",1);
+ X_28 := sql.projectdelta(X_17,X_21,X_23,r1_25,X_25);
+ sql.resultSet(X_47,X_48,X_49,X_50,X_52,X_20,X_28);
end user.s2_1;
#explain select name,func from functions where name not like '%optimizers%';
% .explain # table_name
@@ -69,37 +69,37 @@ end user.s2_1;
% clob # type
% 137 # length
function user.s3_1(A0:str):void;
- X_46:void := querylog.define("explain select name,func from functions
where name not like \\'%optimizers%\\';","sequential_pipe",33);
- X_25 := bat.new(nil:str);
- X_32 := bat.append(X_25,"sys.functions");
- X_40 := bat.append(X_32,"sys.functions");
- X_27 := bat.new(nil:str);
- X_34 := bat.append(X_27,"name");
- X_41 := bat.append(X_34,"func");
- X_28 := bat.new(nil:str);
- X_35 := bat.append(X_28,"varchar");
- X_42 := bat.append(X_35,"varchar");
- X_29 := bat.new(nil:int);
- X_37 := bat.append(X_29,256);
- X_43 := bat.append(X_37,8196);
- X_31 := bat.new(nil:int);
- X_39 := bat.append(X_31,0);
- X_45 := bat.append(X_39,0);
- X_2 := sql.mvc();
- X_6:bat[:str] := sql.bind(X_2,"sys","functions","name",0);
- C_3:bat[:oid] := sql.tid(X_2,"sys","functions");
- C_63 := algebra.likesubselect(X_6,C_3,A0,"",true);
- (C_9,r1_9) := sql.bind(X_2,"sys","functions","name",2);
- C_64 := algebra.likesubselect(r1_9,nil:bat[:oid],A0,"",true);
- X_12:bat[:str] := sql.bind(X_2,"sys","functions","name",1);
- C_66 := algebra.likesubselect(X_12,C_3,A0,"",true);
- C_15 := sql.subdelta(C_63,C_3,C_9,C_64,C_66);
- X_17 := sql.projectdelta(C_15,X_6,C_9,r1_9,X_12);
- X_18:bat[:str] := sql.bind(X_2,"sys","functions","func",0);
- (C_20,r1_25) := sql.bind(X_2,"sys","functions","func",2);
- X_22:bat[:str] := sql.bind(X_2,"sys","functions","func",1);
- X_23 := sql.projectdelta(C_15,X_18,C_20,r1_25,X_22);
- sql.resultSet(X_40,X_41,X_42,X_43,X_45,X_17,X_23);
+ X_53:void := querylog.define("explain select name,func from functions
where name not like \\'%optimizers%\\';","sequential_pipe",33);
+ X_30 := bat.new(nil:str);
+ X_37 := bat.append(X_30,"sys.functions");
+ X_47 := bat.append(X_37,"sys.functions");
+ X_32 := bat.new(nil:str);
+ X_39 := bat.append(X_32,"name");
+ X_48 := bat.append(X_39,"func");
+ X_33 := bat.new(nil:str);
+ X_41 := bat.append(X_33,"varchar");
+ X_49 := bat.append(X_41,"varchar");
+ X_34 := bat.new(nil:int);
+ X_43 := bat.append(X_34,256);
+ X_50 := bat.append(X_43,8196);
+ X_36 := bat.new(nil:int);
+ X_45 := bat.append(X_36,0);
+ X_52 := bat.append(X_45,0);
+ X_0 := sql.mvc();
+ X_4:bat[:str] := sql.bind(X_0,"sys","functions","name",0);
+ X_1:bat[:oid] := sql.tid(X_0,"sys","functions");
+ X_64 := algebra.likesubselect(X_4,X_1,A0,"",true);
+ (X_7,r1_9) := sql.bind(X_0,"sys","functions","name",2);
+ X_65 := algebra.likesubselect(r1_9,nil:bat[:oid],A0,"",true);
+ X_10:bat[:str] := sql.bind(X_0,"sys","functions","name",1);
+ X_67 := algebra.likesubselect(X_10,X_1,A0,"",true);
+ X_17 := sql.subdelta(X_64,X_1,X_7,X_65,X_67);
+ X_20 := sql.projectdelta(X_17,X_4,X_7,r1_9,X_10);
+ X_21:bat[:str] := sql.bind(X_0,"sys","functions","func",0);
+ (X_23,r1_25) := sql.bind(X_0,"sys","functions","func",2);
+ X_25:bat[:str] := sql.bind(X_0,"sys","functions","func",1);
+ X_28 := sql.projectdelta(X_17,X_21,X_23,r1_25,X_25);
+ sql.resultSet(X_47,X_48,X_49,X_50,X_52,X_20,X_28);
end user.s3_1;
#explain select name,func from functions where name ilike '%optimizers%';
% .explain # table_name
@@ -107,37 +107,37 @@ end user.s3_1;
% clob # type
% 134 # length
function user.s4_1(A0:str):void;
- X_46:void := querylog.define("explain select name,func from functions
where name ilike \\'%optimizers%\\';","sequential_pipe",33);
- X_25 := bat.new(nil:str);
- X_32 := bat.append(X_25,"sys.functions");
- X_40 := bat.append(X_32,"sys.functions");
- X_27 := bat.new(nil:str);
- X_34 := bat.append(X_27,"name");
- X_41 := bat.append(X_34,"func");
- X_28 := bat.new(nil:str);
- X_35 := bat.append(X_28,"varchar");
- X_42 := bat.append(X_35,"varchar");
- X_29 := bat.new(nil:int);
- X_37 := bat.append(X_29,256);
- X_43 := bat.append(X_37,8196);
- X_31 := bat.new(nil:int);
- X_39 := bat.append(X_31,0);
- X_45 := bat.append(X_39,0);
- X_2 := sql.mvc();
- X_6:bat[:str] := sql.bind(X_2,"sys","functions","name",0);
- C_3:bat[:oid] := sql.tid(X_2,"sys","functions");
- C_63 := algebra.ilikesubselect(X_6,C_3,A0,"",false);
- (C_9,r1_9) := sql.bind(X_2,"sys","functions","name",2);
- C_64 := algebra.ilikesubselect(r1_9,nil:bat[:oid],A0,"",false);
- X_12:bat[:str] := sql.bind(X_2,"sys","functions","name",1);
- C_66 := algebra.ilikesubselect(X_12,C_3,A0,"",false);
- C_15 := sql.subdelta(C_63,C_3,C_9,C_64,C_66);
- X_17 := sql.projectdelta(C_15,X_6,C_9,r1_9,X_12);
- X_18:bat[:str] := sql.bind(X_2,"sys","functions","func",0);
- (C_20,r1_25) := sql.bind(X_2,"sys","functions","func",2);
- X_22:bat[:str] := sql.bind(X_2,"sys","functions","func",1);
- X_23 := sql.projectdelta(C_15,X_18,C_20,r1_25,X_22);
- sql.resultSet(X_40,X_41,X_42,X_43,X_45,X_17,X_23);
+ X_53:void := querylog.define("explain select name,func from functions
where name ilike \\'%optimizers%\\';","sequential_pipe",33);
+ X_30 := bat.new(nil:str);
+ X_37 := bat.append(X_30,"sys.functions");
+ X_47 := bat.append(X_37,"sys.functions");
+ X_32 := bat.new(nil:str);
+ X_39 := bat.append(X_32,"name");
+ X_48 := bat.append(X_39,"func");
+ X_33 := bat.new(nil:str);
+ X_41 := bat.append(X_33,"varchar");
+ X_49 := bat.append(X_41,"varchar");
+ X_34 := bat.new(nil:int);
+ X_43 := bat.append(X_34,256);
+ X_50 := bat.append(X_43,8196);
+ X_36 := bat.new(nil:int);
+ X_45 := bat.append(X_36,0);
+ X_52 := bat.append(X_45,0);
+ X_0 := sql.mvc();
+ X_4:bat[:str] := sql.bind(X_0,"sys","functions","name",0);
+ X_1:bat[:oid] := sql.tid(X_0,"sys","functions");
+ X_64 := algebra.ilikesubselect(X_4,X_1,A0,"",false);
+ (X_7,r1_9) := sql.bind(X_0,"sys","functions","name",2);
+ X_65 := algebra.ilikesubselect(r1_9,nil:bat[:oid],A0,"",false);
+ X_10:bat[:str] := sql.bind(X_0,"sys","functions","name",1);
+ X_67 := algebra.ilikesubselect(X_10,X_1,A0,"",false);
+ X_17 := sql.subdelta(X_64,X_1,X_7,X_65,X_67);
+ X_20 := sql.projectdelta(X_17,X_4,X_7,r1_9,X_10);
+ X_21:bat[:str] := sql.bind(X_0,"sys","functions","func",0);
+ (X_23,r1_25) := sql.bind(X_0,"sys","functions","func",2);
+ X_25:bat[:str] := sql.bind(X_0,"sys","functions","func",1);
+ X_28 := sql.projectdelta(X_17,X_21,X_23,r1_25,X_25);
+ sql.resultSet(X_47,X_48,X_49,X_50,X_52,X_20,X_28);
end user.s4_1;
#explain select name,func from functions where name not ilike '%optimizers%';
% .explain # table_name
@@ -145,37 +145,37 @@ end user.s4_1;
% clob # type
% 138 # length
function user.s5_1(A0:str):void;
- X_46:void := querylog.define("explain select name,func from functions
where name not ilike \\'%optimizers%\\';","sequential_pipe",33);
- X_25 := bat.new(nil:str);
- X_32 := bat.append(X_25,"sys.functions");
- X_40 := bat.append(X_32,"sys.functions");
- X_27 := bat.new(nil:str);
- X_34 := bat.append(X_27,"name");
- X_41 := bat.append(X_34,"func");
- X_28 := bat.new(nil:str);
- X_35 := bat.append(X_28,"varchar");
- X_42 := bat.append(X_35,"varchar");
- X_29 := bat.new(nil:int);
- X_37 := bat.append(X_29,256);
- X_43 := bat.append(X_37,8196);
- X_31 := bat.new(nil:int);
- X_39 := bat.append(X_31,0);
- X_45 := bat.append(X_39,0);
- X_2 := sql.mvc();
- X_6:bat[:str] := sql.bind(X_2,"sys","functions","name",0);
- C_3:bat[:oid] := sql.tid(X_2,"sys","functions");
- C_63 := algebra.ilikesubselect(X_6,C_3,A0,"",true);
- (C_9,r1_9) := sql.bind(X_2,"sys","functions","name",2);
- C_64 := algebra.ilikesubselect(r1_9,nil:bat[:oid],A0,"",true);
- X_12:bat[:str] := sql.bind(X_2,"sys","functions","name",1);
- C_66 := algebra.ilikesubselect(X_12,C_3,A0,"",true);
- C_15 := sql.subdelta(C_63,C_3,C_9,C_64,C_66);
- X_17 := sql.projectdelta(C_15,X_6,C_9,r1_9,X_12);
- X_18:bat[:str] := sql.bind(X_2,"sys","functions","func",0);
- (C_20,r1_25) := sql.bind(X_2,"sys","functions","func",2);
- X_22:bat[:str] := sql.bind(X_2,"sys","functions","func",1);
- X_23 := sql.projectdelta(C_15,X_18,C_20,r1_25,X_22);
- sql.resultSet(X_40,X_41,X_42,X_43,X_45,X_17,X_23);
+ X_53:void := querylog.define("explain select name,func from functions
where name not ilike \\'%optimizers%\\';","sequential_pipe",33);
+ X_30 := bat.new(nil:str);
+ X_37 := bat.append(X_30,"sys.functions");
+ X_47 := bat.append(X_37,"sys.functions");
+ X_32 := bat.new(nil:str);
+ X_39 := bat.append(X_32,"name");
+ X_48 := bat.append(X_39,"func");
+ X_33 := bat.new(nil:str);
+ X_41 := bat.append(X_33,"varchar");
+ X_49 := bat.append(X_41,"varchar");
+ X_34 := bat.new(nil:int);
+ X_43 := bat.append(X_34,256);
+ X_50 := bat.append(X_43,8196);
+ X_36 := bat.new(nil:int);
+ X_45 := bat.append(X_36,0);
+ X_52 := bat.append(X_45,0);
+ X_0 := sql.mvc();
+ X_4:bat[:str] := sql.bind(X_0,"sys","functions","name",0);
+ X_1:bat[:oid] := sql.tid(X_0,"sys","functions");
+ X_64 := algebra.ilikesubselect(X_4,X_1,A0,"",true);
+ (X_7,r1_9) := sql.bind(X_0,"sys","functions","name",2);
+ X_65 := algebra.ilikesubselect(r1_9,nil:bat[:oid],A0,"",true);
+ X_10:bat[:str] := sql.bind(X_0,"sys","functions","name",1);
+ X_67 := algebra.ilikesubselect(X_10,X_1,A0,"",true);
+ X_17 := sql.subdelta(X_64,X_1,X_7,X_65,X_67);
+ X_20 := sql.projectdelta(X_17,X_4,X_7,r1_9,X_10);
+ X_21:bat[:str] := sql.bind(X_0,"sys","functions","func",0);
+ (X_23,r1_25) := sql.bind(X_0,"sys","functions","func",2);
+ X_25:bat[:str] := sql.bind(X_0,"sys","functions","func",1);
+ X_28 := sql.projectdelta(X_17,X_21,X_23,r1_25,X_25);
+ sql.resultSet(X_47,X_48,X_49,X_50,X_52,X_20,X_28);
end user.s5_1;
#create function contains(str string, substr string)
#returns boolean
@@ -203,39 +203,39 @@ end user.s5_1;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
