Changeset: fc518c404e1c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/fc518c404e1c
Removed Files:
monetdb5/modules/mal/strimps.c
sql/scripts/90_strimps.sql
Modified Files:
monetdb5/modules/mal/CMakeLists.txt
sql/backends/monet5/CMakeLists.txt
sql/scripts/CMakeLists.txt
Branch: Jan2022-strimps-integration
Log Message:
Remove outdated interface
diffs (230 lines):
diff --git a/monetdb5/modules/mal/CMakeLists.txt
b/monetdb5/modules/mal/CMakeLists.txt
--- a/monetdb5/modules/mal/CMakeLists.txt
+++ b/monetdb5/modules/mal/CMakeLists.txt
@@ -42,7 +42,6 @@ target_sources(malmodules
projectionpath.c
tablet.c tablet.h
batcalc.c calc.c
- strimps.c
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/wlc.h)
diff --git a/monetdb5/modules/mal/strimps.c b/monetdb5/modules/mal/strimps.c
deleted file mode 100644
--- a/monetdb5/modules/mal/strimps.c
+++ /dev/null
@@ -1,180 +0,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 - 2022 MonetDB B.V.
- */
-#include "monetdb_config.h"
-#include "mal.h"
-#include "mal_client.h"
-#include "mal_interpreter.h"
-#include "mal_exception.h"
-
-#if 0
-/*
- * String imprints.
- */
-static str
-PATstrimp_ndigrams(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
-{
- bat bid;
- BAT *b;
- size_t n;
-
- (void)cntxt;
- (void)mb;
-
- // return mythrow(MAL, "batcalc.striter", OPERATION_FAILED);
- bid = *getArgReference_bat(stk, pci, 1);
- if ((b = BATdescriptor(bid)) == NULL)
- throw(MAL, "strimps.strimpDigrams", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
-
- if (!STRMPndigrams(b, &n)) {
- throw(MAL, "strimps.strimpDigrams", SQLSTATE(HY002)
OPERATION_FAILED);
- }
-
- *getArgReference_lng(stk, pci, 0) = n;
-
- return MAL_SUCCEED;
-}
-
-static str
-PATstrimp_makehist(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
-{
- bat bid;
- BAT *b, *ob;
- size_t i;
- uint64_t hist[STRIMP_HISTSIZE];
- size_t count;
-
- (void)cntxt;
- (void)mb;
-
- bid = *getArgReference_bat(stk, pci, 2);
- if ((b = BATdescriptor(bid)) == NULL)
- throw(MAL, "strimps.strimpHistogram", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
-
- if (!STRMPmakehistogram(b, hist, STRIMP_HISTSIZE, &count)) {
- throw(MAL, "strimps.strimpHistogram", SQLSTATE(HY002)
OPERATION_FAILED);
- }
-
- ob = COLnew(0, TYPE_lng, STRIMP_HISTSIZE, TRANSIENT);
- if (ob == NULL) {
- throw(MAL, "strimps.strimpHistogram", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
- }
-
- for (i=0; i < STRIMP_HISTSIZE; i++) {
- if (BUNappend(ob, hist + i, false) != GDK_SUCCEED)
- throw(MAL, "strimps.strimpHistogram", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
- }
-
- *getArgReference_lng(stk, pci, 0) = count;
- *getArgReference_bat(stk, pci, 1) = ob->batCacheid;
-
- BBPkeepref(ob->batCacheid);
- return MAL_SUCCEED;
-}
-#endif
-
-static str
-PATstrimpCreate(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
-{
- bat bid, sid;
- BAT *b, *s = NULL;
- gdk_return res;
-
- (void)cntxt;
- (void)mb;
-
- bid = *getArgReference_bat(stk, pci, 1);
- if ((b = BATdescriptor(bid)) == NULL)
- throw(MAL, "strimps.strimpCreate", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
-
- sid = *getArgReference_bat(stk, pci, 2);
- if (sid && !is_bat_nil(sid) && (s = BATdescriptor(sid)) == NULL) {
- BBPunfix(b->batCacheid);
- throw(MAL, "strimps.strimpCreate", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
- }
-
- res = STRMPcreate(b, s);
- BBPunfix(b->batCacheid);
- if (s)
- BBPunfix(s->batCacheid);
- if (res != GDK_SUCCEED)
- throw(MAL, "strimps.strimpCreate", GDK_EXCEPTION);
-
- // *getArgReference_lng(stk, pci, 0) = 0;
- return MAL_SUCCEED;
-}
-
-static str
-PATstrimpFilter(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci) {
- (void)cntxt;
- (void)mb;
- (void)stk;
- (void)pci;
- throw(MAL, "strimps.strimpfilter", SQLSTATE(HY002) "UNIMPLEMENTED");
-}
-
-static str
-PATstrimpFilterSelect(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
-{
- bat bid, sid;
- BAT *b, *s = NULL, *ob;
- str pat;
-
- (void)cntxt;
- (void)mb;
-
- bid = *getArgReference_bat(stk, pci, 1);
- if ((b = BATdescriptor(bid)) == NULL)
- throw(MAL, "strimps.strimpfilter", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
-
- sid = *getArgReference_bat(stk, pci, 2);
- if (sid && !is_bat_nil(sid) && (s = BATdescriptor(sid)) == NULL) {
- BBPunfix(b->batCacheid);
- throw(MAL, "strimps.strimpfilter", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
- }
-
- assert(!s || s->ttype == TYPE_void);
-
- if (STRMPcreate(b, s) != GDK_SUCCEED) {
- BBPunfix(b->batCacheid);
- if (s)
- BBPunfix(s->batCacheid);
- throw(MAL, "strimps.strimpfilter", GDK_EXCEPTION);
- }
-
- pat = *getArgReference_str(stk, pci, 3);
- ob = STRMPfilter(b, s, pat);
- BBPunfix(b->batCacheid);
- if (s)
- BBPunfix(s->batCacheid);
- if (ob == NULL)
- throw(MAL, "strimps.strimpfilter", GDK_EXCEPTION);
-
- *getArgReference_bat(stk, pci, 0) = ob->batCacheid;
- BBPkeepref(ob->batCacheid);
-
- return MAL_SUCCEED;
-}
-
-#include "mel.h"
-mel_func strimp_init_funcs[] = {
- /* String imprints */
- // pattern("bat", "strimpNDigrams", PATstrimp_ndigrams, false, "count digrams
in a string bat", args(1,2,arg("",lng),batarg("b",str))),
- // pattern("bat", "strimpHistogram", PATstrimp_makehist, false, "make a
histogram of all the byte pairs in a BAT", args(2,3,arg("",lng),
batarg("",lng),batarg("b",str))),
- pattern("strimps", "mkstrimp", PATstrimpCreate, true, "construct the strimp a
BAT", args(1,3,arg("",void),batarg("b",str),batarg("s",oid))),
- pattern("strimps", "strimpfilter", PATstrimpFilter, false, "",
args(1,3,arg("",bit),arg("b",str),arg("q",str))),
- pattern("strimps", "strimpfilterselect", PATstrimpFilterSelect, false, "",
args(1,5,batarg("",oid),batarg("b",str),batarg("s",oid),arg("q",str),arg("a",bit))),
- pattern("strimps", "strimpfilterjoin", PATstrimpFilter, false, "",
args(2,8,batarg("",oid),batarg("b",str),arg("q",str))),
- { .imp=NULL }
-};
-#include "mal_import.h"
-#ifdef _MSC_VER
-#undef read
-#pragma section(".CRT$XCU",read)
-#endif
-LIB_STARTUP_FUNC(init_strimps_mal)
-{ mal_module("strimps", NULL, strimp_init_funcs); }
diff --git a/sql/backends/monet5/CMakeLists.txt
b/sql/backends/monet5/CMakeLists.txt
--- a/sql/backends/monet5/CMakeLists.txt
+++ b/sql/backends/monet5/CMakeLists.txt
@@ -106,8 +106,7 @@ set(include_sql_files
75_storagemodel
76_dump
80_statistics
- 81_tracer
- 90_strimps)
+ 81_tracer)
if(HAVE_HGE)
list(APPEND include_sql_files
diff --git a/sql/scripts/90_strimps.sql b/sql/scripts/90_strimps.sql
deleted file mode 100644
--- a/sql/scripts/90_strimps.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-CREATE FILTER FUNCTION sys.strimp_filter(strs STRING, q STRING) EXTERNAL NAME
strimps.strimpfilter;
-GRANT EXECUTE ON FILTER FUNCTION sys.strimp_filter TO PUBLIC;
-
-CREATE PROCEDURE sys.strimp_create(sch string, tab string, col string)
- EXTERNAL NAME sql.createstrimps;
diff --git a/sql/scripts/CMakeLists.txt b/sql/scripts/CMakeLists.txt
--- a/sql/scripts/CMakeLists.txt
+++ b/sql/scripts/CMakeLists.txt
@@ -35,7 +35,6 @@ install(FILES
76_dump.sql
80_statistics.sql
81_tracer.sql
- 90_strimps.sql
99_system.sql
DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5/createdb)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
