Changeset: 3c78ec9666a5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3c78ec9666a5
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
monetdb5/ChangeLog
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/algebra.h
monetdb5/modules/kernel/algebra.mal
Branch: default
Log Message:
Removed algebra.tintersect and algebra.tdifference.
There is still algebra.tinter and algebra.tdiff.
diffs (158 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
@@ -2533,10 +2533,6 @@ command algebra.thetasubselect(b:bat[:oi
address ALGthetasubselect1;
comment Select all head values for which the tail value obeys the relation
value OP VAL. Input is a dense-headed BAT, output is a dense-headed BAT with
in the tail the head value of the input BAT for which the relationship
holds. The output BAT is sorted on the tail value.
-command
algebra.tdifference(left:bat[:oid,:oid],right:bat[:oid,:oid]):bat[:oid,:oid]
-address ALGtdifference;
-command
algebra.tintersect(left:bat[:oid,:oid],right:bat[:oid,:oid]):bat[:oid,:oid]
-address ALGtintersect;
command alarm.ctime{unsafe}():str
address ALARMctime;
comment Return the current time as a C-time string.
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
@@ -3044,10 +3044,6 @@ command algebra.thetasubselect(b:bat[:oi
address ALGthetasubselect1;
comment Select all head values for which the tail value obeys the relation
value OP VAL. Input is a dense-headed BAT, output is a dense-headed BAT with
in the tail the head value of the input BAT for which the relationship
holds. The output BAT is sorted on the tail value.
-command
algebra.tdifference(left:bat[:oid,:oid],right:bat[:oid,:oid]):bat[:oid,:oid]
-address ALGtdifference;
-command
algebra.tintersect(left:bat[:oid,:oid],right:bat[:oid,:oid]):bat[:oid,:oid]
-address ALGtintersect;
command alarm.ctime{unsafe}():str
address ALARMctime;
comment Return the current time as a C-time string.
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
@@ -792,14 +792,12 @@ 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 ALGtdifference(bat *result, const bat *lid, const bat *rid);
str ALGthetajoin(bat *result, const bat *lid, const bat *rid, const int *opc);
str ALGthetajoin2(bat *l, bat *r, const bat *lid, const bat *rid, const int
*opc);
str ALGthetajoinEstimate(bat *result, const bat *lid, const bat *rid, const
int *opc, const lng *estimate);
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 ALGtinter(bat *result, const bat *lid, const bat *rid);
-str ALGtintersect(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);
str ALGtmarkp(bat *result, const bat *bid, const int *nr_parts, const int
*part_nr);
diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog
--- a/monetdb5/ChangeLog
+++ b/monetdb5/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
+* Sat Sep 5 2015 Sjoerd Mullender <[email protected]>
+- Removed algebra.tdifference and algebra.tintersect.
+
* Fri Aug 14 2015 Sjoerd Mullender <[email protected]>
- Removed algebra.tunion.
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
@@ -1201,33 +1201,6 @@ ALGsample(bat *result, const bat *bid, c
/* add items missing in the kernel */
str
-ALGtdifference(bat *result, const bat *bid, const bat *bid2)
-{
- BAT *b, *b2, *bn;
-
- if ((b = BATdescriptor(*bid)) == NULL)
- throw(MAL, "algebra.tdifference", RUNTIME_OBJECT_MISSING);
- if ((b2 = BATdescriptor(*bid2)) == NULL){
- BBPunfix(*bid2);
- throw(MAL, "algebra.tdifference", RUNTIME_OBJECT_MISSING);
- }
-
- bn = BATkdiff(BATmirror(b),BATmirror(b2));
- if (bn) {
- bn = BATmirror(bn);
- if (!(bn->batDirty&2)) BATsetaccess(bn, BAT_READ);
- *result = bn->batCacheid;
- BBPkeepref(*result);
- BBPunfix(b->batCacheid);
- BBPunfix(b2->batCacheid);
- return MAL_SUCCEED;
- }
- BBPunfix(b->batCacheid);
- BBPunfix(b2->batCacheid);
- throw(MAL, "algebra.tdifference", GDK_EXCEPTION);
-}
-
-str
ALGtdiff(bat *result, const bat *bid, const bat *bid2)
{
BAT *b, *b2, *bn;
@@ -1256,31 +1229,6 @@ ALGtdiff(bat *result, const bat *bid, co
}
str
-ALGtintersect(bat *result, const bat *bid, const bat *bid2)
-{
- BAT *b, *b2, *bn;
-
- if ((b = BATdescriptor(*bid)) == NULL)
- throw(MAL, "algebra.tintersect", RUNTIME_OBJECT_MISSING);
- if ((b2 = BATdescriptor(*bid2)) == NULL){
- BBPunfix(*bid2);
- throw(MAL, "algebra.tintersect", RUNTIME_OBJECT_MISSING);
- }
-
- bn = BATsemijoin(BATmirror(b),BATmirror(b2));
- BBPunfix(b->batCacheid);
- BBPunfix(b2->batCacheid);
- if (bn) {
- bn = BATmirror(bn);
- if (!(bn->batDirty&2)) BATsetaccess(bn, BAT_READ);
- *result = bn->batCacheid;
- BBPkeepref(*result);
- return MAL_SUCCEED;
- }
- throw(MAL, "algebra.tintersect", GDK_EXCEPTION);
-}
-
-str
ALGtinter(bat *result, const bat *bid, const bat *bid2)
{
BAT *b, *b2, *bn;
diff --git a/monetdb5/modules/kernel/algebra.h
b/monetdb5/modules/kernel/algebra.h
--- a/monetdb5/modules/kernel/algebra.h
+++ b/monetdb5/modules/kernel/algebra.h
@@ -76,10 +76,8 @@ algebra_export str ALGleftfetchjoin(bat
algebra_export str ALGouterjoinestimate(bat *result, const bat *lid, const bat
*rid, const lng *estimate);
algebra_export str ALGouterjoin(bat *result, const bat *lid, const bat *rid);
algebra_export str ALGsemijoin(bat *result, const bat *lid, const bat *rid);
-algebra_export str ALGtintersect(bat *result, const bat *lid, const bat *rid);
algebra_export str ALGtinter(bat *result, const bat *lid, const bat *rid);
algebra_export str ALGkdiff(bat *result, const bat *lid, const bat *rid);
-algebra_export str ALGtdifference(bat *result, const bat *lid, const bat *rid);
algebra_export str ALGtdiff(bat *result, const bat *lid, const bat *rid);
algebra_export str ALGsample(bat *result, const bat *bid, const int *param);
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
@@ -9,12 +9,6 @@ module algebra;
# TO BE REMOVED OR CHANGED FOR HEADLESS
-command tintersect( left:bat[:oid,:oid], right:bat[:oid,:oid] ) :bat[:oid,:oid]
-address ALGtintersect;
-
-command tdifference ( left:bat[:oid,:oid], right:bat[:oid,:oid] )
:bat[:oid,:oid]
-address ALGtdifference;
-
command groupby(gids:bat[:oid,:oid], cnts:bat[:oid,:wrd]) :bat[:oid,:oid]
address ALGgroupby
comment "Produces a new BAT with groups identified by the head column. The
result contains tail times the head value, ie the tail contains the result
group sizes.";
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
