MonetDB: default - Remove dependency on :bat column

[Martin Kersten]

Changeset: 6b75660e746b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6b75660e746b
Modified Files:
        monetdb5/modules/mal/zorder.c
        monetdb5/modules/mal/zorder.h
        monetdb5/modules/mal/zorder.mal
Branch: default
Log Message:

Remove dependency on :bat column


diffs (48 lines):

diff --git a/monetdb5/modules/mal/zorder.c b/monetdb5/modules/mal/zorder.c
--- a/monetdb5/modules/mal/zorder.c
+++ b/monetdb5/modules/mal/zorder.c
@@ -425,20 +425,3 @@ str ZORDslice_int(int *r, int *xb, int *
        BBPkeepref(*r = bn->batCacheid);
        return MAL_SUCCEED;
 }
-
-zorder_export 
-str ZORDsql_slice_int(int *r, int *xb, int *yb, int *xt, int *yt)
-{
-    int slice_ret;
-       BAT *t = BATnew(TYPE_str, TYPE_bat, 1);
-    str bla;
-
-    rethrow("ZORDsql_slice_int", bla, 
-            ZORDslice_int(&slice_ret, xb, yb, xt, yt));
-
-       BUNins(t, "z", &slice_ret, FALSE);
-    BBPdecref(slice_ret, TRUE);
-       *r = t->batCacheid;
-       BBPkeepref(*r);
-       return MAL_SUCCEED;
-}
diff --git a/monetdb5/modules/mal/zorder.h b/monetdb5/modules/mal/zorder.h
--- a/monetdb5/modules/mal/zorder.h
+++ b/monetdb5/modules/mal/zorder.h
@@ -39,6 +39,5 @@ zorder_export str ZORDbatdecode_int_oid(
 zorder_export str ZORDbatdecode_int_oid_x(int *x, int *z);
 zorder_export str ZORDbatdecode_int_oid_y(int *y, int *z);
 zorder_export str ZORDslice_int(int *r, int *xb, int *yb, int *xt, int *yt);
-zorder_export str ZORDsql_slice_int(int *r, int *xb, int *yb, int *xt, int 
*yt);
 
 #endif /* _ZORDER_H */
diff --git a/monetdb5/modules/mal/zorder.mal b/monetdb5/modules/mal/zorder.mal
--- a/monetdb5/modules/mal/zorder.mal
+++ b/monetdb5/modules/mal/zorder.mal
@@ -32,10 +32,6 @@ command decode_y(z:bat[:oid,:oid]):bat[:
 address ZORDbatdecode_int_oid_y
 comment "Derive the z-order y-coordinate";
 
-command sql_slice(xb:int, yb:int, xt:int, yt:int ):bat[:str,:bat]
-address ZORDsql_slice_int
-comment "Wrapper of the function zorder.slice() for SQL function";
-
 command slice(xb:int, yb:int, xt:int, yt:int ):bat[:oid,:oid]
 address ZORDslice_int
 comment "Extract the Z-order indices between two points";
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list