Changeset: 01263356ec52 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/01263356ec52
Modified Files:
clients/odbc/tests/ODBCmetadata.c
Branch: nested
Log Message:
Adjust the expected output for the EXPLAIN and TRACE commands.
diffs (80 lines):
diff --git a/clients/odbc/tests/ODBCmetadata.c
b/clients/odbc/tests/ODBCmetadata.c
--- a/clients/odbc/tests/ODBCmetadata.c
+++ b/clients/odbc/tests/ODBCmetadata.c
@@ -1535,11 +1535,11 @@ main(int argc, char **argv)
compareResult(stmt, ret, "EXPLAIN SELECT * from odbctst.\"LINES\"",
nrServerThreads > 1 ?
"Resultset with 1 columns\n"
- "Resultset with 17 rows\n"
+ "Resultset with 18 rows\n"
"mal\n"
- "WLONGVARCHAR(174)\n"
+ "WLONGVARCHAR(190)\n"
"function user.main():void;\n"
- " X_1:void := querylog.define(\"explain select * from
odbctst.\\\"LINES\\\";\":str, \"default_pipe\":str, 26:int);\n"
+ " X_1:void := querylog.define(\"explain select * from
odbctst.\\\"LINES\\\";\":str, \"default_pipe\":str, 27:int);\n"
"\n"
" X_33:bat[:int] := bat.new(nil:int);\n"
" X_34:bat[:int] := bat.new(nil:int);\n"
@@ -1550,17 +1550,18 @@ main(int argc, char **argv)
" X_40:bat[:str] := bat.pack(\"int\":str, \"int\":str,
\"int\":str, \"decimal\":str);\n"
" X_41:bat[:int] := bat.pack(31:int, 31:int, 31:int,
9:int);\n"
" X_42:bat[:int] := bat.pack(0:int, 0:int, 0:int, 3:int);\n"
+ " X_43:bat[:int] := bat.pack(0:int, 0:int, 0:int, 0:int);\n"
"\n"
- " X_37:int := sql.resultSet(X_38:bat[:str], X_39:bat[:str],
X_40:bat[:str], X_41:bat[:int], X_42:bat[:int], X_33:bat[:int], X_34:bat[:int],
X_35:bat[:int], X_36:bat[:int]);\n"
+ " X_37:int := sql.resultSet(X_38:bat[:str], X_39:bat[:str],
X_40:bat[:str], X_41:bat[:int], X_42:bat[:int], X_43:bat[:int], X_33:bat[:int],
X_34:bat[:int], X_35:bat[:int], X_36:bat[:int]);\n"
"end user.main;\n"
"\n\n"
:
"Resultset with 1 columns\n"
- "Resultset with 15 rows\n"
+ "Resultset with 16 rows\n"
"mal\n"
- "WLONGVARCHAR(174)\n"
+ "WLONGVARCHAR(190)\n"
"function user.main():void;\n"
- " X_1:void := querylog.define(\"explain select * from
odbctst.\\\"LINES\\\";\":str, \"default_pipe\":str, 26:int);\n"
+ " X_1:void := querylog.define(\"explain select * from
odbctst.\\\"LINES\\\";\":str, \"default_pipe\":str, 27:int);\n"
" X_33:bat[:int] := bat.new(nil:int);\n"
" X_34:bat[:int] := bat.new(nil:int);\n"
" X_35:bat[:int] := bat.new(nil:int);\n"
@@ -1570,7 +1571,8 @@ main(int argc, char **argv)
" X_40:bat[:str] := bat.pack(\"int\":str, \"int\":str,
\"int\":str, \"decimal\":str);\n"
" X_41:bat[:int] := bat.pack(31:int, 31:int, 31:int,
9:int);\n"
" X_42:bat[:int] := bat.pack(0:int, 0:int, 0:int, 3:int);\n"
- " X_37:int := sql.resultSet(X_38:bat[:str], X_39:bat[:str],
X_40:bat[:str], X_41:bat[:int], X_42:bat[:int], X_33:bat[:int], X_34:bat[:int],
X_35:bat[:int], X_36:bat[:int]);\n"
+ " X_43:bat[:int] := bat.pack(0:int, 0:int, 0:int, 0:int);\n"
+ " X_37:int := sql.resultSet(X_38:bat[:str], X_39:bat[:str],
X_40:bat[:str], X_41:bat[:int], X_42:bat[:int], X_43:bat[:int], X_33:bat[:int],
X_34:bat[:int], X_35:bat[:int], X_36:bat[:int]);\n"
"end user.main;\n"
"\n\n");
@@ -1589,7 +1591,7 @@ main(int argc, char **argv)
compareResult(stmt, ret, "TRACE(2) SELECT * from
odbctst.\"LINES\"",
nrServerThreads > 1 ?
"Resultset with 2 columns\n"
- "Resultset with 12 rows\n"
+ "Resultset with 13 rows\n"
"usec statement\n"
"BIGINT WVARCHAR\n"
"4 variable output\n"
@@ -1604,9 +1606,10 @@ main(int argc, char **argv)
"4 variable output\n"
"4 variable output\n"
"4 variable output\n"
+ "4 variable output\n"
:
"Resultset with 2 columns\n"
- "Resultset with 11 rows\n"
+ "Resultset with 12 rows\n"
"usec statement\n"
"BIGINT WVARCHAR\n"
"4 variable output\n"
@@ -1619,6 +1622,7 @@ main(int argc, char **argv)
"4 variable output\n"
"4 variable output\n"
"4 variable output\n"
+ "4 variable output\n"
"4 variable output\n");
/* next is the original output but it is varying a lot on usec
values, X_## values and even the order of rows,
so all data is replaced (see above) for stable output
comparison.
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
