Changeset: b80b30df6a92 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b80b30df6a92
Modified Files:
sql/backends/monet5/sql.c
sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.out
sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out
sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out.int128
sql/test/bugs/Tests/object_name-bug-sf-985242.stable.out
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out
Branch: protocol
Log Message:
Approve different rendering lengths with new protocol.
diffs (191 lines):
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -2398,32 +2398,16 @@ mvc_scalar_value_wrap(Client cntxt, MalB
if (ATOMextern(mtype))
p = *(ptr *) p;
+ // scalar values are single-column result sets
+ res_id = mvc_result_table(b->mvc, mb->tag, 1, 1, NULL);
+ mvc_result_value(b->mvc, *tn, *cn, *type, *digits, *scale, p, mtype);
if (b->output_format == OFMT_NONE) {
- mvc_result_table(b->mvc, 1, 1, NULL);
- mvc_result_value(b->mvc, *tn, *cn, *type, *digits, *scale, p,
mtype);
return MAL_SUCCEED;
}
-
- if (b->client->protocol == PROTOCOL_10) {
- // scalar values are single-column result sets
- // create the empty result table
- mvc *m = b->mvc;
- int res_id = mvc_result_table(m, 1, 1, NULL);
- res_table *t;
- // fill it with the single-column value
- mvc_result_value(m, *tn, *cn, *type, *digits, *scale, p, mtype);
- t = res_tables_find(m->results, res_id);
- // export the value to the client
- if (mvc_export_resultset_prot10(m, t, cntxt->fdout,
b->client->fdin->s, b->client->blocksize, b->client->compute_column_widths, p)
< 0) {
- throw(SQL, "sql.exportValue", "failed");
- }
- return MAL_SUCCEED;
- }
- if (b->out == NULL || mvc_export_value(b, b->out, 1, *tn, *cn, *type,
*digits, *scale, *eclass, p, mtype, "", "NULL") != SQL_OK)
+ if (mvc_export_result(b, b->out, res_id) < 0) {
throw(SQL, "sql.exportValue", "failed");
}
return MAL_SUCCEED;
-
}
static void
diff --git
a/sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.out
b/sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.out
--- a/sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.out
+++ b/sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.stable.out
@@ -30,11 +30,11 @@ Ready.
# 19:04:38 >
#SELECT timestamp_to_str(current_timestamp, '%Q');
-% .L1 # table_name
-% L1 # name
+% .L2 # table_name
+% L2 # name
% clob # type
-% 2 # length
-[ "%Q" ]
+% 1 # length
+[ "Q" ]
# 19:04:38 >
# 19:04:38 > "Done."
diff --git
a/sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out
b/sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out
--- a/sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out
+++ b/sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out
@@ -316,7 +316,7 @@ Ready.
[ 11, 11 ]
[ 0123456789, 0123456789 ]
[ A0B2C3D4F5, A0B2C3D4F5 ]
-[ "" ]
+[ , ]
[ NULL, NULL ]
#SELECT v, cast(v as varchar(16)) from T_blob;
% sys.t_blob, sys.L3 # table_name
@@ -360,7 +360,7 @@ Ready.
[ 11, 11 ]
[ 0123456789, 0123456789 ]
[ A0B2C3D4F5, A0B2C3D4F5 ]
-[ "" ]
+[ , ]
[ NULL, NULL ]
#DROP TABLE T_blob;
#CREATE TABLE T_tinyint (v tinyint);
diff --git
a/sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out.int128
b/sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out.int128
---
a/sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out.int128
+++
b/sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out.int128
@@ -340,7 +340,7 @@ Ready.
[ 11, 11 ]
[ 0123456789, 0123456789 ]
[ A0B2C3D4F5, A0B2C3D4F5 ]
-[ "" ]
+[ , ]
[ NULL, NULL ]
#SELECT v, cast(v as varchar(16)) from T_blob;
% sys.t_blob, sys.L3 # table_name
@@ -384,7 +384,7 @@ Ready.
[ 11, 11 ]
[ 0123456789, 0123456789 ]
[ A0B2C3D4F5, A0B2C3D4F5 ]
-[ "" ]
+[ , ]
[ NULL, NULL ]
#DROP TABLE T_blob;
#CREATE TABLE T_tinyint (v tinyint);
diff --git a/sql/test/bugs/Tests/object_name-bug-sf-985242.stable.out
b/sql/test/bugs/Tests/object_name-bug-sf-985242.stable.out
--- a/sql/test/bugs/Tests/object_name-bug-sf-985242.stable.out
+++ b/sql/test/bugs/Tests/object_name-bug-sf-985242.stable.out
@@ -24,7 +24,7 @@ Ready.
#create table x ("\t" int);
#select * from x;
% sys.x # table_name
-% "\\t" # name
+% \t # name
% int # type
% 1 # length
#drop table "x";
diff --git
a/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
b/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
---
a/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
+++
b/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
@@ -336,27 +336,27 @@ Ready.
% .querylog_catalog, .querylog_catalog, .querylog_catalog,
.querylog_catalog, .querylog_catalog, .querylog_catalog,
.querylog_catalog, .querylog_catalog # table_name
% id, owner, defined, query, pipe, plan, mal, optimize # name
% oid, clob, timestamp, clob, clob, clob, int, bigint # type
-% 3, 0, 26, 0, 0, 0, 1, 1 # length
+% 4, 0, 26, 0, 0, 0, 1, 1 # length
#SELECT * FROM sys.querylog_calls WHERE id NOT IN (SELECT id FROM
sys.querylog_catalog);
% .querylog_calls, .querylog_calls, .querylog_calls,
.querylog_calls, .querylog_calls, .querylog_calls,
.querylog_calls, .querylog_calls, .querylog_calls # table_name
% id, start, stop, arguments, tuples, run, ship, cpu, io #
name
% oid, timestamp, timestamp, clob, bigint, bigint, bigint, int,
int # type
-% 3, 26, 26, 0, 1, 1, 1, 1, 1 # length
+% 4, 26, 26, 0, 1, 1, 1, 1, 1 # length
#SELECT * FROM sys.querylog_history WHERE id NOT IN (SELECT id FROM
sys.querylog_catalog);
% .querylog_history, .querylog_history, .querylog_history,
.querylog_history, .querylog_history, .querylog_history,
.querylog_history, .querylog_history, .querylog_history,
.querylog_history, .querylog_history, .querylog_history,
.querylog_history, .querylog_history, .querylog_history,
.querylog_history # table_name
% id, owner, defined, query, pipe, plan, mal, optimize,
start, stop, arguments, tuples, run, ship, cpu, io # name
% oid, clob, timestamp, clob, clob, clob, int, bigint,
timestamp, timestamp, clob, bigint, bigint, bigint, int, int #
type
-% 3, 0, 26, 0, 0, 0, 1, 1, 26, 26,
0, 1, 1, 1, 1, 1 # length
+% 4, 0, 26, 0, 0, 0, 1, 1, 26, 26,
0, 1, 1, 1, 1, 1 # length
#SELECT * FROM sys.queue WHERE tag > 0 AND tag NOT IN (SELECT qtag FROM
sys.queue);
% .queue, .queue, .queue, .queue, .queue, .queue, .queue, .queue #
table_name
% qtag, user, started, estimate, progress, status,
tag, query # name
% bigint, clob, timestamp, timestamp, int, clob, oid,
clob # type
-% 1, 0, 26, 26, 1, 0, 3, 0 # length
+% 1, 0, 26, 26, 1, 0, 4, 0 # length
#SELECT * FROM sys.queue WHERE "user" NOT IN (SELECT name FROM sys.users);
% .queue, .queue, .queue, .queue, .queue, .queue, .queue, .queue #
table_name
% qtag, user, started, estimate, progress, status,
tag, query # name
% bigint, clob, timestamp, timestamp, int, clob, oid,
clob # type
-% 1, 0, 26, 26, 1, 0, 3, 0 # length
+% 1, 0, 26, 26, 1, 0, 4, 0 # length
#SELECT * FROM sys.sessions WHERE "user" NOT IN (SELECT name FROM sys.users);
% .sessions, .sessions, .sessions, .sessions, .sessions,
.sessions # table_name
% user, login, sessiontimeout, lastcommand, querytimeout, active
# name
diff --git a/sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out
b/sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out
--- a/sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out
+++ b/sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out
@@ -93,7 +93,7 @@ Ready.
% bigint, int # type
% 1, 1 # length
#SELECT COUNT(*) AS duplicates, id FROM sys.tables GROUP BY id HAVING COUNT(*)
> 1;
-% .L40, .tables # table_name
+% .L41, .tables # table_name
% duplicates, id # name
% bigint, int # type
% 1, 1 # length
@@ -108,7 +108,7 @@ Ready.
% bigint, int # type
% 1, 1 # length
#SELECT COUNT(*) AS duplicates, id FROM sys.columns GROUP BY id HAVING
COUNT(*) > 1;
-% .L14, .columns # table_name
+% .L15, .columns # table_name
% duplicates, id # name
% bigint, int # type
% 1, 1 # length
@@ -236,17 +236,17 @@ Ready.
% .L10, .querylog_catalog # table_name
% duplicates, id # name
% bigint, oid # type
-% 1, 3 # length
+% 1, 4 # length
#SELECT COUNT(*) AS duplicates, id FROM sys.querylog_calls GROUP BY id HAVING
COUNT(*) > 1;
% .L10, .querylog_calls # table_name
% duplicates, id # name
% bigint, oid # type
-% 1, 3 # length
+% 1, 4 # length
#SELECT COUNT(*) AS duplicates, id FROM sys.querylog_history GROUP BY id
HAVING COUNT(*) >1;
% .L17, .querylog_history # table_name
% duplicates, id # name
% bigint, oid # type
-% 1, 3 # length
+% 1, 4 # length
#SELECT COUNT(*) AS duplicates, qtag FROM sys.queue GROUP BY qtag HAVING
COUNT(*) > 1;
% .L10, .queue # table_name
% duplicates, qtag # name
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
