Changeset: 611c0f351faa for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=611c0f351faa
Modified Files:
clients/Tests/exports.stable.out
clients/mapiclient/tomograph.c
monetdb5/mal/Tests/dataflow01.malC
monetdb5/mal/Tests/tst013.stable.err
monetdb5/mal/Tests/tst023.malC
monetdb5/mal/Tests/tst033.malC
monetdb5/mal/Tests/tst034.malC
monetdb5/mal/Tests/tst201.malC
monetdb5/mal/Tests/tst220.malC
monetdb5/mal/Tests/tst285.malC
monetdb5/mal/Tests/tst903.malC
monetdb5/mal/Tests/tst903.stable.out
monetdb5/mal/Tests/tst911.malC
monetdb5/mal/Tests/tst911.stable.out
monetdb5/mal/Tests/tst912.malC
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/algebra.h
monetdb5/modules/kernel/algebra.mal
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/pcre.mal
monetdb5/optimizer/Tests/CMexample.malC
monetdb5/optimizer/Tests/CRexample.malC
monetdb5/optimizer/Tests/CXexample.malC
monetdb5/optimizer/Tests/CXexample.stable.out
monetdb5/optimizer/Tests/FTexample.malC
monetdb5/optimizer/Tests/dataflow.malC
monetdb5/optimizer/Tests/dataflow.stable.out
monetdb5/optimizer/Tests/qep01.malC
monetdb5/optimizer/Tests/reorder00.malC
monetdb5/optimizer/Tests/reorder00.stable.out
monetdb5/optimizer/Tests/tst4000.malC
monetdb5/optimizer/Tests/tst4000.stable.out
monetdb5/optimizer/Tests/tst4003.malC
monetdb5/optimizer/Tests/tst4003.stable.out
monetdb5/optimizer/Tests/tst4030.malC
monetdb5/optimizer/Tests/tst4030.stable.out
monetdb5/optimizer/Tests/tst4700.malC
monetdb5/optimizer/opt_candidates.c
monetdb5/optimizer/opt_costModel.c
monetdb5/optimizer/opt_generator.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_profiler.c
monetdb5/optimizer/opt_pushselect.c
monetdb5/optimizer/opt_support.c
monetdb5/optimizer/opt_support.h
monetdb5/optimizer/opt_volcano.c
sql/backends/monet5/sql.h
sql/backends/monet5/sql.mal
sql/backends/monet5/sql_statement.c
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
sql/test/mergetables/Tests/mergequery.stable.out
sql/test/remote/Tests/partition_elim.stable.out
sql/test/remote/Tests/ssbm.stable.err
sql/test/remote/Tests/ssbm.stable.out.int128
Branch: malupgrade
Log Message:
Renaming phase, subselect -> select
A few errors remain to be solved.
diffs (truncated from 2812 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
@@ -701,6 +701,8 @@ str ALGprojectionpath(Client cntxt, MalB
str ALGprojecttail(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str ALGreuse(bat *ret, const bat *bid);
str ALGsample(bat *result, const bat *bid, const int *param);
+str ALGselect1(bat *result, const bat *bid, const void *low, const void *high,
const bit *li, const bit *hi, const bit *anti);
+str ALGselect2(bat *result, const bat *bid, const bat *sid, const void *low,
const void *high, const bit *li, const bit *hi, const bit *anti);
str ALGselectNotNil(bat *result, const bat *bid);
str ALGslice(bat *ret, const bat *bid, const lng *start, const lng *end);
str ALGslice_int(bat *ret, const bat *bid, const int *start, const int *end);
@@ -715,8 +717,6 @@ str ALGsubjoin(bat *r1, bat *r2, const b
str ALGsubleftjoin(bat *r1, bat *r2, const bat *l, const bat *r, const bat
*sl, const bat *sr, const bit *nil_matches, const lng *estimate);
str ALGsubouterjoin(bat *r1, bat *r2, const bat *l, const bat *r, const bat
*sl, const bat *sr, const bit *nil_matches, const lng *estimate);
str ALGsubrangejoin(bat *r1, bat *r2, const bat *lid, const bat *rlid, const
bat *rhid, const bat *slid, const bat *srid, const bit *li, const bit *hi,
const lng *estimate);
-str ALGsubselect1(bat *result, const bat *bid, const void *low, const void
*high, const bit *li, const bit *hi, const bit *anti);
-str ALGsubselect2(bat *result, const bat *bid, const bat *sid, const void
*low, const void *high, const bit *li, const bit *hi, const bit *anti);
str ALGsubsemijoin(bat *r1, bat *r2, const bat *l, const bat *r, const bat
*sl, const bat *sr, const bit *nil_matches, const lng *estimate);
str ALGsubslice_lng(bat *ret, const bat *bid, const lng *start, const lng
*end);
str ALGsubsort11(bat *result, const bat *bid, const bit *reverse, const bit
*stable);
@@ -732,8 +732,8 @@ str ALGsubthetajoin(bat *r1, bat *r2, co
str ALGsubunique1(bat *result, const bat *bid);
str ALGsubunique2(bat *result, const bat *bid, const bat *sid);
str ALGtdiff(bat *result, const bat *lid, const bat *rid);
-str ALGthetasubselect1(bat *result, const bat *bid, const void *val, const
char **op);
-str ALGthetasubselect2(bat *result, const bat *bid, const bat *sid, const void
*val, const char **op);
+str ALGthetaselect1(bat *result, const bat *bid, const void *val, const char
**op);
+str ALGthetaselect2(bat *result, const bat *bid, const bat *sid, const void
*val, const char **op);
str ALGtinter(bat *result, const bat *lid, const bat *rid);
str ALGtmark(bat *result, const bat *bid, const oid *base);
str ALGtmark_default(bat *result, const bat *bid);
@@ -1579,11 +1579,11 @@ str PCREimatch(bit *ret, const str *val,
str PCREindex(int *ret, const pcre *pat, const str *val);
str PCRElike2(bit *ret, const str *s, const str *pat);
str PCRElike3(bit *ret, const str *s, const str *pat, const str *esc);
-str PCRElikesubselect1(bat *ret, const bat *bid, const bat *cid, const str
*pat, const str *esc, const bit *anti);
-str PCRElikesubselect2(bat *ret, const bat *bid, const bat *sid, const str
*pat, const str *esc, const bit *caseignore, const bit *anti);
-str PCRElikesubselect3(bat *ret, const bat *bid, const bat *sid, const str
*pat, const str *esc, const bit *anti);
-str PCRElikesubselect4(bat *ret, const bat *bid, const bat *cid, const str
*pat, const bit *anti);
-str PCRElikesubselect5(bat *ret, const bat *bid, const bat *sid, const str
*pat, const bit *anti);
+str PCRElikeselect1(bat *ret, const bat *bid, const bat *cid, const str *pat,
const str *esc, const bit *anti);
+str PCRElikeselect2(bat *ret, const bat *bid, const bat *sid, const str *pat,
const str *esc, const bit *caseignore, const bit *anti);
+str PCRElikeselect3(bat *ret, const bat *bid, const bat *sid, const str *pat,
const str *esc, const bit *anti);
+str PCRElikeselect4(bat *ret, const bat *bid, const bat *cid, const str *pat,
const bit *anti);
+str PCRElikeselect5(bat *ret, const bat *bid, const bat *sid, const str *pat,
const bit *anti);
str PCREmatch(bit *ret, const str *val, const str *pat);
str PCREnotilike2(bit *ret, const str *s, const str *pat);
str PCREnotilike3(bit *ret, const str *s, const str *pat, const str *esc);
@@ -2032,6 +2032,7 @@ Module findModule(Module scope, str name
str findRef;
Scenario findScenario(str nme);
Symbol findSymbol(Module nspace, str mod, str fcn);
+MALfcn findSymbolAddress(Module scope, str name);
Symbol findSymbolInModule(Module v, str fcn);
int findVariable(MalBlkPtr mb, const char *name);
int findVariableLength(MalBlkPtr mb, str name, int len);
@@ -2114,8 +2115,8 @@ str identityRef;
str ifthenelseRef;
str ilikeRef;
str ilikeselectRef;
-str ilikesubselectRef;
-str ilikethetasubselectRef;
+str ilikeselectRef;
+str ilikethetaselectRef;
str ilikeuselectRef;
void initHeartbeat(void);
void initNamespace(void);
@@ -2156,10 +2157,10 @@ int isOptimizerPipe(str name);
int isOrderby(InstrPtr q);
int isProcedure(MalBlkPtr mb, InstrPtr p);
int isSample(InstrPtr q);
+int isSelect(InstrPtr q);
int isSideEffectFree(MalBlkPtr mb);
int isSlice(InstrPtr q);
int isSubJoin(InstrPtr q);
-int isSubSelect(InstrPtr q);
int isTopn(InstrPtr q);
int isUnsafeFunction(InstrPtr q);
int isUnsafeInstruction(InstrPtr q);
@@ -2173,8 +2174,8 @@ str levenshteinbasic2_impl(int *result,
str levenshteinbasic_impl(int *result, str *s, str *t);
str likeRef;
str likeselectRef;
-str likesubselectRef;
-str likethetasubselectRef;
+str likeselectRef;
+str likethetaselectRef;
str likeuselectRef;
str listRef;
str loadLibrary(str modulename, int flag);
@@ -2404,6 +2405,7 @@ int safetyBarrier(InstrPtr p, InstrPtr q
str sampleRef;
str schedulerRef;
str selectNotNilRef;
+str selectRef;
str semaRef;
str seriesRef;
str setAccessRef;
@@ -2475,7 +2477,6 @@ str submedianRef;
str subminRef;
str subprodRef;
str subrangejoinRef;
-str subselectRef;
str subsliceRef;
str subsortRef;
str subsumRef;
@@ -2485,7 +2486,7 @@ str subuniqueRef;
str sumRef;
str takeOid(oid id, str *val);
str takeRef;
-str thetasubselectRef;
+str thetaselectRef;
str tidRef;
str timestampRef;
int timestamp_fromstr(const char *buf, int *len, timestamp **ret);
diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c
--- a/clients/mapiclient/tomograph.c
+++ b/clients/mapiclient/tomograph.c
@@ -280,7 +280,7 @@ base_colors[NUM_COLORS] = {
/* 10355 */ { 0, 0, "language", "pass", 0 },
/* 5941 */ { 0, 0, "sql", "bind", 0 },
/* 5664 */ { 0, 0, "mat", "packIncrement", 0 },
-/* 4796 */ { 0, 0, "algebra", "subselect", 0 },
+/* 4796 */ { 0, 0, "algebra", "select", 0 },
/* 4789 */ { 0, 0, "algebra", "subjoin", 0 },
/* 2664 */ { 0, 0, "sql", "projectdelta", 0 },
/* 2112 */ { 0, 0, "batcalc", "!=", 0 },
@@ -304,7 +304,7 @@ base_colors[NUM_COLORS] = {
/* 209 */ { 0, 0, "batcalc", "hge", 0 },
/* 209 */ { 0, 0, "calc", "str", 0 },
/* 207 */ { 0, 0, "aggr", "sum", 0 },
-/* 200 */ { 0, 0, "algebra", "thetasubselect", 0 },
+/* 200 */ { 0, 0, "algebra", "thetaselect", 0 },
/* 200 */ { 0, 0, "algebra", "selectNotNil", 0 },
/* 197 */ { 0, 0, "aggr", "subcount", 0 },
/* 166 */ { 0, 0, "batcalc", "dbl", 0 },
@@ -325,7 +325,7 @@ base_colors[NUM_COLORS] = {
/* 66 */ { 0, 0, "pqueue", "utopn_max", 0 },
/* 66 */ { 0, 0, "algebra", "tdiff", 0 },
/* 53 */ { 0, 0, "calc", "int", 0 },
-/* 47 */ { 0, 0, "algebra", "likesubselect", 0 },
+/* 47 */ { 0, 0, "algebra", "likeselect", 0 },
/* 44 */ { 0, 0, "sql", "exportOperation", 0 },
/* 42 */ { 0, 0, "algebra", "subslice", 0 },
/* 36 */ { 0, 0, "pqueue", "utopn_min", 0 },
diff --git a/monetdb5/mal/Tests/dataflow01.malC
b/monetdb5/mal/Tests/dataflow01.malC
--- a/monetdb5/mal/Tests/dataflow01.malC
+++ b/monetdb5/mal/Tests/dataflow01.malC
@@ -26,7 +26,7 @@ end load;
function qry(z:bat[:lng],low:int,hgh:int):lng;
l:= calc.lng(low);
h:= calc.lng(hgh);
- s:= algebra.subselect(z,l,h,true,true,false);
+ s:= algebra.select(z,l,h,true,true,false);
c:= aggr.count(s);
return qry:= c;
end qry;
diff --git a/monetdb5/mal/Tests/tst013.stable.err
b/monetdb5/mal/Tests/tst013.stable.err
--- a/monetdb5/mal/Tests/tst013.stable.err
+++ b/monetdb5/mal/Tests/tst013.stable.err
@@ -1,9 +1,9 @@
stderr of test 'tst013` in directory 'monetdb5/mal` itself:
-# 11:10:24 >
-# 11:10:24 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37868" "--set"
"mapi_usock=/var/tmp/mtest-10484/.s.monetdb.37868" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_mal"
"--set" "mal_listing=2" "--set" "embedded_r=yes"
-# 11:10:24 >
+# 19:05:11 >
+# 19:05:11 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38318" "--set"
"mapi_usock=/var/tmp/mtest-14145/.s.monetdb.38318" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_mal"
+# 19:05:11 >
# builtin opt gdk_dbpath =
/export/scratch1/mk/default//Linux/var/monetdb5/dbfarm/demo
# builtin opt gdk_debug = 0
@@ -17,21 +17,18 @@ stderr of test 'tst013` in directory 'mo
# builtin opt sql_debug = 0
# cmdline opt gdk_nr_threads = 0
# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 37868
-# cmdline opt mapi_usock = /var/tmp/mtest-10484/.s.monetdb.37868
+# cmdline opt mapi_port = 38318
+# cmdline opt mapi_usock = /var/tmp/mtest-14145/.s.monetdb.38318
# cmdline opt monet_prompt =
-# cmdline opt mal_listing = 2
# cmdline opt gdk_dbpath =
/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_mal
-# cmdline opt mal_listing = 2
-# cmdline opt embedded_r = yes
# cmdline opt gdk_debug = 536870922
-# 13:20:00 >
-# 13:20:00 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-18020" "--port=37961"
-# 13:20:00 >
+# 19:05:11 >
+# 19:05:11 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-14145" "--port=38318"
+# 19:05:11 >
-
-# 10:54:30 >
-# 10:54:30 > "Done."
-# 10:54:30 >
+# 19:05:12 >
+# 19:05:12 > "Done."
+# 19:05:12 >
+
diff --git a/monetdb5/mal/Tests/tst023.malC b/monetdb5/mal/Tests/tst023.malC
--- a/monetdb5/mal/Tests/tst023.malC
+++ b/monetdb5/mal/Tests/tst023.malC
@@ -14,7 +14,7 @@ bat.append(b2, 12.34);
bat.append(b2, 12.35);
io.print(b1,b2);
-s:= algebra.subselect(b1,2,2,true,true,false);
+s:= algebra.select(b1,2,2,true,true,false);
io.print(s);
bat.delete(b1,s);
diff --git a/monetdb5/mal/Tests/tst033.malC b/monetdb5/mal/Tests/tst033.malC
--- a/monetdb5/mal/Tests/tst033.malC
+++ b/monetdb5/mal/Tests/tst033.malC
@@ -4,11 +4,11 @@ bat.append(b,1);
bat.append(b,2);
bat.append(b,3);
-s := algebra.subselect(b,0,2,true,true,false); z := algebra.projection(s,b);
io.print(z);
-s := algebra.subselect(b,0,2,true,false,false); z := algebra.projection(s,b);
io.print(z);
-s := algebra.subselect(b,0,2,false,true,false); z := algebra.projection(s,b);
io.print(z);
-s := algebra.subselect(b,0,2,false,false,false); z := algebra.projection(s,b);
io.print(z);
-s := algebra.subselect(b,0,2,true,true,true); z := algebra.projection(s,b);
io.print(z);
-s := algebra.subselect(b,0,2,true,false,true); z := algebra.projection(s,b);
io.print(z);
-s := algebra.subselect(b,0,2,false,true,true); z := algebra.projection(s,b);
io.print(z);
-s := algebra.subselect(b,0,2,false,false,true); z := algebra.projection(s,b);
io.print(z);
+s := algebra.select(b,0,2,true,true,false); z := algebra.projection(s,b);
io.print(z);
+s := algebra.select(b,0,2,true,false,false); z := algebra.projection(s,b);
io.print(z);
+s := algebra.select(b,0,2,false,true,false); z := algebra.projection(s,b);
io.print(z);
+s := algebra.select(b,0,2,false,false,false); z := algebra.projection(s,b);
io.print(z);
+s := algebra.select(b,0,2,true,true,true); z := algebra.projection(s,b);
io.print(z);
+s := algebra.select(b,0,2,true,false,true); z := algebra.projection(s,b);
io.print(z);
+s := algebra.select(b,0,2,false,true,true); z := algebra.projection(s,b);
io.print(z);
+s := algebra.select(b,0,2,false,false,true); z := algebra.projection(s,b);
io.print(z);
diff --git a/monetdb5/mal/Tests/tst034.malC b/monetdb5/mal/Tests/tst034.malC
--- a/monetdb5/mal/Tests/tst034.malC
+++ b/monetdb5/mal/Tests/tst034.malC
@@ -7,13 +7,13 @@ bat.append(b,3);
i:= bbp.getLRefCount(b);
io.printf("start of selections %d [1]\n",i);
-s:= algebra.subselect(b,0,2,true,true,false); z:=algebra.projection(s,b);
io.print(z);
+s:= algebra.select(b,0,2,true,true,false); z:=algebra.projection(s,b);
io.print(z);
i:= bbp.getLRefCount(z);
io.printf("z select %d [1]\n",i);
i:= bbp.getLRefCount(b);
io.printf("select %d [1]\n",i);
-s:= algebra.subselect(b,0,2,true,false,false); z:=algebra.projection(s,b);
io.print(z);
+s:= algebra.select(b,0,2,true,false,false); z:=algebra.projection(s,b);
io.print(z);
i:= bbp.getLRefCount(b);
io.printf("select %d [1]\n",i);
-s:= algebra.subselect(b,0,2,false,true,false); z:=algebra.projection(s,b);
io.print(z);
-s:= algebra.subselect(b,0,2,false,false,false); z:=algebra.projection(s,b);
io.print(z);
+s:= algebra.select(b,0,2,false,true,false); z:=algebra.projection(s,b);
io.print(z);
+s:= algebra.select(b,0,2,false,false,false); z:=algebra.projection(s,b);
io.print(z);
diff --git a/monetdb5/mal/Tests/tst201.malC b/monetdb5/mal/Tests/tst201.malC
--- a/monetdb5/mal/Tests/tst201.malC
+++ b/monetdb5/mal/Tests/tst201.malC
@@ -63,14 +63,14 @@ exit MALException;
v45:= algebra.slice(b,v43,v44);
v46:= io.print(v45);
- v75:= algebra.likesubselect(b, nil:bat[:oid], "ox", nil:str, false,
false);
+ v75:= algebra.likeselect(b, nil:bat[:oid], "ox", nil:str, false, false);
v76:= io.print(v75);
- v78:= algebra.likesubselect(b, nil:bat[:oid], "fo", nil:str, false,
false);
+ v78:= algebra.likeselect(b, nil:bat[:oid], "fo", nil:str, false, false);
v79:= io.print(v78);
- v81:= algebra.likesubselect(b, nil:bat[:oid], "fox", nil:str, false,
false);
+ v81:= algebra.likeselect(b, nil:bat[:oid], "fox", nil:str, false,
false);
v82:= io.print(v81);
- v84:= algebra.likesubselect(b, nil:bat[:oid], " fox", nil:str, false,
false);
+ v84:= algebra.likeselect(b, nil:bat[:oid], " fox", nil:str, false,
false);
v85:= io.print(v84);
diff --git a/monetdb5/mal/Tests/tst220.malC b/monetdb5/mal/Tests/tst220.malC
--- a/monetdb5/mal/Tests/tst220.malC
+++ b/monetdb5/mal/Tests/tst220.malC
@@ -43,7 +43,7 @@ end createone;
io.printf("assignment refcount =%d[1]\n",i);
#re-use a bat variable
- b4:= algebra.subselect(b,"bat C","bat C",true,true,false);
+ b4:= algebra.select(b,"bat C","bat C",true,true,false);
b5:=algebra.projection(b4,b);
io.print(b5);
i:= bbp.getLRefCount(b);
diff --git a/monetdb5/mal/Tests/tst285.malC b/monetdb5/mal/Tests/tst285.malC
--- a/monetdb5/mal/Tests/tst285.malC
+++ b/monetdb5/mal/Tests/tst285.malC
@@ -2,7 +2,7 @@ b:= bat.new(:str);
bat.append(b,"hello");
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
