MonetDB: mtestplusplus - Merge with default.
Changeset: 13256f288ffc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=13256f288ffc
Modified Files:
monetdb5/optimizer/opt_wrapper.c
sql/backends/monet5/sql_upgrades.c
Branch: mtestplusplus
Log Message:
Merge with default.
diffs (76 lines):
diff --git a/monetdb5/optimizer/opt_wrapper.c b/monetdb5/optimizer/opt_wrapper.c
--- a/monetdb5/optimizer/opt_wrapper.c
+++ b/monetdb5/optimizer/opt_wrapper.c
@@ -104,8 +104,8 @@ str OPTwrapper (Client cntxt, MalBlkPtr
str msg = MAL_SUCCEED;
lng clk;
-if (cntxt->mode == FINISHCLIENT)
-throw(MAL, "optimizer", "prematurely stopped client");
+ if (cntxt->mode == FINISHCLIENT)
+ throw(MAL, "optimizer", "prematurely stopped client");
if( p == NULL)
throw(MAL, "opt_wrapper", "missing optimizer statement");
@@ -154,8 +154,7 @@ str OPTwrapper (Client cntxt, MalBlkPtr
if (codes[i].nme == 0)
throw(MAL, optimizer, "Optimizer implementation '%s' missing",
fcnnme);
- //OPTIMIZERDEBUG {
- {
+ OPTIMIZERDEBUG {
fprintf(stderr,"=FINISHED %s %d\n",optimizer, actions);
fprintFunction(stderr,mb,0,LIST_MAL_DEBUG );
}
diff --git a/sql/backends/monet5/sql_upgrades.c
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -1036,25 +1036,32 @@ sql_update_default_geom(Client c, mvc *s
}
static str
-sql_remove_environment_func(Client c)
+sql_remove_environment_func(Client c, mvc *sql)
{
+ sql_schema *s = NULL;
+ sql_table *t = NULL;
size_t bufsize = 1000, pos = 0;
char *buf = GDKmalloc(bufsize), *err = NULL;
if (buf== NULL)
throw(SQL, "sql_remove_environment_func", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
+ /* because issueing sql: "drop view sys.environment cascade;" fails
with with error: !SQLException:sql.drop_view:42000!DROP VIEW: cannot drop
system view 'environment'
+ we need to drop the system view using internal function:
mvc_drop_table() */
+ s = mvc_bind_schema(sql, "sys");
+ t = mvc_bind_table(sql, s, "environment");
+ mvc_drop_table(sql, s, t, 1); // drop the system view:
sys.environment cascade
+
pos += snprintf(buf + pos, bufsize - pos,
- "drop view sys.environment cascade;\n"
- "drop function sys.environment() cascade\n"
+ "drop function sys.environment() cascade;\n"
"create view sys.environment as select * from
sys.env();\n"
"GRANT SELECT ON sys.environment TO PUBLIC;\n"
- "update sys._tables set system = true where name =
'environment' and schema_id in (select id from schemas where name = 'sys');\n");
+ "update sys._tables set system = true where system =
false and name = 'environment' and schema_id in (select id from schemas where
name = 'sys');\n");
pos += snprintf(buf + pos, bufsize - pos,
"delete from sys.systemfunctions where function_id not
in (select id from sys.functions);\n");
assert(pos < bufsize);
- printf("Running database upgrade commands:\n%s\n", buf);
+ printf("Running database upgrade commands:\ndrop view sys.environment
cascade;\n%s\n", buf);
err = SQLstatementIntern(c, &buf, "update", 1, 0, NULL);
GDKfree(buf);
return err; /* usually MAL_SUCCEED */
@@ -1176,8 +1183,8 @@ SQLupgrades(Client c, mvc *m)
}
}
- if (sql_bind_func(m->sa, s, "environment", NULL, NULL, F_FUNC)) {
- if ((err = sql_remove_environment_func(c)) != NULL) {
+ if (sql_bind_func_(m->sa, s, "environment", NULL, F_UNION)) {
+ if ((err = sql_remove_environment_func(c, m)) != NULL) {
fprintf(stderr, "!%s\n", err);
freeException(err);
}
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: mtestplusplus - Remove debug code.
Changeset: e30ea2f0ab4f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e30ea2f0ab4f
Modified Files:
testing/Mtest.py.in
Branch: mtestplusplus
Log Message:
Remove debug code.
diffs (11 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -4386,7 +4386,6 @@ def main(argv) :
if verbose:
print("\nRunning all tests in directories %s.\n" %
str(testdirs))
-parallel_mode = True
if not parallel_mode:
for d in testdirs:
perform_dir((d, 0, env, BusyPorts))
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: mosaic - Merge with default
Changeset: 967c2584fdea for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=967c2584fdea Added Files: monetdb5/optimizer/opt_postfix.c monetdb5/optimizer/opt_postfix.h sql/test/BugTracker-2017/Tests/createorreplace-system-func.Bug-6499.sql sql/test/BugTracker-2017/Tests/createorreplace-system-func.Bug-6499.stable.err sql/test/BugTracker-2017/Tests/createorreplace-system-func.Bug-6499.stable.out sql/test/BugTracker-2017/Tests/select-in-returns-null.Bug-6491.sql sql/test/BugTracker-2017/Tests/select-in-returns-null.Bug-6491.stable.err sql/test/BugTracker-2017/Tests/select-in-returns-null.Bug-6491.stable.out sql/test/BugTracker-2017/Tests/sqlitelogictest-algebra-operators.Bug-6494.stable.err sql/test/BugTracker-2017/Tests/sqlitelogictest-algebra-operators.Bug-6494.stable.out sql/test/BugTracker-2017/Tests/sqlitelogictest-comparisons-between-floating-points-and-NULL.Bug-6496.stable.err sql/test/BugTracker-2017/Tests/sqlitelogictest-comparisons-between-floating-points-and-NULL.Bug-6496.stable.out sql/test/BugTracker-2017/Tests/sqlitelogictest-hidden-alias.Bug-6495.stable.err sql/test/BugTracker-2017/Tests/sqlitelogictest-hidden-alias.Bug-6495.stable.out sql/test/BugTracker-2017/Tests/sqlitelogictest-min-distinct-empty-table.Bug-6493.stable.err sql/test/BugTracker-2017/Tests/sqlitelogictest-min-distinct-empty-table.Bug-6493.stable.out sql/test/BugTracker-2017/Tests/sqlitelogictest-not-between.Bug-6497.stable.err sql/test/BugTracker-2017/Tests/sqlitelogictest-not-between.Bug-6497.stable.out sql/test/BugTracker-2017/Tests/union_all_null.Bug-6487.sql sql/test/BugTracker-2017/Tests/union_all_null.Bug-6487.stable.err sql/test/BugTracker-2017/Tests/union_all_null.Bug-6487.stable.out Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out gdk/gdk_search.c monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/algebra.h monetdb5/modules/kernel/algebra.mal monetdb5/optimizer/Makefile.ag monetdb5/optimizer/opt_deadcode.c monetdb5/optimizer/opt_pipes.c monetdb5/optimizer/opt_support.c monetdb5/optimizer/opt_wrapper.c monetdb5/optimizer/optimizer.mal sql/backends/monet5/UDF/udf/Tests/udf-fuse.stable.out sql/backends/monet5/UDF/udf/Tests/udf-reverse.stable.out sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_upgrades.c sql/common/sql_types.c sql/jdbc/tests/Tests/Test_Rtimedate.stable.out sql/server/rel_optimizer.c sql/server/rel_psm.c sql/server/rel_select.c sql/server/sql_atom.c sql/server/sql_parser.y sql/server/sql_qc.c sql/server/sql_qc.h sql/server/sql_semantic.h sql/test/BugDay_2005-10-06_2.9.3/Tests/simple_union.SF-1005596.stable.out sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out sql/test/BugTracker-2012/Tests/null_except_null.Bug-3040.stable.out sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.err.int128 sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.out sql/test/BugTracker-2014/Tests/hexadecimal_literals.Bug-3621.stable.out.int128 sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.stable.out.int128 sql/test/BugTracker-2016/Tests/select-in-from.Bug-6121.stable.out sql/test/BugTracker-2017/Tests/All sql/test/BugTracker-2017/Tests/distinct_minus_count_distinct.Bug-6296.stable.out sql/test/BugTracker-2017/Tests/limit.Bug-6322.stable.out sql/test/BugTracker-2017/Tests/spurious_error.Bug-6344.stable.out sql/test/BugTracker-2017/Tests/sqlitelogictest-comparisons-between-floating-points-and-NULL.Bug-6496.sql sql/test/BugTracker-2017/Tests/sqlitelogictest-select-in-column.Bug-6490.stable.out sql/test/BugTracker-2017/Tests/sqllitelogistest_case.Bug-6335.stable.err sql/test/BugTracker-2017/Tests/sqllitelogistest_case.Bug-6335.stable.out sql/test/BugTracker-2017/Tests/type-resolution-error.Bugs-6313.stable.err sql/test/Tests/setoptimizer.stable.out sql/test/bugs/Tests/subselect_multiple_unionall_where_1=1-bug-sf-1005596.stable.out sql/test/bugs/Tests/union_all-bug-sf-941788.stable.out sql/test/mapi/Tests/sql_int128.stable.out.int128 sql/test/mergetables/Tests/mergequery.stable.o
