MonetDB: default - R Connector: another missing sys.
Changeset: a54e78551a97 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a54e78551a97
Modified Files:
clients/R/MonetDB.R/R/monetdb.R
Branch: default
Log Message:
R Connector: another missing sys.
diffs (12 lines):
diff --git a/clients/R/MonetDB.R/R/monetdb.R b/clients/R/MonetDB.R/R/monetdb.R
--- a/clients/R/MonetDB.R/R/monetdb.R
+++ b/clients/R/MonetDB.R/R/monetdb.R
@@ -148,7 +148,7 @@ setMethod(dbDisconnect, MonetDBConnec
})
setMethod(dbListTables, MonetDBConnection, def=function(conn, ...,
sys_tables=F, schema_names=F, quote=F) {
- q - select schemas.name as sn, tables.name as tn from tables join
sys.schemas on tables.schema_id=schemas.id
+ q - select schemas.name as sn, tables.name as tn from sys.tables join
sys.schemas on tables.schema_id=schemas.id
if (!sys_tables) q - paste0(q, where tables.system=false)
df - dbGetQuery(conn, q)
if (quote) {
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jan2014 - FreeBSD readlink needs argument to exist.
Changeset: 7b2acbba6a8b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7b2acbba6a8b Modified Files: buildtools/autogen/autogen/am.py Branch: Jan2014 Log Message: FreeBSD readlink needs argument to exist. diffs (12 lines): diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py --- a/buildtools/autogen/autogen/am.py +++ b/buildtools/autogen/autogen/am.py @@ -1046,7 +1046,7 @@ def am_ant(fd, var, ant, am): if COND in ant: fd.write(\nif + ant[COND][0] +\n\n) -fd.write(\n%s_ant_target:\n\t\$(ANT)\ -f \`$(anttranslatepath) $(srcdir)/build.xml`\ -Dbuilddir=\`$(anttranslatepath) $(PWD)/%s`\ -Djardir=\`$(anttranslatepath) $(PWD)`\ -Dbasedir=\`$(anttranslatepath) $(srcdir)`\ %s\n % (target, target, target)) +fd.write(\n%s_ant_target:\n\t\$(ANT)\ -f \`$(anttranslatepath) $(srcdir)/build.xml`\ -Dbuilddir=\`$(anttranslatepath) $(PWD)`/%s\ -Djardir=\`$(anttranslatepath) $(PWD)`\ -Dbasedir=\`$(anttranslatepath) $(srcdir)`\ %s\n % (target, target, target)) for file in ant['FILES']: sfile = file.replace(., _) ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jan2014 branch.
Changeset: 8de156c8d9c1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8de156c8d9c1
Added Files:
sql/test/BugTracker-2014/Tests/union_with_subqueries.Bug-3518.sql
sql/test/BugTracker-2014/Tests/union_with_subqueries.Bug-3518.stable.err
sql/test/BugTracker-2014/Tests/union_with_subqueries.Bug-3518.stable.out
sql/test/BugTracker-2014/Tests/varchar_conversion_crash.Bug-3506.sql
sql/test/BugTracker-2014/Tests/varchar_conversion_crash.Bug-3506.stable.err
sql/test/BugTracker-2014/Tests/varchar_conversion_crash.Bug-3506.stable.out
Modified Files:
buildtools/autogen/autogen/am.py
monetdb5/optimizer/opt_mergetable.c
sql/backends/monet5/rel_bin.c
sql/server/rel_optimizer.c
sql/test/BugTracker-2014/Tests/All
Branch: default
Log Message:
Merge with Jan2014 branch.
diffs (251 lines):
diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py
--- a/buildtools/autogen/autogen/am.py
+++ b/buildtools/autogen/autogen/am.py
@@ -1046,7 +1046,7 @@ def am_ant(fd, var, ant, am):
if COND in ant:
fd.write(\nif + ant[COND][0] +\n\n)
-fd.write(\n%s_ant_target:\n\t\$(ANT)\ -f \`$(anttranslatepath)
$(srcdir)/build.xml`\ -Dbuilddir=\`$(anttranslatepath) $(PWD)/%s`\
-Djardir=\`$(anttranslatepath) $(PWD)`\ -Dbasedir=\`$(anttranslatepath)
$(srcdir)`\ %s\n % (target, target, target))
+fd.write(\n%s_ant_target:\n\t\$(ANT)\ -f \`$(anttranslatepath)
$(srcdir)/build.xml`\ -Dbuilddir=\`$(anttranslatepath) $(PWD)`/%s\
-Djardir=\`$(anttranslatepath) $(PWD)`\ -Dbasedir=\`$(anttranslatepath)
$(srcdir)`\ %s\n % (target, target, target))
for file in ant['FILES']:
sfile = file.replace(., _)
diff --git a/monetdb5/optimizer/opt_mergetable.c
b/monetdb5/optimizer/opt_mergetable.c
--- a/monetdb5/optimizer/opt_mergetable.c
+++ b/monetdb5/optimizer/opt_mergetable.c
@@ -710,18 +710,6 @@ mat_aggr(MalBlkPtr mb, InstrPtr p, mat_t
s = pushArgument(mb, s, getArg(r,0));
pushInstruction(mb, s);
r = s;
-
-/* DEAD CODE FOUND BY COVERITY
- if (isAvg) {
- s = newInstruction(mb,ASSIGNsymbol);
- setModuleId(s, algebraRef);
- setFunctionId(s, selectNotNilRef);
- getArg(s,0) = newTmpVariable(mb, battp2);
- s = pushArgument(mb, s, getArg(u,0));
- pushInstruction(mb, s);
- u = s;
- }
-*/
}
/* for avg we do sum (avg*(count/sumcount) ) */
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -2516,7 +2516,9 @@ rel2bin_groupby( mvc *sql, sql_rel *rel,
stmt *aggrstmt = NULL;
- /* first look in the group by column list */
+ /* first look in the current aggr list (l) and group by column
list */
+ if (l !aggrstmt aggrexp-type == e_column)
+ aggrstmt = list_find_column(sql-sa, l, aggrexp-l,
aggrexp-r);
if (gbexps !aggrstmt aggrexp-type == e_column) {
aggrstmt = list_find_column(sql-sa, gbexps,
aggrexp-l, aggrexp-r);
if (aggrstmt groupby)
diff --git a/sql/test/BugTracker-2014/Tests/All
b/sql/test/BugTracker-2014/Tests/All
--- a/sql/test/BugTracker-2014/Tests/All
+++ b/sql/test/BugTracker-2014/Tests/All
@@ -19,5 +19,7 @@ in_incorrect_multi.Bug-3462
crash_on_groupby_distinct_serial.Bug-3463
local-temp-1.Bug-3468
local-temp-2.Bug-3468
+varchar_conversion_crash.Bug-3506
oid-table-assert.Bug-3514
round-properties.Bug-3515
+union_with_subqueries.Bug-3518
diff --git a/sql/test/BugTracker-2014/Tests/union_with_subqueries.Bug-3518.sql
b/sql/test/BugTracker-2014/Tests/union_with_subqueries.Bug-3518.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/union_with_subqueries.Bug-3518.sql
@@ -0,0 +1,1 @@
+SELECT sum(a), sum(a) FROM (( SELECT 1 AS A ) UNION ALL (SELECT 3 AS A)) AS
query;
diff --git
a/sql/test/BugTracker-2014/Tests/union_with_subqueries.Bug-3518.stable.err
b/sql/test/BugTracker-2014/Tests/union_with_subqueries.Bug-3518.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2014/Tests/union_with_subqueries.Bug-3518.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'union_with_subqueries.Bug-3518` in directory
'sql/test/BugTracker-2014` itself:
+
+
+# 18:48:46
+# 18:48:46 mserver5 --debug=10 --set gdk_nr_threads=0 --set
mapi_open=true --set mapi_port=37060 --set
mapi_usock=/var/tmp/mtest-27766/.s.monetdb.37060 --set monet_prompt=
--forcemito --set mal_listing=2
--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2014
--set mal_listing=0
+# 18:48:46
+
+# builtin opt gdk_dbpath =
MonetDB: bamloader - Merge with default branch.
Changeset: fe4f0ebb6f0f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fe4f0ebb6f0f
Added Files:
sql/test/BugTracker-2014/Tests/union_with_subqueries.Bug-3518.sql
sql/test/BugTracker-2014/Tests/union_with_subqueries.Bug-3518.stable.err
sql/test/BugTracker-2014/Tests/union_with_subqueries.Bug-3518.stable.out
sql/test/BugTracker-2014/Tests/varchar_conversion_crash.Bug-3506.sql
sql/test/BugTracker-2014/Tests/varchar_conversion_crash.Bug-3506.stable.err
sql/test/BugTracker-2014/Tests/varchar_conversion_crash.Bug-3506.stable.out
Modified Files:
buildtools/autogen/autogen/am.py
clients/R/MonetDB.R/R/monetdb.R
monetdb5/optimizer/opt_mergetable.c
sql/backends/monet5/rel_bin.c
sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
sql/benchmarks/tpch/LOCKED/Tests/18.stable.out
sql/benchmarks/tpch/Tests/01-22.stable.out
sql/benchmarks/tpch/Tests/16-explain.stable.out
sql/benchmarks/tpch/Tests/16-plan.stable.out
sql/benchmarks/tpch/Tests/18-explain.stable.out
sql/benchmarks/tpch/Tests/18-plan.stable.out
sql/benchmarks/tpch/Tests/18.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out
sql/benchmarks/tpch/Tests/20-plan.stable.out
sql/server/rel_exp.c
sql/server/rel_optimizer.c
sql/test/BugTracker-2014/Tests/All
Branch: bamloader
Log Message:
Merge with default branch.
diffs (truncated from 1278 to 300 lines):
diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py
--- a/buildtools/autogen/autogen/am.py
+++ b/buildtools/autogen/autogen/am.py
@@ -1046,7 +1046,7 @@ def am_ant(fd, var, ant, am):
if COND in ant:
fd.write(\nif + ant[COND][0] +\n\n)
-fd.write(\n%s_ant_target:\n\t\$(ANT)\ -f \`$(anttranslatepath)
$(srcdir)/build.xml`\ -Dbuilddir=\`$(anttranslatepath) $(PWD)/%s`\
-Djardir=\`$(anttranslatepath) $(PWD)`\ -Dbasedir=\`$(anttranslatepath)
$(srcdir)`\ %s\n % (target, target, target))
+fd.write(\n%s_ant_target:\n\t\$(ANT)\ -f \`$(anttranslatepath)
$(srcdir)/build.xml`\ -Dbuilddir=\`$(anttranslatepath) $(PWD)`/%s\
-Djardir=\`$(anttranslatepath) $(PWD)`\ -Dbasedir=\`$(anttranslatepath)
$(srcdir)`\ %s\n % (target, target, target))
for file in ant['FILES']:
sfile = file.replace(., _)
diff --git a/clients/R/MonetDB.R/R/monetdb.R b/clients/R/MonetDB.R/R/monetdb.R
--- a/clients/R/MonetDB.R/R/monetdb.R
+++ b/clients/R/MonetDB.R/R/monetdb.R
@@ -148,7 +148,7 @@ setMethod(dbDisconnect, MonetDBConnec
})
setMethod(dbListTables, MonetDBConnection, def=function(conn, ...,
sys_tables=F, schema_names=F, quote=F) {
- q - select schemas.name as sn, tables.name as tn from tables join
sys.schemas on tables.schema_id=schemas.id
+ q - select schemas.name as sn, tables.name as tn from sys.tables join
sys.schemas on tables.schema_id=schemas.id
if (!sys_tables) q - paste0(q, where tables.system=false)
df - dbGetQuery(conn, q)
if (quote) {
diff --git a/monetdb5/optimizer/opt_mergetable.c
b/monetdb5/optimizer/opt_mergetable.c
--- a/monetdb5/optimizer/opt_mergetable.c
+++ b/monetdb5/optimizer/opt_mergetable.c
@@ -710,18 +710,6 @@ mat_aggr(MalBlkPtr mb, InstrPtr p, mat_t
s = pushArgument(mb, s, getArg(r,0));
pushInstruction(mb, s);
r = s;
-
-/* DEAD CODE FOUND BY COVERITY
- if (isAvg) {
- s = newInstruction(mb,ASSIGNsymbol);
- setModuleId(s, algebraRef);
- setFunctionId(s, selectNotNilRef);
- getArg(s,0) = newTmpVariable(mb, battp2);
- s = pushArgument(mb, s, getArg(u,0));
- pushInstruction(mb, s);
- u = s;
- }
-*/
}
/* for avg we do sum (avg*(count/sumcount) ) */
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -2516,7 +2516,9 @@ rel2bin_groupby( mvc *sql, sql_rel *rel,
stmt *aggrstmt = NULL;
- /* first look in the group by column list */
+ /* first look in the current aggr list (l) and group by column
list */
+ if (l !aggrstmt aggrexp-type == e_column)
+ aggrstmt = list_find_column(sql-sa, l, aggrexp-l,
aggrexp-r);
if (gbexps !aggrstmt aggrexp-type == e_column) {
aggrstmt = list_find_column(sql-sa, gbexps,
aggrexp-l, aggrexp-r);
if (aggrstmt groupby)
diff --git a/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
b/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
--- a/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
+++ b/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
@@ -1216,7 +1216,7 @@ Ready.
% rewrite, count # name
% clob,
MonetDB: default - Merged bamloader branch into default branch.
Changeset: e464c0fe253f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e464c0fe253f Added Files: debian/libmonetdb5-server-bam.install sql/backends/monet5/bam/85_bam.mal sql/backends/monet5/bam/85_bam.sql sql/backends/monet5/bam/BAMRecipe.pdf sql/backends/monet5/bam/Makefile.ag sql/backends/monet5/bam/Tests/All sql/backends/monet5/bam/Tests/bam.py sql/backends/monet5/bam/Tests/bam_export.SQL.py sql/backends/monet5/bam/Tests/bam_loader_file.SQL.py sql/backends/monet5/bam/Tests/bam_loader_file.stable.err sql/backends/monet5/bam/Tests/bam_loader_file.stable.out sql/backends/monet5/bam/Tests/bam_loader_files.SQL.py sql/backends/monet5/bam/Tests/bam_loader_files.stable.err sql/backends/monet5/bam/Tests/bam_loader_files.stable.out sql/backends/monet5/bam/Tests/bam_loader_repos.SQL.py sql/backends/monet5/bam/Tests/bam_loader_repos.stable.err sql/backends/monet5/bam/Tests/bam_loader_repos.stable.out sql/backends/monet5/bam/Tests/check_files.sql sql/backends/monet5/bam/Tests/check_files.stable.err sql/backends/monet5/bam/Tests/check_files.stable.out sql/backends/monet5/bam/Tests/check_files_exact.sql sql/backends/monet5/bam/Tests/check_files_exact.stable.err sql/backends/monet5/bam/Tests/check_files_exact.stable.out sql/backends/monet5/bam/Tests/drop_last_files.SQL.py sql/backends/monet5/bam/Tests/drop_last_files.stable.err sql/backends/monet5/bam/Tests/drop_last_files.stable.out sql/backends/monet5/bam/Tests/files/file1.bam sql/backends/monet5/bam/Tests/files/file2.sam sql/backends/monet5/bam/Tests/files/queryname/file1.bam sql/backends/monet5/bam/Tests/files/queryname/file2.sam sql/backends/monet5/bam/Tests/query1.1.sql sql/backends/monet5/bam/Tests/query1.1.stable.err sql/backends/monet5/bam/Tests/query1.1.stable.out sql/backends/monet5/bam/Tests/query1.2.sql sql/backends/monet5/bam/Tests/query1.2.stable.err sql/backends/monet5/bam/Tests/query1.2.stable.out sql/backends/monet5/bam/Tests/query1.3.sql sql/backends/monet5/bam/Tests/query1.3.stable.err sql/backends/monet5/bam/Tests/query1.3.stable.out sql/backends/monet5/bam/Tests/query1.4.sql sql/backends/monet5/bam/Tests/query1.4.stable.err sql/backends/monet5/bam/Tests/query1.4.stable.out sql/backends/monet5/bam/Tests/query1.5.sql sql/backends/monet5/bam/Tests/query1.5.stable.err sql/backends/monet5/bam/Tests/query1.5.stable.out sql/backends/monet5/bam/Tests/query1.6.sql sql/backends/monet5/bam/Tests/query2.1.sql sql/backends/monet5/bam/Tests/query2.1.stable.err sql/backends/monet5/bam/Tests/query2.1.stable.out sql/backends/monet5/bam/Tests/query2.10.sql sql/backends/monet5/bam/Tests/query2.10.stable.err sql/backends/monet5/bam/Tests/query2.10.stable.out sql/backends/monet5/bam/Tests/query2.11.sql sql/backends/monet5/bam/Tests/query2.11.stable.err sql/backends/monet5/bam/Tests/query2.11.stable.out sql/backends/monet5/bam/Tests/query2.12.sql sql/backends/monet5/bam/Tests/query2.12.stable.err sql/backends/monet5/bam/Tests/query2.12.stable.out sql/backends/monet5/bam/Tests/query2.2.sql sql/backends/monet5/bam/Tests/query2.2.stable.err sql/backends/monet5/bam/Tests/query2.2.stable.out sql/backends/monet5/bam/Tests/query2.3.sql sql/backends/monet5/bam/Tests/query2.3.stable.err sql/backends/monet5/bam/Tests/query2.3.stable.out sql/backends/monet5/bam/Tests/query2.4.sql sql/backends/monet5/bam/Tests/query2.4.stable.err sql/backends/monet5/bam/Tests/query2.4.stable.out sql/backends/monet5/bam/Tests/query2.5.sql sql/backends/monet5/bam/Tests/query2.5.stable.err sql/backends/monet5/bam/Tests/query2.5.stable.out sql/backends/monet5/bam/Tests/query2.6.sql sql/backends/monet5/bam/Tests/query2.6.stable.err sql/backends/monet5/bam/Tests/query2.6.stable.out sql/backends/monet5/bam/Tests/query2.7.sql sql/backends/monet5/bam/Tests/query2.7.stable.err sql/backends/monet5/bam/Tests/query2.7.stable.out sql/backends/monet5/bam/Tests/query2.8.sql sql/backends/monet5/bam/Tests/query2.8.stable.err sql/backends/monet5/bam/Tests/query2.8.stable.out sql/backends/monet5/bam/Tests/query2.9.sql sql/backends/monet5/bam/Tests/query2.9.stable.err sql/backends/monet5/bam/Tests/query2.9.stable.out sql/backends/monet5/bam/Tests/sam_export.SQL.py sql/backends/monet5/bam/Tests/sam_export.stable.err sql/backends/monet5/bam/Tests/sam_export.stable.out sql/backends/monet5/bam/Tests/sql/bam_export.sql
MonetDB: RIntegration-default - Merge with default branch.
Changeset: 0d1b80849a52 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0d1b80849a52 Added Files: debian/libmonetdb5-server-bam.install sql/backends/monet5/bam/85_bam.mal sql/backends/monet5/bam/85_bam.sql sql/backends/monet5/bam/BAMRecipe.pdf sql/backends/monet5/bam/Makefile.ag sql/backends/monet5/bam/Tests/All sql/backends/monet5/bam/Tests/bam.py sql/backends/monet5/bam/Tests/bam_export.SQL.py sql/backends/monet5/bam/Tests/bam_loader_file.SQL.py sql/backends/monet5/bam/Tests/bam_loader_file.stable.err sql/backends/monet5/bam/Tests/bam_loader_file.stable.out sql/backends/monet5/bam/Tests/bam_loader_files.SQL.py sql/backends/monet5/bam/Tests/bam_loader_files.stable.err sql/backends/monet5/bam/Tests/bam_loader_files.stable.out sql/backends/monet5/bam/Tests/bam_loader_repos.SQL.py sql/backends/monet5/bam/Tests/bam_loader_repos.stable.err sql/backends/monet5/bam/Tests/bam_loader_repos.stable.out sql/backends/monet5/bam/Tests/check_files.sql sql/backends/monet5/bam/Tests/check_files.stable.err sql/backends/monet5/bam/Tests/check_files.stable.out sql/backends/monet5/bam/Tests/check_files_exact.sql sql/backends/monet5/bam/Tests/check_files_exact.stable.err sql/backends/monet5/bam/Tests/check_files_exact.stable.out sql/backends/monet5/bam/Tests/drop_last_files.SQL.py sql/backends/monet5/bam/Tests/drop_last_files.stable.err sql/backends/monet5/bam/Tests/drop_last_files.stable.out sql/backends/monet5/bam/Tests/files/file1.bam sql/backends/monet5/bam/Tests/files/file2.sam sql/backends/monet5/bam/Tests/files/queryname/file1.bam sql/backends/monet5/bam/Tests/files/queryname/file2.sam sql/backends/monet5/bam/Tests/query1.1.sql sql/backends/monet5/bam/Tests/query1.1.stable.err sql/backends/monet5/bam/Tests/query1.1.stable.out sql/backends/monet5/bam/Tests/query1.2.sql sql/backends/monet5/bam/Tests/query1.2.stable.err sql/backends/monet5/bam/Tests/query1.2.stable.out sql/backends/monet5/bam/Tests/query1.3.sql sql/backends/monet5/bam/Tests/query1.3.stable.err sql/backends/monet5/bam/Tests/query1.3.stable.out sql/backends/monet5/bam/Tests/query1.4.sql sql/backends/monet5/bam/Tests/query1.4.stable.err sql/backends/monet5/bam/Tests/query1.4.stable.out sql/backends/monet5/bam/Tests/query1.5.sql sql/backends/monet5/bam/Tests/query1.5.stable.err sql/backends/monet5/bam/Tests/query1.5.stable.out sql/backends/monet5/bam/Tests/query1.6.sql sql/backends/monet5/bam/Tests/query2.1.sql sql/backends/monet5/bam/Tests/query2.1.stable.err sql/backends/monet5/bam/Tests/query2.1.stable.out sql/backends/monet5/bam/Tests/query2.10.sql sql/backends/monet5/bam/Tests/query2.10.stable.err sql/backends/monet5/bam/Tests/query2.10.stable.out sql/backends/monet5/bam/Tests/query2.11.sql sql/backends/monet5/bam/Tests/query2.11.stable.err sql/backends/monet5/bam/Tests/query2.11.stable.out sql/backends/monet5/bam/Tests/query2.12.sql sql/backends/monet5/bam/Tests/query2.12.stable.err sql/backends/monet5/bam/Tests/query2.12.stable.out sql/backends/monet5/bam/Tests/query2.2.sql sql/backends/monet5/bam/Tests/query2.2.stable.err sql/backends/monet5/bam/Tests/query2.2.stable.out sql/backends/monet5/bam/Tests/query2.3.sql sql/backends/monet5/bam/Tests/query2.3.stable.err sql/backends/monet5/bam/Tests/query2.3.stable.out sql/backends/monet5/bam/Tests/query2.4.sql sql/backends/monet5/bam/Tests/query2.4.stable.err sql/backends/monet5/bam/Tests/query2.4.stable.out sql/backends/monet5/bam/Tests/query2.5.sql sql/backends/monet5/bam/Tests/query2.5.stable.err sql/backends/monet5/bam/Tests/query2.5.stable.out sql/backends/monet5/bam/Tests/query2.6.sql sql/backends/monet5/bam/Tests/query2.6.stable.err sql/backends/monet5/bam/Tests/query2.6.stable.out sql/backends/monet5/bam/Tests/query2.7.sql sql/backends/monet5/bam/Tests/query2.7.stable.err sql/backends/monet5/bam/Tests/query2.7.stable.out sql/backends/monet5/bam/Tests/query2.8.sql sql/backends/monet5/bam/Tests/query2.8.stable.err sql/backends/monet5/bam/Tests/query2.8.stable.out sql/backends/monet5/bam/Tests/query2.9.sql sql/backends/monet5/bam/Tests/query2.9.stable.err sql/backends/monet5/bam/Tests/query2.9.stable.out sql/backends/monet5/bam/Tests/sam_export.SQL.py sql/backends/monet5/bam/Tests/sam_export.stable.err sql/backends/monet5/bam/Tests/sam_export.stable.out sql/backends/monet5/bam/Tests/sql/bam_export.sql
MonetDB: geo - Merge with default branch.
Changeset: f22a85321f83 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f22a85321f83 Added Files: debian/libmonetdb5-server-bam.install sql/backends/monet5/bam/85_bam.mal sql/backends/monet5/bam/85_bam.sql sql/backends/monet5/bam/BAMRecipe.pdf sql/backends/monet5/bam/Makefile.ag sql/backends/monet5/bam/Tests/All sql/backends/monet5/bam/Tests/bam.py sql/backends/monet5/bam/Tests/bam_export.SQL.py sql/backends/monet5/bam/Tests/bam_loader_file.SQL.py sql/backends/monet5/bam/Tests/bam_loader_file.stable.err sql/backends/monet5/bam/Tests/bam_loader_file.stable.out sql/backends/monet5/bam/Tests/bam_loader_files.SQL.py sql/backends/monet5/bam/Tests/bam_loader_files.stable.err sql/backends/monet5/bam/Tests/bam_loader_files.stable.out sql/backends/monet5/bam/Tests/bam_loader_repos.SQL.py sql/backends/monet5/bam/Tests/bam_loader_repos.stable.err sql/backends/monet5/bam/Tests/bam_loader_repos.stable.out sql/backends/monet5/bam/Tests/check_files.sql sql/backends/monet5/bam/Tests/check_files.stable.err sql/backends/monet5/bam/Tests/check_files.stable.out sql/backends/monet5/bam/Tests/check_files_exact.sql sql/backends/monet5/bam/Tests/check_files_exact.stable.err sql/backends/monet5/bam/Tests/check_files_exact.stable.out sql/backends/monet5/bam/Tests/drop_last_files.SQL.py sql/backends/monet5/bam/Tests/drop_last_files.stable.err sql/backends/monet5/bam/Tests/drop_last_files.stable.out sql/backends/monet5/bam/Tests/files/file1.bam sql/backends/monet5/bam/Tests/files/file2.sam sql/backends/monet5/bam/Tests/files/queryname/file1.bam sql/backends/monet5/bam/Tests/files/queryname/file2.sam sql/backends/monet5/bam/Tests/query1.1.sql sql/backends/monet5/bam/Tests/query1.1.stable.err sql/backends/monet5/bam/Tests/query1.1.stable.out sql/backends/monet5/bam/Tests/query1.2.sql sql/backends/monet5/bam/Tests/query1.2.stable.err sql/backends/monet5/bam/Tests/query1.2.stable.out sql/backends/monet5/bam/Tests/query1.3.sql sql/backends/monet5/bam/Tests/query1.3.stable.err sql/backends/monet5/bam/Tests/query1.3.stable.out sql/backends/monet5/bam/Tests/query1.4.sql sql/backends/monet5/bam/Tests/query1.4.stable.err sql/backends/monet5/bam/Tests/query1.4.stable.out sql/backends/monet5/bam/Tests/query1.5.sql sql/backends/monet5/bam/Tests/query1.5.stable.err sql/backends/monet5/bam/Tests/query1.5.stable.out sql/backends/monet5/bam/Tests/query1.6.sql sql/backends/monet5/bam/Tests/query2.1.sql sql/backends/monet5/bam/Tests/query2.1.stable.err sql/backends/monet5/bam/Tests/query2.1.stable.out sql/backends/monet5/bam/Tests/query2.10.sql sql/backends/monet5/bam/Tests/query2.10.stable.err sql/backends/monet5/bam/Tests/query2.10.stable.out sql/backends/monet5/bam/Tests/query2.11.sql sql/backends/monet5/bam/Tests/query2.11.stable.err sql/backends/monet5/bam/Tests/query2.11.stable.out sql/backends/monet5/bam/Tests/query2.12.sql sql/backends/monet5/bam/Tests/query2.12.stable.err sql/backends/monet5/bam/Tests/query2.12.stable.out sql/backends/monet5/bam/Tests/query2.2.sql sql/backends/monet5/bam/Tests/query2.2.stable.err sql/backends/monet5/bam/Tests/query2.2.stable.out sql/backends/monet5/bam/Tests/query2.3.sql sql/backends/monet5/bam/Tests/query2.3.stable.err sql/backends/monet5/bam/Tests/query2.3.stable.out sql/backends/monet5/bam/Tests/query2.4.sql sql/backends/monet5/bam/Tests/query2.4.stable.err sql/backends/monet5/bam/Tests/query2.4.stable.out sql/backends/monet5/bam/Tests/query2.5.sql sql/backends/monet5/bam/Tests/query2.5.stable.err sql/backends/monet5/bam/Tests/query2.5.stable.out sql/backends/monet5/bam/Tests/query2.6.sql sql/backends/monet5/bam/Tests/query2.6.stable.err sql/backends/monet5/bam/Tests/query2.6.stable.out sql/backends/monet5/bam/Tests/query2.7.sql sql/backends/monet5/bam/Tests/query2.7.stable.err sql/backends/monet5/bam/Tests/query2.7.stable.out sql/backends/monet5/bam/Tests/query2.8.sql sql/backends/monet5/bam/Tests/query2.8.stable.err sql/backends/monet5/bam/Tests/query2.8.stable.out sql/backends/monet5/bam/Tests/query2.9.sql sql/backends/monet5/bam/Tests/query2.9.stable.err sql/backends/monet5/bam/Tests/query2.9.stable.out sql/backends/monet5/bam/Tests/sam_export.SQL.py sql/backends/monet5/bam/Tests/sam_export.stable.err sql/backends/monet5/bam/Tests/sam_export.stable.out sql/backends/monet5/bam/Tests/sql/bam_export.sql
MonetDB: generator - Merge with default branch.
Changeset: 26778a0575e0 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=26778a0575e0 Added Files: debian/libmonetdb5-server-bam.install sql/backends/monet5/bam/85_bam.mal sql/backends/monet5/bam/85_bam.sql sql/backends/monet5/bam/BAMRecipe.pdf sql/backends/monet5/bam/Makefile.ag sql/backends/monet5/bam/Tests/All sql/backends/monet5/bam/Tests/bam.py sql/backends/monet5/bam/Tests/bam_export.SQL.py sql/backends/monet5/bam/Tests/bam_loader_file.SQL.py sql/backends/monet5/bam/Tests/bam_loader_file.stable.err sql/backends/monet5/bam/Tests/bam_loader_file.stable.out sql/backends/monet5/bam/Tests/bam_loader_files.SQL.py sql/backends/monet5/bam/Tests/bam_loader_files.stable.err sql/backends/monet5/bam/Tests/bam_loader_files.stable.out sql/backends/monet5/bam/Tests/bam_loader_repos.SQL.py sql/backends/monet5/bam/Tests/bam_loader_repos.stable.err sql/backends/monet5/bam/Tests/bam_loader_repos.stable.out sql/backends/monet5/bam/Tests/check_files.sql sql/backends/monet5/bam/Tests/check_files.stable.err sql/backends/monet5/bam/Tests/check_files.stable.out sql/backends/monet5/bam/Tests/check_files_exact.sql sql/backends/monet5/bam/Tests/check_files_exact.stable.err sql/backends/monet5/bam/Tests/check_files_exact.stable.out sql/backends/monet5/bam/Tests/drop_last_files.SQL.py sql/backends/monet5/bam/Tests/drop_last_files.stable.err sql/backends/monet5/bam/Tests/drop_last_files.stable.out sql/backends/monet5/bam/Tests/files/file1.bam sql/backends/monet5/bam/Tests/files/file2.sam sql/backends/monet5/bam/Tests/files/queryname/file1.bam sql/backends/monet5/bam/Tests/files/queryname/file2.sam sql/backends/monet5/bam/Tests/query1.1.sql sql/backends/monet5/bam/Tests/query1.1.stable.err sql/backends/monet5/bam/Tests/query1.1.stable.out sql/backends/monet5/bam/Tests/query1.2.sql sql/backends/monet5/bam/Tests/query1.2.stable.err sql/backends/monet5/bam/Tests/query1.2.stable.out sql/backends/monet5/bam/Tests/query1.3.sql sql/backends/monet5/bam/Tests/query1.3.stable.err sql/backends/monet5/bam/Tests/query1.3.stable.out sql/backends/monet5/bam/Tests/query1.4.sql sql/backends/monet5/bam/Tests/query1.4.stable.err sql/backends/monet5/bam/Tests/query1.4.stable.out sql/backends/monet5/bam/Tests/query1.5.sql sql/backends/monet5/bam/Tests/query1.5.stable.err sql/backends/monet5/bam/Tests/query1.5.stable.out sql/backends/monet5/bam/Tests/query1.6.sql sql/backends/monet5/bam/Tests/query2.1.sql sql/backends/monet5/bam/Tests/query2.1.stable.err sql/backends/monet5/bam/Tests/query2.1.stable.out sql/backends/monet5/bam/Tests/query2.10.sql sql/backends/monet5/bam/Tests/query2.10.stable.err sql/backends/monet5/bam/Tests/query2.10.stable.out sql/backends/monet5/bam/Tests/query2.11.sql sql/backends/monet5/bam/Tests/query2.11.stable.err sql/backends/monet5/bam/Tests/query2.11.stable.out sql/backends/monet5/bam/Tests/query2.12.sql sql/backends/monet5/bam/Tests/query2.12.stable.err sql/backends/monet5/bam/Tests/query2.12.stable.out sql/backends/monet5/bam/Tests/query2.2.sql sql/backends/monet5/bam/Tests/query2.2.stable.err sql/backends/monet5/bam/Tests/query2.2.stable.out sql/backends/monet5/bam/Tests/query2.3.sql sql/backends/monet5/bam/Tests/query2.3.stable.err sql/backends/monet5/bam/Tests/query2.3.stable.out sql/backends/monet5/bam/Tests/query2.4.sql sql/backends/monet5/bam/Tests/query2.4.stable.err sql/backends/monet5/bam/Tests/query2.4.stable.out sql/backends/monet5/bam/Tests/query2.5.sql sql/backends/monet5/bam/Tests/query2.5.stable.err sql/backends/monet5/bam/Tests/query2.5.stable.out sql/backends/monet5/bam/Tests/query2.6.sql sql/backends/monet5/bam/Tests/query2.6.stable.err sql/backends/monet5/bam/Tests/query2.6.stable.out sql/backends/monet5/bam/Tests/query2.7.sql sql/backends/monet5/bam/Tests/query2.7.stable.err sql/backends/monet5/bam/Tests/query2.7.stable.out sql/backends/monet5/bam/Tests/query2.8.sql sql/backends/monet5/bam/Tests/query2.8.stable.err sql/backends/monet5/bam/Tests/query2.8.stable.out sql/backends/monet5/bam/Tests/query2.9.sql sql/backends/monet5/bam/Tests/query2.9.stable.err sql/backends/monet5/bam/Tests/query2.9.stable.out sql/backends/monet5/bam/Tests/sam_export.SQL.py sql/backends/monet5/bam/Tests/sam_export.stable.err sql/backends/monet5/bam/Tests/sam_export.stable.out sql/backends/monet5/bam/Tests/sql/bam_export.sql
MonetDB: transaction-replication - Merge with default branch.
Changeset: 89713a2ba999 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=89713a2ba999 Added Files: debian/libmonetdb5-server-bam.install sql/backends/monet5/bam/85_bam.mal sql/backends/monet5/bam/85_bam.sql sql/backends/monet5/bam/BAMRecipe.pdf sql/backends/monet5/bam/Makefile.ag sql/backends/monet5/bam/Tests/All sql/backends/monet5/bam/Tests/bam.py sql/backends/monet5/bam/Tests/bam_export.SQL.py sql/backends/monet5/bam/Tests/bam_loader_file.SQL.py sql/backends/monet5/bam/Tests/bam_loader_file.stable.err sql/backends/monet5/bam/Tests/bam_loader_file.stable.out sql/backends/monet5/bam/Tests/bam_loader_files.SQL.py sql/backends/monet5/bam/Tests/bam_loader_files.stable.err sql/backends/monet5/bam/Tests/bam_loader_files.stable.out sql/backends/monet5/bam/Tests/bam_loader_repos.SQL.py sql/backends/monet5/bam/Tests/bam_loader_repos.stable.err sql/backends/monet5/bam/Tests/bam_loader_repos.stable.out sql/backends/monet5/bam/Tests/check_files.sql sql/backends/monet5/bam/Tests/check_files.stable.err sql/backends/monet5/bam/Tests/check_files.stable.out sql/backends/monet5/bam/Tests/check_files_exact.sql sql/backends/monet5/bam/Tests/check_files_exact.stable.err sql/backends/monet5/bam/Tests/check_files_exact.stable.out sql/backends/monet5/bam/Tests/drop_last_files.SQL.py sql/backends/monet5/bam/Tests/drop_last_files.stable.err sql/backends/monet5/bam/Tests/drop_last_files.stable.out sql/backends/monet5/bam/Tests/files/file1.bam sql/backends/monet5/bam/Tests/files/file2.sam sql/backends/monet5/bam/Tests/files/queryname/file1.bam sql/backends/monet5/bam/Tests/files/queryname/file2.sam sql/backends/monet5/bam/Tests/query1.1.sql sql/backends/monet5/bam/Tests/query1.1.stable.err sql/backends/monet5/bam/Tests/query1.1.stable.out sql/backends/monet5/bam/Tests/query1.2.sql sql/backends/monet5/bam/Tests/query1.2.stable.err sql/backends/monet5/bam/Tests/query1.2.stable.out sql/backends/monet5/bam/Tests/query1.3.sql sql/backends/monet5/bam/Tests/query1.3.stable.err sql/backends/monet5/bam/Tests/query1.3.stable.out sql/backends/monet5/bam/Tests/query1.4.sql sql/backends/monet5/bam/Tests/query1.4.stable.err sql/backends/monet5/bam/Tests/query1.4.stable.out sql/backends/monet5/bam/Tests/query1.5.sql sql/backends/monet5/bam/Tests/query1.5.stable.err sql/backends/monet5/bam/Tests/query1.5.stable.out sql/backends/monet5/bam/Tests/query1.6.sql sql/backends/monet5/bam/Tests/query2.1.sql sql/backends/monet5/bam/Tests/query2.1.stable.err sql/backends/monet5/bam/Tests/query2.1.stable.out sql/backends/monet5/bam/Tests/query2.10.sql sql/backends/monet5/bam/Tests/query2.10.stable.err sql/backends/monet5/bam/Tests/query2.10.stable.out sql/backends/monet5/bam/Tests/query2.11.sql sql/backends/monet5/bam/Tests/query2.11.stable.err sql/backends/monet5/bam/Tests/query2.11.stable.out sql/backends/monet5/bam/Tests/query2.12.sql sql/backends/monet5/bam/Tests/query2.12.stable.err sql/backends/monet5/bam/Tests/query2.12.stable.out sql/backends/monet5/bam/Tests/query2.2.sql sql/backends/monet5/bam/Tests/query2.2.stable.err sql/backends/monet5/bam/Tests/query2.2.stable.out sql/backends/monet5/bam/Tests/query2.3.sql sql/backends/monet5/bam/Tests/query2.3.stable.err sql/backends/monet5/bam/Tests/query2.3.stable.out sql/backends/monet5/bam/Tests/query2.4.sql sql/backends/monet5/bam/Tests/query2.4.stable.err sql/backends/monet5/bam/Tests/query2.4.stable.out sql/backends/monet5/bam/Tests/query2.5.sql sql/backends/monet5/bam/Tests/query2.5.stable.err sql/backends/monet5/bam/Tests/query2.5.stable.out sql/backends/monet5/bam/Tests/query2.6.sql sql/backends/monet5/bam/Tests/query2.6.stable.err sql/backends/monet5/bam/Tests/query2.6.stable.out sql/backends/monet5/bam/Tests/query2.7.sql sql/backends/monet5/bam/Tests/query2.7.stable.err sql/backends/monet5/bam/Tests/query2.7.stable.out sql/backends/monet5/bam/Tests/query2.8.sql sql/backends/monet5/bam/Tests/query2.8.stable.err sql/backends/monet5/bam/Tests/query2.8.stable.out sql/backends/monet5/bam/Tests/query2.9.sql sql/backends/monet5/bam/Tests/query2.9.stable.err sql/backends/monet5/bam/Tests/query2.9.stable.out sql/backends/monet5/bam/Tests/sam_export.SQL.py sql/backends/monet5/bam/Tests/sam_export.stable.err sql/backends/monet5/bam/Tests/sam_export.stable.out sql/backends/monet5/bam/Tests/sql/bam_export.sql
MonetDB: Jan2014 - Fix order of result.
Changeset: a530e0ef7d93 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a530e0ef7d93 Modified Files: sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.stable.out sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.view1.sql sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.view2.sql Branch: Jan2014 Log Message: Fix order of result. diffs (47 lines): diff --git a/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.stable.out b/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.stable.out --- a/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.stable.out +++ b/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.stable.out @@ -138,8 +138,9 @@ Ready. % value, type, prob # name % varchar, char, double # type % 2, 4, 24 # length +[ A1,term, 1 ] [ A2,term, 1 ] -[ A1,term, 1 ] +#ROLLBACK; # 23:06:18 # 23:06:18 Mtimeout -timeout 60 mclient -lsql -umonetdb -Pmonetdb --host=localhost --port=31419 /home/wouter/opt/MonetDB-Aug2009/mTests/src/test/BugTracker-2009/old_views_incorrectly_reused.SF-2863804.view2.sql @@ -168,8 +169,9 @@ Ready. % value, type, prob # name % varchar, char, double # type % 4, 4, 24 # length +[ 2000, term, 1 ] [ 2001, term, 1 ] -[ 2000, term, 1 ] +#ROLLBACK; # 23:06:18 # 23:06:18 Done. diff --git a/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.view1.sql b/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.view1.sql --- a/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.view1.sql +++ b/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.view1.sql @@ -22,6 +22,6 @@ CREATE VIEW find_TERM_from_DOC_attribute CREATE VIEW find_TERM_from_DOC_attribute_1_RESULT_result AS SELECT ALL a1, 1-prod(1-prob) AS prob FROM find_TERM_from_DOC_attribute_1_RESULT_result_1 GROUP BY a1; -SELECT a.a1 as value, 'term' as type, a.prob FROM find_TERM_from_DOC_attribute_1_RESULT_result as a ORDER BY prob DESC LIMIT 50 OFFSET 0; +SELECT a.a1 as value, 'term' as type, a.prob FROM find_TERM_from_DOC_attribute_1_RESULT_result as a ORDER BY prob DESC, value LIMIT 50 OFFSET 0; ROLLBACK; diff --git a/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.view2.sql b/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.view2.sql --- a/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.view2.sql +++ b/sql/test/BugTracker-2009/Tests/old_views_incorrectly_reused.SF-2863804.view2.sql @@ -22,6 +22,6 @@ CREATE VIEW find_TERM_from_DOC_attribute CREATE VIEW find_TERM_from_DOC_attribute_1_RESULT_result AS SELECT ALL a1, 1-prod(1-prob) AS prob FROM find_TERM_from_DOC_attribute_1_RESULT_result_1 GROUP BY a1; -SELECT a.a1 as value, 'term' as type, a.prob FROM find_TERM_from_DOC_attribute_1_RESULT_result as a ORDER BY prob DESC LIMIT 50 OFFSET 0; +SELECT a.a1 as value, 'term' as type, a.prob FROM find_TERM_from_DOC_attribute_1_RESULT_result as a ORDER BY prob DESC, value LIMIT 50 OFFSET 0; ROLLBACK; ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: generator - No joins on pairs of sequences yet.
Changeset: b62ea8c76576 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b62ea8c76576 Modified Files: sql/backends/monet5/generator/generator.c Branch: generator Log Message: No joins on pairs of sequences yet. diffs (14 lines): diff --git a/sql/backends/monet5/generator/generator.c b/sql/backends/monet5/generator/generator.c --- a/sql/backends/monet5/generator/generator.c +++ b/sql/backends/monet5/generator/generator.c @@ -932,8 +932,8 @@ str VLTgenerator_join(Client cntxt, MalB // in case of both generators || getModuleId(q) == generatorRef)materialize the 'smallest' one first // or implement more knowledge, postponed - assert(!( p q)); - assert(p || q); + if (p q ) + throw(MAL,generator.join,Join over generator pairs not supported); // switch roles to have a single target bat[:oid,:any] designated // by b and reference instruction p for the generator ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: generator - More cornercases tested
Changeset: f6a18b3ed132 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f6a18b3ed132 Added Files: sql/backends/monet5/generator/Tests/joins02.sql sql/backends/monet5/generator/Tests/joins02.stable.err sql/backends/monet5/generator/Tests/joins02.stable.out Modified Files: sql/backends/monet5/generator/Tests/All sql/backends/monet5/generator/Tests/generator00.stable.out sql/backends/monet5/generator/Tests/generator01.sql sql/backends/monet5/generator/Tests/generator01.stable.err sql/backends/monet5/generator/Tests/generator04.stable.err Branch: generator Log Message: More cornercases tested diffs (269 lines): diff --git a/sql/backends/monet5/generator/Tests/All b/sql/backends/monet5/generator/Tests/All --- a/sql/backends/monet5/generator/Tests/All +++ b/sql/backends/monet5/generator/Tests/All @@ -6,5 +6,6 @@ generator04 joins00 joins01 +joins02 thetaselect00 diff --git a/sql/backends/monet5/generator/Tests/generator00.stable.out b/sql/backends/monet5/generator/Tests/generator00.stable.out --- a/sql/backends/monet5/generator/Tests/generator00.stable.out +++ b/sql/backends/monet5/generator/Tests/generator00.stable.out @@ -77,8 +77,17 @@ Ready. [ 4] [ 6] [ 8] -#select * from generate_series(0,10,2) -#where value 5; +#select * from generate_series(0,10) where value 5; +% . # table_name +% value # name +% tinyint # type +% 1 # length +[ 0] +[ 1] +[ 2] +[ 3] +[ 4] +#select * from generate_series(0,10,2) where value 5; % . # table_name % value # name % tinyint # type @@ -108,6 +117,21 @@ Ready. % 1 # length [ 4] [ 6] +#select * from generate_series(10,0); +% . # table_name +% value # name +% tinyint # type +% 2 # length +[ 10 ] +[ 9] +[ 8] +[ 7] +[ 6] +[ 5] +[ 4] +[ 3] +[ 2] +[ 1] #select * from generate_series(10,0,-2); % . # table_name % value # name @@ -118,6 +142,15 @@ Ready. [ 6] [ 4] [ 2] +#select * from generate_series(10,0) where value 5; +% . # table_name +% value # name +% tinyint # type +% 1 # length +[ 4] +[ 3] +[ 2] +[ 1] #select * from generate_series(10,0,-2) where value 5; % . # table_name % value # name diff --git a/sql/backends/monet5/generator/Tests/generator01.sql b/sql/backends/monet5/generator/Tests/generator01.sql --- a/sql/backends/monet5/generator/Tests/generator01.sql +++ b/sql/backends/monet5/generator/Tests/generator01.sql @@ -8,5 +8,11 @@ select * from generate_series(0,10,null) select * from generate_series(null,10,1) ; select * from generate_series(10,null,1) ; +select * from generate_series(null,10) ; +select * from generate_series(10,null) ; + +select * from generate_series(null,-1) ; +select * from generate_series(-1,null) ; + select * from generate_series(0,10,-2) as v where value 7 and value 3; diff --git a/sql/backends/monet5/generator/Tests/generator01.stable.err b/sql/backends/monet5/generator/Tests/generator01.stable.err --- a/sql/backends/monet5/generator/Tests/generator01.stable.err +++ b/sql/backends/monet5/generator/Tests/generator01.stable.err @@ -29,25 +29,37 @@ stderr of test 'generator01` in director # 12:42:21 mclient -lsql -ftest -Eutf-8 -i -e --host=/var/tmp/mtest-23485 --port=37579 # 12:42:21 -MAPI = (monetdb) /var/tmp/mtest-20683/.s.monetdb.37951 +MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679 QUERY = select * from generate_series(0,10,-2); ERROR = !Illegal generator range -MAPI = (monetdb) /var/tmp/mtest-20683/.s.monetdb.37951 +MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679 QUERY = select * from generate_series(10,2,2); ERROR = !Illegal generator range -MAPI = (monetdb) /var/tmp/mtest-20683/.s.monetdb.37951 +MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679 QUERY = select * from generate_series(0,10,0) ; ERROR = !zero step size not allowed -MAPI = (monetdb) /var/tmp/mtest-20683/.s.monetdb.37951 +MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679 QUERY = select * from generate_series(0,10,null) ; ERROR = !null step size not allowed -MAPI = (monetdb) /var/tmp/mtest-20683/.s.monetdb.37951 +MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679 QUERY = select * from generate_series(null,10,1) ; ERROR = !types tinyint(8,0) and timestamp(7,0) are not equal for column 'L2' -MAPI = (monetdb) /var/tmp/mtest-20683/.s.monetdb.37951 +MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679 QUERY = select * from generate_series(10,null,1) ; ERROR = !Illegal generator range -MAPI = (monetdb) /var/tmp/mtest-20683/.s.monetdb.37951 +MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679 +QUERY = select * from generate_series(null,10) ; +ERROR = !Illegal generator range +MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679 +QUERY = select * from generate_series(10,null) ; +ERROR = !Illegal generator range +MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679 +QUERY = select * from
MonetDB: generator - Merge with default
Changeset: f1fac300d344 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f1fac300d344 Added Files: debian/libmonetdb5-server-bam.install sql/backends/monet5/bam/85_bam.mal sql/backends/monet5/bam/85_bam.sql sql/backends/monet5/bam/BAMRecipe.pdf sql/backends/monet5/bam/Makefile.ag sql/backends/monet5/bam/Tests/All sql/backends/monet5/bam/Tests/bam.py sql/backends/monet5/bam/Tests/bam_export.SQL.py sql/backends/monet5/bam/Tests/bam_loader_file.SQL.py sql/backends/monet5/bam/Tests/bam_loader_file.stable.err sql/backends/monet5/bam/Tests/bam_loader_file.stable.out sql/backends/monet5/bam/Tests/bam_loader_files.SQL.py sql/backends/monet5/bam/Tests/bam_loader_files.stable.err sql/backends/monet5/bam/Tests/bam_loader_files.stable.out sql/backends/monet5/bam/Tests/bam_loader_repos.SQL.py sql/backends/monet5/bam/Tests/bam_loader_repos.stable.err sql/backends/monet5/bam/Tests/bam_loader_repos.stable.out sql/backends/monet5/bam/Tests/check_files.sql sql/backends/monet5/bam/Tests/check_files.stable.err sql/backends/monet5/bam/Tests/check_files.stable.out sql/backends/monet5/bam/Tests/check_files_exact.sql sql/backends/monet5/bam/Tests/check_files_exact.stable.err sql/backends/monet5/bam/Tests/check_files_exact.stable.out sql/backends/monet5/bam/Tests/drop_last_files.SQL.py sql/backends/monet5/bam/Tests/drop_last_files.stable.err sql/backends/monet5/bam/Tests/drop_last_files.stable.out sql/backends/monet5/bam/Tests/files/file1.bam sql/backends/monet5/bam/Tests/files/file2.sam sql/backends/monet5/bam/Tests/files/queryname/file1.bam sql/backends/monet5/bam/Tests/files/queryname/file2.sam sql/backends/monet5/bam/Tests/query1.1.sql sql/backends/monet5/bam/Tests/query1.1.stable.err sql/backends/monet5/bam/Tests/query1.1.stable.out sql/backends/monet5/bam/Tests/query1.2.sql sql/backends/monet5/bam/Tests/query1.2.stable.err sql/backends/monet5/bam/Tests/query1.2.stable.out sql/backends/monet5/bam/Tests/query1.3.sql sql/backends/monet5/bam/Tests/query1.3.stable.err sql/backends/monet5/bam/Tests/query1.3.stable.out sql/backends/monet5/bam/Tests/query1.4.sql sql/backends/monet5/bam/Tests/query1.4.stable.err sql/backends/monet5/bam/Tests/query1.4.stable.out sql/backends/monet5/bam/Tests/query1.5.sql sql/backends/monet5/bam/Tests/query1.5.stable.err sql/backends/monet5/bam/Tests/query1.5.stable.out sql/backends/monet5/bam/Tests/query1.6.sql sql/backends/monet5/bam/Tests/query2.1.sql sql/backends/monet5/bam/Tests/query2.1.stable.err sql/backends/monet5/bam/Tests/query2.1.stable.out sql/backends/monet5/bam/Tests/query2.10.sql sql/backends/monet5/bam/Tests/query2.10.stable.err sql/backends/monet5/bam/Tests/query2.10.stable.out sql/backends/monet5/bam/Tests/query2.11.sql sql/backends/monet5/bam/Tests/query2.11.stable.err sql/backends/monet5/bam/Tests/query2.11.stable.out sql/backends/monet5/bam/Tests/query2.12.sql sql/backends/monet5/bam/Tests/query2.12.stable.err sql/backends/monet5/bam/Tests/query2.12.stable.out sql/backends/monet5/bam/Tests/query2.2.sql sql/backends/monet5/bam/Tests/query2.2.stable.err sql/backends/monet5/bam/Tests/query2.2.stable.out sql/backends/monet5/bam/Tests/query2.3.sql sql/backends/monet5/bam/Tests/query2.3.stable.err sql/backends/monet5/bam/Tests/query2.3.stable.out sql/backends/monet5/bam/Tests/query2.4.sql sql/backends/monet5/bam/Tests/query2.4.stable.err sql/backends/monet5/bam/Tests/query2.4.stable.out sql/backends/monet5/bam/Tests/query2.5.sql sql/backends/monet5/bam/Tests/query2.5.stable.err sql/backends/monet5/bam/Tests/query2.5.stable.out sql/backends/monet5/bam/Tests/query2.6.sql sql/backends/monet5/bam/Tests/query2.6.stable.err sql/backends/monet5/bam/Tests/query2.6.stable.out sql/backends/monet5/bam/Tests/query2.7.sql sql/backends/monet5/bam/Tests/query2.7.stable.err sql/backends/monet5/bam/Tests/query2.7.stable.out sql/backends/monet5/bam/Tests/query2.8.sql sql/backends/monet5/bam/Tests/query2.8.stable.err sql/backends/monet5/bam/Tests/query2.8.stable.out sql/backends/monet5/bam/Tests/query2.9.sql sql/backends/monet5/bam/Tests/query2.9.stable.err sql/backends/monet5/bam/Tests/query2.9.stable.out sql/backends/monet5/bam/Tests/sam_export.SQL.py sql/backends/monet5/bam/Tests/sam_export.stable.err sql/backends/monet5/bam/Tests/sam_export.stable.out sql/backends/monet5/bam/Tests/sql/bam_export.sql
MonetDB: Jan2014 - Portability issues for sed command.
Changeset: 22a08e186948 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=22a08e186948
Modified Files:
NT/installer32/cv64-32.sh
NT/installer64/cv32-64.sh
sql/test/pg_regress/Tests/load.SQL.sh
sql/test/pg_regress/postgresql2sql99.sh
testing/quicktest
Branch: Jan2014
Log Message:
Portability issues for sed command.
Some sed implementations require a suffix for the -i command, so
always provide one (and not as a separate argument!); some sed
implementations only recognize I (and not i) as a flag for the s
(substitute) command, so use that.
diffs (141 lines):
diff --git a/NT/installer32/cv64-32.sh b/NT/installer32/cv64-32.sh
--- a/NT/installer32/cv64-32.sh
+++ b/NT/installer32/cv64-32.sh
@@ -19,13 +19,13 @@
# this script is mostly to document what I did, not for regular use.
cp ../installer64/*.{vdproj,sln} .
-sed -i -e '/TargetPlatform/s/3:1/3:0/' \
- -e 's/win64/win32/' \
- -e 's/\[ProgramFiles64Folder\]/[ProgramFilesFolder]/' \
- -e 's/C:Program Files.*Common FilesMerge
ModulesMicrosoft_VC100_CRT_x64.msm/C:Program FilesCommon
FilesMerge ModulesMicrosoft_VC100_CRT_x86.msm/' \
- -e 's/ProductCode = 8:{.*/ProductCode =
8:{66BABD32-D69D-4A89-A7F3-2655D4CD0641}/' \
- -e 's/PackageCode = 8:{.*/PackageCode =
8:{D9B2D386-1461-43BC-9A63-93F1BA0D7921}/' \
- -e 's/UpgradeCode =
8:{95ACBC8C-BC4B-4901-AF70-48B54A5C20F7}/UpgradeCode =
8:{C1F69378-3F5C-4120-8224-32F07D3458F3}/' \
- -e 's/UpgradeCode =
8:{8E6CDFDE-39B9-43D9-97B3-2440C012845C}/UpgradeCode =
8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}/' \
- -e 's/UpgradeCode =
8:{839D3C90-B578-41E2-A004-431440F9E899}/UpgradeCode =
8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}/' \
+sed -i~ -e '/TargetPlatform/s/3:1/3:0/' \
+ -e 's/win64/win32/' \
+ -e 's/\[ProgramFiles64Folder\]/[ProgramFilesFolder]/' \
+ -e 's/C:Program Files.*Common FilesMerge
ModulesMicrosoft_VC100_CRT_x64.msm/C:Program FilesCommon
FilesMerge ModulesMicrosoft_VC100_CRT_x86.msm/' \
+ -e 's/ProductCode = 8:{.*/ProductCode =
8:{66BABD32-D69D-4A89-A7F3-2655D4CD0641}/' \
+ -e 's/PackageCode = 8:{.*/PackageCode =
8:{D9B2D386-1461-43BC-9A63-93F1BA0D7921}/' \
+ -e 's/UpgradeCode =
8:{95ACBC8C-BC4B-4901-AF70-48B54A5C20F7}/UpgradeCode =
8:{C1F69378-3F5C-4120-8224-32F07D3458F3}/' \
+ -e 's/UpgradeCode =
8:{8E6CDFDE-39B9-43D9-97B3-2440C012845C}/UpgradeCode =
8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}/' \
+ -e 's/UpgradeCode =
8:{839D3C90-B578-41E2-A004-431440F9E899}/UpgradeCode =
8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}/' \
*.vdproj
diff --git a/NT/installer64/cv32-64.sh b/NT/installer64/cv32-64.sh
--- a/NT/installer64/cv32-64.sh
+++ b/NT/installer64/cv32-64.sh
@@ -19,13 +19,13 @@
# this script is mostly to document what I did, not for regular use.
cp ../installer32/*.{vdproj,sln} .
-sed -i -e '/TargetPlatform/s/3:0/3:1/' \
- -e 's/win32/win64/' \
- -e 's/\[ProgramFilesFolder\]/[ProgramFiles64Folder]/' \
- -e 's/C:Program Files.*Common FilesMerge
ModulesMicrosoft_VC100_CRT_x86.msm/C:Program FilesCommon
FilesMerge ModulesMicrosoft_VC100_CRT_x86_x64.msm/' \
- -e 's/ProductCode = 8:{.*/ProductCode =
8:{ACC32EDD-13CE-4079-A6E7-D9DD94DA42EE}/' \
- -e 's/PackageCode = 8:{.*/PackageCode =
8:{332EB6D8-73DD-48CA-83E7-BB1922FFE3BD}/' \
- -e 's/UpgradeCode =
8:{C1F69378-3F5C-4120-8224-32F07D3458F3}/UpgradeCode =
8:{95ACBC8C-BC4B-4901-AF70-48B54A5C20F7}/' \
- -e 's/UpgradeCode =
8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}/UpgradeCode =
8:{8E6CDFDE-39B9-43D9-97B3-2440C012845C}/' \
- -e 's/UpgradeCode =
8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}/UpgradeCode =
8:{839D3C90-B578-41E2-A004-431440F9E899}/' \
+sed -i~ -e '/TargetPlatform/s/3:0/3:1/' \
+ -e 's/win32/win64/' \
+ -e 's/\[ProgramFilesFolder\]/[ProgramFiles64Folder]/' \
+ -e 's/C:Program Files.*Common FilesMerge
ModulesMicrosoft_VC100_CRT_x86.msm/C:Program FilesCommon
FilesMerge ModulesMicrosoft_VC100_CRT_x86_x64.msm/' \
+ -e 's/ProductCode = 8:{.*/ProductCode =
8:{ACC32EDD-13CE-4079-A6E7-D9DD94DA42EE}/' \
+ -e 's/PackageCode = 8:{.*/PackageCode =
8:{332EB6D8-73DD-48CA-83E7-BB1922FFE3BD}/' \
+ -e 's/UpgradeCode =
8:{C1F69378-3F5C-4120-8224-32F07D3458F3}/UpgradeCode =
8:{95ACBC8C-BC4B-4901-AF70-48B54A5C20F7}/' \
+ -e 's/UpgradeCode =
8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}/UpgradeCode =
8:{8E6CDFDE-39B9-43D9-97B3-2440C012845C}/' \
+ -e 's/UpgradeCode =
8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}/UpgradeCode =
8:{839D3C90-B578-41E2-A004-431440F9E899}/' \
*.vdproj
diff --git a/sql/test/pg_regress/Tests/load.SQL.sh
b/sql/test/pg_regress/Tests/load.SQL.sh
--- a/sql/test/pg_regress/Tests/load.SQL.sh
+++ b/sql/test/pg_regress/Tests/load.SQL.sh
@@ -7,10 +7,10 @@
MonetDB: Jan2014 - also cleanup columns of views
Changeset: 051b34d4f934 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=051b34d4f934 Modified Files: sql/storage/store.c Branch: Jan2014 Log Message: also cleanup columns of views diffs (12 lines): diff --git a/sql/storage/store.c b/sql/storage/store.c --- a/sql/storage/store.c +++ b/sql/storage/store.c @@ -3562,7 +3562,7 @@ sys_drop_table(sql_trans *tr, sql_table sql_trans_drop_dependencies(tr, t-base.id); - if (isKindOfTable(t)) + if (isKindOfTable(t) || isView(t)) sys_drop_columns(tr, t, drop_action); if (isGlobal(t)) ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: generator - Traditional concurrency conflict
Changeset: ae875a3e0e49 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ae875a3e0e49
Added Files:
monetdb5/optimizer/opt_generator.c
monetdb5/optimizer/opt_generator.h
Modified Files:
monetdb5/optimizer/Makefile.ag
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_support.c
monetdb5/optimizer/opt_support.h
monetdb5/optimizer/opt_wrapper.c
monetdb5/optimizer/optimizer.mal
sql/backends/monet5/generator/generator.c
sql/backends/monet5/generator/generator.mal
Branch: generator
Log Message:
Traditional concurrency conflict
It is wrong to call the optimizer at runtime to
change your inflight plan. It may happen that the
instructions you intend to change are already
selected for execution.
This means that the generator optimizer is a
regular optimizer to be added to the pipelines.
diffs (truncated from 554 to 300 lines):
diff --git a/monetdb5/optimizer/Makefile.ag b/monetdb5/optimizer/Makefile.ag
--- a/monetdb5/optimizer/Makefile.ag
+++ b/monetdb5/optimizer/Makefile.ag
@@ -42,6 +42,7 @@ lib_optimizer = {
opt_evaluate.c opt_evaluate.h \
opt_factorize.c opt_factorize.h \
opt_garbageCollector.c opt_garbageCollector.h \
+ opt_generator.c opt_generator.h \
opt_groups.c opt_groups.h \
opt_querylog.c opt_querylog.h \
opt_inline.c opt_inline.h \
diff --git a/monetdb5/optimizer/opt_generator.c
b/monetdb5/optimizer/opt_generator.c
new file mode 100644
--- /dev/null
+++ b/monetdb5/optimizer/opt_generator.c
@@ -0,0 +1,136 @@
+/*
+ * The contents of this file are subject to the MonetDB Public License
+ * Version 1.1 (the License); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.monetdb.org/Legal/MonetDBLicense
+ *
+ * Software distributed under the License is distributed on an AS IS
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * The Original Code is the MonetDB Database System.
+ *
+ * The Initial Developer of the Original Code is CWI.
+ * Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
+ * Copyright August 2008-2014 MonetDB B.V.
+ * All Rights Reserved.
+ */
+
+#include monetdb_config.h
+#include opt_generator.h
+
+/*
+ * (c) Martin Kersten, Sjoerd Mullender
+ * Series generating module for integer, decimal, real, double and timestamps.
+ */
+
+
+static int
+assignedOnce(MalBlkPtr mb, int varid)
+{
+ InstrPtr p;
+ int i,j, c=0;
+
+ for(i = 1; i mb-stop; i++){
+ p = getInstrPtr(mb,i);
+ for( j = 0; j p-retc; j++)
+ if( getArg(p,j) == varid){
+ c++;
+ break;
+ }
+ }
+ return c == 1;
+}
+static int
+useCount(MalBlkPtr mb, int varid)
+{
+ InstrPtr p;
+ int i,j, d,c=0;
+
+ for(i = 1; i mb-stop; i++){
+ p = getInstrPtr(mb,i);
+ d= 0;
+ for( j = p-retc; j p-argc; j++)
+ if( getArg(p,j) == varid)
+ d++;
+ c += d 0;
+ }
+ return c;
+}
+
+int
+OPTgeneratorImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci)
+{
+ InstrPtr p,q;
+ int i,j,k, used= 0, cases, blocked;
+ str vaultRef = putName(vault,5);
+ str generateRef = putName(generate_series,15);
+ str paramRef = putName(parameters,10);
+
+ (void) cntxt;
+ (void) stk;
+ (void) pci;
+
+ for( i=1; i mb-stop; i++){
+ p = getInstrPtr(mb,i);
+ if ( getModuleId(p) == vaultRef getFunctionId(p) ==
generateRef){
+ /* found a target for propagation */
+ if ( assignedOnce(mb, getArg(p,0)) ){
+ cases = useCount(mb, getArg(p,0));
+ blocked = 0;
+ for( j = i+1; j mb-stop blocked == 0; j++){
+ q = getInstrPtr(mb,j);
+ if ( getModuleId(q) == algebraRef
getFunctionId(q) == subselectRef getArg(q,1) == getArg(p,0)){
+ setModuleId(q, generatorRef);
+ typeChecker(cntxt-fdout,
cntxt-nspace, mb, q, TRUE);
+ used++;
+ } else
+ if ( getModuleId(q) == algebraRef
getFunctionId(q) == thetasubselectRef getArg(q,1) == getArg(p,0)){
+ setModuleId(q, generatorRef);
+
MonetDB: generator - Fall back on leftfetch join if series is ma...
Changeset: 8f8ccf405267 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8f8ccf405267
Modified Files:
sql/backends/monet5/generator/generator.c
Branch: generator
Log Message:
Fall back on leftfetch join if series is materialized
diffs (123 lines):
diff --git a/sql/backends/monet5/generator/generator.c
b/sql/backends/monet5/generator/generator.c
--- a/sql/backends/monet5/generator/generator.c
+++ b/sql/backends/monet5/generator/generator.c
@@ -24,6 +24,7 @@
#include monetdb_config.h
#include opt_prelude.h
+#include algebra.h
#include generator.h
#include mtime.h
#include math.h
@@ -56,13 +57,13 @@ VLTgenerator_noop(Client cntxt, MalBlkPt
if (tpe == TYPE_timestamp){
s = *(timestamp*) getArgReference(stk,pci, 3);
if( timestamp_isnil(s)) nullerr++;
- } else throw(MAL,vault.generator,unknown data type %d,
getArgType(mb,pci,1));
+ } else throw(MAL,generator.noop,unknown data type %d,
getArgType(mb,pci,1));
}
}
if( zeroerror)
- throw(MAL,vault.generator,zero step size not allowed);
+ throw(MAL,generator.noop,zero step size not allowed);
if( nullerr)
- throw(MAL,vault.generator,null step size not allowed);
+ throw(MAL,generator.noop,null step size not allowed);
return MAL_SUCCEED;
}
@@ -202,20 +203,18 @@ VLTgenerator_table(Client cntxt, MalBlkP
/*
* Selection over the generator table does not require a materialization of
the table
* An optimizer can replace the subselect directly into a generator specific
one.
- * The target to look for is vault.generator(A1,A2,A3)
+ * The target to look for is generator.series(A1,A2,A3)
* We need the generator parameters, which are injected to replace the target
column
*/
static InstrPtr
-findLastAssign(MalBlkPtr mb, InstrPtr pci, int target)
+findGeneratorDefinition(MalBlkPtr mb, InstrPtr pci, int target)
{
InstrPtr q, p = NULL;
int i;
- str vaultRef = putName(vault,5);
- str generatorRef = putName(generator,9);
for (i = 1; i mb-stop; i++) {
q = getInstrPtr(mb, i);
- if (q-argv[0] == target (getModuleId(q) == vaultRef ||
getModuleId(q) == generatorRef))
+ if (q-argv[0] == target getModuleId(q) == generatorRef
getFunctionId(q) == parametersRef)
p = q;
if (q == pci)
return p;
@@ -309,7 +308,7 @@ VLTgenerator_subselect(Client cntxt, Mal
int tpe;
(void) cntxt;
- p = findLastAssign(mb, pci, pci-argv[1]);
+ p = findGeneratorDefinition(mb, pci, pci-argv[1]);
if (p == NULL)
throw(MAL, generator.subselect,
Could not locate definition for object);
@@ -576,7 +575,7 @@ str VLTgenerator_thetasubselect(Client c
str oper, msg= MAL_SUCCEED;
(void) cntxt;
- p = findLastAssign(mb,pci,pci-argv[1]);
+ p = findGeneratorDefinition(mb,pci,pci-argv[1]);
if( p == NULL)
throw(MAL,generator.thetasubselect,Could not locate
definition for object);
@@ -706,7 +705,7 @@ wrapup:
str VLTgenerator_leftfetchjoin(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci)
{
- int bid =0, c= 0, tpe;
+ int bid =0, c= 0, tpe, *ret;
BAT *b, *bn = NULL;
BUN cnt;
oid *ol =0, o= 0;
@@ -714,14 +713,23 @@ str VLTgenerator_leftfetchjoin(Client cn
str msg;
(void) cntxt;
- p = findLastAssign(mb,pci,pci-argv[2]);
- // if it does not exist we should fall back to the ordinary join to try
- if( p == NULL)
- throw(MAL,generator.leftfetchjoin,Could not locate
definition for object);
+ p = findGeneratorDefinition(mb,pci,pci-argv[2]);
+ ret = (int*) getArgReference(stk,pci,0);
b = BATdescriptor(bid = *(int*) getArgReference(stk,pci,1));
if( b == NULL)
throw(MAL,generator.leftfetchjoin,RUNTIME_OBJECT_MISSING);
+
+ // if it does not exist we should fall back to the ordinary
leftfetchjoin to try
+ // it might have been materialized already
+ if( p == NULL){
+ bn = BATdescriptor( *(int*) getArgReference(stk,pci,2));
+ if( bn == NULL)
+
throw(MAL,generator.leftfetchjoin,RUNTIME_OBJECT_MISSING);
+ msg = ALGleftfetchjoin(ret, b-batCacheid, bn-batCacheid);
+ return msg;
+ }
+
cnt = BATcount(b);
if ( b-ttype == TYPE_void)
o = b-tseqbase;
@@ -821,13 +829,13 @@ str VLTgenerator_join(Client cntxt, MalB
(void) cntxt;
// we assume at most one of the arguments to refer to the generator
- p = findLastAssign(mb,pci,pci-argv[2]);
+ p = findGeneratorDefinition(mb,pci,pci-argv[2]);
if( p == NULL){
bl =
MonetDB: generator - Simplify naming schemes
Changeset: ab29ccc411a7 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ab29ccc411a7 Modified Files: sql/backends/monet5/generator/90_generator.sql sql/backends/monet5/generator/generator.mal Branch: generator Log Message: Simplify naming schemes diffs (130 lines): diff --git a/sql/backends/monet5/generator/90_generator.sql b/sql/backends/monet5/generator/90_generator.sql --- a/sql/backends/monet5/generator/90_generator.sql +++ b/sql/backends/monet5/generator/90_generator.sql @@ -15,47 +15,44 @@ -- Copyright August 2008-2014 MonetDB B.V. -- All Rights Reserved. --- Author M.Kersten --- The vault is the container for all foreign file support functionalities - --- example of a (void) foreign file interface +-- (c) Author M.Kersten create function sys.generate_series(first tinyint, last tinyint) returns table (value tinyint) -external name vault.generate_series; +external name generator.series; create function sys.generate_series(first tinyint, last tinyint, stepsize tinyint) returns table (value tinyint) -external name vault.generate_series; +external name generator.series; create function sys.generate_series(first int, last int) returns table (value int) -external name vault.generate_series; +external name generator.series; create function sys.generate_series(first int, last int, stepsize int) returns table (value int) -external name vault.generate_series; +external name generator.series; create function sys.generate_series(first bigint, last bigint) returns table (value bigint) -external name vault.generate_series; +external name generator.series; create function sys.generate_series(first bigint, last bigint, stepsize bigint) returns table (value bigint) -external name vault.generate_series; +external name generator.series; create function sys.generate_series(first real, last real, stepsize real) returns table (value real) -external name vault.generate_series; +external name generator.series; create function sys.generate_series(first double, last double, stepsize double) returns table (value double) -external name vault.generate_series; +external name generator.series; create function sys.generate_series(first decimal(10,2), last decimal(10,2), stepsize decimal(10,2)) returns table (value decimal(10,2)) -external name vault.generate_series; +external name generator.series; create function sys.generate_series(first timestamp, last timestamp, stepsize interval second) returns table (value timestamp) -external name vault.generate_series; +external name generator.series; diff --git a/sql/backends/monet5/generator/generator.mal b/sql/backends/monet5/generator/generator.mal --- a/sql/backends/monet5/generator/generator.mal +++ b/sql/backends/monet5/generator/generator.mal @@ -15,50 +15,48 @@ # Copyright August 2008-2014 MonetDB B.V. # All Rights Reserved. -module vault; +module generator; -pattern generate_series(first:bte,last:bte):bat[:oid,:bte] +pattern series(first:bte,last:bte):bat[:oid,:bte] address VLTgenerator_table; -pattern generate_series(first:sht,last:sht):bat[:oid,:sht] +pattern series(first:sht,last:sht):bat[:oid,:sht] address VLTgenerator_table; -pattern generate_series(first:int,last:int):bat[:oid,:int] +pattern series(first:int,last:int):bat[:oid,:int] address VLTgenerator_table; -pattern generate_series(first:lng,last:lng):bat[:oid,:lng] +pattern series(first:lng,last:lng):bat[:oid,:lng] address VLTgenerator_table; -pattern generate_series(first:flt,last:flt):bat[:oid,:flt] +pattern series(first:flt,last:flt):bat[:oid,:flt] address VLTgenerator_table; -pattern generate_series(first:dbl,last:dbl):bat[:oid,:dbl] +pattern series(first:dbl,last:dbl):bat[:oid,:dbl] address VLTgenerator_table; -pattern generate_series(first:bte,last:bte,step:bte):bat[:oid,:bte] +pattern series(first:bte,last:bte,step:bte):bat[:oid,:bte] address VLTgenerator_table; -pattern generate_series(first:sht,last:sht,step:sht):bat[:oid,:sht] +pattern series(first:sht,last:sht,step:sht):bat[:oid,:sht] address VLTgenerator_table; -pattern generate_series(first:int,last:int,step:int):bat[:oid,:int] +pattern series(first:int,last:int,step:int):bat[:oid,:int] address VLTgenerator_table; -pattern generate_series(first:lng,last:lng,step:lng):bat[:oid,:lng] +pattern series(first:lng,last:lng,step:lng):bat[:oid,:lng] address VLTgenerator_table; -pattern generate_series(first:flt,last:flt,step:flt):bat[:oid,:flt] +pattern series(first:flt,last:flt,step:flt):bat[:oid,:flt] address VLTgenerator_table; -pattern generate_series(first:dbl,last:dbl,step:dbl):bat[:oid,:dbl] +pattern series(first:dbl,last:dbl,step:dbl):bat[:oid,:dbl] address VLTgenerator_table comment Create and materialize a generator table; -pattern generate_series(first:timestamp,last:timestamp,step:lng):bat[:oid,:timestamp] +pattern series(first:timestamp,last:timestamp,step:lng):bat[:oid,:timestamp] address VLTgenerator_table; -module
MonetDB: generator - accept output
Changeset: 60b1b7fec8f2 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=60b1b7fec8f2 Modified Files: sql/backends/monet5/generator/Tests/joins02.stable.err sql/backends/monet5/generator/Tests/joins02.stable.out Branch: generator Log Message: accept output diffs (49 lines): diff --git a/sql/backends/monet5/generator/Tests/joins02.stable.err b/sql/backends/monet5/generator/Tests/joins02.stable.err --- a/sql/backends/monet5/generator/Tests/joins02.stable.err +++ b/sql/backends/monet5/generator/Tests/joins02.stable.err @@ -29,15 +29,6 @@ stderr of test 'joins02` in directory 's # 14:13:31 mclient -lsql -ftest -Eutf-8 -i -e --host=/var/tmp/mtest-23026 --port=39679 # 14:13:31 -MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679 -QUERY = select * from generate_series(0,10,2) X, generate_series(0,4,2) Y where X.value = Y.value; -ERROR = !Join over generator pairs not supported -MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679 -QUERY = select * from generate_series(0,4,2) X, generate_series(0,10,2) Y where X.value = Y.value; -ERROR = !Join over generator pairs not supported -MAPI = (monetdb) /var/tmp/mtest-23026/.s.monetdb.39679 -QUERY = select * from generate_series(0,10,3) X, generate_series(0,4,2) Y where X.value = Y.value; -ERROR = !Join over generator pairs not supported # 14:13:32 # 14:13:32 Done. diff --git a/sql/backends/monet5/generator/Tests/joins02.stable.out b/sql/backends/monet5/generator/Tests/joins02.stable.out --- a/sql/backends/monet5/generator/Tests/joins02.stable.out +++ b/sql/backends/monet5/generator/Tests/joins02.stable.out @@ -24,6 +24,26 @@ Ready. # 14:13:31 mclient -lsql -ftest -Eutf-8 -i -e --host=/var/tmp/mtest-23026 --port=39679 # 14:13:31 +#select * from generate_series(0,10,2) X, generate_series(0,4,2) Y where X.value = Y.value; +% .x, .y # table_name +% value, value # name +% tinyint, tinyint # type +% 1, 1 # length +[ 0, 0 ] +[ 2, 2 ] +#select * from generate_series(0,4,2) X, generate_series(0,10,2) Y where X.value = Y.value; +% .x, .y # table_name +% value, value # name +% tinyint, tinyint # type +% 1, 1 # length +[ 0, 0 ] +[ 2, 2 ] +#select * from generate_series(0,10,3) X, generate_series(0,4,2) Y where X.value = Y.value; +% .x, .y # table_name +% value, value # name +% tinyint, tinyint # type +% 1, 1 # length +[ 0, 0 ] # 14:13:32 # 14:13:32 Done. ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: generator - Minor renaming in optimizer
Changeset: b2207d55fede for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b2207d55fede
Modified Files:
monetdb5/optimizer/opt_generator.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
Branch: generator
Log Message:
Minor renaming in optimizer
diffs (85 lines):
diff --git a/monetdb5/optimizer/opt_generator.c
b/monetdb5/optimizer/opt_generator.c
--- a/monetdb5/optimizer/opt_generator.c
+++ b/monetdb5/optimizer/opt_generator.c
@@ -64,9 +64,6 @@ OPTgeneratorImplementation(Client cntxt,
{
InstrPtr p,q;
int i,j,k, used= 0, cases, blocked;
- str vaultRef = putName(vault,5);
- str generateRef = putName(generate_series,15);
- str paramRef = putName(parameters,10);
(void) cntxt;
(void) stk;
@@ -74,7 +71,7 @@ OPTgeneratorImplementation(Client cntxt,
for( i=1; i mb-stop; i++){
p = getInstrPtr(mb,i);
- if ( getModuleId(p) == vaultRef getFunctionId(p) ==
generateRef){
+ if ( getModuleId(p) == generatorRef getFunctionId(p) ==
seriesRef){
/* found a target for propagation */
if ( assignedOnce(mb, getArg(p,0)) ){
cases = useCount(mb, getArg(p,0));
@@ -120,7 +117,7 @@ OPTgeneratorImplementation(Client cntxt,
// fix the original, only when all use cases
are replaced by the overloaded function
if(used == cases blocked == 0){
setModuleId(p, generatorRef);
- setFunctionId(p, paramRef);
+ setFunctionId(p, parametersRef);
typeChecker(cntxt-fdout,
cntxt-nspace, mb, p, TRUE);
} else used = 0;
#ifdef VLT_DEBUG
diff --git a/monetdb5/optimizer/opt_prelude.c b/monetdb5/optimizer/opt_prelude.c
--- a/monetdb5/optimizer/opt_prelude.c
+++ b/monetdb5/optimizer/opt_prelude.c
@@ -175,6 +175,7 @@ str oidRef;
str octopusRef;
str openRef;
str optimizerRef;
+str parametersRef;
str packRef;
str pack2Ref;
str passRef;
@@ -215,6 +216,7 @@ str rsColumnRef;
str schedulerRef;
str selectNotNilRef;
str selectRef;
+str seriesRef;
str semaRef;
str semijoinRef;
str semijoinPathRef;
@@ -438,6 +440,7 @@ void optimizerInit(void)
octopusRef = putName(octopus,7);
optimizerRef = putName(optimizer,9);
openRef = putName(open,4);
+ parametersRef = putName(parameters,10);
packRef = putName(pack,4);
pack2Ref = putName(pack2,5);
passRef = putName(pass,4);
@@ -477,6 +480,7 @@ void optimizerInit(void)
schedulerRef = putName(scheduler,9);
selectNotNilRef = putName(selectNotNil,12);
selectRef = putName(select,6);
+ seriesRef = putName(series,6);
semaRef = putName(sema,4);
semijoinRef = putName(semijoin,8);
semijoinPathRef = putName(semijoinPath,12);
diff --git a/monetdb5/optimizer/opt_prelude.h b/monetdb5/optimizer/opt_prelude.h
--- a/monetdb5/optimizer/opt_prelude.h
+++ b/monetdb5/optimizer/opt_prelude.h
@@ -173,6 +173,7 @@ opt_export str oidRef;
opt_export str octopusRef;
opt_export str openRef;
opt_export str optimizerRef;
+opt_export str parametersRef;
opt_export str packRef;
opt_export str pack2Ref;
opt_export str passRef;
@@ -212,6 +213,7 @@ opt_export str rsColumnRef;
opt_export str schedulerRef;
opt_export str selectNotNilRef;
opt_export str selectRef;
+opt_export str seriesRef;
opt_export str semaRef;
opt_export str semijoinRef;
opt_export str semijoinPathRef;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
