Changeset: f78020ed51a4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f78020ed51a4
Modified Files:
        monetdb5/modules/kernel/algebra.c.mx
        monetdb5/modules/kernel/algebra.mal.mx
Branch: headless
Log Message:

Fix some interfaces.
project takes the list of OIDs as the first argument.
unique produces a list of OIDs.


diffs (42 lines):

diff --git a/monetdb5/modules/kernel/algebra.c.mx 
b/monetdb5/modules/kernel/algebra.c.mx
--- a/monetdb5/modules/kernel/algebra.c.mx
+++ b/monetdb5/modules/kernel/algebra.c.mx
@@ -1341,7 +1341,7 @@
 }
 
 str
-ALGproject(int *ret, int *bid, int *sid)
+ALGproject(int *ret, int *sid, int *bid)
 {
        COL *b, *s, *bn = NULL;
        str msg;
@@ -1354,7 +1354,7 @@
                throw(MAL, "algebra.fetch", RUNTIME_OBJECT_MISSING);
        }
 
-       bn = COLproject(b, s);
+       bn = COLproject(s, b);
        if (bn) {
                COLsetreadonly(bn);
                *ret = CBPkeepref(bn);
diff --git a/monetdb5/modules/kernel/algebra.mal.mx 
b/monetdb5/modules/kernel/algebra.mal.mx
--- a/monetdb5/modules/kernel/algebra.mal.mx
+++ b/monetdb5/modules/kernel/algebra.mal.mx
@@ -36,7 +36,7 @@
 address ALGfetch
 comment "Returns the value at x-th position in the column with 0 <= x < 
b.count";
 
-command project(b:col[:any_1], s:col[:oid]) :col[:any_1] 
+command project(s:col[:oid], b:col[:any_1]) :col[:any_1] 
 address ALGproject
 comment "Returns a positional selection of b by the oid values provided in s";
 
@@ -116,7 +116,7 @@
 address ALGrevert
 comment "Returns a BAT copy with elements in reverse order";
 
-command unique (b:col[:any_1] ) :col[:any_1] 
+command unique (b:col[:any_1] ) :col[:oid] 
 address ALGunique
 comment "Select unique vaules from the input column. 
                Result is a column with real set value semantics.";
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to