Changeset: aab6ba8d33d5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aab6ba8d33d5
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/mapiclient/tomograph.c
monetdb5/ChangeLog
monetdb5/mal/Tests/tst1602.mal
monetdb5/mal/Tests/tst1602.stable.out
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/algebra.h
monetdb5/modules/kernel/algebra.mal
monetdb5/optimizer/Tests/mat00.mal
monetdb5/optimizer/Tests/qep00.mal
monetdb5/optimizer/Tests/qep01.mal
monetdb5/optimizer/Tests/qep02.mal
monetdb5/optimizer/opt_costModel.c
monetdb5/optimizer/opt_generator.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_pushselect.c
monetdb5/optimizer/opt_support.c
Branch: default
Log Message:
Removed algebra.join.
diffs (truncated from 496 to 300 lines):
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -2316,14 +2316,6 @@ command algebra.ilike(s:str,pat:str):bit
address PCREilike2;
command algebra.ilike(s:str,pat:str,esc:str):bit
address PCREilike3;
-command
algebra.join(left:bat[:oid,:any_2],rl:bat[:oid,:any_2],rh:bat[:oid,:any_2],li:bit,hi:bit)
(l:bat[:oid,:oid],r:bat[:oid,:oid])
-address ALGrangejoin2;
-comment Deprecated, see algebra.subrangejoin. Range join
-
-command algebra.join(left:bat[:oid,:any_1],right:bat[:oid,:any_1])
(l:bat[:oid,:oid],r:bat[:oid,:oid])
-address ALGjoin2;
-comment Returns 2 columns with all BUNs, consisting of the head-oids from
'left' and 'right' for which there are BUNs in 'left' and 'right' with
equal tails
-
command
algebra.likesubjoin(l:bat[:oid,:str],r:bat[:oid,:str],sl:bat[:oid,:oid],sr:bat[:oid,:oid],nil_matches:bit,estimate:lng)
(X_7:bat[:oid,:oid],X_8:bat[:oid,:oid])
address LIKEsubjoin1;
command
algebra.likesubjoin(l:bat[:oid,:str],r:bat[:oid,:str],esc:str,sl:bat[:oid,:oid],sr:bat[:oid,:oid],nil_matches:bit,estimate:lng)
(X_8:bat[:oid,:oid],X_9:bat[:oid,:oid])
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -2827,14 +2827,6 @@ command algebra.ilike(s:str,pat:str):bit
address PCREilike2;
command algebra.ilike(s:str,pat:str,esc:str):bit
address PCREilike3;
-command
algebra.join(left:bat[:oid,:any_2],rl:bat[:oid,:any_2],rh:bat[:oid,:any_2],li:bit,hi:bit)
(l:bat[:oid,:oid],r:bat[:oid,:oid])
-address ALGrangejoin2;
-comment Deprecated, see algebra.subrangejoin. Range join
-
-command algebra.join(left:bat[:oid,:any_1],right:bat[:oid,:any_1])
(l:bat[:oid,:oid],r:bat[:oid,:oid])
-address ALGjoin2;
-comment Returns 2 columns with all BUNs, consisting of the head-oids from
'left' and 'right' for which there are BUNs in 'left' and 'right' with
equal tails
-
command
algebra.likesubjoin(l:bat[:oid,:str],r:bat[:oid,:str],sl:bat[:oid,:oid],sr:bat[:oid,:oid],nil_matches:bit,estimate:lng)
(X_7:bat[:oid,:oid],X_8:bat[:oid,:oid])
address LIKEsubjoin1;
command
algebra.likesubjoin(l:bat[:oid,:str],r:bat[:oid,:str],esc:str,sl:bat[:oid,:oid],sr:bat[:oid,:oid],nil_matches:bit,estimate:lng)
(X_8:bat[:oid,:oid],X_9:bat[:oid,:oid])
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
@@ -703,13 +703,11 @@ str ALGfetchoid(ptr ret, const bat *bid,
str ALGfind(oid *ret, const bat *bid, ptr val);
str ALGfirstn(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str ALGgroupby(bat *res, const bat *gids, const bat *cnts);
-str ALGjoin2(bat *l, bat *r, const bat *lid, const bat *rid);
str ALGjoinPath(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str ALGmaxany(ptr result, const bat *bid);
str ALGminany(ptr result, const bat *bid);
str ALGprojection(bat *result, const bat *lid, const bat *rid);
str ALGprojecttail(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str ALGrangejoin2(bat *l, bat *r, const bat *lid, const bat *rlid, const bat
*rhid, const bit *li, const bit *hi);
str ALGreuse(bat *ret, const bat *bid);
str ALGsample(bat *result, const bat *bid, const int *param);
str ALGselectNotNil(bat *result, const bat *bid);
@@ -2220,7 +2218,6 @@ int isUnsafeInstruction(InstrPtr q);
int isUpdateInstruction(InstrPtr p);
str iteratorRef;
str joinPathRef;
-str joinRef;
str jsonRef;
str languageRef;
str levenshtein_impl(int *result, str *s, str *t, int *insdel_cost, int
*replace_cost, int *transpose_cost);
diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c
--- a/clients/mapiclient/tomograph.c
+++ b/clients/mapiclient/tomograph.c
@@ -281,7 +281,6 @@ base_colors[NUM_COLORS] = {
/* 5941 */ { 0, 0, "sql", "bind", 0 },
/* 5664 */ { 0, 0, "mat", "packIncrement", 0 },
/* 4796 */ { 0, 0, "algebra", "subselect", 0 },
-/* 4789 */ { 0, 0, "algebra", "join", 0 },
/* 4789 */ { 0, 0, "algebra", "subjoin", 0 },
/* 2664 */ { 0, 0, "sql", "projectdelta", 0 },
/* 2112 */ { 0, 0, "batcalc", "!=", 0 },
diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog
--- a/monetdb5/ChangeLog
+++ b/monetdb5/ChangeLog
@@ -2,6 +2,7 @@
# This file is updated with Maddlog
* Thu Dec 3 2015 Sjoerd Mullender <sjo...@acm.org>
+- Removed algebra.join. Use algebra.subjoin instead.
- Removed algebra.antijoin. Use algebra.subantijoin or
algebra.subthetajoin instead.
diff --git a/monetdb5/mal/Tests/tst1602.mal b/monetdb5/mal/Tests/tst1602.mal
--- a/monetdb5/mal/Tests/tst1602.mal
+++ b/monetdb5/mal/Tests/tst1602.mal
@@ -21,7 +21,7 @@ exit sj_a;
mdb.setDebug(dbgmsk_restore);
t := alarm.time();
- (vg_a,xg_b) := algebra.join(int_1M,int_1M);
+ (vg_a,xg_b) :=
algebra.subjoin(int_1M,int_1M,nil:bat,nil:bat,false,nil:lng);
wg_a := aggr.count(vg_a);
xg_a := io.printf("#count %d = ",wg_a);
x:= alarm.time();
@@ -30,7 +30,7 @@ mdb.setDebug(dbgmsk_restore);
t := alarm.time();
- (vg_a,xg_b) := algebra.join(int_1M,int_1M);
+ (vg_a,xg_b) :=
algebra.subjoin(int_1M,int_1M,nil:bat,nil:bat,false,nil:lng);
wg_a := aggr.count(vg_a);
xg_a := io.printf("#count %d = ",wg_a);
x:= alarm.time();
@@ -38,7 +38,7 @@ mdb.setDebug(dbgmsk_restore);
ah_a := io.printf("%d ms\n",yg_a);
t := alarm.time();
- (vg_a,xg_b) := algebra.join(int_1M,int_1M);
+ (vg_a,xg_b) :=
algebra.subjoin(int_1M,int_1M,nil:bat,nil:bat,false,nil:lng);
wg_a := aggr.count(vg_a);
xg_a := io.printf("#count %d = ",wg_a);
x:= alarm.time();
@@ -47,7 +47,7 @@ mdb.setDebug(dbgmsk_restore);
t := alarm.time();
- (vg_a,xg_b) := algebra.join(int_1M,int_1M);
+ (vg_a,xg_b) :=
algebra.subjoin(int_1M,int_1M,nil:bat,nil:bat,false,nil:lng);
wg_a := aggr.count(vg_a);
xg_a := io.printf("#count %d = ",wg_a);
x:= alarm.time();
@@ -72,7 +72,7 @@ exit sj_b;
mdb.setDebug(dbgmsk_restore);
t := alarm.time();
- (vg_b,z) := algebra.join(M2,M2);
+ (vg_b,z) := algebra.subjoin(M2,M2,nil:bat,nil:bat,false,nil:lng);
wg_b := aggr.count(vg_b);
xxx := io.printf("#count %d = ",wg_b);
x:= alarm.time();
@@ -81,7 +81,7 @@ mdb.setDebug(dbgmsk_restore);
t := alarm.time();
- (vg_b,z) := algebra.join(M2,M2);
+ (vg_b,z) := algebra.subjoin(M2,M2,nil:bat,nil:bat,false,nil:lng);
wg_b := aggr.count(vg_b);
xxx := io.printf("#count %d = ",wg_b);
x:= alarm.time();
@@ -89,7 +89,7 @@ mdb.setDebug(dbgmsk_restore);
ah_b := io.printf("%d ms\n",zzz);
t := alarm.time();
- (vg_b,z) := algebra.join(M2,M2);
+ (vg_b,z) := algebra.subjoin(M2,M2,nil:bat,nil:bat,false,nil:lng);
wg_b := aggr.count(vg_b);
xxx := io.printf("#count %d = ",wg_b);
x:= alarm.time();
@@ -98,7 +98,7 @@ mdb.setDebug(dbgmsk_restore);
t := alarm.time();
- (vg_b,z) := algebra.join(M2,M2);
+ (vg_b,z) := algebra.subjoin(M2,M2,nil:bat,nil:bat,false,nil:lng);
wg_b := aggr.count(vg_b);
xxx := io.printf("#count %d = ",wg_b);
x:= alarm.time();
diff --git a/monetdb5/mal/Tests/tst1602.stable.out
b/monetdb5/mal/Tests/tst1602.stable.out
--- a/monetdb5/mal/Tests/tst1602.stable.out
+++ b/monetdb5/mal/Tests/tst1602.stable.out
@@ -32,28 +32,28 @@ exit tj_a;
exit sj_a;
mdb.setDebug(dbgmsk_restore);
t := alarm.time();
- (vg_a,xg_b) := algebra.join(int_1M,int_1M);
+ (vg_a,xg_b) :=
algebra.subjoin(int_1M,int_1M,nil:BAT,nil:BAT,false,nil:lng);
wg_a := aggr.count(vg_a);
xg_a := io.printf("#count %d = ",wg_a);
x := alarm.time();
yg_a := calc.-(x,t);
ah_a := io.printf("%d ms\n",yg_a);
t := alarm.time();
- (vg_a,xg_b) := algebra.join(int_1M,int_1M);
+ (vg_a,xg_b) :=
algebra.subjoin(int_1M,int_1M,nil:BAT,nil:BAT,false,nil:lng);
wg_a := aggr.count(vg_a);
xg_a := io.printf("#count %d = ",wg_a);
x := alarm.time();
yg_a := calc.-(x,t);
ah_a := io.printf("%d ms\n",yg_a);
t := alarm.time();
- (vg_a,xg_b) := algebra.join(int_1M,int_1M);
+ (vg_a,xg_b) :=
algebra.subjoin(int_1M,int_1M,nil:BAT,nil:BAT,false,nil:lng);
wg_a := aggr.count(vg_a);
xg_a := io.printf("#count %d = ",wg_a);
x := alarm.time();
yg_a := calc.-(x,t);
ah_a := io.printf("%d ms\n",yg_a);
t := alarm.time();
- (vg_a,xg_b) := algebra.join(int_1M,int_1M);
+ (vg_a,xg_b) :=
algebra.subjoin(int_1M,int_1M,nil:BAT,nil:BAT,false,nil:lng);
wg_a := aggr.count(vg_a);
xg_a := io.printf("#count %d = ",wg_a);
x := alarm.time();
@@ -73,28 +73,28 @@ exit tj_b;
exit sj_b;
mdb.setDebug(dbgmsk_restore);
t := alarm.time();
- (vg_b,z) := algebra.join(M2,M2);
+ (vg_b,z) := algebra.subjoin(M2,M2,nil:BAT,nil:BAT,false,nil:lng);
wg_b := aggr.count(vg_b);
xxx := io.printf("#count %d = ",wg_b);
x := alarm.time();
zzz := calc.-(x,t);
ah_b := io.printf("%d ms\n",zzz);
t := alarm.time();
- (vg_b,z) := algebra.join(M2,M2);
+ (vg_b,z) := algebra.subjoin(M2,M2,nil:BAT,nil:BAT,false,nil:lng);
wg_b := aggr.count(vg_b);
xxx := io.printf("#count %d = ",wg_b);
x := alarm.time();
zzz := calc.-(x,t);
ah_b := io.printf("%d ms\n",zzz);
t := alarm.time();
- (vg_b,z) := algebra.join(M2,M2);
+ (vg_b,z) := algebra.subjoin(M2,M2,nil:BAT,nil:BAT,false,nil:lng);
wg_b := aggr.count(vg_b);
xxx := io.printf("#count %d = ",wg_b);
x := alarm.time();
zzz := calc.-(x,t);
ah_b := io.printf("%d ms\n",zzz);
t := alarm.time();
- (vg_b,z) := algebra.join(M2,M2);
+ (vg_b,z) := algebra.subjoin(M2,M2,nil:BAT,nil:BAT,false,nil:lng);
wg_b := aggr.count(vg_b);
xxx := io.printf("#count %d = ",wg_b);
x := alarm.time();
diff --git a/monetdb5/modules/kernel/algebra.c
b/monetdb5/modules/kernel/algebra.c
--- a/monetdb5/modules/kernel/algebra.c
+++ b/monetdb5/modules/kernel/algebra.c
@@ -669,34 +669,6 @@ ALGsubunique1(bat *result, const bat *bi
}
str
-ALGjoin2( bat *l, bat *r, const bat *left, const bat *right)
-{
- BAT *L, *R, *j1, *j2;
- gdk_return ret;
-
- if ((L = BATdescriptor(*left)) == NULL) {
- throw(MAL, "algebra.join", RUNTIME_OBJECT_MISSING);
- }
- if ((R = BATdescriptor(*right)) == NULL) {
- BBPunfix(L->batCacheid);
- throw(MAL, "algebra.join", RUNTIME_OBJECT_MISSING);
- }
-
- ret = BATjoin(&j1, &j2, L, R, NULL, NULL, 0, BUN_NONE);
- BBPunfix(L->batCacheid);
- BBPunfix(R->batCacheid);
- if (ret != GDK_SUCCEED)
- throw(MAL, "algebra.join", GDK_EXCEPTION);
- if (!(j1->batDirty&2))
- BATsetaccess(j1, BAT_READ);
- if (!(j2->batDirty&2))
- BATsetaccess(j2, BAT_READ);
- BBPkeepref(*l = j1->batCacheid);
- BBPkeepref(*r = j2->batCacheid);
- return MAL_SUCCEED;
-}
-
-str
ALGcrossproduct2( bat *l, bat *r, const bat *left, const bat *right)
{
BAT *L, *R, *bn1, *bn2;
@@ -720,40 +692,6 @@ ALGcrossproduct2( bat *l, bat *r, const
}
str
-ALGrangejoin2(bat *l, bat *r, const bat *left, const bat *rightl, const bat
*righth, const bit *li, const bit *hi)
-{
- BAT *L, *RL, *RH, *bn1, *bn2;
- gdk_return ret;
-
- if ((L = BATdescriptor(*left)) == NULL) {
- throw(MAL, "algebra.join", RUNTIME_OBJECT_MISSING);
- }
- if ((RL = BATdescriptor(*rightl)) == NULL) {
- BBPunfix(L->batCacheid);
- throw(MAL, "algebra.join", RUNTIME_OBJECT_MISSING);
- }
- if ((RH = BATdescriptor(*righth)) == NULL) {
- BBPunfix(L->batCacheid);
- BBPunfix(RL->batCacheid);
- throw(MAL, "algebra.join", RUNTIME_OBJECT_MISSING);
- }
-
- ret = BATrangejoin(&bn1, &bn2, L, RL, RH, NULL, NULL, *li, *hi,
BUN_NONE);
- BBPunfix(L->batCacheid);
- BBPunfix(RL->batCacheid);
- BBPunfix(RH->batCacheid);
- if (ret != GDK_SUCCEED)
- throw(MAL, "algebra.rangejoin", GDK_EXCEPTION);
- if (!(bn1->batDirty&2))
- BATsetaccess(bn1, BAT_READ);
- if (!(bn2->batDirty&2))
- BATsetaccess(bn2, BAT_READ);
- BBPkeepref(*l = bn1->batCacheid);
- BBPkeepref(*r = bn2->batCacheid);
- return MAL_SUCCEED;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
