Changeset: 99a5f20d96c4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=99a5f20d96c4
Modified Files:
common/stream/stream.c
common/utils/mutils.c
embedded/CMakeLists.txt
embedded/monetdb_embedded.c
gdk/gdk_bat.c
gdk/gdk_posix.c
gdk/gdk_utils.c
monetdb5/mal/mal_atom.c
monetdb5/mal/mal_authorize.c
monetdb5/mal/mal_client.c
monetdb5/mal/mal_dataflow.c
monetdb5/mal/mal_embedded.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_interpreter.h
monetdb5/mal/mal_private.h
monetdb5/mal/mal_runtime.c
monetdb5/mal/mal_runtime.h
monetdb5/mal/mal_session.c
monetdb5/optimizer/opt_evaluate.c
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_wrapper.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_optimizer.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/sql_user.c
sql/server/rel_optimizer.c
sql/server/rel_planner.c
sql/server/rel_schema.c
sql/server/sql_mvc.c
sql/server/sql_scan.c
Branch: cmake-monetdblite
Log Message:
Removed preprocessor checks for embedded compilation, making the codebases
closer.
diffs (truncated from 2096 to 300 lines):
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -156,7 +156,7 @@ mnstr_init(void)
if (ATOMIC_TAS(&inited))
return 0;
-#if defined(NATIVE_WIN32) && !defined(HAVE_EMBEDDED)
+#ifdef NATIVE_WIN32
{
WSADATA w;
@@ -2075,7 +2075,6 @@ open_wastream(const char *filename)
return s;
}
-#ifndef HAVE_EMBEDDED
/* ------------------------------------------------------------------ */
/* streams working on a remote file using cURL */
@@ -2660,8 +2659,6 @@ socket_wstream(SOCKET sock, const char *
return s;
}
-#endif /* HAVE EMBEDDED*/
-
/* ------------------------------------------------------------------ */
/* streams working on an open file pointer */
diff --git a/common/utils/mutils.c b/common/utils/mutils.c
--- a/common/utils/mutils.c
+++ b/common/utils/mutils.c
@@ -404,7 +404,6 @@ MT_lockf(char *filename, int mode, off_t
#endif
-#ifndef HAVE_EMBEDDED
#ifndef PATH_MAX
# define PATH_MAX 1024
#endif
@@ -442,7 +441,6 @@ get_bin_path(void)
* that's a lot of work and unreliable */
return NULL;
}
-#endif
static bool MT_silent = false;
diff --git a/embedded/CMakeLists.txt b/embedded/CMakeLists.txt
--- a/embedded/CMakeLists.txt
+++ b/embedded/CMakeLists.txt
@@ -14,8 +14,8 @@ include_directories(${CMAKE_CURRENT_BINA
add_definitions(${COMPILER_OPTION}DLIBGDK ${COMPILER_OPTION}DLIBMONETDB5
${COMPILER_OPTION}DLIBSQL
${COMPILER_OPTION}DLIBEMBEDDED
${COMPILER_OPTION}DHAVE_EMBEDDED)
-bison_target(sqlparserlite ../sql/server/sql_parser.y
${CMAKE_CURRENT_BINARY_DIR}/sql_sqlparserlite.tab.c
- COMPILE_FLAGS "-d -p sql -r all" DEFINES_FILE
${CMAKE_CURRENT_BINARY_DIR}/sql_sqlparserlite.tab.h)
+bison_target(sqlparserlite ../sql/server/sql_parser.y
${CMAKE_CURRENT_BINARY_DIR}/sql_parser.tab.c
+ COMPILE_FLAGS "-d -p sql -r all" DEFINES_FILE
${CMAKE_CURRENT_BINARY_DIR}/sql_parser.tab.h)
add_library(bisonlite_obj OBJECT ${BISON_sqlparserlite_OUTPUTS})
set_target_properties(bisonlite_obj PROPERTIES POSITION_INDEPENDENT_CODE ON)
if(COMPILER_Wnounreachablecode)
@@ -49,6 +49,7 @@ set(MAL_SCRIPTS_LIST
"${CMAKE_SOURCE_DIR}/monetdb5/optimizer/optimizer.mal"
"${CMAKE_SOURCE_DIR}/monetdb5/modules/mal/iterator.mal"
"${CMAKE_SOURCE_DIR}/monetdb5/modules/mal/language.mal"
+ "${CMAKE_SOURCE_DIR}/monetdb5/modules/mal/querylog.mal"
"${CMAKE_SOURCE_DIR}/monetdb5/modules/mal/01_batcalc.mal"
"${CMAKE_SOURCE_DIR}/monetdb5/modules/mal/01_calc.mal"
"${CMAKE_SOURCE_DIR}/sql/backends/monet5/sql.mal" # sql.mal MUST be here
@@ -90,7 +91,10 @@ set(MONETDBLITE_TRANSLATION_UNITS
monetdb_embedded.c
../common/options/monet_options.c
../common/stream/stream.c
+ ../common/utils/mcrypt.c
+ ../common/utils/msabaoth.c
../common/utils/mutils.c
+ ../common/utils/muuid.c
../common/utils/revision.c
../gdk/gdk_aggr.c
../gdk/gdk_align.c
@@ -128,11 +132,14 @@ set(MONETDBLITE_TRANSLATION_UNITS
../gdk/gdk_value.c
../monetdb5/mal/mal.c
../monetdb5/mal/mal_atom.c
+ ../monetdb5/mal/mal_authorize.c
../monetdb5/mal/mal_builder.c
../monetdb5/mal/mal_client.c
../monetdb5/mal/mal_dataflow.c
+ ../monetdb5/mal/mal_debugger.c
../monetdb5/mal/mal_embedded.c
../monetdb5/mal/mal_exception.c
+ ../monetdb5/mal/mal_factory.c
../monetdb5/mal/mal_function.c
../monetdb5/mal/mal_import.c
../monetdb5/mal/mal_instruction.c
@@ -142,6 +149,7 @@ set(MONETDBLITE_TRANSLATION_UNITS
../monetdb5/mal/mal_module.c
../monetdb5/mal/mal_namespace.c
../monetdb5/mal/mal_parser.c
+ ../monetdb5/mal/mal_profiler.c
../monetdb5/mal/mal_resolve.c
../monetdb5/mal/mal_resource.c
../monetdb5/mal/mal_runtime.c
@@ -150,34 +158,36 @@ set(MONETDBLITE_TRANSLATION_UNITS
../monetdb5/mal/mal_stack.c
../monetdb5/mal/mal_type.c
../monetdb5/mal/mal_utils.c
+ ../monetdb5/modules/atoms/blob.c
+ ../monetdb5/modules/atoms/mtime.c
+ ../monetdb5/modules/atoms/mtime_analytic.c
+ ../monetdb5/modules/atoms/str.c
+ ../monetdb5/modules/atoms/streams.c
+ ../monetdb5/modules/atoms/strptime.c
../monetdb5/modules/kernel/aggr.c
- ../monetdb5/modules/atoms/streams.c
../monetdb5/modules/kernel/algebra.c
../monetdb5/modules/kernel/bat5.c
- ../monetdb5/modules/mal/batcalc.c
- ../monetdb5/modules/mal/batExtensions.c
../monetdb5/modules/kernel/batmmath.c
../monetdb5/modules/kernel/batstr.c
- ../monetdb5/modules/atoms/blob.c
+ ../monetdb5/modules/kernel/group.c
+ ../monetdb5/modules/kernel/mmath.c
+ ../monetdb5/modules/mal/batExtensions.c
+ ../monetdb5/modules/mal/batcalc.c
../monetdb5/modules/mal/bbp.c
../monetdb5/modules/mal/calc.c
- ../monetdb5/modules/kernel/group.c
../monetdb5/modules/mal/inspect.c
../monetdb5/modules/mal/iterator.c
../monetdb5/modules/mal/language.c
../monetdb5/modules/mal/manifold.c
../monetdb5/modules/mal/mat.c
../monetdb5/modules/mal/mkey.c
- ../monetdb5/modules/kernel/mmath.c
- ../monetdb5/modules/atoms/mtime.c
- ../monetdb5/modules/atoms/mtime_analytic.c
- ../monetdb5/modules/atoms/strptime.c
../monetdb5/modules/mal/orderidx.c
../monetdb5/modules/mal/pcre.c
../monetdb5/modules/mal/projectionpath.c
+ ../monetdb5/modules/mal/querylog.c
../monetdb5/modules/mal/sample.c
- ../monetdb5/modules/atoms/str.c
../monetdb5/modules/mal/tablet.c
+ ../monetdb5/modules/mal/wlc.c
../monetdb5/optimizer/opt_aliases.c
../monetdb5/optimizer/opt_candidates.c
../monetdb5/optimizer/opt_coercion.c
@@ -191,19 +201,28 @@ set(MONETDBLITE_TRANSLATION_UNITS
../monetdb5/optimizer/opt_garbageCollector.c
../monetdb5/optimizer/opt_generator.c
../monetdb5/optimizer/opt_inline.c
+ ../monetdb5/optimizer/opt_jit.c
+ ../monetdb5/optimizer/opt_json.c
../monetdb5/optimizer/opt_macro.c
../monetdb5/optimizer/opt_matpack.c
../monetdb5/optimizer/opt_mergetable.c
../monetdb5/optimizer/opt_mitosis.c
../monetdb5/optimizer/opt_multiplex.c
+ ../monetdb5/optimizer/opt_oltp.c
../monetdb5/optimizer/opt_pipes.c
+ ../monetdb5/optimizer/opt_postfix.c
../monetdb5/optimizer/opt_prelude.c
../monetdb5/optimizer/opt_profiler.c
../monetdb5/optimizer/opt_projectionpath.c
../monetdb5/optimizer/opt_pushselect.c
+ ../monetdb5/optimizer/opt_querylog.c
+ ../monetdb5/optimizer/opt_reduce.c
../monetdb5/optimizer/opt_remap.c
+ ../monetdb5/optimizer/opt_remoteQueries.c
../monetdb5/optimizer/opt_reorder.c
../monetdb5/optimizer/opt_support.c
+ ../monetdb5/optimizer/opt_volcano.c
+ ../monetdb5/optimizer/opt_wlc.c
../monetdb5/optimizer/opt_wrapper.c
../monetdb5/optimizer/optimizer.c
../sql/backends/monet5/mal_backend.c
@@ -229,6 +248,7 @@ set(MONETDBLITE_TRANSLATION_UNITS
../sql/backends/monet5/sql_transaction.c
../sql/backends/monet5/sql_upgrades.c
../sql/backends/monet5/sql_user.c
+ ../sql/backends/monet5/wlr.c
../sql/common/sql_backend.c
../sql/common/sql_changeset.c
../sql/common/sql_hash.c
@@ -245,6 +265,7 @@ set(MONETDBLITE_TRANSLATION_UNITS
../sql/server/rel_partition.c
../sql/server/rel_planner.c
../sql/server/rel_prop.c
+ ../sql/server/rel_propagate.c
../sql/server/rel_psm.c
../sql/server/rel_rel.c
../sql/server/rel_remote.c
@@ -261,6 +282,7 @@ set(MONETDBLITE_TRANSLATION_UNITS
../sql/server/sql_decimal.c
../sql/server/sql_env.c
../sql/server/sql_mvc.c
+ ../sql/server/sql_partition.c
../sql/server/sql_privileges.c
../sql/server/sql_qc.c
../sql/server/sql_query.c
diff --git a/embedded/monetdb_embedded.c b/embedded/monetdb_embedded.c
--- a/embedded/monetdb_embedded.c
+++ b/embedded/monetdb_embedded.c
@@ -30,6 +30,7 @@
#include "rel_rel.h"
#include "rel_updates.h"
#include "monet_options.h"
+#include "msabaoth.h"
typedef struct {
monetdb_result res;
@@ -362,7 +363,7 @@ monetdb_shutdown_internal(void) // Call
char*
monetdb_startup(char* dbdir, bool silent, bool sequential)
{
- char* msg = MAL_SUCCEED;
+ char* msg = MAL_SUCCEED, *err;
monetdb_result* res = NULL;
void* c;
opt *set = NULL;
@@ -404,7 +405,7 @@ monetdb_startup(char* dbdir, bool silent
msg = createException(MAL, "embedded.monetdb_startup",
MAL_MALLOC_FAIL);
goto cleanup;
}
- if (!dbdir) {
+ if (!dbdir) { /* in-memory */
if (BBPaddfarm(NULL, (1 << PERSISTENT) | (1 << TRANSIENT)) !=
GDK_SUCCEED) {
mo_free_options(set, setlen);
msg = createException(MAL, "embedded.monetdb_startup",
"Cannot add in-memory farm");
@@ -422,6 +423,19 @@ monetdb_startup(char* dbdir, bool silent
msg = createException(MAL, "embedded.monetdb_startup",
"Cannot create directory %s", dbdir);
goto cleanup;
}
+ msab_dbpathinit(dbdir);
+ if ((err = msab_wildRetreat()) != NULL) {
+ mo_free_options(set, setlen);
+ msg = createException(MAL, "embedded.monetdb_startup",
"%s", err);
+ free(err);
+ goto cleanup;
+ }
+ if ((err = msab_registerStarting()) != NULL) {
+ mo_free_options(set, setlen);
+ msg = createException(MAL, "embedded.monetdb_startup",
"%s", err);
+ free(err);
+ goto cleanup;
+ }
}
gdk_res = GDKinit(set, setlen);
mo_free_options(set, setlen);
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -240,12 +240,6 @@ BATdense(oid hseq, oid tseq, BUN cnt)
return bn;
}
-#ifdef HAVE_EMBEDDED
-extern int TYPE_date;
-extern int TYPE_daytime;
-extern int TYPE_timestamp;
-#endif
-
BAT *
BATattach(int tt, const char *heapfile, role_t role)
{
@@ -254,9 +248,7 @@ BATattach(int tt, const char *heapfile,
size_t m;
FILE *f;
//The JVM is always Big-Endian, so the integer values must be swapped
if so
-#ifdef HAVE_EMBEDDED
bool swapendianess = GDK_is_bin_import_swap() && MT_check_endianness()
!= HOST_BIG_ENDIAN;
-#endif
ERRORcheck(tt <= 0 , "BATattach: bad tail type (<=0)\n", NULL);
ERRORcheck(ATOMvarsized(tt) && ATOMstorage(tt) != TYPE_str, "BATattach:
bad tail type (varsized and not str)\n", NULL);
@@ -366,32 +358,29 @@ BATattach(int tt, const char *heapfile,
p = Tloc(bn, 0);
n = (lng) st.st_size;
while (n > 0 && (m = fread(p, 1, (size_t) MIN(1024*1024, n),
f)) > 0) {
-#ifdef HAVE_EMBEDDED
if (swapendianess) {
BUN j = 0, end = m / atomsize;
- int stype = ATOMstorage(tt);
- if (stype == TYPE_sht) {
+ if (ATOMsize(tt) == 2) {
sht *bufptr = (sht*) p;
for (j = 0; j < end; j++)
bufptr[j] =
short_int_SWAP(bufptr[j]);
- } else if (stype == TYPE_int || stype ==
TYPE_flt || stype == TYPE_daytime) {
+ } else if (ATOMsize(tt) == 4) {
int *bufptr = (int*) p;
for (j = 0; j < end; j++)
bufptr[j] =
normal_int_SWAP(bufptr[j]);
- } else if (stype == TYPE_dbl || stype ==
TYPE_lng || stype == TYPE_date || stype == TYPE_timestamp) {
+ } else if (ATOMsize(tt) == 8) {
lng *bufptr = (lng*) p;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
