Changeset: 5bfe3a1cf128 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5bfe3a1cf128
Added Files:
sql/test/BugTracker-2014/Tests/local-temp-1.Bug-3468.sql
sql/test/BugTracker-2014/Tests/local-temp-1.Bug-3468.stable.err
sql/test/BugTracker-2014/Tests/local-temp-1.Bug-3468.stable.out
sql/test/BugTracker-2014/Tests/local-temp-2.Bug-3468.sql
sql/test/BugTracker-2014/Tests/local-temp-2.Bug-3468.stable.err
sql/test/BugTracker-2014/Tests/local-temp-2.Bug-3468.stable.out
Modified Files:
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
clients/examples/C/smack01.c
clients/mapiclient/mclient.c
clients/mapiclient/tomograph.c
clients/odbc/driver/SQLDriverConnect.c
gdk/gdk_imprints.c
gdk/gdk_search.c
monetdb5/mal/mal_runtime.c
monetdb5/modules/kernel/bat5.c
monetdb5/modules/mal/groupby.c
sql/backends/monet5/sql.c
sql/common/sql_types.c
sql/server/rel_optimizer.c
sql/server/rel_psm.c
sql/server/rel_schema.c
sql/server/rel_updates.c
sql/storage/bat/bat_storage.c
sql/storage/store.c
sql/test/BugTracker-2014/Tests/All
sql/test/Users/Tests/schema.stable.err
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/discoveryrunner.c
tools/merovingian/daemon/multiplex-funnel.c
tools/merovingian/daemon/peering.c
Branch: default
Log Message:
Merge with Jan2014 branch.
diffs (truncated from 809 to 300 lines):
diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj
b/NT/installer32/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer32/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj
@@ -330,7 +330,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_779449EF5BAD4B068A50802402E52278"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1b.win32-vs10\\bin\\libeay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win32-vs10\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -370,7 +370,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B1B1C0011D7945F892A77F529772EA72"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1b.win32-vs10\\bin\\ssleay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win32-vs10\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -1835,7 +1835,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2E0FEE7726DA47369758C263666F3DB1"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1b.win32-vs10\\lib\\libeay32.lib"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win32-vs10\\lib\\libeay32.lib"
"TargetName" = "8:libeay32.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -2095,7 +2095,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_45C820B6483D494EBFE6F9A28A30760C"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1b.win32-vs10\\bin\\ssleay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win32-vs10\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -2455,7 +2455,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_732094CE07974147A084EDD6A5F43C6F"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1b.win32-vs10\\lib\\ssleay32.lib"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win32-vs10\\lib\\ssleay32.lib"
"TargetName" = "8:ssleay32.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -4095,7 +4095,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E80B0549492B4D76B7EB93941A6BF89D"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1b.win32-vs10\\bin\\libeay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win32-vs10\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
diff --git a/NT/installer64/MonetDB-ODBC-Installer.vdproj
b/NT/installer64/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer64/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer64/MonetDB-ODBC-Installer.vdproj
@@ -330,7 +330,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_779449EF5BAD4B068A50802402E52278"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1b.win64-vs10\\bin\\libeay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win64-vs10\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -370,7 +370,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B1B1C0011D7945F892A77F529772EA72"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1b.win64-vs10\\bin\\ssleay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win64-vs10\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -1835,7 +1835,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2E0FEE7726DA47369758C263666F3DB1"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1b.win64-vs10\\lib\\libeay32.lib"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win64-vs10\\lib\\libeay32.lib"
"TargetName" = "8:libeay32.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -2095,7 +2095,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_45C820B6483D494EBFE6F9A28A30760C"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1b.win64-vs10\\bin\\ssleay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win64-vs10\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -2455,7 +2455,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_732094CE07974147A084EDD6A5F43C6F"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1b.win64-vs10\\lib\\ssleay32.lib"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win64-vs10\\lib\\ssleay32.lib"
"TargetName" = "8:ssleay32.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -4095,7 +4095,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E80B0549492B4D76B7EB93941A6BF89D"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1b.win64-vs10\\bin\\libeay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win64-vs10\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
diff --git a/clients/examples/C/smack01.c b/clients/examples/C/smack01.c
--- a/clients/examples/C/smack01.c
+++ b/clients/examples/C/smack01.c
@@ -67,10 +67,13 @@ main(int argc, char **argv)
port = atol(argv[1]);
dbh = mapi_connect("localhost", port, "monetdb", "monetdb", l, NULL);
+ if (dbh == NULL || mapi_error(dbh))
+ die(dbh, hdl);
+
for (i = 0; i < 1000; i++) {
/* printf("setup connection %d\n", i); */
mapi_reconnect(dbh);
- if (dbh == NULL || mapi_error(dbh))
+ if (mapi_error(dbh))
die(dbh, hdl);
/* switch of autocommit */
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -709,7 +709,7 @@ CSVrenderer(MapiHdl hdl)
mnstr_write(toConsole, "\"", 1, 1);
} else
mnstr_printf(toConsole, "%s%s",
- i == 0 ? "" : sep, s ? s : "");
+ i == 0 ? "" : sep, s);
}
mnstr_printf(toConsole, "\n");
}
diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c
--- a/clients/mapiclient/tomograph.c
+++ b/clients/mapiclient/tomograph.c
@@ -1626,7 +1626,7 @@ update(int state, int thread, lng clktic
return;
}
- if (state == DONE && strncmp(fcn, "profiler.tomograph", 18) == 0) {
+ if (state == DONE && fcn && strncmp(fcn, "profiler.tomograph", 18) ==
0) {
#ifdef _DEBUG_TOMOGRAPH_
fprintf(stderr, "Profiler.tomograph ends %d\n", batch);
#endif
@@ -1887,6 +1887,8 @@ processFile(char *fname)
s = open_rastream(fname);
if (s == NULL || mnstr_errnr(s)) {
fprintf(stderr,"ERROR Can not access '%s'\n",fname);
+ if (s)
+ mnstr_destroy(s);
return;
}
len = 0;
@@ -1909,7 +1911,7 @@ processFile(char *fname)
} else
len = 0;
}
- mnstr_close(s);
+ close_stream(s);
}
static void
diff --git a/clients/odbc/driver/SQLDriverConnect.c
b/clients/odbc/driver/SQLDriverConnect.c
--- a/clients/odbc/driver/SQLDriverConnect.c
+++ b/clients/odbc/driver/SQLDriverConnect.c
@@ -326,7 +326,7 @@ SQLDriverConnect_(ODBCDbc *dbc,
getenv("ODBCDEBUG") == NULL) {
if (ODBCdebug)
free((void *) ODBCdebug); /* discard const */
- ODBCdebug = strdup(attr);
+ ODBCdebug = attr;
#endif
} else
free(attr);
diff --git a/gdk/gdk_imprints.c b/gdk/gdk_imprints.c
--- a/gdk/gdk_imprints.c
+++ b/gdk/gdk_imprints.c
@@ -666,16 +666,16 @@ do {
GDKerror("#BATimprints: memory allocation error");
HEAPfree(imprints->bins);
GDKfree(imprints->bins);
- if (imprints->imps->filename != NULL) {
- GDKfree(imprints->imps->filename);
- }
- if (imprints->dict->filename != NULL) {
- GDKfree(imprints->dict->filename);
- }
if (imprints->imps != NULL) {
+ if (imprints->imps->filename != NULL) {
+ GDKfree(imprints->imps->filename);
+ }
GDKfree(imprints->imps);
}
if (imprints->dict != NULL) {
+ if (imprints->dict->filename != NULL) {
+ GDKfree(imprints->dict->filename);
+ }
GDKfree(imprints->dict);
}
GDKfree(imprints);
diff --git a/gdk/gdk_search.c b/gdk/gdk_search.c
--- a/gdk/gdk_search.c
+++ b/gdk/gdk_search.c
@@ -218,10 +218,11 @@ HASHcollisions(BAT *b, Hash *h)
{
lng cnt, entries = 0, max = 0;
double total = 0;
- BUN p, i, j, nil = HASHnil(h);
+ BUN p, i, j, nil;
if (b == 0 || h == 0)
return;
+ nil = HASHnil(h);
for (i = 0, j = h->mask; i <= j; i++)
if ((p = HASHget(h, i)) != nil) {
entries++;
diff --git a/monetdb5/mal/mal_runtime.c b/monetdb5/mal/mal_runtime.c
--- a/monetdb5/mal/mal_runtime.c
+++ b/monetdb5/mal/mal_runtime.c
@@ -281,13 +281,13 @@ updateFootPrint(MalBlkPtr mb, MalStkPtr
if (b == NULL || isVIEW(b) || b->batPersistence == PERSISTENT)
return;
cnt = BATcount(b);
- if( b->H ) total += heapinfo(&b->H->heap);
- if( b->H ) total += heapinfo(b->H->vheap);
+ total += heapinfo(&b->H->heap);
+ total += heapinfo(b->H->vheap);
- if ( b->T ) total += heapinfo(&b->T->heap);
- if ( b->T ) total += heapinfo(b->T->vheap);
- if ( b->H ) total += hashinfo(b->H->hash);
- if ( b->T ) total += hashinfo(b->T->hash);
+ total += heapinfo(&b->T->heap);
+ total += heapinfo(b->T->vheap);
+ total += hashinfo(b->H->hash);
+ total += hashinfo(b->T->hash);
BBPreleaseref(b->batCacheid);
// no concurrency protection (yet)
stk->tmpspace += total/1024/1024; // keep it in MBs
diff --git a/monetdb5/modules/kernel/bat5.c b/monetdb5/modules/kernel/bat5.c
--- a/monetdb5/modules/kernel/bat5.c
+++ b/monetdb5/modules/kernel/bat5.c
@@ -97,7 +97,7 @@ local_utoa(size_t i)
return buf;
}
-#define COLLISION 64
+#define COLLISION (8 * sizeof(size_t))
static void
HASHinfo(BAT *bk, BAT *bv, Hash *h, str s)
@@ -105,14 +105,14 @@ HASHinfo(BAT *bk, BAT *bv, Hash *h, str
BUN i;
BUN j;
BUN k;
- BUN cnt[COLLISION + 2];
+ BUN cnt[COLLISION + 1];
BUNappend(bk, pre(s, "type"), FALSE);
BUNappend(bv, ATOMname(h->type),FALSE);
BUNappend(bk, pre(s, "mask"), FALSE);
BUNappend(bv, local_utoa(h->lim),FALSE);
- for (i = 0; i <= COLLISION + 1; i++) {
+ for (i = 0; i < COLLISION + 1; i++) {
cnt[i] = 0;
}
for (i = 0; i <= h->mask; i++) {
@@ -122,9 +122,9 @@ HASHinfo(BAT *bk, BAT *bv, Hash *h, str
cnt[k]++;
}
- for (i = 0; i <= COLLISION + 1; i++)
+ for (i = 0; i < COLLISION + 1; i++)
if (cnt[i]) {
- BUNappend(bk, pre(s, local_itoa((ssize_t)
(i?(((ssize_t)1)<<(i-1)):0))), FALSE);
+ BUNappend(bk, pre(s,
local_utoa(i?(((size_t)1)<<(i-1)):0)), FALSE);
BUNappend(bv, local_utoa((size_t) cnt[i]), FALSE);
}
}
diff --git a/monetdb5/modules/mal/groupby.c b/monetdb5/modules/mal/groupby.c
--- a/monetdb5/modules/mal/groupby.c
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
