Changeset: 451bbfdcc9a8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/451bbfdcc9a8
Modified Files:
clients/Tests/MAL-signatures-hge.test
clients/Tests/MAL-signatures.test
monetdb5/modules/kernel/CMakeLists.txt
monetdb5/modules/kernel/pp_group.c
Branch: pp_hashjoin
Log Message:
removed the 'pipeline ptr' from lockedgroup.group and lockedgroup.subgroupdone
diffs (115 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
@@ -48175,17 +48175,17 @@ LALGprojection
Project left input onto right input.
lockedgroup
group
-command lockedgroup.group(X_0:ptr, X_1:bat[:any_1]) (X_2:bat[:oid],
X_3:bat[:oid], X_4:bat[:lng])
+command lockedgroup.group(X_0:bat[:any_1]) (X_1:bat[:oid], X_2:bat[:oid],
X_3:bat[:lng])
LGRPgroup1
(empty)
lockedgroup
group
-command lockedgroup.group(X_0:ptr, X_1:bat[:any_1]) (X_2:bat[:oid],
X_3:bat[:oid])
+command lockedgroup.group(X_0:bat[:any_1]) (X_1:bat[:oid], X_2:bat[:oid])
LGRPgroup3
(empty)
lockedgroup
subgroupdone
-command lockedgroup.subgroupdone(X_0:ptr, X_1:bat[:any_1], X_2:bat[:oid])
(X_3:bat[:oid], X_4:bat[:oid], X_5:bat[:lng])
+command lockedgroup.subgroupdone(X_0:bat[:any_1], X_1:bat[:oid])
(X_2:bat[:oid], X_3:bat[:oid], X_4:bat[:lng])
LGRPsubgroup2
(empty)
logging
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
@@ -36550,17 +36550,17 @@ LALGprojection
Project left input onto right input.
lockedgroup
group
-command lockedgroup.group(X_0:ptr, X_1:bat[:any_1]) (X_2:bat[:oid],
X_3:bat[:oid], X_4:bat[:lng])
+command lockedgroup.group(X_0:bat[:any_1]) (X_1:bat[:oid], X_2:bat[:oid],
X_3:bat[:lng])
LGRPgroup1
(empty)
lockedgroup
group
-command lockedgroup.group(X_0:ptr, X_1:bat[:any_1]) (X_2:bat[:oid],
X_3:bat[:oid])
+command lockedgroup.group(X_0:bat[:any_1]) (X_1:bat[:oid], X_2:bat[:oid])
LGRPgroup3
(empty)
lockedgroup
subgroupdone
-command lockedgroup.subgroupdone(X_0:ptr, X_1:bat[:any_1], X_2:bat[:oid])
(X_3:bat[:oid], X_4:bat[:oid], X_5:bat[:lng])
+command lockedgroup.subgroupdone(X_0:bat[:any_1], X_1:bat[:oid])
(X_2:bat[:oid], X_3:bat[:oid], X_4:bat[:lng])
LGRPsubgroup2
(empty)
logging
diff --git a/monetdb5/modules/kernel/CMakeLists.txt
b/monetdb5/modules/kernel/CMakeLists.txt
--- a/monetdb5/modules/kernel/CMakeLists.txt
+++ b/monetdb5/modules/kernel/CMakeLists.txt
@@ -36,6 +36,8 @@ target_sources(microbenchmark
${CMAKE_CURRENT_SOURCE_DIR}/bat5.h)
target_include_directories(kernel
+ PRIVATE
+ ../mal
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${INCLUDEDIR}/monetdb>)
diff --git a/monetdb5/modules/kernel/pp_group.c
b/monetdb5/modules/kernel/pp_group.c
--- a/monetdb5/modules/kernel/pp_group.c
+++ b/monetdb5/modules/kernel/pp_group.c
@@ -13,11 +13,12 @@
#include "mal_exception.h"
#include "mal_pipelines.h"
#include "group.h"
+#include "pipeline.h"
static str
-LGRPsubgroup2(Client ctx, bat *ngid, bat *next, bat *nhis, const ptr *h, const
bat *bid, const bat *gid)
+LGRPsubgroup2(Client ctx, bat *ngid, bat *next, bat *nhis, const bat *bid,
const bat *gid)
{
- Pipeline *p = (Pipeline*)*h;
+ Pipeline *p = pipeline_get_thread_private_pipeline();
str res;
MT_lock_set(&p->p->l);
@@ -27,9 +28,9 @@ LGRPsubgroup2(Client ctx, bat *ngid, bat
}
static str
-LGRPgroup3(Client ctx, bat *ngid, bat *next, const ptr *h, const bat *bid)
+LGRPgroup3(Client ctx, bat *ngid, bat *next, const bat *bid)
{
- Pipeline *p = (Pipeline*)*h;
+ Pipeline *p = pipeline_get_thread_private_pipeline();
str res;
MT_lock_set(&p->p->l);
@@ -39,9 +40,9 @@ LGRPgroup3(Client ctx, bat *ngid, bat *n
}
static str
-LGRPgroup1(Client ctx, bat *ngid, bat *next, bat *nhis, const ptr *h, const
bat *bid)
+LGRPgroup1(Client ctx, bat *ngid, bat *next, bat *nhis, const bat *bid)
{
- Pipeline *p = (Pipeline*)*h;
+ Pipeline *p = pipeline_get_thread_private_pipeline();
str res;
MT_lock_set(&p->p->l);
@@ -52,9 +53,9 @@ LGRPgroup1(Client ctx, bat *ngid, bat *n
#include "mel.h"
mel_func pp_group_init_funcs[] = {
- command("lockedgroup", "group", LGRPgroup1, false, "", args(3,5,
batarg("groups",oid),batarg("extents",oid),batarg("histo",lng),arg("pipeline",
ptr),batargany("b",1))),
- command("lockedgroup", "group", LGRPgroup3, false, "", args(2,4,
batarg("groups",oid),batarg("extents",oid),arg("pipeline",
ptr),batargany("b",1))),
- command("lockedgroup", "subgroupdone", LGRPsubgroup2, false, "", args(3,6,
batarg("groups",oid),batarg("extents",oid),batarg("histo",lng),arg("pipeline",
ptr),batargany("b",1),batarg("g",oid))),
+ command("lockedgroup", "group", LGRPgroup1, false, "", args(3,4,
batarg("groups",oid),batarg("extents",oid),batarg("histo",lng),batargany("b",1))),
+ command("lockedgroup", "group", LGRPgroup3, false, "", args(2,3,
batarg("groups",oid),batarg("extents",oid),batargany("b",1))),
+ command("lockedgroup", "subgroupdone", LGRPsubgroup2, false, "", args(3,5,
batarg("groups",oid),batarg("extents",oid),batarg("histo",lng),batargany("b",1),batarg("g",oid))),
{ .imp=NULL }
};
#include "mal_import.h"
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
