MonetDB: Oct2012 - enable yesterday's test
Changeset: 895dcc4bf0da for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=895dcc4bf0da Modified Files: sql/test/BugTracker-2012/Tests/All Branch: Oct2012 Log Message: enable yesterday's test diffs (8 lines): diff --git a/sql/test/BugTracker-2012/Tests/All b/sql/test/BugTracker-2012/Tests/All --- a/sql/test/BugTracker-2012/Tests/All +++ b/sql/test/BugTracker-2012/Tests/All @@ -53,3 +53,4 @@ not-equal-Bug.3139 many-columns-truncated.Bug-3161 aggregate_incorrect_precision_scale.Bug-3182 timestamp-diff.Bug-3190 +string-insert-default-null-crash.Bug-3168 ___ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Oct2012 - getTableName: use correct backing array
Changeset: c58ed8603d69 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c58ed8603d69
Modified Files:
java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
Branch: Oct2012
Log Message:
getTableName: use correct backing array
Thanks Julian Hyde for noticing in bug #3192
diffs (12 lines):
diff --git a/java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
b/java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
--- a/java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
+++ b/java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
@@ -480,7 +480,7 @@ public class MonetPreparedStatement
* @return table name or if not applicable
*/
public String getTableName(int col) throws SQLException
{
- return column[getColumnIdx(col)];
+ return table[getColumnIdx(col)];
}
/**
___
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Replaced ungrouped sum/product aggregates wit...
Changeset: 783e8d7f88b4 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=783e8d7f88b4 Added Files: monetdb5/modules/mal/Tests/bigsum.mal monetdb5/modules/mal/Tests/bigsum.stable.err monetdb5/modules/mal/Tests/bigsum.stable.out Modified Files: clients/Tests/exports.stable.out gdk/gdk_aggr.c gdk/gdk_calc.h monetdb5/modules/kernel/algebra.mx monetdb5/modules/mal/Tests/All monetdb5/modules/mal/calc.c monetdb5/modules/mal/calc.mal monetdb5/modules/mal/calc.mal.sh Branch: default Log Message: Replaced ungrouped sum/product aggregates with same code as grouped aggrs. Not only do we now get overflow checks, sum aggregates into flt/dbl are now done without loss of precision. For that, see the new test bigsum which fails with the old code. diffs (truncated from 2385 to 300 lines): diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -160,6 +160,7 @@ BAT *BATouterjoin(BAT *l, BAT *r, BUN es BAT *BATprev(BAT *b); int BATprint(BAT *b); int BATprintf(stream *f, BAT *b); +gdk_return BATprod(void *res, int tp, BAT *b, BAT *s, int skip_nils, int abort_on_error, int nil_if_empty); BAT *BATrangejoin(BAT *l, BAT *rl, BAT *rh, bit li, bit hi); BAT *BATreplace(BAT *b, BAT *n, bit force); BAT *BATrestrict(BAT *b, const void *hl, const void *hh, const void *tl, const void *th); @@ -185,6 +186,7 @@ BAT *BATssort(BAT *b); BAT *BATssort_rev(BAT *b); BAT *BATsubselect(BAT *b, BAT *s, const void *tl, const void *th, int li, int hi, int anti); gdk_return BATsubsort(BAT **sorted, BAT **order, BAT **groups, BAT *b, BAT *o, BAT *g, int reverse, int stable); +gdk_return BATsum(void *res, int tp, BAT *b, BAT *s, int skip_nils, int abort_on_error, int nil_if_empty); BAT *BATsunion(BAT *b, BAT *c); BAT *BATsunique(BAT *b); BAT *BATthetajoin(BAT *l, BAT *r, int mode, BUN estimate); @@ -761,29 +763,6 @@ str ALGouterjoinestimate(int *result, in str ALGposition(wrd *retval, int *bid, ptr val); str ALGpositionBUN(wrd *retval, int *bid, ptr val, ptr tval); str ALGprejoin(int *rl, int *rr, int *l, int *r); -str ALGprod_bte_bte(bte *res, int *bid, bit *empty_is_nil); -str ALGprod_bte_dbl(dbl *res, int *bid, bit *empty_is_nil); -str ALGprod_bte_int(int *res, int *bid, bit *empty_is_nil); -str ALGprod_bte_lng(lng *res, int *bid, bit *empty_is_nil); -str ALGprod_bte_sht(sht *res, int *bid, bit *empty_is_nil); -str ALGprod_bte_wrd(wrd *res, int *bid, bit *empty_is_nil); -str ALGprod_dbl_dbl(dbl *res, int *bid, bit *empty_is_nil); -str ALGprod_flt_dbl(dbl *res, int *bid, bit *empty_is_nil); -str ALGprod_flt_flt(flt *res, int *bid, bit *empty_is_nil); -str ALGprod_int_dbl(dbl *res, int *bid, bit *empty_is_nil); -str ALGprod_int_int(int *res, int *bid, bit *empty_is_nil); -str ALGprod_int_lng(lng *res, int *bid, bit *empty_is_nil); -str ALGprod_int_wrd(wrd *res, int *bid, bit *empty_is_nil); -str ALGprod_lng_dbl(dbl *res, int *bid, bit *empty_is_nil); -str ALGprod_lng_lng(lng *res, int *bid, bit *empty_is_nil); -str ALGprod_sht_dbl(dbl *res, int *bid, bit *empty_is_nil); -str ALGprod_sht_int(int *res, int *bid, bit *empty_is_nil); -str ALGprod_sht_lng(lng *res, int *bid, bit *empty_is_nil); -str ALGprod_sht_sht(sht *res, int *bid, bit *empty_is_nil); -str ALGprod_sht_wrd(wrd *res, int *bid, bit *empty_is_nil); -str ALGprod_wrd_dbl(dbl *res, int *bid, bit *empty_is_nil); -str ALGprod_wrd_lng(lng *res, int *bid, bit *empty_is_nil); -str ALGprod_wrd_wrd(wrd *res, int *bid, bit *empty_is_nil); str ALGprojectNIL(int *ret, int *bid); str ALGprojecthead(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str ALGprojecttail(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); @@ -827,29 +806,6 @@ str ALGsubsort23(bat *result, bat *norde str ALGsubsort31(bat *result, bat *bid, bat *order, bat *group, bit *reverse, bit *stable); str ALGsubsort32(bat *result, bat *norder, bat *bid, bat *order, bat *group, bit *reverse, bit *stable); str ALGsubsort33(bat *result, bat *norder, bat *ngroup, bat *bid, bat *order, bat *group, bit *reverse, bit *stable); -str ALGsum_bte_bte(bte *res, int *bid, bit *empty_is_nil); -str ALGsum_bte_dbl(dbl *res, int *bid, bit *empty_is_nil); -str ALGsum_bte_int(int *res, int *bid, bit *empty_is_nil); -str ALGsum_bte_lng(lng *res, int *bid, bit *empty_is_nil); -str ALGsum_bte_sht(sht *res, int *bid, bit *empty_is_nil); -str ALGsum_bte_wrd(wrd *res, int *bid, bit *empty_is_nil); -str ALGsum_dbl_dbl(dbl *res, int *bid, bit *empty_is_nil); -str ALGsum_flt_dbl(dbl *res, int *bid, bit *empty_is_nil); -str ALGsum_flt_flt(flt *res, int *bid, bit *empty_is_nil); -str ALGsum_int_dbl(dbl *res, int *bid, bit *empty_is_nil); -str ALGsum_int_int(int *res, int *bid, bit *empty_is_nil); -str ALGsum_int_lng(lng *res, int *bid, bit *empty_is_nil); -str ALGsum_int_wrd(wrd *res, int *bid, bit
MonetDB: default - Approved output after recent changes.
Changeset: 84d0cbd527fd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=84d0cbd527fd
Modified Files:
clients/Tests/exports.stable.out
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/optimizer/Tests/inline07.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/Tests/setoptimizer.stable.err
sql/test/Tests/setoptimizer.stable.out
Branch: default
Log Message:
Approved output after recent changes.
diffs (208 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -2721,6 +2721,7 @@ str kunionRef;
str kuniqueRef;
str languageRef;
str lastline(Client cntxt);
+str leftfetchjoinPathRef;
str leftfetchjoinRef;
str leftjoinPathRef;
str leftjoinRef;
@@ -3031,6 +3032,7 @@ str schedulerRef;
str selectNotNilRef;
str selectRef;
str semaRef;
+str semijoinPathRef;
str semijoinRef;
str setAccessRef;
void setArgType(MalBlkPtr mb, InstrPtr p, int i, int tpe);
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
@@ -55,8 +55,8 @@ Ready.
% . # table_name
% def # name
% clob # type
-% 423 # length
-[
optimizer.inline();optimizer.remap();optimizer.evaluate();optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.groups();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.garbageCollector();
]
+% 446 # length
+[
optimizer.inline();optimizer.remap();optimizer.evaluate();optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.groups();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.garbageCollector();
]
#explain copy into ttt from '/:\tmp/xyz';
% .explain # table_name
% mal # name
@@ -66,8 +66,8 @@ function user.s2_1{autoCommit=true}():vo
X_2 := sql.mvc();
(X_5:bat[:oid,:int] ,X_6:bat[:oid,:int] ,X_7:bat[:oid,:int] ) :=
sql.copy_from(sys:str,ttt:str,|:str,\\n:str,nil:str,null:str,/:\\tmp/xyz:str,-1:lng,0:lng,0:int);
X_9 := sql.append(X_2,sys,ttt,a,X_5);
-X_11 := sql.append(X_9,sys:str,ttt:str,b,X_6);
-X_15 := sql.append(X_11,sys:str,ttt:str,c,X_7);
+X_11 := sql.append(X_9,sys,ttt,b,X_6);
+X_15 := sql.append(X_11,sys,ttt,c,X_7);
X_16 := aggr.count(X_7);
sql.affectedRows(X_15,X_16,);
end s2_1;
@@ -83,8 +83,8 @@ end s2_1;
% . # table_name
% def # name
% clob # type
-% 446 # length
-[
optimizer.inline();optimizer.remap();optimizer.evaluate();optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.groups();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.sql_append();optimizer.garbageCollector();
]
+% 469 # length
+[
optimizer.inline();optimizer.remap();optimizer.evaluate();optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.groups();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.sql_append();optimizer.garbageCollector();
]
#explain copy into ttt from '/:\tmp/xyz';
% .explain # table_name
% mal # name
diff --git a/monetdb5/optimizer/Tests/inline07.stable.out
b/monetdb5/optimizer/Tests/inline07.stable.out
--- a/monetdb5/optimizer/Tests/inline07.stable.out
+++ b/monetdb5/optimizer/Tests/inline07.stable.out
@@ -28,7 +28,7 @@ end main;
function user.qry():void; # 0 qry:void := user.qry() {G}
b := bat.new(:oid,:int);# 1 b:bat[:oid,:int] :=
CMDBATnew(_2:oid, _3:int) {G}
bat.insert(b,0@0,1);# 2 _4:bat[:oid,:int] :=
BKCinsert_bun(b:bat[:oid,:int], _5:oid, _6:int) {G}
-X_13 := aggr.sum(b);# 3 _13:dbl :=
aggr.sum(b:bat[:oid,:int]) {G}
+X_13 := aggr.sum(b);# 3 _13:dbl :=
CMDBATsum(b:bat[:oid,:int]) {G}
X_14 := batcalc.+(b,X_13);
MonetDB: Oct2012 - Test_PSmetadata: test for column and paramete...
Changeset: 59deba53fa55 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=59deba53fa55
Added Files:
java/tests/Test_PSmetadata.java
Modified Files:
java/tests/build.xml
Branch: Oct2012
Log Message:
Test_PSmetadata: test for column and parameter metadata
This test reveals the problem reported in bug #3192
diffs (137 lines):
diff --git a/java/tests/Test_PSmetadata.java b/java/tests/Test_PSmetadata.java
new file mode 100644
--- /dev/null
+++ b/java/tests/Test_PSmetadata.java
@@ -0,0 +1,108 @@
+/*
+ * 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-2012 MonetDB B.V.
+ * All Rights Reserved.
+ */
+
+import java.sql.*;
+
+public class Test_PSmetadata {
+ 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;
+ ResultSetMetaData rsmd = null;
+ ParameterMetaData pmd = null;
+
+ con.setAutoCommit(false);
+ // false: auto commit should be off now
+ System.out.println(0. false\t + con.getAutoCommit());
+
+ try {
+ stmt.executeUpdate(CREATE TABLE table_Test_PSmetadata
( myint int, mydouble double, mybool boolean, myvarchar varchar(15), myclob
clob ));
+
+ // all NULLs
+ stmt.executeUpdate(INSERT INTO table_Test_PSmetadata
VALUES (NULL, NULL,NULL, NULL, NULL));
+ // all filled in
+ stmt.executeUpdate(INSERT INTO table_Test_PSmetadata
VALUES (2 , 3.0, true, 'A string','bla bla
bla'));
+
+ pstmt = con.prepareStatement(SELECT CASE WHEN myint IS
NULL THEN 0 ELSE 1 END AS intnull, * FROM table_Test_PSmetadata WHERE myint =
?);
+
+ rsmd = pstmt.getMetaData();
+
+ System.out.println(0. 6 columns:\t +
rsmd.getColumnCount());
+ for (int col = 1; col = rsmd.getColumnCount(); col++) {
+ System.out.println( + col + .\t +
rsmd.getCatalogName(col));
+ System.out.println(\tclassname +
rsmd.getColumnClassName(col));
+ System.out.println(\tdisplaysize+
rsmd.getColumnDisplaySize(col));
+ System.out.println(\tlabel +
rsmd.getColumnLabel(col));
+ System.out.println(\tname +
rsmd.getColumnName(col));
+ System.out.println(\ttype +
rsmd.getColumnType(col));
+ System.out.println(\ttypename +
rsmd.getColumnTypeName(col));
+ System.out.println(\tprecision +
rsmd.getPrecision(col));
+ System.out.println(\tscale +
rsmd.getScale(col));
+ System.out.println(\tschemaname +
rsmd.getSchemaName(col));
+ System.out.println(\ttablename +
rsmd.getTableName(col));
+ System.out.println(\tautoincrement +
rsmd.isAutoIncrement(col));
+ System.out.println(\tcasesensitive +
rsmd.isCaseSensitive(col));
+ System.out.println(\tcurrency +
rsmd.isCurrency(col));
+ System.out.println(\tdefwritable+
rsmd.isDefinitelyWritable(col));
+ System.out.println(\tnullable +
rsmd.isNullable(col));
+ System.out.println(\treadonly +
rsmd.isReadOnly(col));
+ System.out.println(\tsearchable +
rsmd.isSearchable(col));
+ System.out.println(\tsigned +
rsmd.isSigned(col));
+ System.out.println(\twritable +
rsmd.isWritable(col));
+ }
+
+ pmd = pstmt.getParameterMetaData();
+
MonetDB: Oct2012 - PreparedStatement: don't mix up parameters an...
Changeset: 1e15c1849512 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1e15c1849512
Modified Files:
java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
Branch: Oct2012
Log Message:
PreparedStatement: don't mix up parameters and columns
PreparedStatements can return metadata for parameters as well as result
columns since Dec2011. In previous fixes to cope with this, I didn't
quite realise that there is a difference between the two. We now
properly separate both, such that we don't mistakenly claim a column or
parameter doesn't exist, such as in bug #3192. This changeset makes
Test_PSmetadata working correctly.
diffs (141 lines):
diff --git a/java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
b/java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
--- a/java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
+++ b/java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
@@ -302,7 +302,7 @@ public class MonetPreparedStatement
private int getColumnIdx(int colnr) throws SQLException {
int curcol = 0;
for (int i = 0; i size; i++) {
- if (column[i] != null)
+ if (column[i] == null)
continue;
curcol++;
if (curcol == colnr)
@@ -310,6 +310,22 @@ public class MonetPreparedStatement
}
throw new SQLException(No such column with index: + colnr,
M1M05);
}
+ /**
+* Returns the index in the backing arrays for the given
+* parameter number
+*/
+ private int getParamIdx(int paramnr) throws SQLException {
+ int curparam = 0;
+ for (int i = 0; i size; i++) {
+ if (column[i] != null)
+ continue;
+ curparam++;
+ if (curparam == paramnr)
+ return i;
+ }
+ throw new SQLException(No such parameter with index: +
paramnr, M1M05);
+ }
+
/* helper for the anonymous class inside getMetaData */
private abstract class rsmdw extends MonetWrapper implements
ResultSetMetaData {}
@@ -695,7 +711,14 @@ public class MonetPreparedStatement
* @throws SQLException if a database access error
occurs
*/
public int getParameterCount() throws SQLException {
- return size;
+ int cnt = 0;
+
+ for (int i = 0; i size; i++) {
+ if (column[i] == null)
+ cnt++;
+ }
+
+ return cnt;
}
/**
@@ -726,7 +749,7 @@ public class MonetPreparedStatement
public boolean isSigned(int param) throws SQLException {
// we can hardcode this, based on the colum type
// (from ResultSetMetaData.isSigned)
- switch (javaType[getColumnIdx(param)]) {
+ switch (javaType[getParamIdx(param)]) {
case Types.NUMERIC:
case Types.DECIMAL:
case Types.TINYINT:
@@ -756,7 +779,7 @@ public class MonetPreparedStatement
* @throws SQLException if a database access error
occurs
*/
public int getPrecision(int param) throws SQLException {
- return digits[getColumnIdx(param)];
+ return digits[getParamIdx(param)];
}
/**
@@ -768,7 +791,7 @@ public class MonetPreparedStatement
* @throws SQLException if a database access error
occurs
*/
public int getScale(int param) throws SQLException {
- return scale[getColumnIdx(param)];
+ return scale[getParamIdx(param)];
}
/**
@@ -779,7 +802,7 @@ public class MonetPreparedStatement
* @throws SQLException if a database access error
occurs
*/
public int getParameterType(int param) throws
SQLException {
- return javaType[getColumnIdx(param)];
+ return javaType[getParamIdx(param)];
}
/**
@@ -793,7 +816,7 @@ public class MonetPreparedStatement
* @throws
MonetDB: Oct2012 - JDBC: add ChangeLog entry, and bump version m...
Changeset: ea88aea191c3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ea88aea191c3
Modified Files:
java/ChangeLog.Oct2012
java/Makefile.ag
java/build.properties
java/pom.xml
java/release.txt
Branch: Oct2012
Log Message:
JDBC: add ChangeLog entry, and bump version minor
diffs (62 lines):
diff --git a/java/ChangeLog.Oct2012 b/java/ChangeLog.Oct2012
--- a/java/ChangeLog.Oct2012
+++ b/java/ChangeLog.Oct2012
@@ -1,3 +1,8 @@
# ChangeLog file for java
# This file is updated with Maddlog
+* Thu Nov 22 2012 Fabian Groffen fab...@monetdb.org
+- Fixed a problem in PreparedStatement where the prepared statement's
+ ResultSetMetaData (on its columns to be produced) incorrectly threw
+ exceptions about non existing columns. Bug #3192
+
diff --git a/java/Makefile.ag b/java/Makefile.ag
--- a/java/Makefile.ag
+++ b/java/Makefile.ag
@@ -27,7 +27,7 @@ JAVA_HOME = @JAVA_HOME@
ant_distjdbc = {
COND = HAVE_JAVAJDBC
DIR = datadir/monetdb/lib
- FILES = monetdb-mcl-1.8.jar monetdb-jdbc-2.7.jar jdbcclient.jar
+ FILES = monetdb-mcl-1.8.jar monetdb-jdbc-2.8.jar jdbcclient.jar
}
ant_distmerocontrol = {
diff --git a/java/build.properties b/java/build.properties
--- a/java/build.properties
+++ b/java/build.properties
@@ -19,7 +19,7 @@ MCL_MINOR=8
# major release number
JDBC_MAJOR=2
# minor release number
-JDBC_MINOR=7
+JDBC_MINOR=8
# an additional identifying string
JDBC_VER_SUFFIX=Liberica
# the default port to connect on, if no port given when using SQL
diff --git a/java/pom.xml b/java/pom.xml
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -6,7 +6,7 @@
modelVersion4.0.0/modelVersion
groupIdmonetdb/groupId
artifactIdmonetdb-jdbc/artifactId
- version2.7/version
+ version2.8/version
namemonetdb-jdbc/name
descriptionMonetDB JDBC driver/description
repositories
diff --git a/java/release.txt b/java/release.txt
--- a/java/release.txt
+++ b/java/release.txt
@@ -1,8 +1,8 @@
RELEASE NOTES
-MonetDB JDBC driver version 2.7 (Liberica/MCL-1.8)
+MonetDB JDBC driver version 2.8 (Liberica/MCL-1.8)
Fabian Groffen fabian.grof...@cwi.nl
-Release date: 2012-11-02
+Release date: 2012-11-22
This JDBC driver is designed for use with MonetDB, a main-memory
___
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Oct2012 - Add Mtest for bug #3192
Changeset: e4a6b9edf48f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e4a6b9edf48f Added Files: sql/jdbc/tests/Tests/Test_PSmetadata.SQL.bat sql/jdbc/tests/Tests/Test_PSmetadata.SQL.sh sql/jdbc/tests/Tests/Test_PSmetadata.stable.err sql/jdbc/tests/Tests/Test_PSmetadata.stable.out Modified Files: sql/jdbc/tests/Tests/All Branch: Oct2012 Log Message: Add Mtest for bug #3192 diffs (265 lines): diff --git a/sql/jdbc/tests/Tests/All b/sql/jdbc/tests/Tests/All --- a/sql/jdbc/tests/Tests/All +++ b/sql/jdbc/tests/Tests/All @@ -13,6 +13,7 @@ HAVE_JDBCTESTS?Test_PStimedate HAVE_JDBCTESTS?Test_PStimezone HAVE_JDBCTESTS?Test_PStypes HAVE_JDBCTESTS?Test_PSmanycon +HAVE_JDBCTESTS?Test_PSmetadata HAVE_JDBCTESTS?Test_Rbooleans HAVE_JDBCTESTS?Test_Rmetadata HAVE_JDBCTESTS?Test_Rpositioning diff --git a/sql/jdbc/tests/Tests/Test_PSmetadata.SQL.bat b/sql/jdbc/tests/Tests/Test_PSmetadata.SQL.bat new file mode 100755 --- /dev/null +++ b/sql/jdbc/tests/Tests/Test_PSmetadata.SQL.bat @@ -0,0 +1,1 @@ +@call %TSTSRCDIR%\Test.SQL.bat %* diff --git a/sql/jdbc/tests/Tests/Test_PSmetadata.SQL.sh b/sql/jdbc/tests/Tests/Test_PSmetadata.SQL.sh new file mode 100755 --- /dev/null +++ b/sql/jdbc/tests/Tests/Test_PSmetadata.SQL.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +$TSTSRCDIR/Test.SQL.sh $* diff --git a/sql/jdbc/tests/Tests/Test_PSmetadata.stable.err b/sql/jdbc/tests/Tests/Test_PSmetadata.stable.err new file mode 100644 --- /dev/null +++ b/sql/jdbc/tests/Tests/Test_PSmetadata.stable.err @@ -0,0 +1,41 @@ +stderr of test 'Test_PSmetadata` in directory 'jdbc/tests` itself: + + +# 13:52:42 +# 13:52:42 mserver5 --debug=10 --set gdk_nr_threads=0 --set gdk_dbfarm=/net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-Oct2012-sofia.ins.cwi.nl/sql/dbfarm --set mapi_open=true --set mapi_port=32363 --set monet_prompt= --trace --forcemito --set mal_listing=2 --dbname=mTests_jdbc_tests --set mal_listing=0 +# 13:52:42 + +# builtin opt gdk_dbname = demo +# builtin opt gdk_dbfarm = /ufs/fabian/scratch/ssd/monetdb/Oct2012/program-x86_64/var/lib/monetdb5/dbfarm +# builtin opt gdk_debug = 0 +# builtin opt gdk_vmtrim = yes +# builtin opt monet_prompt = +# builtin opt monet_daemon = no +# builtin opt mapi_port = 5 +# builtin opt mapi_open = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt gdk_dbfarm = /net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-Oct2012-sofia.ins.cwi.nl/sql/dbfarm +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 32363 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbname = mTests_jdbc_tests +# cmdline opt mal_listing = 0 + +# 13:52:42 +# 13:52:42 ./Test_PSmetadata.SQL.sh Test_PSmetadata +# 13:52:42 + + +# 13:52:42 +# 13:52:42 java Test_PSmetadata jdbc:monetdb://sofia:32363/mTests_jdbc_tests?user=monetdbpassword=monetdb +# 13:52:42 + + +# 13:52:43 +# 13:52:43 Done. +# 13:52:43 + diff --git a/sql/jdbc/tests/Tests/Test_PSmetadata.stable.out b/sql/jdbc/tests/Tests/Test_PSmetadata.stable.out new file mode 100644 --- /dev/null +++ b/sql/jdbc/tests/Tests/Test_PSmetadata.stable.out @@ -0,0 +1,189 @@ +stdout of test 'Test_PSmetadata` in directory 'jdbc/tests` itself: + + +# 13:52:42 +# 13:52:42 mserver5 --debug=10 --set gdk_nr_threads=0 --set gdk_dbfarm=/net/sofia.ins.cwi.nl/export/scratch1/fabian/tmp/mtest-Oct2012-sofia.ins.cwi.nl/sql/dbfarm --set mapi_open=true --set mapi_port=32363 --set monet_prompt= --trace --forcemito --set mal_listing=2 --dbname=mTests_jdbc_tests --set mal_listing=0 +# 13:52:42 + +# MonetDB 5 server v11.13.4 Oct2012-7f942d4b43a5 +# Serving database 'mTests_jdbc_tests', using 8 threads +# Compiled for x86_64-pc-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 15.629 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2012 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://sofia.ins.cwi.nl:32363/ +# MonetDB/GIS module loaded +# MonetDB/JAQL module loaded +# MonetDB/SQL 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_history.sql +# loading sql script: 16_tracelog.sql +# loading sql script: 17_compress.sql +# loading sql script: 18_dictionary.sql +# loading sql script: 19_cluster.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 +#
MonetDB: Oct2012 - Fixed package names for Debuntu library packa...
Changeset: c499d3d79ef6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c499d3d79ef6
Added Files:
debian/libmonetdb-client6.install
debian/libmonetdb8.install
Removed Files:
debian/libmonetdb-client5.install
debian/libmonetdb6.install
Modified Files:
debian/control
Branch: Oct2012
Log Message:
Fixed package names for Debuntu library packages.
The number at the end of the package name should be the major version
number of the library.
diffs (44 lines):
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Standards-Version: 3.8.0
X-Python-Version: = 2.6
X-Python3-Version: = 3.0
-Package: libmonetdb6
+Package: libmonetdb8
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libmonetdb1, libmonetdb2, libmonetdb-dev
@@ -55,7 +55,7 @@ Description: MonetDB stream library deve
This package contains the files to develop with the
libmonetdb-stream3 library.
-Package: libmonetdb-client5
+Package: libmonetdb-client6
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libmonetdb-client1, libmonetdb-client2
@@ -71,14 +71,14 @@ Description: MonetDB client/server inter
Package: libmonetdb-client-dev
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmonetdb-client5
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmonetdb-client6
Description: MonetDB client/server interface library development files
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
automatic index management, extensibility of data types and search
accelerators. It also has an SQL frontend.
.
- This package contains the files to develop with the libmonetdb-client5
+ This package contains the files to develop with the libmonetdb-client6
library.
Package: monetdb-client
diff --git a/debian/libmonetdb-client5.install
b/debian/libmonetdb-client6.install
rename from debian/libmonetdb-client5.install
rename to debian/libmonetdb-client6.install
diff --git a/debian/libmonetdb6.install b/debian/libmonetdb8.install
rename from debian/libmonetdb6.install
rename to debian/libmonetdb8.install
___
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
