Changeset: ee7daea58b76 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/ee7daea58b76
Branch: multi-cachelock
Log Message:
merged with default
diffs (71 lines):
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
@@ -91,6 +91,10 @@ rel_no_mitosis(mvc *sql, sql_rel *rel)
}
if (is_topn(rel->op) || is_sample(rel->op) ||
is_simple_project(rel->op))
return rel_no_mitosis(sql, rel->l);
+ if (is_ddl(rel->op) && rel->flag == ddl_output) {
+ // COPY SELECT ... INTO
+ return rel_no_mitosis(sql, rel->l);
+ }
if ((is_delete(rel->op) || is_truncate(rel->op)) && rel->card <=
CARD_AGGR)
return 1;
if ((is_insert(rel->op) || is_update(rel->op)) && rel->card <=
CARD_AGGR)
diff --git a/sql/backends/monet5/sql_gencode.c
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -1436,16 +1436,8 @@ backend_create_sql_func(backend *be, sql
if (!r)
return -1;
-#ifndef NDEBUG
- /* for debug builds we keep the SQL function name in the MAL function
name to make it easy to debug */
- if (strlen(f->base.name) + 21 >= IDLENGTH) { /* 20 bits for u64 number
+ '%' */
- (void) sql_error(m, 10, SQLSTATE(42000) "MAL function name '%s'
too large for the backend", f->base.name);
- return -1;
- }
- (void) snprintf(befname, IDLENGTH, "%%" LLFMT "%s",
store_function_counter(m->store), f->base.name);
-#else
(void) snprintf(befname, IDLENGTH, "f_" LLFMT,
store_function_counter(m->store));
-#endif
+ TRC_INFO(SQL_PARSER, "Mapping SQL name '%s' to MAL name '%s'\n",
f->base.name, befname);
symbackup = c->curprg;
memcpy(&bebackup, be, sizeof(backend)); /* backup current backend */
backend_reset(be);
diff --git a/sql/test/miscellaneous/Tests/All b/sql/test/miscellaneous/Tests/All
--- a/sql/test/miscellaneous/Tests/All
+++ b/sql/test/miscellaneous/Tests/All
@@ -22,7 +22,7 @@ unique_keys
vessels
prepare
HAVE_HGE?rel_push_count_down
-NOT_ASSERT?sqlfuncnames
+sqlfuncnames
sequences
analyze_test
blobs
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -91,9 +91,6 @@ endif(HAVE_GETENTROPY)
if (NOT WIN32)
set(NOT_WIN32_FALSE "#")
endif()
-if(NOT ASSERT)
- set(NOT_ASSERT_FALSE "#")
-endif()
configure_file(Mtest.py.in
${CMAKE_CURRENT_BINARY_DIR}/Mtest.py
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -385,7 +385,6 @@ CONDITIONALS = {
'HAVE_GETENTROPY' : "@HAVE_GETENTROPY_FALSE@",
'NATIVE_WIN32' : "@NATIVE_WIN32_FALSE@",
'NOT_WIN32' : "@NOT_WIN32_FALSE@",
- 'NOT_ASSERT' : "@NOT_ASSERT_FALSE@",
# unknown at compile time;
# hence, we set them only at runtime in main() below
'KNOWNFAIL' : False, # skip on release branch when not in
testweb
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
