Changeset: 7c1581d7c70a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7c1581d7c70a
Modified Files:
MonetDB.spec
debian/changelog
gdk/gdk_batop.c
java/ChangeLog-Archive
monetdb5/modules/mal/mat.c
sql/backends/monet5/sql_scenario.c
Branch: Jul2015
Log Message:
merged
diffs (74 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1063,7 +1063,7 @@ rm -f %{buildroot}%{_bindir}/Maddlog
- java: Improved JDBC driver to not throw NullPointerException anymore
when calling isNullable() or getPrecision() or getScale() or
getColumnDisplaySize() or getSchemaName() or getTableName() or
- getColumnClassName() on a ResultSet object.
+ getColumnClassName() on a ResultSetMetaData object.
* Tue Jul 28 2015 Sjoerd Mullender <[email protected]> - 11.21.1-20150807
- sql: Added support for 128-bit integers (called HUGEINT) on platforms that
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -70,7 +70,7 @@ monetdb (11.21.1) unstable; urgency=low
* java: Improved JDBC driver to not throw NullPointerException anymore
when calling isNullable() or getPrecision() or getScale() or
getColumnDisplaySize() or getSchemaName() or getTableName() or
- getColumnClassName() on a ResultSet object.
+ getColumnClassName() on a ResultSetMetaData object.
-- Martin van Dinther <[email protected]> Thu, 6 Aug
2015 14:56:54 +0200
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -103,7 +103,7 @@ insert_string_bat(BAT *b, BAT *n, int ap
/* If b is in the transient farm (i.e. b will
* never become persistent), we try some
* clever tricks to avoid copying:
- * - if b is empty, we just let is share the
+ * - if b is empty, we just let it share the
* string heap with n;
* - otherwise, if b's string heap and n's
* string heap are the same (i.e. shared),
diff --git a/java/ChangeLog-Archive b/java/ChangeLog-Archive
--- a/java/ChangeLog-Archive
+++ b/java/ChangeLog-Archive
@@ -5,7 +5,7 @@
- Improved JDBC driver to not throw NullPointerException anymore
when calling isNullable() or getPrecision() or getScale() or
getColumnDisplaySize() or getSchemaName() or getTableName() or
- getColumnClassName() on a ResultSet object.
+ getColumnClassName() on a ResultSetMetaData object.
* Thu Jul 16 2015 Sjoerd Mullender <[email protected]> - 11.21.1-20150807
- We now compile the Java classes using the latest Java 1.8 version, and
diff --git a/monetdb5/modules/mal/mat.c b/monetdb5/modules/mal/mat.c
--- a/monetdb5/modules/mal/mat.c
+++ b/monetdb5/modules/mal/mat.c
@@ -148,8 +148,9 @@ MATpackIncrement(Client cntxt, MalBlkPtr
bn = BATnew(TYPE_void, b->ttype?b->ttype:TYPE_oid, (BUN)(1.2 *
BATcount(b) * pieces), TRANSIENT);
if (bn == NULL)
throw(MAL, "mat.pack", MAL_MALLOC_FAIL);
- /* allocate enough space for the strings */
- if ( b->T->vheap && bn->T->vheap ){
+ /* allocate enough space for the vheap, but not for strings,
+ * since BATappend does clever things for strings */
+ if ( b->T->vheap && bn->T->vheap && ATOMstorage(b->ttype) !=
TYPE_str){
newsize = b->T->vheap->size * pieces;
if (HEAPextend(bn->T->vheap, newsize, TRUE) !=
GDK_SUCCEED)
throw(MAL, "mat.pack", MAL_MALLOC_FAIL);
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -849,6 +849,7 @@ SQLsetTrace(backend *be, Client cntxt, b
(void) be;
if (onoff) {
+ newStmt(mb,"profiler","reset");
q= newStmt(mb, "profiler", "stethoscope");
(void) pushInt(mb,q,0);
} else {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
