Changeset: faf758c4fb6a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/faf758c4fb6a
Modified Files:
clients/Tests/MAL-signatures-hge.test
clients/Tests/MAL-signatures.test
monetdb5/modules/mal/pp_hash.c
sql/backends/monet5/rel_pphash.c
sql/backends/monet5/rel_pptopn.c
sql/backends/monet5/sql_pp_statement.c
sql/backends/monet5/sql_pp_statement.h
Branch: pp_hashjoin
Log Message:
Removed the Pipeline pointer from the OAHASH functions, since it is now a
thread's private data,
diffs (truncated from 686 to 300 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
@@ -49500,42 +49500,42 @@ NCDFtest
Returns number of variables in a given NetCDF dataset (file)
oahash
build_combined_table
-command oahash.build_combined_table(X_0:bat[:any_1], X_1:bat[:oid], X_2:ptr)
(X_3:bat[:oid], X_4:bat[:any_1])
+command oahash.build_combined_table(X_0:bat[:any_1], X_1:bat[:oid])
(X_2:bat[:oid], X_3:bat[:any_1])
OAHASHbuild_tbl_cmbd
Add the `key`-s with a `parent_slotid` to the hash table. Returns the
`slot_id` per `key` and the updated `ht_sink`
oahash
build_table
-command oahash.build_table(X_0:bat[:any_1], X_1:ptr) (X_2:bat[:oid],
X_3:bat[:any_1])
+command oahash.build_table(X_0:bat[:any_1]) (X_1:bat[:oid], X_2:bat[:any_1])
OAHASHbuild_tbl
Add the `key`-s to the hash table. Returns the `slot_id` per `key` and the
updated `ht_sink`
oahash
combined_mprobe
-command oahash.combined_mprobe(X_0:bat[:any_1], X_1:bat[:oid], X_2:bat[:oid],
X_3:bat[:any_1], X_4:bit, X_5:bit, X_6:ptr) (X_7:bat[:oid], X_8:bat[:oid],
X_9:bat[:bit])
+command oahash.combined_mprobe(X_0:bat[:any_1], X_1:bat[:oid], X_2:bat[:oid],
X_3:bat[:any_1], X_4:bit, X_5:bit) (X_6:bat[:oid], X_7:bat[:oid], X_8:bat[:bit])
OAHASHmprobe_cmbd
Probe the selected `key`-s in the hash table. For a matched item, return its
OID in the 'key' column and the slot ID in the hash table
oahash
combined_mprobe
-command oahash.combined_mprobe(X_0:bat[:any_1], X_1:bat[:oid], X_2:bat[:oid],
X_3:bat[:any_1], X_4:bat[:lng], X_5:bit, X_6:bit, X_7:ptr) (X_8:bat[:oid],
X_9:bat[:oid], X_10:bat[:bit])
+command oahash.combined_mprobe(X_0:bat[:any_1], X_1:bat[:oid], X_2:bat[:oid],
X_3:bat[:any_1], X_4:bat[:lng], X_5:bit, X_6:bit) (X_7:bat[:oid],
X_8:bat[:oid], X_9:bat[:bit])
OAHASHmprobe_cmbd_single
Probe the selected `key`-s pairs in the hash table. For a matched item, return
its OID in the 'key' column and the slot ID in the hash table
oahash
combined_oprobe
-command oahash.combined_oprobe(X_0:bat[:any_1], X_1:bat[:oid], X_2:bat[:oid],
X_3:bat[:any_1], X_4:bit, X_5:bit, X_6:ptr) (X_7:bat[:oid], X_8:bat[:oid],
X_9:bat[:bit])
+command oahash.combined_oprobe(X_0:bat[:any_1], X_1:bat[:oid], X_2:bat[:oid],
X_3:bat[:any_1], X_4:bit, X_5:bit) (X_6:bat[:oid], X_7:bat[:oid], X_8:bat[:bit])
OAHASHoprobe_cmbd
Probe the selected `key`-s in the hash table. For a matched item, return its
OID in the 'key' column and the slot ID in the hash table
oahash
combined_oprobe
-command oahash.combined_oprobe(X_0:bat[:any_1], X_1:bat[:oid], X_2:bat[:oid],
X_3:bat[:any_1], X_4:bat[:lng], X_5:bit, X_6:bit, X_7:ptr) (X_8:bat[:oid],
X_9:bat[:oid], X_10:bat[:bit])
+command oahash.combined_oprobe(X_0:bat[:any_1], X_1:bat[:oid], X_2:bat[:oid],
X_3:bat[:any_1], X_4:bat[:lng], X_5:bit, X_6:bit) (X_7:bat[:oid],
X_8:bat[:oid], X_9:bat[:bit])
OAHASHoprobe_cmbd_single
Probe the selected `key`-s in the hash table. For a matched item, return its
OID in the 'key' column and the slot ID in the hash table
oahash
combined_probe
-command oahash.combined_probe(X_0:bat[:any_1], X_1:bat[:oid], X_2:bat[:oid],
X_3:bat[:any_1], X_4:bit, X_5:bit, X_6:ptr) (X_7:bat[:oid], X_8:bat[:oid])
+command oahash.combined_probe(X_0:bat[:any_1], X_1:bat[:oid], X_2:bat[:oid],
X_3:bat[:any_1], X_4:bit, X_5:bit) (X_6:bat[:oid], X_7:bat[:oid])
OAHASHprobe_cmbd
Probe the selected `key`-s in the hash table. For a matched item, return its
OID in the 'key' column and the slot ID in the hash table
oahash
combined_probe
-command oahash.combined_probe(X_0:bat[:any_1], X_1:bat[:oid], X_2:bat[:oid],
X_3:bat[:any_1], X_4:bat[:lng], X_5:bit, X_6:bit, X_7:ptr) (X_8:bat[:oid],
X_9:bat[:oid])
+command oahash.combined_probe(X_0:bat[:any_1], X_1:bat[:oid], X_2:bat[:oid],
X_3:bat[:any_1], X_4:bat[:lng], X_5:bit, X_6:bit) (X_7:bat[:oid], X_8:bat[:oid])
OAHASHprobe_cmbd_single
Probe the selected `key`-s in the hash table. For a matched item, return its
OID in the 'key' column and the slot ID in the hash table
oahash
@@ -49565,12 +49565,12 @@ OAHASHexplode_unmatched
Expand the count of 'unmatched' with 'frequency'. Returns the count in a VOID
BAT.
oahash
frequency
-pattern oahash.frequency(X_0:bat[:oid], X_1:ptr) (X_2:bat[:oid], X_3:bat[:lng])
+pattern oahash.frequency(X_0:bat[:oid) (X_1:bat[:oid], X_2:bat[:lng])
OAHASHadd_freq
Add `slot_id` to the shared `frequencies` BAT. Returns the occurrence index
for each `slot_id` (i.e. it is the n-th time the `slot_id` is seen so far) and
the updated `frequencies`
oahash
frequency
-pattern oahash.frequency(X_0:bat[:oid], X_1:ptr):bat[:lng]
+pattern oahash.frequency(X_0:bat[:oid):bat[:lng]
OAHASHadd_freq
Add `slot_id` to the shared `frequencies` BAT. Returns the updated
`frequencies`
oahash
@@ -49585,12 +49585,12 @@ OAHASHhashmark_init
(empty)
oahash
mprobe
-command oahash.mprobe(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bit, X_3:bit,
X_4:ptr) (X_5:bat[:oid], X_6:bat[:oid], X_7:bat[:bit])
+command oahash.mprobe(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bit, X_3:bit)
(X_4:bat[:oid], X_5:bat[:oid], X_6:bat[:bit])
OAHASHmprobe
Probe the `key`-s in the hash table. For a matched key, return its OID in the
'key' column and the slot ID in the hash table
oahash
mprobe
-command oahash.mprobe(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:lng],
X_3:bit, X_4:bit, X_5:ptr) (X_6:bat[:oid], X_7:bat[:oid], X_8:bat[:bit])
+command oahash.mprobe(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:lng],
X_3:bit, X_4:bit) (X_5:bat[:oid], X_6:bat[:oid], X_7:bat[:bit])
OAHASHmprobe_single
Probe the `key`-s in the hash table. For a matched key, return its OID in the
'key' column and the slot ID in the hash table
oahash
@@ -49620,12 +49620,12 @@ OAHASHno_slices
Get the number of slices for this hashtable.
oahash
nprobe
-command oahash.nprobe(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bit, X_3:bit,
X_4:ptr) (X_5:bat[:oid], X_6:bat[:oid])
+command oahash.nprobe(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bit, X_3:bit)
(X_4:bat[:oid], X_5:bat[:oid])
OAHASHnprobe
Probe the `key` in the hash table. For a not-matched key, return its OID in
the 'key' column and the slot ID in the hash table
oahash
nprobe
-command oahash.nprobe(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:lng],
X_3:bit, X_4:bit, X_5:ptr) (X_6:bat[:oid], X_7:bat[:oid])
+command oahash.nprobe(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:lng],
X_3:bit, X_4:bit) (X_5:bat[:oid], X_6:bat[:oid])
OAHASHnprobe_single
Probe the `key`-s in the hash table. For a not-matched key, return its OID in
the 'key' column and the slot ID in the hash table
oahash
@@ -49635,22 +49635,22 @@ OAHASHnth_slice
Get the nth slice of this hashtable.
oahash
oprobe
-command oahash.oprobe(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bit, X_3:bit,
X_4:ptr) (X_5:bat[:oid], X_6:bat[:oid], X_7:bat[:bit])
+command oahash.oprobe(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bit, X_3:bit)
(X_4:bat[:oid], X_5:bat[:oid], X_6:bat[:bit])
OAHASHoprobe
Probe the `key`-s in the hash table. For a matched key, return its OID in the
'key' column and the slot ID in the hash table
oahash
oprobe
-command oahash.oprobe(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:lng],
X_3:bit, X_4:bit, X_5:ptr) (X_6:bat[:oid], X_7:bat[:oid], X_8:bat[:bit])
+command oahash.oprobe(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:lng],
X_3:bit, X_4:bit) (X_5:bat[:oid], X_6:bat[:oid], X_7:bat[:bit])
OAHASHoprobe_single
Probe the `key`-s in the hash table. For a matched key, return its OID in the
'key' column and the slot ID in the hash table
oahash
probe
-command oahash.probe(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bit, X_3:bit,
X_4:ptr) (X_5:bat[:oid], X_6:bat[:oid])
+command oahash.probe(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bit, X_3:bit)
(X_4:bat[:oid], X_5:bat[:oid])
OAHASHprobe
Probe the `key` in the hash table. For a matched key, return its OID in the
'key' column and the slot ID in the hash table
oahash
probe
-command oahash.probe(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:lng], X_3:bit,
X_4:bit, X_5:ptr) (X_6:bat[:oid], X_7:bat[:oid])
+command oahash.probe(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:lng], X_3:bit,
X_4:bit) (X_5:bat[:oid], X_6:bat[:oid])
OAHASHprobe_single
Probe the `key`-s in the hash table. For a matched key, return its OID in the
'key' column and the slot ID in the hash table
optimizer
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
@@ -37870,42 +37870,42 @@ NCDFtest
Returns number of variables in a given NetCDF dataset (file)
oahash
build_combined_table
-command oahash.build_combined_table(X_0:bat[:any_1], X_1:bat[:oid], X_2:ptr)
(X_3:bat[:oid], X_4:bat[:any_1])
+command oahash.build_combined_table(X_0:bat[:any_1], X_1:bat[:oid])
(X_2:bat[:oid], X_3:bat[:any_1])
OAHASHbuild_tbl_cmbd
Add the `key`-s with a `parent_slotid` to the hash table. Returns the
`slot_id` per `key` and the updated `ht_sink`
oahash
build_table
-command oahash.build_table(X_0:bat[:any_1], X_1:ptr) (X_2:bat[:oid],
X_3:bat[:any_1])
+command oahash.build_table(X_0:bat[:any_1]) (X_1:bat[:oid], X_2:bat[:any_1])
OAHASHbuild_tbl
Add the `key`-s to the hash table. Returns the `slot_id` per `key` and the
updated `ht_sink`
oahash
combined_mprobe
-command oahash.combined_mprobe(X_0:bat[:any_1], X_1:bat[:oid], X_2:bat[:oid],
X_3:bat[:any_1], X_4:bit, X_5:bit, X_6:ptr) (X_7:bat[:oid], X_8:bat[:oid],
X_9:bat[:bit])
+command oahash.combined_mprobe(X_0:bat[:any_1], X_1:bat[:oid], X_2:bat[:oid],
X_3:bat[:any_1], X_4:bit, X_5:bit) (X_6:bat[:oid], X_7:bat[:oid], X_8:bat[:bit])
OAHASHmprobe_cmbd
Probe the selected `key`-s in the hash table. For a matched item, return its
OID in the 'key' column and the slot ID in the hash table
oahash
combined_mprobe
-command oahash.combined_mprobe(X_0:bat[:any_1], X_1:bat[:oid], X_2:bat[:oid],
X_3:bat[:any_1], X_4:bat[:lng], X_5:bit, X_6:bit, X_7:ptr) (X_8:bat[:oid],
X_9:bat[:oid], X_10:bat[:bit])
+command oahash.combined_mprobe(X_0:bat[:any_1], X_1:bat[:oid], X_2:bat[:oid],
X_3:bat[:any_1], X_4:bat[:lng], X_5:bit, X_6:bit) (X_7:bat[:oid],
X_8:bat[:oid], X_9:bat[:bit])
OAHASHmprobe_cmbd_single
Probe the selected `key`-s pairs in the hash table. For a matched item, return
its OID in the 'key' column and the slot ID in the hash table
oahash
combined_oprobe
-command oahash.combined_oprobe(X_0:bat[:any_1], X_1:bat[:oid], X_2:bat[:oid],
X_3:bat[:any_1], X_4:bit, X_5:bit, X_6:ptr) (X_7:bat[:oid], X_8:bat[:oid],
X_9:bat[:bit])
+command oahash.combined_oprobe(X_0:bat[:any_1], X_1:bat[:oid], X_2:bat[:oid],
X_3:bat[:any_1], X_4:bit, X_5:bit) (X_6:bat[:oid], X_7:bat[:oid], X_8:bat[:bit])
OAHASHoprobe_cmbd
Probe the selected `key`-s in the hash table. For a matched item, return its
OID in the 'key' column and the slot ID in the hash table
oahash
combined_oprobe
-command oahash.combined_oprobe(X_0:bat[:any_1], X_1:bat[:oid], X_2:bat[:oid],
X_3:bat[:any_1], X_4:bat[:lng], X_5:bit, X_6:bit, X_7:ptr) (X_8:bat[:oid],
X_9:bat[:oid], X_10:bat[:bit])
+command oahash.combined_oprobe(X_0:bat[:any_1], X_1:bat[:oid], X_2:bat[:oid],
X_3:bat[:any_1], X_4:bat[:lng], X_5:bit, X_6:bit) (X_7:bat[:oid],
X_8:bat[:oid], X_9:bat[:bit])
OAHASHoprobe_cmbd_single
Probe the selected `key`-s in the hash table. For a matched item, return its
OID in the 'key' column and the slot ID in the hash table
oahash
combined_probe
-command oahash.combined_probe(X_0:bat[:any_1], X_1:bat[:oid], X_2:bat[:oid],
X_3:bat[:any_1], X_4:bit, X_5:bit, X_6:ptr) (X_7:bat[:oid], X_8:bat[:oid])
+command oahash.combined_probe(X_0:bat[:any_1], X_1:bat[:oid], X_2:bat[:oid],
X_3:bat[:any_1], X_4:bit, X_5:bit) (X_6:bat[:oid], X_7:bat[:oid])
OAHASHprobe_cmbd
Probe the selected `key`-s in the hash table. For a matched item, return its
OID in the 'key' column and the slot ID in the hash table
oahash
combined_probe
-command oahash.combined_probe(X_0:bat[:any_1], X_1:bat[:oid], X_2:bat[:oid],
X_3:bat[:any_1], X_4:bat[:lng], X_5:bit, X_6:bit, X_7:ptr) (X_8:bat[:oid],
X_9:bat[:oid])
+command oahash.combined_probe(X_0:bat[:any_1], X_1:bat[:oid], X_2:bat[:oid],
X_3:bat[:any_1], X_4:bat[:lng], X_5:bit, X_6:bit) (X_7:bat[:oid], X_8:bat[:oid])
OAHASHprobe_cmbd_single
Probe the selected `key`-s in the hash table. For a matched item, return its
OID in the 'key' column and the slot ID in the hash table
oahash
@@ -37935,12 +37935,12 @@ OAHASHexplode_unmatched
Expand the count of 'unmatched' with 'frequency'. Returns the count in a VOID
BAT.
oahash
frequency
-pattern oahash.frequency(X_0:bat[:oid], X_1:ptr) (X_2:bat[:oid], X_3:bat[:lng])
+pattern oahash.frequency(X_0:bat[:oid) (X_1:bat[:oid], X_2:bat[:lng])
OAHASHadd_freq
Add `slot_id` to the shared `frequencies` BAT. Returns the occurrence index
for each `slot_id` (i.e. it is the n-th time the `slot_id` is seen so far) and
the updated `frequencies`
oahash
frequency
-pattern oahash.frequency(X_0:bat[:oid], X_1:ptr):bat[:lng]
+pattern oahash.frequency(X_0:bat[:oid):bat[:lng]
OAHASHadd_freq
Add `slot_id` to the shared `frequencies` BAT. Returns the updated
`frequencies`
oahash
@@ -37955,12 +37955,12 @@ OAHASHhashmark_init
(empty)
oahash
mprobe
-command oahash.mprobe(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bit, X_3:bit,
X_4:ptr) (X_5:bat[:oid], X_6:bat[:oid], X_7:bat[:bit])
+command oahash.mprobe(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bit, X_3:bit)
(X_4:bat[:oid], X_5:bat[:oid], X_6:bat[:bit])
OAHASHmprobe
Probe the `key`-s in the hash table. For a matched key, return its OID in the
'key' column and the slot ID in the hash table
oahash
mprobe
-command oahash.mprobe(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:lng],
X_3:bit, X_4:bit, X_5:ptr) (X_6:bat[:oid], X_7:bat[:oid], X_8:bat[:bit])
+command oahash.mprobe(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:lng],
X_3:bit, X_4:bit) (X_5:bat[:oid], X_6:bat[:oid], X_7:bat[:bit])
OAHASHmprobe_single
Probe the `key`-s in the hash table. For a matched key, return its OID in the
'key' column and the slot ID in the hash table
oahash
@@ -37990,12 +37990,12 @@ OAHASHno_slices
Get the number of slices for this hashtable.
oahash
nprobe
-command oahash.nprobe(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bit, X_3:bit,
X_4:ptr) (X_5:bat[:oid], X_6:bat[:oid])
+command oahash.nprobe(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bit, X_3:bit)
(X_4:bat[:oid], X_5:bat[:oid])
OAHASHnprobe
Probe the `key` in the hash table. For a not-matched key, return its OID in
the 'key' column and the slot ID in the hash table
oahash
nprobe
-command oahash.nprobe(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:lng],
X_3:bit, X_4:bit, X_5:ptr) (X_6:bat[:oid], X_7:bat[:oid])
+command oahash.nprobe(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:lng],
X_3:bit, X_4:bit) (X_5:bat[:oid], X_6:bat[:oid])
OAHASHnprobe_single
Probe the `key`-s in the hash table. For a not-matched key, return its OID in
the 'key' column and the slot ID in the hash table
oahash
@@ -38005,22 +38005,22 @@ OAHASHnth_slice
Get the nth slice of this hashtable.
oahash
oprobe
-command oahash.oprobe(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bit, X_3:bit,
X_4:ptr) (X_5:bat[:oid], X_6:bat[:oid], X_7:bat[:bit])
+command oahash.oprobe(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bit, X_3:bit)
(X_4:bat[:oid], X_5:bat[:oid], X_6:bat[:bit])
OAHASHoprobe
Probe the `key`-s in the hash table. For a matched key, return its OID in the
'key' column and the slot ID in the hash table
oahash
oprobe
-command oahash.oprobe(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:lng],
X_3:bit, X_4:bit, X_5:ptr) (X_6:bat[:oid], X_7:bat[:oid], X_8:bat[:bit])
+command oahash.oprobe(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:lng],
X_3:bit, X_4:bit) (X_5:bat[:oid], X_6:bat[:oid], X_7:bat[:bit])
OAHASHoprobe_single
Probe the `key`-s in the hash table. For a matched key, return its OID in the
'key' column and the slot ID in the hash table
oahash
probe
-command oahash.probe(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bit, X_3:bit,
X_4:ptr) (X_5:bat[:oid], X_6:bat[:oid])
+command oahash.probe(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bit, X_3:bit)
(X_4:bat[:oid], X_5:bat[:oid])
OAHASHprobe
Probe the `key` in the hash table. For a matched key, return its OID in the
'key' column and the slot ID in the hash table
oahash
probe
-command oahash.probe(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:lng], X_3:bit,
X_4:bit, X_5:ptr) (X_6:bat[:oid], X_7:bat[:oid])
+command oahash.probe(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:lng], X_3:bit,
X_4:bit) (X_5:bat[:oid], X_6:bat[:oid])
OAHASHprobe_single
Probe the `key`-s in the hash table. For a matched key, return its OID in the
'key' column and the slot ID in the hash table
optimizer
diff --git a/monetdb5/modules/mal/pp_hash.c b/monetdb5/modules/mal/pp_hash.c
--- a/monetdb5/modules/mal/pp_hash.c
+++ b/monetdb5/modules/mal/pp_hash.c
@@ -858,10 +858,10 @@ UHASHext(Client cntxt, MalBlkPtr m, MalS
} while (0)
static str
-OAHASHbuild_tbl(Client ctx, bat *slot_id, bat *ht_sink, const bat *key, const
ptr *H)
+OAHASHbuild_tbl(Client ctx, bat *slot_id, bat *ht_sink, const bat *key)
{
(void)ctx;
- Pipeline *p = (Pipeline*)*H;
+ Pipeline *p = pipeline_get_thread_private_pipeline();
bool private = 0, local_storage = false;
str err = NULL;
BAT *g = NULL, *u = NULL, *b = NULL;
@@ -1259,10 +1259,10 @@ error:
} while (0)
static str
-OAHASHbuild_tbl_cmbd(Client ctx, bat *slot_id, bat *ht_sink, const bat *key,
const bat *parent_slotid, const ptr *H)
+OAHASHbuild_tbl_cmbd(Client ctx, bat *slot_id, bat *ht_sink, const bat *key,
const bat *parent_slotid)
{
(void)ctx;
- Pipeline *p = (Pipeline*)*H;
+ Pipeline *p = pipeline_get_thread_private_pipeline();
bool private = 0, local_storage = false;
str err = NULL;
BAT *u = NULL, *b = NULL, *G = NULL, *g = NULL;
@@ -1407,7 +1407,7 @@ OAHASHadd_freq(Client cntxt, MalBlkPtr m
bat *occrrence_idx = pci->retc == 2? getArgReference_bat(stk, pci, 0) :
NULL;
bat *frequencies = getArgReference_bat(stk, pci, pci->retc - 1);
bat *slot_id = getArgReference_bat(stk, pci, pci->retc);
- Pipeline *p = (Pipeline*)*getArgReference_ptr(stk, pci, pci->retc + 1);
+ Pipeline *p = pipeline_get_thread_private_pipeline();
BAT *frq = NULL, *slt = NULL, *res = NULL;
bool locked = false;
str err = NULL;
@@ -1651,7 +1651,7 @@ error:
} while (0)
static str
-OAHASHprobe1(Client ctx, bat *PRB_oid, bat *HSH_slotid, const bat *PRB_key,
const bat *HSH_ht, const bat *frequency, const bit *single, const bit
*semantics, const ptr *H, bit match)
+OAHASHprobe1(Client ctx, bat *PRB_oid, bat *HSH_slotid, const bat *PRB_key,
const bat *HSH_ht, const bat *frequency, const bit *single, const bit
*semantics, bit match)
{
(void)ctx;
BAT *o = NULL, *s = NULL, *k = NULL, *t = NULL, *f = NULL;
@@ -1659,7 +1659,6 @@ OAHASHprobe1(Client ctx, bat *PRB_oid, b
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
