Changeset: e0d2d3c598b3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e0d2d3c598b3
Modified Files:
gdk/gdk_batop.c
sql/backends/monet5/sql_user.c
sql/backends/monet5/sql_user.h
sql/test/pg_regress/Tests/oid.stable.err.oid32
Branch: default
Log Message:
Merge with Jul2015 branch.
diffs (155 lines):
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -1426,7 +1426,7 @@ BATconstant(int tailtype, const void *v,
if (bn == NULL)
return NULL;
p = Tloc(bn, bn->batFirst);
- switch (ATOMbasetype(tailtype)) {
+ switch (ATOMstorage(tailtype)) {
case TYPE_void:
v = &oid_nil;
BATseqbase(BATmirror(bn), oid_nil);
diff --git a/sql/backends/monet5/sql_user.c b/sql/backends/monet5/sql_user.c
--- a/sql/backends/monet5/sql_user.c
+++ b/sql/backends/monet5/sql_user.c
@@ -383,7 +383,7 @@ monet5_user_init(backend_functions *be_f
}
str
-monet5_user_get_def_schema(mvc *m, oid user)
+monet5_user_get_def_schema(mvc *m, int user)
{
oid rid;
sqlid schema_id;
@@ -450,7 +450,7 @@ monet5_user_set_def_schema(mvc *m, oid u
str err = NULL;
if (m->debug &1)
- fprintf(stderr, "monet5_user_get_def_schema " OIDFMT "\n",
user);
+ fprintf(stderr, "monet5_user_set_def_schema " OIDFMT "\n",
user);
if ((err = AUTHresolveUser(&username, &user)) !=MAL_SUCCEED) {
GDKfree(err);
diff --git a/sql/backends/monet5/sql_user.h b/sql/backends/monet5/sql_user.h
--- a/sql/backends/monet5/sql_user.h
+++ b/sql/backends/monet5/sql_user.h
@@ -12,7 +12,7 @@
sql5_export void monet5_user_init(backend_functions *be_funcs);
sql5_export str monet5_user_set_def_schema(mvc *m, oid user /* mal user id */);
-sql5_export str monet5_user_get_def_schema(mvc *m, oid user /* sql user id */);
+sql5_export str monet5_user_get_def_schema(mvc *m, int user /* sql user id */);
sql5_export str db_users_wrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
sql5_export str db_password_wrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
diff --git a/sql/test/pg_regress/Tests/oid.stable.err.oid32
b/sql/test/pg_regress/Tests/oid.stable.err.oid32
--- a/sql/test/pg_regress/Tests/oid.stable.err.oid32
+++ b/sql/test/pg_regress/Tests/oid.stable.err.oid32
@@ -1,11 +1,11 @@
stderr of test 'oid` in directory 'sql/test/pg_regress` itself:
-# 17:11:18 >
-# 17:11:18 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38959" "--set"
"mapi_usock=/var/tmp/mtest-1142/.s.monetdb.38959" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/dinther/INSTALL/var/MonetDB/mTests_sql_test_pg_regress" "--set"
"mal_listing=0"
-# 17:11:18 >
+# 11:41:06 >
+# 11:41:06 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38151" "--set"
"mapi_usock=/var/tmp/mtest-91139/.s.monetdb.38151" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/Users/hannes/monetdb-install/var/MonetDB/mTests_sql_test_pg_regress"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 11:41:06 >
-# builtin opt gdk_dbpath = /ufs/dinther/INSTALL/var/monetdb5/dbfarm/demo
+# builtin opt gdk_dbpath =
/Users/hannes/monetdb-install/var/monetdb5/dbfarm/demo
# builtin opt gdk_debug = 0
# builtin opt gdk_vmtrim = no
# builtin opt monet_prompt = >
@@ -17,64 +17,63 @@ stderr of test 'oid` in directory 'sql/t
# builtin opt sql_debug = 0
# cmdline opt gdk_nr_threads = 0
# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 38959
-# cmdline opt mapi_usock = /var/tmp/mtest-1142/.s.monetdb.38959
+# cmdline opt mapi_port = 38151
+# cmdline opt mapi_usock = /var/tmp/mtest-91139/.s.monetdb.38151
# cmdline opt monet_prompt =
# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbpath =
/ufs/dinther/INSTALL/var/MonetDB/mTests_sql_test_pg_regress
+# cmdline opt gdk_dbpath =
/Users/hannes/monetdb-install/var/MonetDB/mTests_sql_test_pg_regress
# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
# cmdline opt gdk_debug = 536870922
-# 15:18:43 >
-# 15:18:43 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-7372" "--port=31804"
-# 15:18:43 >
+# 11:41:06 >
+# 11:41:06 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-91139" "--port=38151"
+# 11:41:06 >
-MAPI = (monetdb) /var/tmp/mtest-21793/.s.monetdb.32589
+MAPI = (monetdb) /var/tmp/mtest-91139/.s.monetdb.38151
QUERY = INSERT INTO OID_TBL(f1) VALUES (12345678901);
ERROR = !overflow in conversion of 12345678901 to oid.
-MAPI = (monetdb) /var/tmp/mtest-17898/.s.monetdb.31237
+MAPI = (monetdb) /var/tmp/mtest-91139/.s.monetdb.38151
QUERY = INSERT INTO OID_TBL(f1) VALUES ('asdfasd');
ERROR = !conversion of string 'asdfasd' to type oid failed.
-MAPI = (monetdb) /var/tmp/mtest-17898/.s.monetdb.31237
+MAPI = (monetdb) /var/tmp/mtest-91139/.s.monetdb.38151
QUERY = INSERT INTO OID_TBL(f1) VALUES ('99asdfasd');
ERROR = !conversion of string '99asdfasd' to type oid failed.
-MAPI = (monetdb) /var/tmp/mtest-17898/.s.monetdb.31237
+MAPI = (monetdb) /var/tmp/mtest-91139/.s.monetdb.38151
QUERY = INSERT INTO OID_TBL(f1) VALUES ('5 d');
ERROR = !conversion of string '5 d' to type oid failed.
-MAPI = (monetdb) /var/tmp/mtest-17898/.s.monetdb.31237
+MAPI = (monetdb) /var/tmp/mtest-91139/.s.monetdb.38151
QUERY = INSERT INTO OID_TBL(f1) VALUES (' 5d');
ERROR = !conversion of string ' 5d' to type oid failed.
-MAPI = (monetdb) /var/tmp/mtest-17898/.s.monetdb.31237
+MAPI = (monetdb) /var/tmp/mtest-91139/.s.monetdb.38151
QUERY = INSERT INTO OID_TBL(f1) VALUES ('5 5');
ERROR = !conversion of string '5 5' to type oid failed.
-MAPI = (monetdb) /var/tmp/mtest-17898/.s.monetdb.31237
+MAPI = (monetdb) /var/tmp/mtest-91139/.s.monetdb.38151
QUERY = INSERT INTO OID_TBL(f1) VALUES (-10); -- negative oids are not
allowed in MonetDB, so this should fail
ERROR = !overflow in conversion of -10 to oid.
-MAPI = (monetdb) /var/tmp/mtest-17898/.s.monetdb.31237
+MAPI = (monetdb) /var/tmp/mtest-91139/.s.monetdb.38151
QUERY = INSERT INTO OID_TBL(f1) VALUES (-1040); -- negative oids are not
allowed in MonetDB, so this should fail
ERROR = !overflow in conversion of -1040 to oid.
-MAPI = (monetdb) /var/tmp/mtest-17898/.s.monetdb.31237
+MAPI = (monetdb) /var/tmp/mtest-91139/.s.monetdb.38151
QUERY = INSERT INTO OID_TBL(f1) VALUES ('-1040'); -- negative oids are not
allowed in MonetDB, so this should fail
ERROR = !conversion of string '-1040' to type oid failed.
-MAPI = (monetdb) /var/tmp/mtest-17898/.s.monetdb.31237
+MAPI = (monetdb) /var/tmp/mtest-91139/.s.monetdb.38151
QUERY = INSERT INTO OID_TBL(f1) VALUES (' - 500');
ERROR = !conversion of string ' - 500' to type oid failed.
-MAPI = (monetdb) /var/tmp/mtest-17898/.s.monetdb.31237
+MAPI = (monetdb) /var/tmp/mtest-91139/.s.monetdb.38151
QUERY = INSERT INTO OID_TBL(f1) VALUES ('32958209582039852935');
ERROR = !conversion of string '32958209582039852935' to type oid failed.
-MAPI = (monetdb) /var/tmp/mtest-17898/.s.monetdb.31237
+MAPI = (monetdb) /var/tmp/mtest-91139/.s.monetdb.38151
QUERY = INSERT INTO OID_TBL(f1) VALUES (32958209582039852935);
-ERROR = !integer value too large or not a number (32958209582039852935) in:
"insert into oid_tbl(f1) values (32958209582039852935"
- !syntax error, unexpected ')' in: ")"
-MAPI = (monetdb) /var/tmp/mtest-28183/.s.monetdb.33906
+ERROR = !overflow in conversion of 32958209582039851008 to int.
+MAPI = (monetdb) /var/tmp/mtest-91139/.s.monetdb.38151
QUERY = INSERT INTO OID_TBL(f1) VALUES ('-23582358720398502385');
ERROR = !conversion of string '-23582358720398502385' to type oid failed.
-MAPI = (monetdb) /var/tmp/mtest-17898/.s.monetdb.31237
+MAPI = (monetdb) /var/tmp/mtest-91139/.s.monetdb.38151
QUERY = INSERT INTO OID_TBL(f1) VALUES (-23582358720398502385);
-ERROR = !integer value too large or not a number (23582358720398502385) in:
"insert into oid_tbl(f1) values (-23582358720398502385"
- !syntax error, unexpected ')' in: ")"
+ERROR = !overflow in conversion of -23582358720398503936 to int.
-# 16:41:57 >
-# 16:41:57 > "Done."
-# 16:41:57 >
+# 11:41:06 >
+# 11:41:06 > "Done."
+# 11:41:06 >
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
