Changeset: 95378fa5defd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=95378fa5defd
Added Files:
sql/test/BugTracker-2013/Tests/create_table_with_func.Bug-3286.sql
sql/test/BugTracker-2013/Tests/create_table_with_func.Bug-3286.stable.err
sql/test/BugTracker-2013/Tests/create_table_with_func.Bug-3286.stable.out
sql/test/BugTracker-2013/Tests/db_users.Bug-3287.sql
sql/test/BugTracker-2013/Tests/db_users.Bug-3287.stable.err
sql/test/BugTracker-2013/Tests/db_users.Bug-3287.stable.out
Modified Files:
gdk/gdk_join.c
monetdb5/optimizer/optimizer.mal
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_user.c
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out
sql/test/BugTracker-2013/Tests/All
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
Branch: default
Log Message:
Merge with default.
diffs (truncated from 346 to 300 lines):
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -1418,7 +1418,7 @@ thetajoin(BAT *r1, BAT *r2, BAT *l, BAT
assert(sr == NULL || sr->tsorted);
/* encode operator as a bit mask into opcode */
- if (op[0] == '=' && ((op[1] == '=' && op[2] == 0) || op[2] == 0)) {
+ if (op[0] == '=' && ((op[1] == '=' && op[2] == 0) || op[1] == 0)) {
/* "=" or "==" */
opcode |= MASK_EQ;
} else if (op[0] == '!' && op[1] == '=' && op[2] == 0) {
@@ -1720,7 +1720,7 @@ BATsubthetajoin(BAT **r1p, BAT **r2p, BA
{
BAT *r1, *r2;
- if (op[0] == '=' && ((op[1] == '=' && op[2] == 0) || op[2] == 0))
+ if (op[0] == '=' && ((op[1] == '=' && op[2] == 0) || op[1] == 0))
return BATsubjoin(r1p, r2p, l, r, sl, sr, estimate);
*r1p = NULL;
diff --git a/monetdb5/optimizer/optimizer.mal b/monetdb5/optimizer/optimizer.mal
--- a/monetdb5/optimizer/optimizer.mal
+++ b/monetdb5/optimizer/optimizer.mal
@@ -16,6 +16,7 @@
# All Rights Reserved.
module optimizer;
+
pattern optimizer.accumulators():str
address OPTwrapper;
pattern optimizer.accumulators(mod:str, fcn:str):str
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
@@ -55,7 +55,7 @@
#include <rel_bin.h>
static int _dumpstmt(backend *sql, MalBlkPtr mb, stmt *s);
-static int backend_dumpstmt(backend *be, MalBlkPtr mb, stmt *s);
+static int backend_dumpstmt(backend *be, MalBlkPtr mb, stmt *s, int top);
/*
* @+ MAL code support
@@ -315,7 +315,7 @@ static int
}
}
- if (backend_dumpstmt(be, curBlk, s) < 0)
+ if (backend_dumpstmt(be, curBlk, s, 0) < 0)
return -1;
/* SQL function definitions meant for inlineing should not be optimized
before */
varSetProp(curBlk, getArg(curInstr, 0), sqlfunctionProp, op_eq, NULL);
@@ -2205,7 +2205,7 @@ static void setCommitProperty(MalBlkPtr
}
static int
-backend_dumpstmt(backend *be, MalBlkPtr mb, stmt *s)
+backend_dumpstmt(backend *be, MalBlkPtr mb, stmt *s, int top)
{
mvc *c = be->mvc;
stmt **stmts = stmt_array(c->sa, s);
@@ -2213,7 +2213,7 @@ backend_dumpstmt(backend *be, MalBlkPtr
int old_mv = be->mvc_var, nr = 0;
/* announce the transaction mode */
- if ( c->session->auto_commit)
+ if (top && c->session->auto_commit)
setCommitProperty(mb);
q = newStmt1(mb, sqlRef, "mvc");
be->mvc_var = getDestVar(q);
@@ -2229,7 +2229,7 @@ backend_dumpstmt(backend *be, MalBlkPtr
return -1;
be->mvc_var = old_mv;
- if (c->caching && (c->type == Q_SCHEMA || c->type == Q_TRANS)) {
+ if (top && c->caching && (c->type == Q_SCHEMA || c->type == Q_TRANS)) {
q = newStmt2(mb, sqlRef, exportOperationRef);
(void) pushStr(mb, q, ""); /* warning */
}
@@ -2276,7 +2276,7 @@ backend_callinline(backend *be, Client c
}
}
}
- if (backend_dumpstmt(be, curBlk, s) < 0)
+ if (backend_dumpstmt(be, curBlk, s, 1) < 0)
return -1;
c->curprg->def = curBlk;
return 0;
@@ -2338,7 +2338,7 @@ backend_dumpproc(backend *be, Client c,
}
}
- if (backend_dumpstmt(be, mb, s) < 0)
+ if (backend_dumpstmt(be, mb, s, 1) < 0)
return NULL;
// Always keep the SQL query around for monitoring
@@ -2530,7 +2530,7 @@ backend_create_func(backend *be, sql_fun
if ( m->session->auto_commit)
setCommitProperty(curBlk);
- if (backend_dumpstmt(be, curBlk, s) < 0)
+ if (backend_dumpstmt(be, curBlk, s, 0) < 0)
return -1;
/* selectively make functions available for inlineing */
/* for the time being we only inline scalar functions */
diff --git a/sql/backends/monet5/sql_user.c b/sql/backends/monet5/sql_user.c
--- a/sql/backends/monet5/sql_user.c
+++ b/sql/backends/monet5/sql_user.c
@@ -164,9 +164,11 @@ db_users_wrap(Client cntxt, MalBlkPtr mb
{
bat *r = (bat *)getArgReference(stk, pci, 0);
BAT *b = db_users(cntxt);
+ BAT *bm = BATmirror(BATmark(BATmirror(b), 0));
(void)mb;
- *r = b->batCacheid;
+ BBPunfix(b->batCacheid);
+ *r = bm->batCacheid;
BBPkeepref(*r);
return MAL_SUCCEED;
}
diff --git
a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out
b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out
--- a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out
+++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out
@@ -66,6 +66,7 @@ Ready.
[ 5983, "storagemodel", 2000, "create view sys.storagemodel as select
* from sys.storagemodel();", 1, true, 0, false, 0 ]
[ 5992, "tablestoragemodel", 2000, "-- A summary of the table
storage requirement is is available as a table view.\n-- The auxillary column
denotes the maximum space if all non-sorted columns\n-- would be augmented with
a hash (rare situation)\ncreate view sys.tablestoragemodel\nas select
\"schema\",\"table\",max(count) as \"count\",\n\tsum(columnsize) as
columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(indices) as
indices,\n\tsum(case when sorted = false then 8 * count else 0 end) as
auxillary\nfrom sys.storagemodel() group by \"schema\",\"table\";", 1,
true, 0, false, 0 ]
[ 6014, "systemfunctions", 2000, NULL, 0, true, 0,
false, 0 ]
+[ 6123, "r", 2000, NULL, 0, false, 0, false, 0
]
# 18:53:13 >
# 18:53:13 > "Done."
diff --git a/sql/test/BugTracker-2013/Tests/All
b/sql/test/BugTracker-2013/Tests/All
--- a/sql/test/BugTracker-2013/Tests/All
+++ b/sql/test/BugTracker-2013/Tests/All
@@ -17,3 +17,5 @@ numeric-column-orderby.Bug-3278
numeric-column-alias.Bug-3279
median-null.Bug-3280
corrupt-after-restart.Bug-3282
+db_users.Bug-3287
+create_table_with_func.Bug-3286
diff --git a/sql/test/BugTracker-2013/Tests/create_table_with_func.Bug-3286.sql
b/sql/test/BugTracker-2013/Tests/create_table_with_func.Bug-3286.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/create_table_with_func.Bug-3286.sql
@@ -0,0 +1,10 @@
+call sys.storagemodelinit();
+create table estimated_storage
+as (
+ select "table" as tblname,
+ max("count") as count
+ from sys.storagemodel()
+ where "schema" = 'sys'
+ group by "table")
+ with data;
+
diff --git
a/sql/test/BugTracker-2013/Tests/create_table_with_func.Bug-3286.stable.err
b/sql/test/BugTracker-2013/Tests/create_table_with_func.Bug-3286.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/create_table_with_func.Bug-3286.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'create_table_with_func.Bug-3286` in directory
'sql/test/BugTracker-2013` itself:
+
+
+# 20:04:33 >
+# 20:04:33 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37761" "--set"
"mapi_usock=/var/tmp/mtest-23407/.s.monetdb.37761" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2013"
"--set" "mal_listing=0"
+# 20:04:33 >
+
+# 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 = yes
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# 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 = 37761
+# cmdline opt mapi_usock = /var/tmp/mtest-23407/.s.monetdb.37761
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2013
+# cmdline opt mal_listing = 0
+
+# 20:04:33 >
+# 20:04:33 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-23407" "--port=37761"
+# 20:04:33 >
+
+
+# 20:04:33 >
+# 20:04:33 > "Done."
+# 20:04:33 >
+
diff --git
a/sql/test/BugTracker-2013/Tests/create_table_with_func.Bug-3286.stable.out
b/sql/test/BugTracker-2013/Tests/create_table_with_func.Bug-3286.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/create_table_with_func.Bug-3286.stable.out
@@ -0,0 +1,40 @@
+stdout of test 'create_table_with_func.Bug-3286` in directory
'sql/test/BugTracker-2013` itself:
+
+
+# 20:04:33 >
+# 20:04:33 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=37761" "--set"
"mapi_usock=/var/tmp/mtest-23407/.s.monetdb.37761" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2013"
"--set" "mal_listing=0"
+# 20:04:33 >
+
+# MonetDB 5 server v11.15.4
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2013', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 3.778 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://niels.nesco.mine.nu:37761/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-23407/.s.monetdb.37761
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 20:04:33 >
+# 20:04:33 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-23407" "--port=37761"
+# 20:04:33 >
+
+#create table estimated_storage
+#as (
+# select "table" as tblname,
+# max("count") as count
+# from sys.storagemodel()
+# where "schema" = 'sys'
+# group by "table")
+# with data;
+
+# 20:04:33 >
+# 20:04:33 > "Done."
+# 20:04:33 >
+
diff --git a/sql/test/BugTracker-2013/Tests/db_users.Bug-3287.sql
b/sql/test/BugTracker-2013/Tests/db_users.Bug-3287.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/db_users.Bug-3287.sql
@@ -0,0 +1,2 @@
+create user my_user with password 'p1' name 'User with role' schema "sys";
+select name from "sys".users where lower(name) = 'monetdb';
diff --git a/sql/test/BugTracker-2013/Tests/db_users.Bug-3287.stable.err
b/sql/test/BugTracker-2013/Tests/db_users.Bug-3287.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/db_users.Bug-3287.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'db_users.Bug-3287` in directory 'sql/test/BugTracker-2013`
itself:
+
+
+# 16:44:50 >
+# 16:44:50 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35608" "--set"
"mapi_usock=/var/tmp/mtest-31032/.s.monetdb.35608" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2013"
"--set" "mal_listing=0"
+# 16:44:50 >
+
+# 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 = yes
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# 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 = 35608
+# cmdline opt mapi_usock = /var/tmp/mtest-31032/.s.monetdb.35608
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2013
+# cmdline opt mal_listing = 0
+
+# 16:44:51 >
+# 16:44:51 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-31032" "--port=35608"
+# 16:44:51 >
+
+
+# 16:44:51 >
+# 16:44:51 > "Done."
+# 16:44:51 >
+
diff --git a/sql/test/BugTracker-2013/Tests/db_users.Bug-3287.stable.out
b/sql/test/BugTracker-2013/Tests/db_users.Bug-3287.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/db_users.Bug-3287.stable.out
@@ -0,0 +1,39 @@
+stdout of test 'db_users.Bug-3287` in directory 'sql/test/BugTracker-2013`
itself:
+
+
+# 16:44:50 >
+# 16:44:50 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35608" "--set"
"mapi_usock=/var/tmp/mtest-31032/.s.monetdb.35608" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2013"
"--set" "mal_listing=0"
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
