Changeset: 0e883883eaf9 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0e883883eaf9 Added Files: sql/test/BugTracker-2012/Tests/server-crash.Bug-3046.sql sql/test/BugTracker-2012/Tests/server-crash.Bug-3046.stable.err sql/test/BugTracker-2012/Tests/server-crash.Bug-3046.stable.out Modified Files: .hgtags MonetDB.spec NT/installer32/MonetDB-ODBC-Installer.vdproj NT/installer32/MonetDB5-Geom-Module.vdproj NT/installer32/MonetDB5-SQL-Installer.vdproj NT/installer64/MonetDB-ODBC-Installer.vdproj NT/installer64/MonetDB5-Geom-Module.vdproj NT/installer64/MonetDB5-SQL-Installer.vdproj NT/monetdb_config.h.in NT/rules.msc clients/Tests/exports.stable.out clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc clients/python/setup.py configure.ag debian/changelog gdk/gdk_bat.mx gdk/libbat.rc java/ChangeLog-Archive java/ChangeLog.Dec2011 libversions monetdb5/mal/mal_type.c monetdb5/mal/mal_type.h monetdb5/tools/libmonetdb5.rc sql/test/BugTracker-2012/Tests/All vertoo.data Branch: default Log Message:
Merge with Apr2012 branch. diffs (255 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -472,3 +472,5 @@ 32665cf67d03011ff1fcc2c8e118370c47e5fae6 d159bb1ba293002773b896353854b14aeb4e5cd1 Dec2011_7 f47248f30989933b245a4d6f2e31a9e443f1078b Dec2011_SP1_release ab662699300b790a0c20b3c40b6ca0eebf25cd14 Apr2012_root +e36693f883f56d50da695471b876542755306736 Dec2011_9 +f50d60ffdbeec52cc17a72ecb91eed6753ab403c Dec2011_SP2_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -27,7 +27,7 @@ Vendor: MonetDB BV <i...@monetdb.org> Group: Applications/Databases License: MPL - http://www.monetdb.org/Legal/MonetDBLicense URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Dec2011-SP1/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Dec2011-SP2/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -626,6 +626,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet rm -fr $RPM_BUILD_ROOT %changelog +* Mon Mar 12 2012 Fabian Groffen <fab...@monetdb.org> - 11.7.9-20120312 +- Rebuilt. + +* Tue Feb 28 2012 Fabian Groffen <fab...@cwi.nl> - 11.7.9-20120312 +- java: Implemented missing Number types support in + PreparedStatement.setObject() + * Fri Feb 24 2012 Fabian Groffen <fab...@monetdb.org> - 11.7.7-20120224 - Rebuilt. 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 @@ -5588,7 +5588,6 @@ int hlbProp; int horiginProp; int hubProp; int idLength(Client cntxt); -int idcmp(str n, str m); str identityRef; str ifthenelseRef; str ilikeselectRef; diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +monetdb (11.7.9-20120312) unstable; urgency=low + + * Rebuilt. + + -- Fabian Groffen <fab...@monetdb.org> Mon, 12 Mar 2012 14:32:53 +0100 + +monetdb (11.7.9-20120312) unstable; urgency=low + + * java: Implemented missing Number types support in + PreparedStatement.setObject() + + -- Fabian Groffen <fab...@cwi.nl> Tue, 28 Feb 2012 14:32:53 +0100 + monetdb (11.7.7-20120224) unstable; urgency=low * Rebuilt. diff --git a/gdk/gdk_bat.mx b/gdk/gdk_bat.mx --- a/gdk/gdk_bat.mx +++ b/gdk/gdk_bat.mx @@ -3085,8 +3085,8 @@ BATmode(BAT *b, int mode) /* * @+ BATpropcheck * - * This is a low-cost routine that smartly tries to deduce as - * much properties possible on the head column of its BAT parameter. + * This is a low-cost routine that smartly tries to deduce as many + * properties as possible on the head column of its BAT parameter. * * with PROPDEBUG (-d8) enabled, it is also a powerful tool * to check whether all properties of a BAT are set correctly. diff --git a/java/ChangeLog-Archive b/java/ChangeLog-Archive --- a/java/ChangeLog-Archive +++ b/java/ChangeLog-Archive @@ -1,6 +1,10 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Tue Feb 28 2012 Fabian Groffen <fab...@cwi.nl> - 11.7.9-20120312 +- Implemented missing Number types support in + PreparedStatement.setObject() + * Mon Feb 20 2012 Fabian Groffen <fab...@cwi.nl> - 11.7.7-20120224 - Fixed bug in DatabaseMetaData.getSchemas() method that caused an SQL error when called with catalog and schema argument. diff --git a/java/ChangeLog.Dec2011 b/java/ChangeLog.Dec2011 --- a/java/ChangeLog.Dec2011 +++ b/java/ChangeLog.Dec2011 @@ -1,7 +1,3 @@ # ChangeLog file for java # This file is updated with Maddlog -* Tue Feb 28 2012 Fabian Groffen <fab...@cwi.nl> -- Implemented missing Number types support in - PreparedStatement.setObject() - diff --git a/libversions b/libversions --- a/libversions +++ b/libversions @@ -35,13 +35,13 @@ # version of the GDK library (subdirectory gdk; also includes # common/options and common/mutils) -GDK_VERSION=4:4:0 +GDK_VERSION=4:5:0 # version of the MAPI library (subdirectory clients/mapilib) MAPI_VERSION=5:0:0 # version of the MONETDB5 library (subdirectory monetdb5, not including extras) -MONETDB5_VERSION=10:3:0 +MONETDB5_VERSION=10:4:0 # version of the STREAM library (subdirectory common/stream) STREAM_VERSION=3:0:0 diff --git a/monetdb5/mal/mal_type.c b/monetdb5/mal/mal_type.c --- a/monetdb5/mal/mal_type.c +++ b/monetdb5/mal/mal_type.c @@ -115,15 +115,6 @@ getTypeIdentifier(malType tpe){ * Use the information that identifiers are at least one character * and are terminated by a null to speedup comparison */ -inline int -idcmp(str n, str m) -{ - assert(n != NULL); - assert(m != NULL); - if (*n == *m) - return strcmp(n, m); - return -1; -} /* * @- @@ -194,8 +185,8 @@ getTypeIndex(str nme, int len, int defty nme[k] = 0; } for(i= TYPE_str; i< GDKatomcnt; i++) - if( BATatoms[i].name[0]==nme[0] && - strcmp(nme,BATatoms[i].name)==0) break; + if( BATatoms[i].name[0]==nme[0] && + strcmp(nme,BATatoms[i].name)==0) break; if( len > 0) nme[k]=old; if (i == GDKatomcnt) diff --git a/monetdb5/mal/mal_type.h b/monetdb5/mal/mal_type.h --- a/monetdb5/mal/mal_type.h +++ b/monetdb5/mal/mal_type.h @@ -82,7 +82,7 @@ mal_export str getTypeIdentifier(malType mal_export int getTypeIndex(str nme, int len, int deftpe); mal_export malType reverseBatType(malType v); mal_export malType malAnyBatType(malType t1, malType t2); -mal_export int idcmp(str n, str m); +#define idcmp(n, m) strcmp(n, m) mal_export str newTmpName(char tag, int i); mal_export int isTmpName(str n); mal_export int isTypeName(str n); 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 @@ -19,3 +19,4 @@ multicolumn_join.Bug-2998 simple_select.Bug-2988 interval_timestamp.Bug-3002 hash_select.Bug-2947 +server-crash.Bug-3046 diff --git a/sql/test/BugTracker-2012/Tests/server-crash.Bug-3046.sql b/sql/test/BugTracker-2012/Tests/server-crash.Bug-3046.sql new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2012/Tests/server-crash.Bug-3046.sql @@ -0,0 +1,64 @@ +START TRANSACTION; + +CREATE TABLE node ( + id integer NOT NULL, + text_ref integer NOT NULL, + corpus_ref integer NOT NULL, + namespace character varying(100), + name character varying(100) NOT NULL, + "left" integer NOT NULL, + "right" integer NOT NULL, + token_index integer, + continuous boolean, + span character varying(2000), + toplevel_corpus integer NOT NULL, + left_token integer, + right_token integer +); +CREATE TABLE rank ( + pre integer NOT NULL, + post integer NOT NULL, + node_ref integer NOT NULL, + component_ref integer NOT NULL, + parent integer, + root boolean, + level integer NOT NULL +); +CREATE TABLE component ( + id integer NOT NULL, + type character(1), + namespace character varying(255), + name character varying(255) +); +ALTER TABLE node ADD CONSTRAINT "PK_node" PRIMARY KEY (id); +ALTER TABLE component ADD CONSTRAINT "PK_component" PRIMARY KEY (id); +ALTER TABLE rank ADD CONSTRAINT "PK_rank" PRIMARY KEY (pre); +ALTER TABLE rank ADD CONSTRAINT "UNIQ_rank_pre" UNIQUE (pre); +ALTER TABLE rank ADD CONSTRAINT "UNIQ_rank_post" UNIQUE (post); +ALTER TABLE rank ADD CONSTRAINT "FK_rank_parent" FOREIGN KEY (parent) REFERENCES rank (pre); +ALTER TABLE rank ADD CONSTRAINT "FK_rank_node" FOREIGN KEY (node_ref) REFERENCES node (id); +ALTER TABLE rank ADD CONSTRAINT "FK_rank_component" FOREIGN KEY (component_ref) REFERENCES component (id); + +SELECT + count(*) +FROM + ( + SELECT DISTINCT + node1.id AS id1, node2.id AS id2, node1.toplevel_corpus + FROM + node AS node1, rank AS rank1, component AS component1, + node AS node2, rank AS rank2, component AS component2 + WHERE + component1.id = component2.id AND + component1.name IS NULL AND + component1.type = 'd' AND + component2.name IS NULL AND + component2.type = 'd' AND + rank1.component_ref = component1.id AND + rank1.node_ref = node1.id AND + rank1.pre = rank2.parent AND + rank2.component_ref = component2.id AND + rank2.node_ref = node2.id + ) AS solutions; + +ROLLBACK; diff --git a/sql/test/BugTracker-2012/Tests/server-crash.Bug-3046.stable.err b/sql/test/BugTracker-2012/Tests/server-crash.Bug-3046.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2012/Tests/server-crash.Bug-3046.stable.err @@ -0,0 +1,1 @@ +to be filled in... diff --git a/sql/test/BugTracker-2012/Tests/server-crash.Bug-3046.stable.out b/sql/test/BugTracker-2012/Tests/server-crash.Bug-3046.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2012/Tests/server-crash.Bug-3046.stable.out @@ -0,0 +1,1 @@ +to be filled in... _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
