Changeset: 7e975a6333cd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7e975a6333cd
Removed Files:
sql/backends/monet5/generator/generator.h
Modified Files:
clients/Tests/exports.stable.out
sql/backends/monet5/generator/CMakeLists.txt
sql/backends/monet5/generator/generator.c
Branch: default
Log Message:
Unexport generator functions: they're not used outside the one file.
diffs (154 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1427,13 +1427,6 @@ char *UDFfuse_int_lng(lng *ret, const in
char *UDFfuse_lng_hge(hge *ret, const lng *one, const lng *two);
char *UDFfuse_sht_int(int *ret, const sht *one, const sht *two);
str UDFreverse(str *ret, const str *arg);
-str VLTgenerator_join(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str VLTgenerator_noop(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str VLTgenerator_projection(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
-str VLTgenerator_rangejoin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-str VLTgenerator_subselect(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-str VLTgenerator_table(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-str VLTgenerator_thetasubselect(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
str append_to_table_from_emit(Client cntxt, char *sname, char *tname,
sql_emit_col *columns, size_t ncols);
str batbte_dec2_bte(bat *res, const int *s1, const bat *v, const bat *sid);
str batbte_dec2_dbl(bat *res, const int *s1, const bat *v, const bat *sid);
diff --git a/sql/backends/monet5/generator/CMakeLists.txt
b/sql/backends/monet5/generator/CMakeLists.txt
--- a/sql/backends/monet5/generator/CMakeLists.txt
+++ b/sql/backends/monet5/generator/CMakeLists.txt
@@ -31,7 +31,7 @@ create_include_object(
target_sources(generator
PRIVATE
- generator.c generator.h
+ generator.c
${MONETDB_CURRENT_SQL_SOURCES})
target_include_directories(generator
diff --git a/sql/backends/monet5/generator/generator.c
b/sql/backends/monet5/generator/generator.c
--- a/sql/backends/monet5/generator/generator.c
+++ b/sql/backends/monet5/generator/generator.c
@@ -16,7 +16,9 @@
*/
#include "monetdb_config.h"
-#include "generator.h"
+#include "mal.h"
+#include "mal_interpreter.h"
+#include "mal_function.h"
#include "gdk_time.h"
@@ -33,7 +35,7 @@
nullerr = is_##TPE##_nil(s);
\
} while (0)
-str
+static str
VLTgenerator_noop(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
int nullerr= 0, zeroerror=0, tpe;
@@ -350,7 +352,7 @@ VLTgenerator_table_(BAT **result, Client
return MAL_SUCCEED;
}
-str
+static str
VLTgenerator_table(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
str msg;
@@ -464,7 +466,7 @@ findGeneratorDefinition(MalBlkPtr mb, In
}
\
} while (0)
-str
+static str
VLTgenerator_subselect(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
bit li, hi, anti;
@@ -886,7 +888,8 @@ VLTgenerator_subselect(Client cntxt, Mal
} while (0)
-str VLTgenerator_thetasubselect(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci)
+static str
+VLTgenerator_thetasubselect(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci)
{
bool anti = false;
int tpe;
@@ -1206,7 +1209,8 @@ str VLTgenerator_thetasubselect(Client c
}
\
} while (0)
-str VLTgenerator_projection(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci)
+static str
+VLTgenerator_projection(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci)
{
int tpe;
bat *ret;
@@ -1435,7 +1439,8 @@ str VLTgenerator_projection(Client cntxt
}
\
} while (0)
-str VLTgenerator_join(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
+static str
+VLTgenerator_join(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
BAT *b, *bl = NULL, *br = NULL, *bln = NULL, *brn= NULL;
BUN cnt,c =0;
@@ -1626,7 +1631,8 @@ str VLTgenerator_join(Client cntxt, MalB
}
\
} while (0)
-str VLTgenerator_rangejoin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci)
+static str
+VLTgenerator_rangejoin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
BAT *blow = NULL, *bhgh = NULL, *bln = NULL, *brn= NULL;
bit li,ri;
diff --git a/sql/backends/monet5/generator/generator.h
b/sql/backends/monet5/generator/generator.h
deleted file mode 100644
--- a/sql/backends/monet5/generator/generator.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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 2024, 2025 MonetDB Foundation;
- * Copyright August 2008 - 2023 MonetDB B.V.;
- * Copyright 1997 - July 2008 CWI.
- */
-
-#ifndef _VLT_SEQUENCE_
-#define _VLT_SEQUENCE_
-#include "mal.h"
-#include "mal_interpreter.h"
-#include "mal_function.h"
-
-//#define VLT_DEBUG
-
-#ifdef WIN32
-#ifndef LIBGENERATOR
-#define generator_export extern __declspec(dllimport)
-#else
-#define generator_export extern __declspec(dllexport)
-#endif
-#else
-#define generator_export extern
-#endif
-
-generator_export str VLTgenerator_noop(Client cntxt, MalBlkPtr mb, MalStkPtr
stk, InstrPtr pci);
-generator_export str VLTgenerator_table(Client cntxt, MalBlkPtr mb, MalStkPtr
stk, InstrPtr pci);
-generator_export str VLTgenerator_subselect(Client cntxt, MalBlkPtr mb,
MalStkPtr stk, InstrPtr pci);
-generator_export str VLTgenerator_thetasubselect(Client cntxt, MalBlkPtr mb,
MalStkPtr stk, InstrPtr pci);
-generator_export str VLTgenerator_projection(Client cntxt, MalBlkPtr mb,
MalStkPtr stk, InstrPtr pci);
-generator_export str VLTgenerator_join(Client cntxt, MalBlkPtr mb, MalStkPtr
stk, InstrPtr pci);
-generator_export str VLTgenerator_rangejoin(Client cntxt, MalBlkPtr mb,
MalStkPtr stk, InstrPtr pci);
-
-#endif
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
