Changeset: ee1a2e1109b8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ee1a2e1109b8
Added Files:
sql/test/BugTracker-2015/Tests/All
sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3646.sql
sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3646.stable.err
sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3646.stable.out
sql/test/BugTracker-2015/Tests/sharp-alias.Bug-3467.sql
sql/test/BugTracker-2015/Tests/sharp-alias.Bug-3467.stable.err
sql/test/BugTracker-2015/Tests/sharp-alias.Bug-3467.stable.out
Modified Files:
clients/Tests/exports.stable.out
clients/mapilib/mapi.c
common/stream/stream.c
gdk/gdk.h
gdk/gdk_bbp.c
monetdb5/modules/atoms/inet.c
monetdb5/modules/atoms/inet.h
monetdb5/modules/atoms/inet.mal
sql/backends/monet5/sql_result.c
tools/merovingian/daemon/connections.c
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/discoveryrunner.c
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (truncated from 563 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
@@ -1307,6 +1307,7 @@ str INET_inet(inet *d, inet *s);
str INET_isnil(bit *retval, inet *val);
str INETabbrev(str *retval, inet *val);
str INETbroadcast(inet *retval, inet *val);
+int INETcompare(inet *l, inet *r);
int INETfromString(str src, int *len, inet **retval);
str INEThost(str *retval, inet *val);
str INEThostmask(inet *retval, inet *val);
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -4279,7 +4279,11 @@ mapi_query_part(MapiHdl hdl, const char
mid->active = hdl;
/* remember the query just for the error messages */
if (hdl->query == NULL) {
- hdl->query = strdup(query);
+ hdl->query = malloc(size + 1);
+ if (hdl->query) {
+ strncpy(hdl->query, query, size);
+ hdl->query[size] = 0;
+ }
} else {
size_t sz = strlen(hdl->query);
char *q;
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -2063,6 +2063,7 @@ udp_socket(udp_stream * udp, const char
freeaddrinfo(res);
return 0;
}
+ freeaddrinfo(res);
return -1;
#else
struct sockaddr *serv;
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -968,8 +968,9 @@ typedef struct {
/* assert that atom width is power of 2, i.e., width == 1<<shift */
#define assert_shift_width(shift,width) assert(((shift) == 0 && (width) == 0)
|| ((unsigned)1<<(shift)) == (unsigned)(width))
-#define GDKLIBRARY_64_BIT_INT 061026 /* version that had no 128-bit integer
option, yet */
-#define GDKLIBRARY 061027
+#define GDKLIBRARY_INET_COMPARE 061026 /* version with missing inet
cmp func */
+#define GDKLIBRARY_64_BIT_INT 061027 /* version that had no 128-bit integer
option, yet */
+#define GDKLIBRARY 061030
typedef struct BAT {
/* static bat properties */
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -775,6 +775,11 @@ heapinit(COLrec *col, const char *buf, i
col->heap.newstorage = (storage_t) storage;
col->heap.farmid = BBPselectfarm(PERSISTENT, col->type, offheap);
col->heap.dirty = 0;
+ if (bbpversion <= GDKLIBRARY_INET_COMPARE && strcmp(type, "inet") == 0)
{
+ /* don't trust ordering information on inet columns */
+ col->sorted = 0;
+ col->revsorted = 0;
+ }
return n;
}
@@ -957,6 +962,7 @@ BBPheader(FILE *fp, oid *BBPoid, int *OI
exit(1);
}
if (bbpversion != GDKLIBRARY &&
+ bbpversion != GDKLIBRARY_INET_COMPARE &&
bbpversion != GDKLIBRARY_64_BIT_INT) {
GDKfatal("BBPinit: incompatible BBP version: expected 0%o, got
0%o.", GDKLIBRARY, bbpversion);
}
diff --git a/monetdb5/modules/atoms/inet.c b/monetdb5/modules/atoms/inet.c
--- a/monetdb5/modules/atoms/inet.c
+++ b/monetdb5/modules/atoms/inet.c
@@ -194,6 +194,22 @@ INETnew(inet *retval, str *in)
return (MAL_SUCCEED);
}
+int
+INETcompare(inet *l, inet *r)
+{
+ bit res = 0;
+ if (in_isnil(l))
+ return in_isnil(r) ? 0 : -1;
+ if (in_isnil(r))
+ return 1;
+ INET_comp_EQ(&res, l, r);
+ if (res)
+ return 0;
+ INET_comp_LT(&res, l, r);
+ if (res)
+ return -1;
+ return 1;
+}
/* === Operators === */
/**
diff --git a/monetdb5/modules/atoms/inet.h b/monetdb5/modules/atoms/inet.h
--- a/monetdb5/modules/atoms/inet.h
+++ b/monetdb5/modules/atoms/inet.h
@@ -53,6 +53,7 @@ typedef struct _inet {
inet_export int INETfromString(str src, int *len, inet **retval);
inet_export int INETtoString(str *retval, int *len, inet *handle);
+inet_export int INETcompare(inet *l, inet *r);
inet_export str INETnew(inet * retval, str *in);
inet_export str INET_isnil(bit *retval, inet * val);
inet_export str INET_comp_EQ(bit *retval, inet * val1, inet *val2);
diff --git a/monetdb5/modules/atoms/inet.mal b/monetdb5/modules/atoms/inet.mal
--- a/monetdb5/modules/atoms/inet.mal
+++ b/monetdb5/modules/atoms/inet.mal
@@ -17,6 +17,8 @@
atom inet:lng;
+command cmp() :int
+address INETcompare;
command fromstr()
address INETfromString
comment "Convert a string to an inet";
diff --git a/sql/backends/monet5/sql_result.c b/sql/backends/monet5/sql_result.c
--- a/sql/backends/monet5/sql_result.c
+++ b/sql/backends/monet5/sql_result.c
@@ -1667,7 +1667,7 @@ mvc_export_head(backend *b, stream *s, i
for (i = 0; i < t->nr_cols; i++) {
res_col *c = t->cols + i;
- if (strchr(c->name, ',') || strchr(c->name, ' ') ||
strchr(c->name , '\t')) {
+ if (strchr(c->name, ',') || strchr(c->name, ' ') ||
strchr(c->name , '\t') || strchr(c->name, '#')) {
if (mnstr_write(s, "\"", 1, 1) != 1)
return -1;
if (strchr(c->name, '"')) {
diff --git a/sql/test/BugTracker-2015/Tests/All
b/sql/test/BugTracker-2015/Tests/All
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/All
@@ -0,0 +1,2 @@
+inet-ordering.Bug-3646
+sharp-alias.Bug-3467
diff --git a/sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3646.sql
b/sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3646.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3646.sql
@@ -0,0 +1,5 @@
+CREATE TABLE "testing" ( "addr" inet );
+INSERT INTO "testing" VALUES('192.168.0.1');
+INSERT INTO "testing" VALUES('255.255.255.0');
+SELECT * FROM "testing" ORDER BY addr;
+DROP TABLE "testing";
diff --git a/sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3646.stable.err
b/sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3646.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3646.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'inet-ordering.Bug-3646` in directory
'sql/test/BugTracker-2015` itself:
+
+
+# 14:08:01 >
+# 14:08:01 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30627" "--set"
"mapi_usock=/var/tmp/mtest-13903/.s.monetdb.30627" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 14:08:01 >
+
+# builtin opt gdk_dbpath = /ufs/sjoerd/Monet-stable/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# 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 mapi_open = true
+# cmdline opt mapi_port = 30627
+# cmdline opt mapi_usock = /var/tmp/mtest-13903/.s.monetdb.30627
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2015
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 14:08:02 >
+# 14:08:02 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-13903" "--port=30627"
+# 14:08:02 >
+
+
+# 14:08:02 >
+# 14:08:02 > "Done."
+# 14:08:02 >
+
diff --git a/sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3646.stable.out
b/sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3646.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3646.stable.out
@@ -0,0 +1,74 @@
+stdout of test 'inet-ordering.Bug-3646` in directory
'sql/test/BugTracker-2015` itself:
+
+
+# 14:08:01 >
+# 14:08:01 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=30627" "--set"
"mapi_usock=/var/tmp/mtest-13903/.s.monetdb.30627" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 14:08:01 >
+
+# MonetDB 5 server v11.19.8 (hg id: 79641de9748d+)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2015', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 15.590 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://madrid.ins.cwi.nl:30627/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-13903/.s.monetdb.30627
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+# MonetDB/R 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_querylog.sql
+# loading sql script: 16_tracelog.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
+# loading sql script: 26_sysmon.sql
+# loading sql script: 39_analytics.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 40_json.sql
+# loading sql script: 41_jsonstore.sql
+# loading sql script: 45_uuid.sql
+# loading sql script: 46_gsl.sql
+# loading sql script: 75_storagemodel.sql
+# loading sql script: 80_statistics.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 85_bam.sql
+# loading sql script: 90_generator.sql
+# loading sql script: 99_system.sql
+
+# 14:08:02 >
+# 14:08:02 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-13903" "--port=30627"
+# 14:08:02 >
+
+#CREATE TABLE "testing" ( "addr" inet );
+#INSERT INTO "testing" VALUES('192.168.0.1');
+[ 1 ]
+#INSERT INTO "testing" VALUES('255.255.255.0');
+[ 1 ]
+#SELECT * FROM "testing" ORDER BY addr;
+% sys.testing # table_name
+% addr # name
+% inet # type
+% 0 # length
+[ 192.168.0.1 ]
+[ 255.255.255.0 ]
+#DROP TABLE "testing";
+
+# 14:08:02 >
+# 14:08:02 > "Done."
+# 14:08:02 >
+
diff --git a/sql/test/BugTracker-2015/Tests/sharp-alias.Bug-3467.sql
b/sql/test/BugTracker-2015/Tests/sharp-alias.Bug-3467.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/sharp-alias.Bug-3467.sql
@@ -0,0 +1,4 @@
+CREATE TABLE test3467 (a int);
+SELECT a AS "#" FROM test3467;
+SELECT a AS "@" FROM test3467;
+DROP TABLE test3467;
diff --git a/sql/test/BugTracker-2015/Tests/sharp-alias.Bug-3467.stable.err
b/sql/test/BugTracker-2015/Tests/sharp-alias.Bug-3467.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2015/Tests/sharp-alias.Bug-3467.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'sharp-alias.Bug-3467` in directory 'sql/test/BugTracker-2015`
itself:
+
+
+# 14:38:25 >
+# 14:38:25 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=33653" "--set"
"mapi_usock=/var/tmp/mtest-3931/.s.monetdb.33653" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_BugTracker-2015"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 14:38:25 >
+
+# builtin opt gdk_dbpath = /ufs/sjoerd/Monet-stable/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# builtin opt monet_prompt = >
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
