Changeset: 87f290b8380a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/87f290b8380a
Added Files:
monetdb5/modules/kernel/aggr.h
Modified Files:
monetdb5/modules/kernel/CMakeLists.txt
monetdb5/modules/kernel/aggr.c
monetdb5/modules/kernel/group.c
monetdb5/modules/kernel/group.h
Branch: default
Log Message:
Export functions needed by 'pipeline'
diffs (94 lines):
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
@@ -18,7 +18,7 @@ target_sources(kernel
bat5.c
algebra.c algebra.h
group.c group.h
- aggr.c
+ aggr.c aggr.h
batmmath.c
batstr.c
batcolor.c
diff --git a/monetdb5/modules/kernel/aggr.c b/monetdb5/modules/kernel/aggr.c
--- a/monetdb5/modules/kernel/aggr.c
+++ b/monetdb5/modules/kernel/aggr.c
@@ -11,6 +11,7 @@
#include "monetdb_config.h"
#include "mal.h"
#include "mal_exception.h"
+#include "aggr.h"
/*
* grouped aggregates
@@ -124,7 +125,7 @@ AGGRsum3_int(bat *retval, const bat *bid
BATgroupsum, NULL, NULL, NULL,
"aggr.sum");
}
-static str
+str
AGGRsum3_lng(bat *retval, const bat *bid, const bat *gid, const bat *eid)
{
return AGGRgrouped(retval, NULL, bid, gid, eid, NULL, true, 0, TYPE_lng,
@@ -132,7 +133,7 @@ AGGRsum3_lng(bat *retval, const bat *bid
}
#ifdef HAVE_HGE
-static str
+str
AGGRsum3_hge(bat *retval, const bat *bid, const bat *gid, const bat *eid)
{
return AGGRgrouped(retval, NULL, bid, gid, eid, NULL, true, 0, TYPE_hge,
diff --git a/monetdb5/modules/kernel/aggr.h b/monetdb5/modules/kernel/aggr.h
new file mode 100644
--- /dev/null
+++ b/monetdb5/modules/kernel/aggr.h
@@ -0,0 +1,17 @@
+/*
+ * SPDX-License-Identifier: MPL-2.0
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
+ */
+
+#ifndef _AGGR_H_
+#define _AGGR_H_
+
+extern str AGGRsum3_lng(bat *retval, const bat *bid, const bat *gid, const bat
*eid);
+extern str AGGRsum3_hge(bat *retval, const bat *bid, const bat *gid, const bat
*eid);
+
+#endif /* _AGGR_H_ */
diff --git a/monetdb5/modules/kernel/group.c b/monetdb5/modules/kernel/group.c
--- a/monetdb5/modules/kernel/group.c
+++ b/monetdb5/modules/kernel/group.c
@@ -92,7 +92,7 @@ GRPsubgroup3(bat *ngid, bat *next, bat *
return GRPsubgroup5(ngid, next, nhis, bid, sid, gid, NULL, NULL);
}
-static str
+str
GRPsubgroup2(bat *ngid, bat *next, bat *nhis, const bat *bid, const bat *gid)
{
return GRPsubgroup5(ngid, next, nhis, bid, NULL, gid, NULL, NULL);
@@ -104,7 +104,7 @@ GRPgroup4(bat *ngid, bat *next, const ba
return GRPsubgroup5(ngid, next, NULL, bid, sid, NULL, NULL, NULL);
}
-static str
+str
GRPgroup3(bat *ngid, bat *next, const bat *bid)
{
return GRPsubgroup5(ngid, next, NULL, bid, NULL, NULL, NULL, NULL);
diff --git a/monetdb5/modules/kernel/group.h b/monetdb5/modules/kernel/group.h
--- a/monetdb5/modules/kernel/group.h
+++ b/monetdb5/modules/kernel/group.h
@@ -17,4 +17,6 @@ mal_export str GRPsubgroup5(bat *ngid, b
const bat *bid, const
bat *sid,
const bat *gid, const
bat *eid, const bat *hid);
+extern str GRPsubgroup2(bat *ngid, bat *next, bat *nhis, const bat *bid, const
bat *gid);
+extern str GRPgroup3(bat *ngid, bat *next, const bat *bid);
#endif /* _GROUP_H_ */
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
