Changeset: c6a0b6430948 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c6a0b6430948
Added Files:
sql/test/BugTracker-2015/Tests/concurrent-schema.Bug-3826.timeout
Modified Files:
debian/rules
java/ChangeLog.Jun2016
java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
java/tests/Test_Dobjects.java
sql/jdbc/tests/Tests/Test_Dobjects.stable.out
sql/test/BugTracker-2015/Tests/concurrent-schema.Bug-3826.stable.err
sql/test/BugTracker-2015/Tests/concurrent-schema.Bug-3826.stable.out
sql/test/BugTracker-2016/Tests/All
Branch: default
Log Message:
Merge with Jun2016 branch.
diffs (208 lines):
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ override_dh_auto_configure:
--enable-oid32=no \
--enable-optimize=yes \
--enable-profile=no \
- --enable-rintegration=no \
+ --enable-rintegration=yes \
--enable-sql=yes \
--enable-strict=no \
--enable-testing=yes \
diff --git a/java/ChangeLog.Jun2016 b/java/ChangeLog.Jun2016
--- a/java/ChangeLog.Jun2016
+++ b/java/ChangeLog.Jun2016
@@ -1,6 +1,12 @@
# ChangeLog file for java
# This file is updated with Maddlog
+* Thu May 26 2016 Martin van Dinther <martin.van.dint...@monetdbsolutions.com>
+- Fixed problem in DatabaseMetaData.getUDTs() when it was called with
+ types parameter filled. It used to throw SQException with message:
+ SELECT: identifier 'DATA_TYPE' unknown. Now it returns the UDTs which
+ match the provided array of data types.
+
* Thu May 19 2016 Martin van Dinther <martin.van.dint...@monetdbsolutions.com>
- Implemented MonetDatabaseMetaData.supportsConvert() and
MonetDatabaseMetaData.supportsConvert(int fromType, int toType) methods.
diff --git a/java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
--- a/java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
+++ b/java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
@@ -3239,6 +3239,9 @@ public class MonetDatabaseMetaData exten
) throws SQLException
{
StringBuilder query = new StringBuilder(990);
+ if (types != null && types.length > 0) {
+ query.append("SELECT * FROM (");
+ }
query.append("SELECT cast(null as char(1)) AS \"TYPE_CAT\", " +
"\"schemas\".\"name\" AS \"TYPE_SCHEM\", " +
"\"types\".\"sqlname\" AS \"TYPE_NAME\", " +
@@ -3269,7 +3272,7 @@ public class MonetDatabaseMetaData exten
query.append(" AND \"types\".\"sqlname\"
").append(composeMatchPart(typeNamePattern));
}
if (types != null && types.length > 0) {
- query.append(" AND \"DATA_TYPE\" IN (");
+ query.append(") AS getUDTs WHERE \"DATA_TYPE\" IN (");
for (int i = 0; i < types.length; i++) {
if (i > 0) {
query.append(", ");
diff --git a/java/tests/Test_Dobjects.java b/java/tests/Test_Dobjects.java
--- a/java/tests/Test_Dobjects.java
+++ b/java/tests/Test_Dobjects.java
@@ -38,6 +38,9 @@ public class Test_Dobjects {
// dumpResultSet(dbmd.getSchemas()); // this
produces different outputs on different platforms due to dependency on SAMTOOLS
and NETCDF. so exclude it
dumpResultSet(dbmd.getSchemas(null, "sys"));
dumpResultSet(dbmd.getTables(null, "sys", null, null));
+ dumpResultSet(dbmd.getUDTs(null, "sys", null, null));
+ int[] UDTtypes = { Types.STRUCT, Types.DISTINCT };
+ dumpResultSet(dbmd.getUDTs(null, "sys", null,
UDTtypes));
} catch (SQLException e) {
System.out.println("FAILED :( "+ e.getMessage());
System.out.println("ABORTING TEST!!!");
diff --git a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
--- a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
+++ b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
@@ -107,8 +107,16 @@ as select "schema","table",max(count) as
from sys.storagemodel() group by "schema","table"; null null null
null null
null sys tracelog SYSTEM VIEW create view sys.tracelog as
select * from sys.tracelog(); null null null null null
null sys users SYSTEM VIEW SELECT u."name" AS "name",
ui."fullname", ui."default_schema" FROM db_users() AS u LEFT JOIN
"sys"."db_user_info" AS ui ON u."name" = ui."name" ; null null null
null null
+Resultset with 7 columns
+TYPE_CAT TYPE_SCHEM TYPE_NAME CLASS_NAME DATA_TYPE
REMARKS BASE_TYPE
+null sys inet nl.cwi.monetdb.jdbc.types.INET 2000 inet null
+null sys json java.lang.String 2000 json null
+null sys url nl.cwi.monetdb.jdbc.types.URL 2000 url null
+null sys uuid java.lang.String 2000 uuid null
+Resultset with 7 columns
+TYPE_CAT TYPE_SCHEM TYPE_NAME CLASS_NAME DATA_TYPE
REMARKS BASE_TYPE
-# 18:29:26 >
-# 18:29:26 > "Done."
-# 18:29:26 >
+# 17:19:03 >
+# 17:19:03 > "Done."
+# 17:19:03 >
diff --git
a/sql/test/BugTracker-2015/Tests/concurrent-schema.Bug-3826.stable.err
b/sql/test/BugTracker-2015/Tests/concurrent-schema.Bug-3826.stable.err
--- a/sql/test/BugTracker-2015/Tests/concurrent-schema.Bug-3826.stable.err
+++ b/sql/test/BugTracker-2015/Tests/concurrent-schema.Bug-3826.stable.err
@@ -1,1 +1,35 @@
-should not crash
+stderr of test 'concurrent-schema.Bug-3826` in directory
'sql/test/BugTracker-2015` itself:
+
+
+# 13:30:05 >
+# 13:30:05 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30709" "--set"
"mapi_usock=/var/tmp/mtest-30226/.s.monetdb.30709" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "embedded_r=yes"
+# 13:30:05 >
+
+# builtin opt gdk_dbpath =
/ufs/sjoerd/Monet-candidate/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 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 = 30709
+# cmdline opt mapi_usock = /var/tmp/mtest-30226/.s.monetdb.30709
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_BugTracker-2015
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 13:30:06 >
+# 13:30:06 > "/usr/bin/python2" "concurrent-schema.Bug-3826.SQL.py"
"concurrent-schema.Bug-3826"
+# 13:30:06 >
+
+
+# 13:31:36 >
+# 13:31:36 > "Done."
+# 13:31:36 >
+
diff --git
a/sql/test/BugTracker-2015/Tests/concurrent-schema.Bug-3826.stable.out
b/sql/test/BugTracker-2015/Tests/concurrent-schema.Bug-3826.stable.out
--- a/sql/test/BugTracker-2015/Tests/concurrent-schema.Bug-3826.stable.out
+++ b/sql/test/BugTracker-2015/Tests/concurrent-schema.Bug-3826.stable.out
@@ -1,1 +1,71 @@
-should not crash
+stdout of test 'concurrent-schema.Bug-3826` in directory
'sql/test/BugTracker-2015` itself:
+
+
+# 13:30:05 >
+# 13:30:05 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30709" "--set"
"mapi_usock=/var/tmp/mtest-30226/.s.monetdb.30709" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "embedded_r=yes"
+# 13:30:05 >
+
+# MonetDB 5 server v11.23.0 (hg id: 34ce4afa0244)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2015', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit
integers dynamically linked
+# Found 15.589 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:30709/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-30226/.s.monetdb.30709
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/R module loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_querylog.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_temporal.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 24_zorder.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 26_sysmon.sql
+# loading sql script: 27_rejects.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 39_analytics_hge.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 40_json.sql
+# loading sql script: 40_json_hge.sql
+# loading sql script: 41_md5sum.sql
+# loading sql script: 45_uuid.sql
+# loading sql script: 46_gsl.sql
+# loading sql script: 46_profiler.sql
+# loading sql script: 51_sys_schema_extension.sql
+# loading sql script: 72_fits.sql
+# loading sql script: 74_netcdf.sql
+# loading sql script: 75_shp.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 80_udf_hge.sql
+# loading sql script: 85_bam.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 90_generator_hge.sql
+# loading sql script: 99_system.sql
+
+# 13:30:06 >
+# 13:30:06 > "/usr/bin/python2" "concurrent-schema.Bug-3826.SQL.py"
"concurrent-schema.Bug-3826"
+# 13:30:06 >
+
+
+# 13:31:36 >
+# 13:31:36 > "Done."
+# 13:31:36 >
+
diff --git a/sql/test/BugTracker-2015/Tests/concurrent-schema.Bug-3826.timeout
b/sql/test/BugTracker-2015/Tests/concurrent-schema.Bug-3826.timeout
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/concurrent-schema.Bug-3826.timeout
@@ -0,0 +1,1 @@
+3
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
