Changeset: 8dbd1fbb7937 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8dbd1fbb7937
Modified Files:
clients/Tests/MAL-signatures-hge.test
clients/Tests/MAL-signatures.test
sql/backends/monet5/vaults/parquet/parquet.c
Branch: pp_hashjoin
Log Message:
removed the 'pipeline ptr' parameter from parquet.read
diffs (53 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
@@ -50035,7 +50035,7 @@ PARQUETprelude
(empty)
parquet
read
-pattern parquet.read(X_0:bat[:oid], X_1:int, X_2:ptr):bat[:any_1]
+pattern parquet.read(X_0:bat[:oid], X_1:int):bat[:any_1]
PARQUETread
read part of parquet file
parquet
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
@@ -38405,7 +38405,7 @@ PARQUETprelude
(empty)
parquet
read
-pattern parquet.read(X_0:bat[:oid], X_1:int, X_2:ptr):bat[:any_1]
+pattern parquet.read(X_0:bat[:oid], X_1:int):bat[:any_1]
PARQUETread
read part of parquet file
parquet
diff --git a/sql/backends/monet5/vaults/parquet/parquet.c
b/sql/backends/monet5/vaults/parquet/parquet.c
--- a/sql/backends/monet5/vaults/parquet/parquet.c
+++ b/sql/backends/monet5/vaults/parquet/parquet.c
@@ -845,7 +845,7 @@ PARQUETread(Client cntxt, MalBlkPtr mb,
bat *res = getArgReference_bat(stk, pci, 0);
bat pqb = *getArgReference_bat(stk, pci, pci->retc + 0);
int colno = *getArgReference_int(stk, pci, pci->retc + 1);
- Pipeline *p = (Pipeline*)*getArgReference_ptr(stk, pci, pci->retc + 2);
+ Pipeline *p = pipeline_get_thread_private_pipeline();
char *msg = NULL;
BAT *b = BATdescriptor(pqb), *rb = NULL;
@@ -980,7 +980,6 @@ pqc_load(void *BE, sql_subfunc *f, char
setVarType(be->mb, getArg(q, 0),
newBatType(st->type->localtype));
q = pushArgument(be->mb, q, pf);
q = pushInt(be->mb, q, i);
- q = pushArgument(be->mb, q, be->pipeline);
pushInstruction(be->mb, q);
s->nr = getDestVar(q);
@@ -1444,7 +1443,7 @@ static mel_func parquet_init_funcs[] = {
pattern("parquet", "prelude", PARQUETprelude, false, "", noargs),
command("parquet", "epilogue", PARQUETepilogue, false, "", noargs),
pattern("parquet", "open", PARQUETopen, true, "Create resource for shared
reading from parquet file", args(1, 3, batarg("", oid), arg("f", str),
arg("nrows", lng))),
- pattern("parquet", "read", PARQUETread, false, "read part of parquet
file", args(1, 4, batargany("", 1), batarg("p", oid), arg("colno", int),
arg("pipeline", ptr))),
+ pattern("parquet", "read", PARQUETread, false, "read part of parquet
file", args(1, 3, batargany("", 1), batarg("p", oid), arg("colno", int))),
pattern("parquet", "schema", PARQUETschema, false, "Read parquet
schema",
args(10,11,
batarg("name", str),
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
