Changeset: 640b5b25fda9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=640b5b25fda9
Modified Files:
sql/src/server/bin_optimizer.c
sql/src/server/rel_bin.c
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (truncated from 308 to 300 lines):
diff -r cad11c6e3bb7 -r 640b5b25fda9 java/tests/Makefile.ag
--- a/java/tests/Makefile.ag Wed Oct 13 10:03:23 2010 +0200
+++ b/java/tests/Makefile.ag Wed Oct 13 14:31:44 2010 +0200
@@ -22,6 +22,7 @@
Test_Creplysize.java \
Test_Csavepoints.java \
Test_Ctransaction.java \
+ Test_PSgeneratedkeys.java \
Test_PStimedate.java \
Test_PStimezone.java \
Test_PStypes.java \
diff -r cad11c6e3bb7 -r 640b5b25fda9 java/tests/Test_PSgeneratedkeys.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/java/tests/Test_PSgeneratedkeys.java Wed Oct 13 14:31:44 2010 +0200
@@ -0,0 +1,78 @@
+/*
+ * 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://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
+ *
+ * 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-2010 MonetDB B.V.
+ * All Rights Reserved.
+ */
+
+import java.sql.*;
+
+public class Test_PSgeneratedkeys {
+ public static void main(String[] args) throws Exception {
+ Class.forName("nl.cwi.monetdb.jdbc.MonetDriver");
+ Connection con = DriverManager.getConnection(args[0]);
+ Statement stmt = con.createStatement();
+ PreparedStatement pstmt;
+ //ResultSet rs = null;
+ //DatabaseMetaData dbmd = con.getMetaData();
+
+ con.setAutoCommit(false);
+ // >> false: auto commit was just switched off
+ System.out.println("0. false\t" + con.getAutoCommit());
+
+ try {
+ stmt.executeUpdate(
+"CREATE TABLE psgenkey (" +
+" id serial," +
+" val varchar(20)" +
+")"
+);
+ } catch (SQLException e) {
+ System.out.println(e);
+ System.out.println("Creation of test table failed! :(");
+ System.out.println("ABORTING TEST!!!");
+ System.exit(-1);
+ }
+
+ try {
+ pstmt = con.prepareStatement(
+"INSERT INTO psgenkey (val) VALUES ('this is a test')",
+Statement.RETURN_GENERATED_KEYS
+);
+ System.out.print("1. inserting a record...");
+
+ pstmt.executeUpdate();
+
+ System.out.println("success :)");
+
+ // now get the generated keys
+ System.out.print("2. getting generated keys...");
+ ResultSet keys = pstmt.getGeneratedKeys();
+ if (keys == null || !keys.next()) {
+ System.out.println("there are no keys! :(");
+ System.out.println("ABORTING TEST!!!");
+ System.exit(-1);
+ }
+
+ System.out.println("generated key index: " +
keys.getInt(1));
+ } catch (SQLException e) {
+ System.out.println("FAILED :( "+ e.getMessage());
+ System.out.println("ABORTING TEST!!!");
+ }
+
+ con.rollback();
+ con.close();
+ }
+}
diff -r cad11c6e3bb7 -r 640b5b25fda9 java/tests/build.xml
--- a/java/tests/build.xml Wed Oct 13 10:03:23 2010 +0200
+++ b/java/tests/build.xml Wed Oct 13 14:31:44 2010 +0200
@@ -107,6 +107,7 @@
<antcall target="Test_Creplysize" />
<antcall target="Test_Csavepoints" />
<antcall target="Test_Ctransaction" />
+ <antcall target="Test_PSgeneratedkeys" />
<antcall target="Test_PSlargeresponse" />
<antcall target="Test_PStimedate" />
<antcall target="Test_PStimezone" />
@@ -182,6 +183,12 @@
</antcall>
</target>
+ <target name="Test_PSgeneratedkeys">
+ <antcall target="test_class">
+ <param name="test.class" value="Test_PSgeneratedkeys" />
+ </antcall>
+ </target>
+
<target name="Test_PSlargeresponse">
<antcall target="test_class">
<param name="test.class" value="Test_PSlargeresponse" />
diff -r cad11c6e3bb7 -r 640b5b25fda9 sql/src/jdbc/tests/Tests/All
--- a/sql/src/jdbc/tests/Tests/All Wed Oct 13 10:03:23 2010 +0200
+++ b/sql/src/jdbc/tests/Tests/All Wed Oct 13 14:31:44 2010 +0200
@@ -4,6 +4,7 @@
HAVE_JDBCTESTS?Test_Creplysize
HAVE_JDBCTESTS?Test_Csavepoints
HAVE_JDBCTESTS?Test_Ctransaction
+HAVE_JDBCTESTS?Test_PSgeneratedkeys
HAVE_JDBCTESTS?Test_PStimedate
HAVE_JDBCTESTS?Test_PStimezone
HAVE_JDBCTESTS?Test_PStypes
diff -r cad11c6e3bb7 -r 640b5b25fda9
sql/src/jdbc/tests/Tests/Test_PSgeneratedkeys.SQL.bat
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/jdbc/tests/Tests/Test_PSgeneratedkeys.SQL.bat Wed Oct 13
14:31:44 2010 +0200
@@ -0,0 +1,1 @@
+...@call "%TSTSRCDIR%\Test.SQL.bat" %*
diff -r cad11c6e3bb7 -r 640b5b25fda9
sql/src/jdbc/tests/Tests/Test_PSgeneratedkeys.SQL.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/jdbc/tests/Tests/Test_PSgeneratedkeys.SQL.sh Wed Oct 13
14:31:44 2010 +0200
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+$TSTSRCDIR/Test.SQL.sh $*
diff -r cad11c6e3bb7 -r 640b5b25fda9
sql/src/jdbc/tests/Tests/Test_PSgeneratedkeys.stable.err
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/jdbc/tests/Tests/Test_PSgeneratedkeys.stable.err Wed Oct 13
14:31:44 2010 +0200
@@ -0,0 +1,84 @@
+stderr of test 'Test_PSgeneratedkeys` in directory 'src/jdbc/tests` itself:
+
+
+# 10:40:25 >
+# 10:40:25 > mserver5
"--config=/ufs/fabian/scratch/monetdb/Oct2010/program-x86_64/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/fabian/scratch/monetdb/Oct2010/program-x86_64/lib/MonetDB5:/ufs/fabian/scratch/monetdb/Oct2010/program-x86_64/lib/MonetDB5/lib:/ufs/fabian/scratch/monetdb/Oct2010/program-x86_64/lib/MonetDB5/bin"
--set
"gdk_dbfarm=/net/volund.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-Oct2010-volund.ins.cwi.nl/sql/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=30090 --set
xrpc_port=46576 --set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_jdbc_tests" --set mal_listing=0 ; echo ; echo Over..
+# 10:40:25 >
+
+# builtin opt gdk_arch = 64bitx86_64-pc-linux-gnu
+# builtin opt gdk_version = 1.40.0
+# builtin opt prefix = /ufs/fabian/scratch/monetdb/Oct2010/program-x86_64
+# builtin opt exec_prefix = ${prefix}
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_admin = adm
+# builtin opt monet_prompt = >
+# builtin opt monet_welcome = yes
+# builtin opt monet_mod_path =
/ufs/fabian/scratch/monetdb/Oct2010/program-x86_64/lib/MonetDB
+# builtin opt monet_daemon = no
+# builtin opt host = localhost
+# builtin opt mapi_port = 50000
+# builtin opt mapi_clients = 2
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_debug = 0
+# builtin opt standoff_ns =
+# builtin opt standoff_start = start
+# builtin opt standoff_end = end
+# config opt prefix = /ufs/fabian/scratch/monetdb/Oct2010/program-x86_64
+# config opt config = ${prefix}/etc/monetdb5.conf
+# config opt prefix = /ufs/fabian/scratch/monetdb/Oct2010/program-x86_64
+# config opt exec_prefix = ${prefix}
+# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
+# config opt monet_mod_path =
/ufs/fabian/scratch/monetdb/Oct2010/program-x86_64/lib/MonetDB5:/ufs/fabian/scratch/monetdb/Oct2010/program-x86_64/lib/MonetDB5/lib:/ufs/fabian/scratch/monetdb/Oct2010/program-x86_64/lib/MonetDB5/bin
+# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
+# config opt mero_controlport = 50001
+# config opt sql_optimizer = default_pipe
+# config opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector
+# config opt default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt no_mitosis_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt sequential_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,history,multiplex,garbageCollector
+# config opt nov2009_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt replication_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
+# config opt accumulator_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,accumulators,dataflow,history,multiplex,garbageCollector
+# config opt recycler_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,deadcode,recycle,reduce,dataflow,history,multiplex,garbageCollector
+# config opt cracker_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,selcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt sidcrack_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,sidcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt datacell_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,datacell,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt octopus_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,constants,commonTerms,joinPath,octopus,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt datacyclotron_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,datacyclotron,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
+# config opt derive_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,derivePath,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt dictionary_pipe =
inline,remap,dictionary,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt compression_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,compression,dataflow,history,multiplex,garbageCollector
+# cmdline opt config =
/ufs/fabian/scratch/monetdb/Oct2010/program-x86_64/etc/monetdb5.conf
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt monet_mod_path =
/ufs/fabian/scratch/monetdb/Oct2010/program-x86_64/lib/MonetDB5:/ufs/fabian/scratch/monetdb/Oct2010/program-x86_64/lib/MonetDB5/lib:/ufs/fabian/scratch/monetdb/Oct2010/program-x86_64/lib/MonetDB5/bin
+# cmdline opt gdk_dbfarm =
/net/volund.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-Oct2010-volund.ins.cwi.nl/sql/dbfarm
+# cmdline opt mapi_open = true
+# cmdline opt xrpc_open = true
+# cmdline opt mapi_port = 30090
+# cmdline opt xrpc_port = 46576
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_src_jdbc_tests
+# cmdline opt mal_listing = 0
+#warning: please don't forget to set your vault key!
+#(see /ufs/fabian/scratch/monetdb/Oct2010/program-x86_64/etc/monetdb5.conf)
+
+# 10:40:26 >
+# 10:40:26 > ./Test_PSgeneratedkeys.SQL.sh Test_PSgeneratedkeys
+# 10:40:26 >
+
+
+# 10:40:26 >
+# 10:40:26 > java Test_PSgeneratedkeys
"jdbc:monetdb://volund:30090/mTests_src_jdbc_tests?user=monetdb&password=monetdb"
+# 10:40:26 >
+
+
+# 10:40:26 >
+# 10:40:26 > Done.
+# 10:40:26 >
+
diff -r cad11c6e3bb7 -r 640b5b25fda9
sql/src/jdbc/tests/Tests/Test_PSgeneratedkeys.stable.out
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/jdbc/tests/Tests/Test_PSgeneratedkeys.stable.out Wed Oct 13
14:31:44 2010 +0200
@@ -0,0 +1,40 @@
+stdout of test 'Test_PSgeneratedkeys` in directory 'src/jdbc/tests` itself:
+
+
+# 10:40:25 >
+# 10:40:25 > mserver5
"--config=/ufs/fabian/scratch/monetdb/Oct2010/program-x86_64/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/fabian/scratch/monetdb/Oct2010/program-x86_64/lib/MonetDB5:/ufs/fabian/scratch/monetdb/Oct2010/program-x86_64/lib/MonetDB5/lib:/ufs/fabian/scratch/monetdb/Oct2010/program-x86_64/lib/MonetDB5/bin"
--set
"gdk_dbfarm=/net/volund.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-Oct2010-volund.ins.cwi.nl/sql/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=30090 --set
xrpc_port=46576 --set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_jdbc_tests" --set mal_listing=0 ; echo ; echo Over..
+# 10:40:25 >
+
+# MonetDB server v5.22.0, based on kernel v1.40.0
+# Release Oct2010-hg
+# Serving database 'mTests_src_jdbc_tests', using 4 threads
+# Compiled for x86_64-pc-linux-gnu/64bit with 64bit OIDs dynamically linked
+# Found 7.750 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2010 MonetDB B.V., all rights reserved
+# Visit http://monetdb.cwi.nl/ for further information
+# Listening for connection requests on mapi:monetdb://volund.ins.cwi.nl:30090/
+# MonetDB/SQL module v2.40.0 loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+
+Over..
+
+# 10:40:26 >
+# 10:40:26 > ./Test_PSgeneratedkeys.SQL.sh Test_PSgeneratedkeys
+# 10:40:26 >
+
+
+# 10:40:26 >
+# 10:40:26 > java Test_PSgeneratedkeys
"jdbc:monetdb://volund:30090/mTests_src_jdbc_tests?user=monetdb&password=monetdb"
+# 10:40:26 >
+
+0. false false
+1. inserting a record...success :)
+2. getting generated keys...generated key index: 1
+
+# 10:40:26 >
+# 10:40:26 > Done.
+# 10:40:26 >
+
diff -r cad11c6e3bb7 -r 640b5b25fda9 sql/src/server/bin_optimizer.c
--- a/sql/src/server/bin_optimizer.c Wed Oct 13 10:03:23 2010 +0200
+++ b/sql/src/server/bin_optimizer.c Wed Oct 13 14:31:44 2010 +0200
@@ -313,7 +313,7 @@
s = stmt_reverse(stmt_limit(stmt_dup(j->op1.stval),
stmt_dup(s->op2.stval),
stmt_dup(s->op3.stval),
- 0));
+ s->flag));
ns = bin_optimizer(c, s);
stmt_destroy(s);
assert(os->rewritten==NULL);
diff -r cad11c6e3bb7 -r 640b5b25fda9 sql/src/server/rel_bin.c
--- a/sql/src/server/rel_bin.c Wed Oct 13 10:03:23 2010 +0200
+++ b/sql/src/server/rel_bin.c Wed Oct 13 14:31:44 2010 +0200
@@ -1939,7 +1939,7 @@
if (oe)
o = exp_bin(sql, oe, NULL, NULL, NULL, NULL);
- if (!le)
+ if (!l)
l = stmt_atom_wrd_nil();
if (!o)
o = stmt_atom_wrd(0);
diff -r cad11c6e3bb7 -r 640b5b25fda9 testing/src/Mtest.py.in
--- a/testing/src/Mtest.py.in Wed Oct 13 10:03:23 2010 +0200
+++ b/testing/src/Mtest.py.in Wed Oct 13 14:31:44 2010 +0200
@@ -2564,7 +2564,7 @@
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
