Changeset: 6da88eafadbd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6da88eafadbd
Modified Files:
MonetDB.spec
debian/changelog
debian/control
debian/fix-deb.sh
java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java
monetdb5/ChangeLog-Archive
sql/backends/monet5/sql_round_impl.h
sql/backends/monet5/sql_upgrades.c
sql/scripts/51_sys_schema_extension.sql
sql/server/rel_dump.c
sql/server/rel_prop.c
sql/server/rel_psm.c
sql/storage/bat/bat_logger.c
sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/check.stable.out
sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/check.stable.out
sql/test/emptydb-upgrade/Tests/check.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.oid32
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.oid32
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: default
Log Message:
Merge with Jun2016 branch.
diffs (truncated from 1262 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -9,7 +9,7 @@
%define bits 32
%else
%define bits 64
-%define with_int128=1
+%define with_int128 1
%endif
# only add .oidXX suffix if oid size differs from bit size
@@ -695,7 +695,7 @@ fi
%if %{bits} == 64
%package -n MonetDB5-server-hugeint
Summary: MonetDB - 128-bit integer support for MonetDB5-server
-Group: Application/Databases
+Group: Applications/Databases
Requires: MonetDB5-server%{?_isa}
%description -n MonetDB5-server-hugeint
@@ -910,7 +910,6 @@ Group: Applications/Databases
Requires: %{name}-testing = %{version}-%{release}
Requires: %{name}-client-tests = %{version}-%{release}
Requires: python
-BuildArch: noarch
%description testing-python
MonetDB is a database management system that is developed from a
@@ -1276,7 +1275,7 @@ rm -f %{buildroot}%{_bindir}/Maddlog
- gdk: Removed all versions of the SORTloop macro.
* Tue Apr 5 2016 Sjoerd Mullender <[email protected]> - 11.23.1-20160601
-- monetdb5: Removed algerbra.like with a BAT argument. Use
algebra.likesubselect
+- monetdb5: Removed algebra.like with a BAT argument. Use
algebra.likesubselect
instead.
* Tue Apr 5 2016 Sjoerd Mullender <[email protected]> - 11.23.1-20160601
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -382,7 +382,7 @@ monetdb (11.23.1) unstable; urgency=low
monetdb (11.23.1) unstable; urgency=low
- * monetdb5: Removed algerbra.like with a BAT argument. Use
algebra.likesubselect
+ * monetdb5: Removed algebra.like with a BAT argument. Use
algebra.likesubselect
instead.
-- Sjoerd Mullender <[email protected]> Tue, 5 Apr 2016 16:10:50 +0200
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ X-Python3-Version: >= 3.0
Package: libmonetdb13
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libmonetdb5-server-geom (< ${source:Version})
Description: MonetDB core library
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -58,7 +59,8 @@ Description: MonetDB stream library
Package: libmonetdb-stream-dev
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmonetdb-stream8
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ libmonetdb-stream8 (= ${source:Version})
Description: MonetDB stream 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,
@@ -82,7 +84,8 @@ Description: MonetDB client/server inter
Package: libmonetdb-client-dev
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmonetdb-client8
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ libmonetdb-client8 (= ${source:Version})
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,
@@ -95,7 +98,7 @@ Description: MonetDB client/server inter
Package: monetdb-client
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: monetdb5-sql
+Recommends: monetdb5-sql (= ${source:Version})
Description: MonetDB database client
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -109,7 +112,8 @@ Description: MonetDB database client
Package: monetdb-client-tools
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, monetdb-client
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ monetdb-client (= ${source:Version})
Description: MonetDB database client
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -132,7 +136,9 @@ Description: MonetDB ODBC driver
Package: php5-monetdb-client
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, php5-common
+# wheezy, jessie, precise, trusty, wily: php5-common
+# xenial: php-common
+Depends: ${shlibs:Depends}, ${misc:Depends}, php-common
Description: MonetDB php5 client module
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -143,7 +149,7 @@ Description: MonetDB php5 client module
program.
Package: perl-monetdb-client
-Architecture: any
+Architecture: all
Depends: ${shlibs:Depends}, ${perl:Depends}, libdbi-perl
Provides: ${perl:Provides}
Description: MonetDB perl client code
@@ -157,7 +163,12 @@ Description: MonetDB perl client code
Package: monetdb-client-testing
Architecture: any
-Depends: ${shlibs:Depends}, libmonetdb-client-odbc, monetdb5-server,
perl-monetdb-client, php5-monetdb-client, python-monetdb, monetdb5-sql
+Depends: ${shlibs:Depends}, libmonetdb-client-odbc (= ${source:Version}),
+ monetdb5-server (= ${source:Version}),
+ perl-monetdb-client (= ${source:Version}),
+ php5-monetdb-client (= ${source:Version}),
+ python-monetdb (= ${source:Version}),
+ monetdb5-sql (= ${source:Version})
Description: MonetDB client testing tools
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -171,7 +182,8 @@ Description: MonetDB client testing tool
Package: libmonetdb5-server-geom
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, monetdb5-sql
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ monetdb5-sql (= ${source:Version})
Description: MonetDB5 SQL GIS support module
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -184,7 +196,8 @@ Description: MonetDB5 SQL GIS support mo
Package: libmonetdb5-server-lidar
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, monetdb5-sql
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ monetdb5-sql (= ${source:Version})
Description: MonetDB5 SQL GIS support module
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -196,7 +209,8 @@ Description: MonetDB5 SQL GIS support mo
Package: libmonetdb5-server-gsl
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, monetdb5-sql
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ monetdb5-sql (= ${source:Version})
Description: MonetDB5 SQL interface to the gsl library
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -209,7 +223,8 @@ Description: MonetDB5 SQL interface to t
Package: libmonetdb5-server-bam
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, monetdb5-sql
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ monetdb5-sql (= ${source:Version})
Description: MonetDB5 SQL interface to the bam library
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -222,8 +237,9 @@ Description: MonetDB5 SQL interface to t
Package: monetdb5-server
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
-Recommends: monetdb5-server-hugeint [amd64], monetdb5-sql
-Suggests: monetdb-client
+Recommends: monetdb5-server-hugeint (= ${source:Version}) [amd64],
+ monetdb5-sql (= ${source:Version})
+Suggests: monetdb-client (= ${source:Version})
Description: MonetDB database server version 5
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -248,7 +264,8 @@ Description: MonetDB - 128-bit integer s
Package: monetdb5-server-dev
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, monetdb5-server, libmonetdb-dev
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ monetdb5-server (= ${source:Version}), libmonetdb-dev (= ${source:Version})
Description: MonetDB database server version 5
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -260,9 +277,10 @@ Description: MonetDB database server ver
Package: monetdb5-sql
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, monetdb5-server (=
${source:Version})
-Recommends: monetdb5-sql-hugeint [amd64]
-Suggests: monetdb-client
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ monetdb5-server (= ${source:Version})
+Recommends: monetdb5-sql-hugeint (= ${source:Version}) [amd64]
+Suggests: monetdb-client (= ${source:Version})
Description: MonetDB SQL support for monetdb5
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -273,7 +291,8 @@ Description: MonetDB SQL support for mon
Package: monetdb5-sql-hugeint
Architecture: amd64
-Depends: monetdb5-sql (= ${source:Version}), monetdb5-server-hugeint (=
${source:Version})
+Depends: monetdb5-sql (= ${source:Version}),
+ monetdb5-server-hugeint (= ${source:Version})
Description: MonetDB5 128 bit integer (hugeint) support for SQL
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -285,8 +304,9 @@ Description: MonetDB5 128 bit integer (h
Package: monetdb-r
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, monetdb5-sql (= ${source:Version})
-Description: MonetDB5 128 bit integer (hugeint) support for SQL
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ monetdb5-sql (= ${source:Version})
+Description: Integration of MonetDB and R, allowing use of R from within SQL
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
@@ -313,8 +333,10 @@ Description: MonetDB testing programs
developer. If you do want to test, install monetdb-testing-python.
Package: monetdb-testing-python
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, python, monetdb-testing (=
${source:Version}), monetdb-client-testing (= ${source:Version})
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, python,
+ monetdb-testing (= ${source:Version}),
+ monetdb-client-testing (= ${source:Version})
Description: MonetDB testing Python programs
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
diff --git a/debian/fix-deb.sh b/debian/fix-deb.sh
--- a/debian/fix-deb.sh
+++ b/debian/fix-deb.sh
@@ -38,10 +38,18 @@ case $SUITE in
wheezy | precise | trusty)
# fix control file because these systems don't have liblas and a
# too old version of libgeos
- sed -i 's/, libgeos-dev[^,]*//;s/, liblas-c-dev[^,]*//' debian/control
- sed -i '/^Package:.*lidar/,/^$/d' debian/control
- sed -i '/^Package:.*geom/,/^$/d' debian/control
+ sed -i -e 's/, libgeos-dev[^,]*//;s/, liblas-c-dev[^,]*//' \
+ -e '/^Package:.*lidar/,/^$/d' \
+ -e '/^Package:.*geom/,/^$/d' debian/control
rm debian/libmonetdb5-server-lidar.install
debian/libmonetdb5-server-geom.install
sed -i
'/geo[ms]=yes/s/yes/no/;/gdal=yes/s/yes/no/;/lidar=yes/s/yes/no/;/liblas=yes/s/yes/no/'
debian/rules
;;
esac
+
+case $SUITE in
+wheezy | jessie | precise | trusty | wily)
+ # Xenial Xerus (and presumably newer releases) uses php-common,
+ # all others still have php5-common
+ sed -i 's/php-common/php5-common/' debian/control
+ ;;
+esac
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
@@ -4074,88 +4074,3 @@ public class MonetDatabaseMetaData exten
//== end methods interface DatabaseMetaData
}
-
-/**
- * This class is not intended for normal use. Therefore it is restricted to
- * classes from the very same package only. Because it is mainly used
- * only in the MonetDatabaseMetaData class it is placed here.
- */
-class MonetVirtualResultSet extends MonetResultSet {
- private String results[][];
- private boolean closed;
-
- MonetVirtualResultSet(
- String[] columns,
- String[] types,
- String[][] results
- ) throws IllegalArgumentException {
- super(columns, types, results.length);
-
- this.results = results;
- closed = false;
- }
-
- /**
- * This method is overridden in order to let it use the results array
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
