Changeset: 895e718f6f0f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=895e718f6f0f
Added Files:
sql/backends/monet5/sql_sysmon.mal
Modified Files:
embedded/CMakeLists.txt
embedded/monetdb_embedded.c
monetdb5/mal/mal_embedded.c
monetdb5/modules/mal/inspect.mal
monetdb5/optimizer/optimizer.mal
sql/backends/monet5/CMakeLists.txt
sql/backends/monet5/sql.c
sql/backends/monet5/sql.mal
sql/backends/monet5/sql_cat.c
Branch: cmake-monetdblite
Log Message:
Attempting to start the embedded server successfully.
diffs (truncated from 346 to 300 lines):
diff --git a/embedded/CMakeLists.txt b/embedded/CMakeLists.txt
--- a/embedded/CMakeLists.txt
+++ b/embedded/CMakeLists.txt
@@ -39,6 +39,7 @@ set(MAL_SCRIPTS_LIST
"${CMAKE_SOURCE_DIR}/monetdb5/modules/atoms/blob.mal"
"${CMAKE_SOURCE_DIR}/monetdb5/modules/atoms/str.mal"
"${CMAKE_SOURCE_DIR}/monetdb5/modules/atoms/mtime.mal"
+ "${CMAKE_SOURCE_DIR}/monetdb5/modules/atoms/streams.mal"
"${CMAKE_SOURCE_DIR}/monetdb5/modules/kernel/batmmath.mal"
"${CMAKE_SOURCE_DIR}/monetdb5/modules/mal/batmtime.mal"
"${CMAKE_SOURCE_DIR}/monetdb5/modules/kernel/batstr.mal"
@@ -46,7 +47,6 @@ set(MAL_SCRIPTS_LIST
"${CMAKE_SOURCE_DIR}/monetdb5/modules/mal/bbp.mal"
"${CMAKE_SOURCE_DIR}/monetdb5/modules/mal/manifold.mal"
"${CMAKE_SOURCE_DIR}/monetdb5/modules/mal/mat.mal"
- "${CMAKE_SOURCE_DIR}/monetdb5/modules/mal/inspect.mal"
"${CMAKE_SOURCE_DIR}/monetdb5/modules/mal/language.mal"
"${CMAKE_SOURCE_DIR}/monetdb5/modules/mal/tablet.mal"
"${CMAKE_SOURCE_DIR}/monetdb5/modules/mal/sample.mal"
@@ -160,6 +160,7 @@ add_library(monetdblite SHARED
../monetdb5/mal/mal_type.c
../monetdb5/mal/mal_utils.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
@@ -167,6 +168,7 @@ add_library(monetdblite SHARED
../monetdb5/modules/kernel/batmmath.c
../monetdb5/modules/kernel/batstr.c
../monetdb5/modules/atoms/blob.c
+ ../monetdb5/modules/mal/bbp.c
../monetdb5/modules/mal/calc.c
../monetdb5/modules/kernel/group.c
../monetdb5/modules/mal/iterator.c
@@ -219,8 +221,10 @@ add_library(monetdblite SHARED
../sql/backends/monet5/sql_bat2time.c
../sql/backends/monet5/sql_cast.c
../sql/backends/monet5/sql_cat.c
+ ../sql/backends/monet5/sql_datetrunc.c
../sql/backends/monet5/sql_execute.c
../sql/backends/monet5/sql_fround.c
+ ../sql/backends/monet5/sql_generator.c
../sql/backends/monet5/sql_gencode.c
../sql/backends/monet5/sql_optimizer.c
../sql/backends/monet5/sql_orderidx.c
diff --git a/embedded/monetdb_embedded.c b/embedded/monetdb_embedded.c
--- a/embedded/monetdb_embedded.c
+++ b/embedded/monetdb_embedded.c
@@ -73,7 +73,7 @@ monetdb_connect(monetdb_connection *conn
msg = createException(MAL, "embedded.monetdb_connect",
SQLSTATE(42000) "monetdb_connection parameter is NULL");
goto cleanup;
}
- mc = MCinitClient((oid) 0, 0, 0);
+ mc = MCinitClient((oid) 0, bstream_create(GDKstdin, 0), GDKstdout);
if (!MCvalid(mc)) {
msg = createException(MAL, "embedded.monetdb_connect",
SQLSTATE(HY001) "Failed to initialize client");
goto cleanup;
@@ -152,7 +152,7 @@ monetdb_startup(char* dbdir, char silent
msg = createException(MAL, "embedded.monetdb_startup",
SQLSTATE(HY001) MAL_MALLOC_FAIL);
goto cleanup;
}
- if ((setlen = mo_add_option(&set, setlen, opt_cmdline, "gdk_dbpath",
dbdir)) == 0) {
+ if (dbdir && (setlen = mo_add_option(&set, setlen, opt_cmdline,
"gdk_dbpath", dbdir)) == 0) {
mo_free_options(set, setlen);
msg = createException(MAL, "embedded.monetdb_startup",
SQLSTATE(HY001) MAL_MALLOC_FAIL);
goto cleanup;
diff --git a/monetdb5/mal/mal_embedded.c b/monetdb5/mal/mal_embedded.c
--- a/monetdb5/mal/mal_embedded.c
+++ b/monetdb5/mal/mal_embedded.c
@@ -100,6 +100,7 @@ malEmbeddedBoot(void)
MCcloseClient(c);
return msg;
}
+#endif
pushEndInstruction(c->curprg->def);
chkProgram(c->usermodule, c->curprg->def);
if ( (msg= c->curprg->def->errors) != MAL_SUCCEED ) {
@@ -107,7 +108,6 @@ malEmbeddedBoot(void)
return msg;
}
msg = MALengine(c);
-#endif
embeddedinitialized = true;
MCcloseClient(c);
return msg;
diff --git a/monetdb5/modules/mal/inspect.mal b/monetdb5/modules/mal/inspect.mal
--- a/monetdb5/modules/mal/inspect.mal
+++ b/monetdb5/modules/mal/inspect.mal
@@ -6,6 +6,10 @@
module inspect;
+pattern optimizer_stats()(:bat[:str], :bat[:int], :bat[:lng])
+address OPTstatistics
+comment "Get optimizer use statistics, i.e. calls and total time";
+
pattern getDefinition(mod:str,fcn:str) :bat[:str]
address INSPECTgetDefinition
comment "Returns a string representation of a specific function.";
diff --git a/monetdb5/optimizer/optimizer.mal b/monetdb5/optimizer/optimizer.mal
--- a/monetdb5/optimizer/optimizer.mal
+++ b/monetdb5/optimizer/optimizer.mal
@@ -243,12 +243,6 @@ pattern optimizer.reorder(mod:str, fcn:s
address OPTwrapper
comment "Reorder by dataflow dependencies";
-#opt_statistics.mal
-
-pattern inspect.optimizer_stats()(:bat[:str], :bat[:int], :bat[:lng])
-address OPTstatistics
-comment "Get optimizer use statistics, i.e. calls and total time";
-
#opt_pushselect.mal
pattern optimizer.pushselect():str
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
@@ -17,6 +17,7 @@ include_directories(${CMAKE_CURRENT_BINA
../../../monetdb5/extras/rapi
../../../common/stream ../../../common/utils ../../scripts)
set(SQL_MAL_SCRIPTS_LIST
+ "${CMAKE_CURRENT_SOURCE_DIR}/sql_sysmon.mal"
"${CMAKE_CURRENT_SOURCE_DIR}/sqlcatalog.mal"
"${CMAKE_CURRENT_SOURCE_DIR}/sql_transaction.mal"
"${CMAKE_CURRENT_SOURCE_DIR}/sql_decimal.mal"
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -262,19 +262,24 @@ SQLabort(Client cntxt, MalBlkPtr mb, Mal
return msg;
}
-#ifndef HAVE_EMBEDDED
str
SQLshutdown_wrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
- str msg;
-
+ str msg = MAL_SUCCEED;
+
+#ifdef HAVE_EMBEDDED
+ (void) cntxt;
+ (void) mb;
+ (void) stk;
+ (void) pci;
+#else
if ((msg = CLTshutdown(cntxt, mb, stk, pci)) == MAL_SUCCEED) {
/* administer the shutdown */
mnstr_printf(GDKstdout, "#%s\n", *getArgReference_str(stk, pci,
0));
}
+#endif
return msg;
}
-#endif
str
create_table_or_view(mvc *sql, char* sname, char *tname, sql_table *t, int
temp)
diff --git a/sql/backends/monet5/sql.mal b/sql/backends/monet5/sql.mal
--- a/sql/backends/monet5/sql.mal
+++ b/sql/backends/monet5/sql.mal
@@ -579,38 +579,6 @@ comment "Obtain the query log calls";
pattern querylog_empty()
address sql_querylog_empty;
-command querylog_enable()
-address QLOGenable;
-command querylog_enable(thres:int)
-address QLOGenableThreshold;
-command querylog_disable()
-address QLOGdisable;
-
-
-pattern sysmon_queue()(qtag:bat[:lng],
user:bat[:str],started:bat[:timestamp],estimate:bat[:timestamp],progress:bat[:int],
status:bat[:str], tag:bat[:oid], query:bat[:str])
-address SYSMONqueue;
-
-pattern sysmon_pause(tag:sht)
-address SYSMONpause;
-pattern sysmon_pause(tag:int)
-address SYSMONpause;
-pattern sysmon_pause(tag:lng)
-address SYSMONpause;
-
-pattern sysmon_resume(tag:sht)
-address SYSMONresume;
-pattern sysmon_resume(tag:int)
-address SYSMONresume;
-pattern sysmon_resume(tag:lng)
-address SYSMONresume;
-
-pattern sysmon_stop(tag:sht)
-address SYSMONstop;
-pattern sysmon_stop(tag:int)
-address SYSMONstop;
-pattern sysmon_stop(tag:lng)
-address SYSMONstop;
-
pattern copy_rejects() (rowid:bat[:lng], fldid:bat[:int], msg:bat[:str],
inp:bat[:str])
address COPYrejects;
pattern copy_rejects_clear()
diff --git a/sql/backends/monet5/sql_cat.c b/sql/backends/monet5/sql_cat.c
--- a/sql/backends/monet5/sql_cat.c
+++ b/sql/backends/monet5/sql_cat.c
@@ -1449,12 +1449,19 @@ SQLdrop_trigger(Client cntxt, MalBlkPtr
return msg;
}
-#ifndef HAVE_EMBEDDED
str
SQLalter_add_table(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
-{ mvc *sql = NULL;
+{
+#ifdef HAVE_EMBEDDED
+ (void) cntxt;
+ (void) mb;
+ (void) stk;
+ (void) pci;
+ return MAL_SUCCEED;
+#else
+ mvc *sql = NULL;
str msg;
- str sname = *getArgReference_str(stk, pci, 1);
+ str sname = *getArgReference_str(stk, pci, 1);
char *mtname = SaveArgReference(stk, pci, 2);
char *psname = SaveArgReference(stk, pci, 3);
char *ptname = SaveArgReference(stk, pci, 4);
@@ -1462,11 +1469,20 @@ SQLalter_add_table(Client cntxt, MalBlkP
initcontext();
msg = alter_table_add_table(sql, sname, mtname, psname, ptname);
return msg;
+#endif
}
str
SQLalter_add_range_partition(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci)
-{ mvc *sql = NULL;
+{
+#ifdef HAVE_EMBEDDED
+ (void) cntxt;
+ (void) mb;
+ (void) stk;
+ (void) pci;
+ return MAL_SUCCEED;
+#else
+ mvc *sql = NULL;
str msg;
str sname = *getArgReference_str(stk, pci, 1);
char *mtname = SaveArgReference(stk, pci, 2);
@@ -1480,11 +1496,20 @@ SQLalter_add_range_partition(Client cntx
initcontext();
msg = alter_table_add_range_partition(sql, sname, mtname, psname,
ptname, VALget(min), VALget(max), with_nills, update);
return msg;
+#endif
}
str
SQLalter_add_value_partition(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci)
-{ mvc *sql = NULL;
+{
+#ifdef HAVE_EMBEDDED
+ (void) cntxt;
+ (void) mb;
+ (void) stk;
+ (void) pci;
+ return MAL_SUCCEED;
+#else
+ mvc *sql = NULL;
str msg;
str sname = *getArgReference_str(stk, pci, 1);
char *mtname = SaveArgReference(stk, pci, 2);
@@ -1496,11 +1521,20 @@ SQLalter_add_value_partition(Client cntx
initcontext();
msg = alter_table_add_value_partition(sql, stk, pci, sname, mtname,
psname, ptname, with_nills, update);
return msg;
+#endif
}
str
SQLalter_del_table(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
-{ mvc *sql = NULL;
+{
+#ifdef HAVE_EMBEDDED
+ (void) cntxt;
+ (void) mb;
+ (void) stk;
+ (void) pci;
+ return MAL_SUCCEED;
+#else
+ mvc *sql = NULL;
str msg;
str sname = *getArgReference_str(stk, pci, 1);
char *mtname = SaveArgReference(stk, pci, 2);
@@ -1511,8 +1545,8 @@ SQLalter_del_table(Client cntxt, MalBlkP
initcontext();
msg= alter_table_del_table(sql, sname, mtname, psname, ptname,
drop_action);
return msg;
+#endif
}
-#endif
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
