MonetDB: data-vaults - Remove unused functions from the LiDAR vault
Changeset: c158db1c5828 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c158db1c5828
Modified Files:
sql/backends/monet5/vaults/lidar/lidar.c
sql/backends/monet5/vaults/lidar/lidar.h
Branch: data-vaults
Log Message:
Remove unused functions from the LiDAR vault
diffs (47 lines):
diff --git a/sql/backends/monet5/vaults/lidar/lidar.c
b/sql/backends/monet5/vaults/lidar/lidar.c
--- a/sql/backends/monet5/vaults/lidar/lidar.c
+++ b/sql/backends/monet5/vaults/lidar/lidar.c
@@ -2080,7 +2080,8 @@ LIDARunload(Client cntxt, MalBlkPtr mb,
/* Left over code to be examined and scavenged */
-
+/*
+static
str LIDARdir(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
(void) cntxt;
@@ -2123,6 +2124,7 @@ str LIDARdir(Client cntxt, MalBlkPtr mb,
return MAL_SUCCEED;
}
+static
str LIDARdirpat(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
(void) cntxt;
@@ -2146,8 +2148,6 @@ str LIDARdirpat(Client cntxt, MalBlkPtr
snprintf(fulldirectory, BUFSIZ, "%s%s", dir, pat);
glob(fulldirectory, GLOB_DOOFFS, NULL, &globbuf);
- /* fprintf(stderr,"#fulldir: %s \nSize: %lu\n",fulldirectory,
globbuf.gl_pathc);*/
-
if (globbuf.gl_pathc == 0)
throw(MAL, "listdir", "Couldn't open the directory or there are
no files that match the pattern");
@@ -2172,3 +2172,4 @@ str LIDARdirpat(Client cntxt, MalBlkPtr
return MAL_SUCCEED;
}
+*/
diff --git a/sql/backends/monet5/vaults/lidar/lidar.h
b/sql/backends/monet5/vaults/lidar/lidar.h
--- a/sql/backends/monet5/vaults/lidar/lidar.h
+++ b/sql/backends/monet5/vaults/lidar/lidar.h
@@ -23,8 +23,6 @@
#endif
lidar_export str LIDARtest(int *res, str *fname);
-lidar_export str LIDARdir(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-lidar_export str LIDARdirpat(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
lidar_export str LIDARattach(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
lidar_export str LIDARloadTable(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
lidar_export str LIDARexportTable(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: data-vaults - Merge with default
Changeset: c859aeb0e378 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c859aeb0e378 Removed Files: monetdb5/optimizer/opt_statistics.c monetdb5/optimizer/opt_statistics.h Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/eventparser.c clients/mapiclient/eventparser.h gdk/gdk.h gdk/gdk_align.c gdk/gdk_atoms.c gdk/gdk_bat.c gdk/gdk_bbp.c gdk/gdk_hash.c gdk/gdk_heap.c gdk/gdk_logger.c gdk/gdk_logger.h gdk/gdk_private.h gdk/gdk_storage.c gdk/gdk_tm.c gdk/gdk_utils.c gdk/gdk_utils.h geom/monetdb5/geom.c geom/monetdb5/geomBulk.c geom/monetdb5/geom_upgrade.c monetdb5/extras/mal_optimizer_template/opt_sql_append.c monetdb5/mal/mal.c monetdb5/mal/mal_authorize.c monetdb5/mal/mal_client.c monetdb5/mal/mal_dataflow.c monetdb5/mal/mal_factory.c monetdb5/mal/mal_function.c monetdb5/mal/mal_function.h monetdb5/mal/mal_instruction.c monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_listing.c monetdb5/mal/mal_listing.h monetdb5/mal/mal_profiler.c monetdb5/mal/mal_resolve.c monetdb5/mal/mal_resource.c monetdb5/modules/atoms/color.c monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/str.c monetdb5/modules/atoms/uuid.c monetdb5/modules/kernel/aggr.c monetdb5/modules/kernel/bat5.c monetdb5/modules/mal/batExtensions.c monetdb5/modules/mal/batcalc.c monetdb5/modules/mal/bbp.c monetdb5/modules/mal/calc.c monetdb5/modules/mal/clients.c monetdb5/modules/mal/groupby.c monetdb5/modules/mal/groupby.h monetdb5/modules/mal/inspect.c monetdb5/modules/mal/json_util.h monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/manifold.c monetdb5/modules/mal/mdb.c monetdb5/modules/mal/oltp.c monetdb5/modules/mal/orderidx.c monetdb5/modules/mal/querylog.c monetdb5/modules/mal/remote.c monetdb5/modules/mal/tablet.c monetdb5/optimizer/Makefile.ag monetdb5/optimizer/opt_aliases.c monetdb5/optimizer/opt_aliases.h monetdb5/optimizer/opt_candidates.c monetdb5/optimizer/opt_candidates.h monetdb5/optimizer/opt_coercion.c monetdb5/optimizer/opt_coercion.h monetdb5/optimizer/opt_commonTerms.c monetdb5/optimizer/opt_commonTerms.h monetdb5/optimizer/opt_constants.c monetdb5/optimizer/opt_constants.h monetdb5/optimizer/opt_costModel.c monetdb5/optimizer/opt_costModel.h monetdb5/optimizer/opt_dataflow.c monetdb5/optimizer/opt_dataflow.h monetdb5/optimizer/opt_datavaults.c monetdb5/optimizer/opt_datavaults.h monetdb5/optimizer/opt_deadcode.c monetdb5/optimizer/opt_deadcode.h monetdb5/optimizer/opt_emptybind.c monetdb5/optimizer/opt_emptybind.h monetdb5/optimizer/opt_evaluate.c monetdb5/optimizer/opt_evaluate.h monetdb5/optimizer/opt_garbageCollector.c monetdb5/optimizer/opt_garbageCollector.h monetdb5/optimizer/opt_generator.c monetdb5/optimizer/opt_generator.h monetdb5/optimizer/opt_inline.c monetdb5/optimizer/opt_inline.h monetdb5/optimizer/opt_jit.c monetdb5/optimizer/opt_jit.h monetdb5/optimizer/opt_json.c monetdb5/optimizer/opt_json.h monetdb5/optimizer/opt_macro.c monetdb5/optimizer/opt_macro.h monetdb5/optimizer/opt_matpack.c monetdb5/optimizer/opt_matpack.h monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_mergetable.h monetdb5/optimizer/opt_mitosis.c monetdb5/optimizer/opt_mitosis.h monetdb5/optimizer/opt_multiplex.c monetdb5/optimizer/opt_multiplex.h monetdb5/optimizer/opt_oltp.c monetdb5/optimizer/opt_oltp.h monetdb5/optimizer/opt_profiler.c monetdb5/optimizer/opt_profiler.h monetdb5/optimizer/opt_projectionpath.c monetdb5/optimizer/opt_projectionpath.h monetdb5/optimizer/opt_pushselect.c monetdb5/optimizer/opt_pushselect.h monetdb5/optimizer/opt_querylog.c monetdb5/optimizer/opt_querylog.h monetdb5/optimizer/opt_reduce.c monetdb5/optimizer/opt_reduce.h monetdb5/optimizer/opt_remap.c monetdb5/optimizer/opt_remap.h monetdb5/optimizer/opt_remoteQueries.c monetdb5/optimizer/opt_remoteQueries.h monetdb5/optimizer/opt_reorder.c monetdb5/optimizer/opt_reorder.h monetdb5/optimizer/opt_support.c monetdb5/optimizer/opt_support.h monetd
MonetDB: data-vaults - Approve tests
Changeset: 77b0b2c30f69 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=77b0b2c30f69 Modified Files: sql/test/leaks/Tests/check1.stable.out.int128 sql/test/leaks/Tests/check2.stable.out.int128 sql/test/leaks/Tests/check3.stable.out.int128 sql/test/leaks/Tests/check4.stable.out.int128 sql/test/leaks/Tests/check5.stable.out.int128 sql/test/leaks/Tests/drop3.stable.out sql/test/leaks/Tests/drop3.stable.out.int128 Branch: data-vaults Log Message: Approve tests diffs (truncated from 529 to 300 lines): diff --git a/sql/test/leaks/Tests/check1.stable.out.int128 b/sql/test/leaks/Tests/check1.stable.out.int128 --- a/sql/test/leaks/Tests/check1.stable.out.int128 +++ b/sql/test/leaks/Tests/check1.stable.out.int128 @@ -43,10 +43,10 @@ Ready. [ "bit", 5 ] [ "bit", 60 ] [ "bit", 385 ] -[ "bit", 1738] -[ "bit", 1738] -[ "bit", 1738] -[ "bte", 4892] +[ "bit", 1735] +[ "bit", 1735] +[ "bit", 1735] +[ "bte", 4887] [ "int", 0 ] [ "int", 0 ] [ "int", 0 ] @@ -79,8 +79,6 @@ Ready. [ "int", 0 ] [ "int", 0 ] [ "int", 1 ] -[ "int", 1 ] -[ "int", 1 ] [ "int", 3 ] [ "int", 3 ] [ "int", 5 ] @@ -118,18 +116,18 @@ Ready. [ "int", 385 ] [ "int", 389 ] [ "int", 389 ] -[ "int", 1738] -[ "int", 1738] -[ "int", 1738] -[ "int", 1738] -[ "int", 1738] +[ "int", 1735] +[ "int", 1735] +[ "int", 1735] +[ "int", 1735] +[ "int", 1735] [ "int", 3911] [ "int", 3911] -[ "int", 4892] -[ "int", 4892] -[ "int", 4892] -[ "int", 4892] -[ "int", 4892] +[ "int", 4887] +[ "int", 4887] +[ "int", 4887] +[ "int", 4887] +[ "int", 4887] [ "lng", 0 ] [ "lng", 0 ] [ "lng", 0 ] @@ -166,7 +164,6 @@ Ready. [ "lng", 0 ] [ "lng", 0 ] [ "lng", 0 ] -[ "lng", 1 ] [ "oid", 0 ] [ "oid", 0 ] [ "oid", 0 ] @@ -282,7 +279,6 @@ Ready. [ "str", 1 ] [ "str", 1 ] [ "str", 1 ] -[ "str", 1 ] [ "str", 3 ] [ "str", 3 ] [ "str", 5 ] @@ -305,14 +301,14 @@ Ready. [ "str", 385 ] [ "str", 385 ] [ "str", 385 ] -[ "str", 1738] -[ "str", 1738] -[ "str", 1738] +[ "str", 1735] +[ "str", 1735] +[ "str", 1735] [ "str", 3911] [ "str", 3911] [ "str", 3911] -[ "str", 4892] -[ "str", 4892] +[ "str", 4887] +[ "str", 4887] [ "timestamp", 0 ] [ "timestamp", 0 ] #select 'transient', count(*) from bbp() as bbp where kind like 'tran%'; @@ -326,7 +322,7 @@ Ready. % L2, L5 # name % char,bigint # type % 10, 3 # length -[ "persistent",282 ] +[ "persistent",278 ] # 16:21:16 > # 16:21:16 > "Done." diff --git a/sql/test/leaks/Tests/check2.stable.out.int128 b/sql/test/leaks/Tests/check2.stable.out.int128 --- a/sql/test/leaks/Tests/check2.stable.out.int128 +++ b/sql/test/leaks/Tests/check2.stable.out.int128 @@ -43,10 +43,10 @@ Ready. [ "bit", 5 ] [ "bit", 60 ] [ "bit", 385 ] -[ "bit", 1738] -[ "bit", 1738] -[ "bit", 1738] -[ "bte", 4892] +[ "bit", 1735] +[ "bit", 1735] +[ "bit", 1735] +[ "bte", 4887] [ "int", 0 ] [ "int", 0 ] [ "int", 0 ] @@ -79,8 +79,6 @@ Ready. [ "int", 0 ] [ "int", 0 ] [ "int", 1 ] -[ "int", 1 ] -[ "int", 1 ] [ "int", 3 ] [ "int", 3 ] [ "int", 5 ] @@ -118,18 +116,18 @@ Ready. [ "int", 385 ] [ "int", 389 ] [ "int", 389 ] -[ "int", 1738] -[ "int", 1738] -[ "int", 1738] -[ "int", 1738] -[ "int", 1738] +[ "int", 1735] +[ "int", 1735] +[ "int", 1735] +[ "int", 1735] +[ "int", 1735] [ "int", 3911] [ "int", 3911] -[ "int", 4892] -[ "int", 4892] -[ "int", 4892] -[ "int", 4892] -[ "int", 4892] +[ "int", 4887] +[ "int", 4887] +[ "int", 4887] +[ "int", 4887] +[ "int", 4887] [ "lng", 0 ] [ "lng", 0 ] [ "lng", 0 ] @@ -166,7 +164,6 @@ Ready. [ "lng",
MonetDB: Dec2016 - fix bug 6245, ie properly handle outer-join i...
Changeset: ad28781a31b5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ad28781a31b5
Modified Files:
sql/backends/monet5/sql_gencode.c
sql/server/rel_optimizer.c
Branch: Dec2016
Log Message:
fix bug 6245, ie properly handle outer-join in apply rewriter
diffs (24 lines):
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
@@ -474,7 +474,7 @@ static int
const char *nme =
(op->op3)?op->op3->op4.aval->data.val.sval:op->cname;
char buf[64];
- if (op->op3)
+ if (nme[0] != 'A')
snprintf(buf,64,"A%s",nme);
else
snprintf(buf,64,"%s",nme);
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -8358,7 +8358,7 @@ rel_apply_rewrite(int *changes, mvc *sql
return l;
}
}
- if (rel->flag == APPLY_LOJ && r->op == op_select) {
+ if (rel->flag == APPLY_LOJ && (r->op == op_select || is_join(r->op))) {
sql_rel *nr, *ns;
nr = rel_project(sql->sa, rel_dup(r),
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Dec2016 - fixed bug 6246, ie handle alias in with subquery
Changeset: 235ab012ead8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=235ab012ead8
Added Files:
sql/test/BugTracker-2017/Tests/with-alias-bug.6246.sql
sql/test/BugTracker-2017/Tests/with-alias-bug.6246.stable.err
sql/test/BugTracker-2017/Tests/with-alias-bug.6246.stable.out
Modified Files:
sql/server/rel_select.c
sql/test/BugTracker-2012/Tests/with_in_derived_table.Bug-3043.stable.out
sql/test/BugTracker-2017/Tests/All
sql/test/remote/Tests/ssbm.stable.out
sql/test/remote/Tests/ssbm.stable.out.int128
Branch: Dec2016
Log Message:
fixed bug 6246, ie handle alias in with subquery
diffs (truncated from 457 to 300 lines):
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -306,7 +306,15 @@ query_exp_optname(mvc *sql, sql_rel *r,
{
switch (q->token) {
case SQL_WITH:
- return rel_with_query(sql, q);
+ {
+ sql_rel *tq = rel_with_query(sql, q);
+
+ if (!tq)
+ return NULL;
+ if (q->data.lval->t->type == type_symbol)
+ return rel_table_optname(sql, tq,
q->data.lval->t->data.sym);
+ return tq;
+ }
case SQL_UNION:
case SQL_EXCEPT:
case SQL_INTERSECT:
diff --git
a/sql/test/BugTracker-2012/Tests/with_in_derived_table.Bug-3043.stable.out
b/sql/test/BugTracker-2012/Tests/with_in_derived_table.Bug-3043.stable.out
--- a/sql/test/BugTracker-2012/Tests/with_in_derived_table.Bug-3043.stable.out
+++ b/sql/test/BugTracker-2012/Tests/with_in_derived_table.Bug-3043.stable.out
@@ -27,7 +27,7 @@ Ready.
#WITH x AS (SELECT 1)
#SELECT * FROM x
#) y;
-% .x # table_name
+% .y # table_name
% L2 # name
% tinyint # type
% 1 # length
diff --git a/sql/test/BugTracker-2017/Tests/All
b/sql/test/BugTracker-2017/Tests/All
--- a/sql/test/BugTracker-2017/Tests/All
+++ b/sql/test/BugTracker-2017/Tests/All
@@ -3,7 +3,7 @@ insert_self_ref_FK.Bug-6131
shutdown.Bug-6182
avggroupbysq.Bug-6178
semijoinunion.Bug-6150
-HAVE_LIBZ?heapextend.Bug-6134
+#HAVE_LIBZ?heapextend.Bug-6134
incorrect_error.Bug-6141
empty-interval.Bug-6184
crash_in_null_cast.Bug-6186
@@ -26,3 +26,4 @@ prepare.Bug-6133
null-quantile.Bug-6218
real-power.Bug-6228
one-plus-nil.Bug-6243
+with-alias-bug.6246
diff --git a/sql/test/BugTracker-2017/Tests/with-alias-bug.6246.sql
b/sql/test/BugTracker-2017/Tests/with-alias-bug.6246.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/with-alias-bug.6246.sql
@@ -0,0 +1,38 @@
+CREATE TABLE test1 (A INT NOT NULL, B INT NOT NULL DEFAULT -1);
+INSERT INTO test1(A) VALUES (1), (2), (3);
+
+CREATE TABLE test2 (X INT NOT NULL);
+INSERT INTO test2 VALUES (10), (20);
+
+
+UPDATE test1
+SET B = test3.X *10
+FROM (
+ WITH test3 AS (SELECT * FROM test2)
+ SELECT X FROM test3
+) AS t2
+WHERE 10 * A = test3.X;
+
+SELECT * FROM test1;
+/*
++--+--+
+| a| b|
++==+==+
+|1 | 100 |
+|2 | 200 |
+|3 | -1 |
++--+--+
+*/
+
+UPDATE test1
+SET B = t2.X
+FROM (
+ WITH test3 AS (SELECT * FROM test2)
+ SELECT X FROM test3
+) AS t2
+WHERE 10 * A = t2.X;
+-- SELECT: no such column 't2.x'
+
+-- cleanup
+DROP TABLE test1;
+DROP TABLE test2;
diff --git a/sql/test/BugTracker-2017/Tests/with-alias-bug.6246.stable.err
b/sql/test/BugTracker-2017/Tests/with-alias-bug.6246.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2017/Tests/with-alias-bug.6246.stable.err
@@ -0,0 +1,43 @@
+stderr of test 'with-alias-bug.6246` in directory 'sql/test/BugTracker-2017`
itself:
+
+
+# 21:42:55 >
+# 21:42:55 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32448" "--set"
"mapi_usock=/var/tmp/mtest-11663/.s.monetdb.32448" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017"
+# 21:42:55 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 5
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 32448
+# cmdline opt mapi_usock = /var/tmp/mtest-11663/.s.monetdb.32448
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2017
+# cmdline opt gdk_debug = 536870922
+
+# 21:42:55 >
+# 21:42:55 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-11663" "--port=32448"
+# 21:42:55 >
+
+MAPI = (monetdb) /var/tmp/mte
MonetDB: default - Always initialize the trace tables.
Changeset: eedc54068b87 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eedc54068b87
Modified Files:
monetdb5/mal/mal_profiler.c
Branch: default
Log Message:
Always initialize the trace tables.
diffs (11 lines):
diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -624,6 +624,7 @@ static BAT *TRACE_id_stmt = 0;
int
TRACEtable(BAT **r)
{
+ initTrace();
MT_lock_set(&mal_profileLock);
if (TRACE_init == 0) {
MT_lock_unset(&mal_profileLock);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
