Changeset: 65975e1f56f2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=65975e1f56f2
Removed Files:
monetdb5/tests/BugReports/Tests/no.119.mal
monetdb5/tests/BugReports/Tests/no.119.stable.err
monetdb5/tests/BugReports/Tests/no.119.stable.out
monetdb5/tests/BugTracker/Tests/thetajoin-properties.Bug-2974.mal
monetdb5/tests/BugTracker/Tests/thetajoin-properties.Bug-2974.stable.err
monetdb5/tests/BugTracker/Tests/thetajoin-properties.Bug-2974.stable.out
Modified Files:
monetdb5/modules/kernel/algebra.mal
monetdb5/tests/BugReports/Tests/All
monetdb5/tests/BugTracker/Tests/All
Branch: default
Log Message:
Remove old outerjoin, thetajoin, bandjoin
diffs (truncated from 374 to 300 lines):
diff --git a/monetdb5/modules/kernel/algebra.mal
b/monetdb5/modules/kernel/algebra.mal
--- a/monetdb5/modules/kernel/algebra.mal
+++ b/monetdb5/modules/kernel/algebra.mal
@@ -83,42 +83,7 @@ command leftfetchjoin ( left:bat[:oid,:o
address ALGleftfetchjoin
comment "Hook directly into the left fetch join implementation.";
-#command outerjoin( outer:bat[:any_1,:any_2], inner:bat[:any_2,:any_3])
:bat[:any_1,:any_3]
-#address ALGouterjoin
-#comment "Returns all the result of a join, plus the BUNS formed NIL in
-# the tail and the head-values of 'outer' whose tail-value does
-# not match an head-value in 'inner'.";
-#
-#command outerjoin( outer:bat[:any_1,:any_2], inner:bat[:any_2,:any_3],
estimate:lng) :bat[:any_1,:any_3]
-#address ALGouterjoinestimate;
-
# Theta Join
-command thetajoin( left:bat[:any_1,:any_2], right:bat[:any_2,:any_3],
opname:int) :bat[:any_1,:any_3]
-address ALGthetajoin
-comment "Theta join on for 'mode' in { LE, LT, EQ, GT, GE }. JOIN_EQ is
- just the same as join(). All other options do merge algorithms.
- Either using the fact that they are ordered() already (left on
tail,
- right on head), or by using/creating binary search trees on the
- join columns. ";
-
-command thetajoin( left:bat[:any_1,:any_2], right:bat[:any_2,:any_3],
opname:int,estimate:lng) :bat[:any_1,:any_3]
-address ALGthetajoinEstimate;
-# Band Join (approximate match)
-command bandjoin( outer:bat[:any_1,:any_2], inner:bat[:any_2,:any_3],
minus:any_2 , plus:any_2 ) :bat[:any_1,:any_3]
-address ALGbandjoin_default
-comment "This is a join() for which the predicate is that two BUNs match
- if the left-tail value is within the range [right-head - minus,
- right-head + plus]. Works only for the builtin numerical types,
- and their derivates.";
-
-command bandjoin( outer:bat[:any_1,:any_2], inner:bat[:any_2,:any_3],
minus:any_2 , plus:any_2, li:bit, hi:bit ) :bat[:any_1,:any_3]
-address ALGbandjoin
-comment "This is a join() for which the predicate is that two BUNs match
- if the left-tail value is within the range [right-head - minus,
- right-head + plus], depending on (l_in/h_in), the bounds
- are included. Works only for the builtin numerical types,
- and their derivates.";
-
command join(l:bat[:any_1,:any_2], rl:bat[:any_3,:any_2],
rh:bat[:any_3,:any_2], li:bit, hi:bit) :bat[:any_1,:any_3]
address ALGrangejoin;
@@ -320,8 +285,7 @@ address ALGtunion;
# @+ Join operations
# The core of every relational engine.
# The join collection provided by the GDK kernel.
-command antijoin( left:bat[:oid,:any_1], right:bat[:oid,:any_1])
- (l:bat[:oid,:oid],r:bat[:oid,:oid])
+command antijoin( left:bat[:oid,:any_1], right:bat[:oid,:any_1])
(l:bat[:oid,:oid],r:bat[:oid,:oid])
address ALGantijoin2
comment "Returns 2 columns with all BUNs, consisting of the head-oids
from 'left' and 'right' for which there are BUNs in 'left'
@@ -335,12 +299,12 @@ comment "Returns 2 columns with all BUNs
and 'right' with equal tails";
# Theta Join
-command thetajoin( left:bat[:oid,:any_1], right:bat[:oid,:any_1], opname:int)
- (l:bat[:oid,:oid],r:bat[:oid,:oid])
-address ALGthetajoin2
-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 thetajoin( left:bat[:oid,:any_1], right:bat[:oid,:any_1], opname:int)
+# (l:bat[:oid,:oid],r:bat[:oid,:oid])
+#address ALGthetajoin2
+#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 crossproduct( left:bat[:oid,:any_1], right:bat[:oid,:any_2])
(l:bat[:oid,:oid],r:bat[:oid,:oid])
@@ -349,15 +313,6 @@ comment "Returns 2 columns with all BUNs
from 'left' and 'right' for which there are BUNs in 'left'
and 'right' with equal tails";
-command bandjoin( outer:bat[:oid,:any_2], inner:bat[:oid,:any_2], minus:any_2
, plus:any_2, li:bit, hi:bit )
- (l:bat[:oid,:oid],r:bat[:oid,:oid])
-address ALGbandjoin2
-comment "This is a join() for which the predicate is that two BUNs match
- if the left-tail value is within the range [right-head - minus,
- right-head + plus], depending on (l_in/h_in), the bounds
- are included. Works only for the builtin numerical types,
- and their derivates.";
-
command 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;
diff --git a/monetdb5/tests/BugReports/Tests/All
b/monetdb5/tests/BugReports/Tests/All
--- a/monetdb5/tests/BugReports/Tests/All
+++ b/monetdb5/tests/BugReports/Tests/All
@@ -12,7 +12,6 @@ no.051
no.062
no.098
no.100
-no.119
no.150
no.157
no.161
diff --git a/monetdb5/tests/BugReports/Tests/no.119.mal
b/monetdb5/tests/BugReports/Tests/no.119.mal
deleted file mode 100644
--- a/monetdb5/tests/BugReports/Tests/no.119.mal
+++ /dev/null
@@ -1,26 +0,0 @@
- a := bat.new(nil:oid,nil:int);
- ca_a := bat.append(a,3);
- da_a := bat.append(a,2);
- ea_a := bat.append(a,1);
- ra:= bat.reverse(a);
- LT:= -1;
- fa_a := calc.lng(nil);
- ga_a := algebra.thetajoin(a,ra,LT,fa_a);
- ha_a := io.print(ga_a);
- LE:= -2;
- ia_a := calc.lng(nil);
- ja_a := algebra.thetajoin(a,ra,LE,ia_a);
- ka_a := io.print(ja_a);
- EQ:= 0;
- la_a := calc.lng(nil);
- ma_a := algebra.thetajoin(a,ra,EQ,la_a);
- na_a := io.print(ma_a);
- GE:= 2;
- oa_a := calc.lng(nil);
- pa_a := algebra.thetajoin(a,ra,GE,oa_a);
- qa_a := io.print(pa_a);
- GT:= 1;
- ra_a := calc.lng(nil);
- sa_a := algebra.thetajoin(a,ra,GT,ra_a);
- ta_a := io.print(sa_a);
- ua_a := clients.quit();
diff --git a/monetdb5/tests/BugReports/Tests/no.119.stable.err
b/monetdb5/tests/BugReports/Tests/no.119.stable.err
deleted file mode 100644
--- a/monetdb5/tests/BugReports/Tests/no.119.stable.err
+++ /dev/null
@@ -1,12 +0,0 @@
-stderr of test 'no.119` in directory 'monetdb5/tests/BugReports` itself:
-
-
-# 07:27:15 >
-# 07:27:15 > Mtimeout -timeout 60 mserver5
"--config=/ufs/mk/monet5/Linux/etc/MonetDB5.conf" --debug=10 --set
"monet_mod_path=/ufs/mk/monet5/Linux/lib/MonetDB5:/ufs/mk/opensource/MonetDB/Linux/lib/MonetDB"
--set "gdk_dbfarm=/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5/Linux/var/MonetDB5/dblogs" --set mapi_port=35545
--set monet_prompt= --trace --dbname=mTests_tests_BugReports no.119.mal <
/dev/null
-# 07:27:15 >
-
-
-# 07:27:15 >
-# 07:27:15 > Done.
-# 07:27:15 >
-
diff --git a/monetdb5/tests/BugReports/Tests/no.119.stable.out
b/monetdb5/tests/BugReports/Tests/no.119.stable.out
deleted file mode 100644
--- a/monetdb5/tests/BugReports/Tests/no.119.stable.out
+++ /dev/null
@@ -1,94 +0,0 @@
-stdout of test 'no.119` in directory 'monetdb5/tests/BugReports` itself:
-
-
-# 07:27:15 >
-# 07:27:15 > Mtimeout -timeout 60 mserver5
"--config=/ufs/mk/monet5/Linux/etc/MonetDB5.conf" --debug=10 --set
"monet_mod_path=/ufs/mk/monet5/Linux/lib/MonetDB5:/ufs/mk/opensource/MonetDB/Linux/lib/MonetDB"
--set "gdk_dbfarm=/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5/Linux/var/MonetDB5/dblogs" --set mapi_port=35545
--set monet_prompt= --trace --dbname=mTests_tests_BugReports no.119.mal <
/dev/null
-# 07:27:15 >
-
-# MonetDB Server v4.99.19
-# Copyright (c) 1993-2006 CWI, all rights reserved
-# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked
-# config:/ufs/mk/monet5/Linux/etc/MonetDB5.conf
-# dbfarm:/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm
-# dbname:mTests_tests_BugReports
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:30579/
-function user.main():void;
- a := bat.new(nil:oid,nil:int);
- ca_a := bat.append(a,3);
- da_a := bat.append(a,2);
- ea_a := bat.append(a,1);
- ra := bat.reverse(a);
- LT := -1;
- fa_a := calc.lng(nil);
- ga_a := algebra.thetajoin(a,ra,LT,fa_a);
- ha_a := io.print(ga_a);
-# io.print("a.thetajoin(a,LE,calc.lng(nil)).print();");
- LE := -2;
- ia_a := calc.lng(nil);
- ja_a := algebra.thetajoin(a,ra,LE,ia_a);
- ka_a := io.print(ja_a);
-# io.print("a.thetajoin(a,EQ,calc.lng(nil)).print();");
- EQ := 0;
- la_a := calc.lng(nil);
- ma_a := algebra.thetajoin(a,ra,EQ,la_a);
- na_a := io.print(ma_a);
-# io.print("a.thetajoin(a,GE,calc.lng(nil)).print();");
- GE := 2;
- oa_a := calc.lng(nil);
- pa_a := algebra.thetajoin(a,ra,GE,oa_a);
- qa_a := io.print(pa_a);
-# io.print("a.thetajoin(a,GT,calc.lng(nil)).print();");
- GT := 1;
- ra_a := calc.lng(nil);
- sa_a := algebra.thetajoin(a,ra,GT,ra_a);
- ta_a := io.print(sa_a);
-# io.print("quit();");
- ua_a := clients.quit();
-end main;
-#-----------------#
-# h t # name
-# int int # type
-#-----------------#
-[ 1@0, 0@0 ]
-[ 2@0, 0@0 ]
-[ 2@0, 1@0 ]
-#-----------------#
-# h t # name
-# int int # type
-#-----------------#
-[ 0@0, 0@0 ]
-[ 1@0, 0@0 ]
-[ 1@0, 1@0 ]
-[ 2@0, 0@0 ]
-[ 2@0, 1@0 ]
-[ 2@0, 2@0 ]
-#-----------------#
-# h t # name
-# int int # type
-#-----------------#
-[ 0@0, 0@0 ]
-[ 1@0, 1@0 ]
-[ 2@0, 2@0 ]
-#-----------------#
-# h t # name
-# int int # type
-#-----------------#
-[ 0@0, 0@0 ]
-[ 0@0, 1@0 ]
-[ 0@0, 2@0 ]
-[ 1@0, 1@0 ]
-[ 1@0, 2@0 ]
-[ 2@0, 2@0 ]
-#-----------------#
-# h t # name
-# int int # type
-#-----------------#
-[ 0@0, 1@0 ]
-[ 0@0, 2@0 ]
-[ 1@0, 2@0 ]
-
-# 07:27:15 >
-# 07:27:15 > Done.
-# 07:27:15 >
-
diff --git a/monetdb5/tests/BugTracker/Tests/All
b/monetdb5/tests/BugTracker/Tests/All
--- a/monetdb5/tests/BugTracker/Tests/All
+++ b/monetdb5/tests/BugTracker/Tests/All
@@ -6,6 +6,5 @@ empty_line_crash.SF-1806638
parser.SF-2051309
mal_var_persistent_over_sessions.SF-2581675
joinpath-loop.Bug-2965
-thetajoin-properties.Bug-2974
algebra_project.Bug-3045
stdev.Bug-3178
diff --git a/monetdb5/tests/BugTracker/Tests/thetajoin-properties.Bug-2974.mal
b/monetdb5/tests/BugTracker/Tests/thetajoin-properties.Bug-2974.mal
deleted file mode 100644
--- a/monetdb5/tests/BugTracker/Tests/thetajoin-properties.Bug-2974.mal
+++ /dev/null
@@ -1,19 +0,0 @@
-l := bat.new(:oid, :int);
-r := bat.new(:oid, :int);
-
-l := bat.insert(l, 2@0, 1);
-l := bat.insert(l, 6@0, 2);
-
-r := bat.insert(r, 3@0, 1);
-r := bat.insert(r, 7@0, 2);
-
-rr := bat.reverse(r);
-
-t := algebra.thetajoin(l, rr, 1); # gt
-
-io.print(t); # returns 6@0 3@0 (2 is greater than 1?)
-
-b := bat.new(:oid, :oid);
-b := bat.insert(b, t); # BUG: ERROR: BATkey: dense column must be unique.
-
-io.print(b);
diff --git
a/monetdb5/tests/BugTracker/Tests/thetajoin-properties.Bug-2974.stable.err
b/monetdb5/tests/BugTracker/Tests/thetajoin-properties.Bug-2974.stable.err
deleted file mode 100644
--- a/monetdb5/tests/BugTracker/Tests/thetajoin-properties.Bug-2974.stable.err
+++ /dev/null
@@ -1,31 +0,0 @@
-stderr of test 'thetajoin-properties.Bug-2974` in directory
'monetdb5/tests/BugTracker` itself:
-
-
-# 16:24:34 >
-# 16:24:34 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/ufs/sjoerd/Monet-stable/var/MonetDB" "--set" "mapi_open=true"
"--set" "mapi_port=37407" "--set" "monet_prompt=" "--trace" "--forcemito"
"--set" "mal_listing=2" "--dbname=mTests_tests_BugTracker"
"thetajoin-properties.Bug-2974.mal"
-# 16:24:34 >
-
-# builtin opt gdk_dbname = demo
-# builtin opt gdk_dbfarm = /ufs/sjoerd/Monet-stable/var/monetdb5/dbfarm
-# builtin opt gdk_debug = 0
-# builtin opt gdk_alloc_map = no
-# builtin opt gdk_vmtrim = yes
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
