Changeset: d0488d76663e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/d0488d76663e
Modified Files:
clients/Tests/MAL-signatures-hge.test
clients/Tests/MAL-signatures.test
monetdb5/modules/mal/pp_slicer.c
sql/backends/monet5/sql_pp_statement.c
Branch: pp_hashjoin
Log Message:
removed 'pipeline ptr' from algebra.subslice
diffs (70 lines):
diff --git a/clients/Tests/MAL-signatures-hge.test
b/clients/Tests/MAL-signatures-hge.test
--- a/clients/Tests/MAL-signatures-hge.test
+++ b/clients/Tests/MAL-signatures-hge.test
@@ -3885,7 +3885,7 @@ ALGsubslice_lng
Return the oids of the slice with the BUNs at position x till y.
algebra
subslice
-command algebra.subslice(X_0:bat[:any_1], X_1:lng, X_2:lng, X_3:ptr)
(X_4:bat[:oid], X_5:bat[:oid], X_6:bat[:oid])
+command algebra.subslice(X_0:bat[:any_1], X_1:lng, X_2:lng) (X_3:bat[:oid],
X_4:bat[:oid], X_5:bat[:oid])
LALGsubslice
Returns the slice of a pipelined result
algebra
diff --git a/clients/Tests/MAL-signatures.test
b/clients/Tests/MAL-signatures.test
--- a/clients/Tests/MAL-signatures.test
+++ b/clients/Tests/MAL-signatures.test
@@ -3320,7 +3320,7 @@ ALGsubslice_lng
Return the oids of the slice with the BUNs at position x till y.
algebra
subslice
-command algebra.subslice(X_0:bat[:any_1], X_1:lng, X_2:lng, X_3:ptr)
(X_4:bat[:oid], X_5:bat[:oid], X_6:bat[:oid])
+command algebra.subslice(X_0:bat[:any_1], X_1:lng, X_2:lng) (X_3:bat[:oid],
X_4:bat[:oid], X_5:bat[:oid])
LALGsubslice
Returns the slice of a pipelined result
algebra
diff --git a/monetdb5/modules/mal/pp_slicer.c b/monetdb5/modules/mal/pp_slicer.c
--- a/monetdb5/modules/mal/pp_slicer.c
+++ b/monetdb5/modules/mal/pp_slicer.c
@@ -43,11 +43,11 @@ topn_create(void)
}
static str
-LALGsubslice(Client ctx, bat *gid, bat *rid, bat *tid, bat *bid, /*bat *sid,*/
lng *start, lng *end, const ptr *H)
+LALGsubslice(Client ctx, bat *gid, bat *rid, bat *tid, bat *bid, /*bat *sid,*/
lng *start, lng *end)
{
(void)ctx;
str msg = MAL_SUCCEED;
- Pipeline *p = (Pipeline*)*H;
+ Pipeline *p = pipeline_get_thread_private_pipeline();
BAT *g = NULL, *r = NULL, *t = NULL, *b = NULL;
BUN s = *start, e = *end;
int fb = 1, locked = 0;
@@ -216,7 +216,7 @@ SLICERno_slices(Client cntxt, MalBlkPtr
#include "mel.h"
static mel_func pp_slicer_init_funcs[] = {
- command("algebra", "subslice", LALGsubslice, false, "Returns the slice of a
pipelined result", args(3,7, batarg("gid", oid), batarg("rid", oid),
batarg("tid", oid), batargany("b", 1), arg("start", lng), arg("end", lng),
arg("pipeline", ptr))),
+ command("algebra", "subslice", LALGsubslice, false, "Returns the slice of a
pipelined result", args(3,6, batarg("gid", oid), batarg("rid", oid),
batarg("tid", oid), batargany("b", 1), arg("start", lng), arg("end", lng))),
pattern("slicer", "nth_slice", SLICERnth_slice, false, "Return the n-th
slice, of SLICE_SIZE rrows, from the input BAT", args(1,3,
batargany("slice",1), batargany("b",1), arg("nr",int))),
pattern("slicer", "no_slices", SLICERno_slices, false, "Returns the number of
slices into which the input BAT is to be sliced", args(1,2, arg("slices", int),
batargany("b",1))),
{ .imp=NULL }
diff --git a/sql/backends/monet5/sql_pp_statement.c
b/sql/backends/monet5/sql_pp_statement.c
--- a/sql/backends/monet5/sql_pp_statement.c
+++ b/sql/backends/monet5/sql_pp_statement.c
@@ -367,7 +367,7 @@ stmt_limit_partitioned(backend *be, stmt
len = getDestVar(q);
pushInstruction(mb, q);
- q = newStmtArgs(mb, algebraRef, subsliceRef, 8);
+ q = newStmtArgs(mb, algebraRef, subsliceRef, 6);
/* returns gid, rid, hid */
q = pushReturn(mb, q, newTmpVariable(mb, TYPE_any)); /* rid */
q = pushReturn(mb, q, newTmpVariable(mb, TYPE_any)); /* hid for
topn/heap sink */
@@ -375,7 +375,6 @@ stmt_limit_partitioned(backend *be, stmt
q = pushArgument(mb, q, c);
q = pushArgument(mb, q, offset->nr);
q = pushArgument(mb, q, len);
- q = pushArgument(mb, q, be->pipeline);
if (q == NULL)
return NULL;
l = getDestVar(q);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
