Changeset: 763dd5d9963e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=763dd5d9963e
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
sql/backends/monet5/rel_bin.c
sql/test/Tests/session_vars.sql
sql/test/Tests/session_vars.stable.err
sql/test/Tests/session_vars.stable.out
Branch: gdk_tracer
Log Message:
approved output
diffs (190 lines):
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -11243,7 +11243,6 @@ stdout of test 'MAL-signatures` in direc
[ "lidar", "export", "pattern lidar.export(tablename:str, fname:str,
type:str):void ", "LIDARexportTable;", "Exporta LIDAR table to a
LAS/LAZ file" ]
[ "lidar", "load", "pattern lidar.load(tablename:str):void ",
"LIDARloadTable;", "Load a LIDAR table from an attached file" ]
[ "logging", "flush", "command logging.flush():void ",
"TRACERflush_buffer;", "Flush the buffer" ]
-[ "logging", "log", "command logging.log():void ", "TRACERlog;", "Create
a log message" ]
[ "logging", "resetadapter", "command logging.resetadapter():void ",
"TRACERreset_adapter;", "Resets the adapter back to the default" ]
[ "logging", "resetcomplevel", "command
logging.resetcomplevel(comp:int):void ", "TRACERreset_component_level;",
"Resets the log level for a specific component back to the default" ]
[ "logging", "resetflushlevel", "command logging.resetflushlevel():void
", "TRACERreset_flush_level;", "Resets the flush level back to the
default" ]
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -15645,7 +15645,6 @@ stdout of test 'MAL-signatures` in direc
[ "lidar", "export", "pattern lidar.export(tablename:str, fname:str,
type:str):void ", "LIDARexportTable;", "Exporta LIDAR table to a
LAS/LAZ file" ]
[ "lidar", "load", "pattern lidar.load(tablename:str):void ",
"LIDARloadTable;", "Load a LIDAR table from an attached file" ]
[ "logging", "flush", "command logging.flush():void ",
"TRACERflush_buffer;", "Flush the buffer" ]
-[ "logging", "log", "command logging.log():void ", "TRACERlog;", "Create
a log message" ]
[ "logging", "resetadapter", "command logging.resetadapter():void ",
"TRACERreset_adapter;", "Resets the adapter back to the default" ]
[ "logging", "resetcomplevel", "command
logging.resetcomplevel(comp:int):void ", "TRACERreset_component_level;",
"Resets the log level for a specific component back to the default" ]
[ "logging", "resetflushlevel", "command logging.resetflushlevel():void
", "TRACERreset_flush_level;", "Resets the flush level back to the
default" ]
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
@@ -2131,7 +2131,7 @@ int daytime_usec(daytime tm);
str dblRef;
str deblockdataflow(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
void debugFunction(COMPONENT comp, MalBlkPtr mb, MalStkPtr stk, int flg);
-void debugInstruction(COMPONENT comp, MalBlkPtr mb, MalStkPtr stk, InstrPtr p,
int flg);
+void debugInstruction(COMPONENT comp, MalBlkPtr mb, MalStkPtr stk, InstrPtr p,
int p_idx, int flg);
int defConstant(MalBlkPtr mb, int type, ValPtr cst);
str defineRef;
void delArgument(InstrPtr p, int varid);
@@ -2274,7 +2274,7 @@ str initQlog(void);
int inlineMALblock(MalBlkPtr mb, int pc, MalBlkPtr mc);
str inplaceRef;
void insertSymbol(Module scope, Symbol prg);
-str instruction2str(MalBlkPtr mb, MalStkPtr stl, InstrPtr p, int hidden);
+str instruction2str(MalBlkPtr mb, MalStkPtr stl, InstrPtr p, int p_idx, int
hidden);
str intRef;
str intersectRef;
str intersectcandRef;
@@ -2481,7 +2481,7 @@ str preludeRef;
MalStkPtr prepareMALstack(MalBlkPtr mb, int size);
int prepareMalBlk(MalBlkPtr mb, str s);
void printFunction(stream *fd, MalBlkPtr mb, MalStkPtr stk, int flg);
-void printInstruction(stream *fd, MalBlkPtr mb, MalStkPtr stk, InstrPtr p, int
flg);
+void printInstruction(stream *fd, MalBlkPtr mb, MalStkPtr stk, InstrPtr p, int
p_idx, int flg);
str printRef;
void printSignature(stream *fd, Symbol s, int flg);
void printStack(stream *f, MalBlkPtr mb, MalStkPtr s);
@@ -2668,7 +2668,7 @@ str transaction_releaseRef;
str transaction_rollbackRef;
void trimMalVariables(MalBlkPtr mb, MalStkPtr stk);
void trimMalVariables_(MalBlkPtr mb, MalStkPtr glb);
-void typeChecker(Module scope, MalBlkPtr mb, InstrPtr p, int silent);
+void typeChecker(Module scope, MalBlkPtr mb, InstrPtr p, int p_idx, int
silent);
str unescape_str(str *retval, str s);
str uniqueRef;
str unlockRef;
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -554,7 +554,7 @@ exp_bin(backend *be, sql_exp *e, stmt *l
} else if (e->flag & PSM_REL) {
sql_rel *rel = e->l;
stmt *r = rel_bin(be, rel);
-
+
if (!r)
return NULL;
if (is_modify(rel->op) || is_ddl(rel->op))
@@ -749,7 +749,7 @@ exp_bin(backend *be, sql_exp *e, stmt *l
assert(s);
return NULL;
}
- } break;
+ } break;
case e_cmp: {
stmt *l = NULL, *r = NULL, *r2 = NULL;
int swapped = 0, is_select = 0;
@@ -1389,7 +1389,7 @@ rel2bin_basetable(backend *be, sql_rel *
if (!t && c)
t = c->t;
- dels = stmt_tid(be, t, rel->flag == REL_PARTITION);
+ dels = stmt_tid(be, t, rel->flag == REL_PARTITION);
/* add aliases */
assert(rel->exps);
@@ -1949,7 +1949,7 @@ rel2bin_join(backend *be, sql_rel *rel,
}
rel->exps = jexps;
}
-
+
/* generate a relational join */
if (join)
en = rel->exps->h;
diff --git a/sql/test/Tests/session_vars.sql b/sql/test/Tests/session_vars.sql
--- a/sql/test/Tests/session_vars.sql
+++ b/sql/test/Tests/session_vars.sql
@@ -20,11 +20,11 @@ select @current_schema;
select @"current_user";
select @"current_role";
-set test_nr = 'help';
-set test_str = 1;
-set test_boolean = 'help';
+set test_nr = 'help'; --error, conversion failed
+set test_str = 1; --error, variable no longer in cache
+set test_boolean = 'help'; --error, variable no longer in cache
-select @test_nr;
-select @test_str;
-select @test_boolean;
+select @test_nr; --error, variable no longer in cache
+select @test_str; --error, variable no longer in cache
+select @test_boolean; --error, variable no longer in cache
diff --git a/sql/test/Tests/session_vars.stable.err
b/sql/test/Tests/session_vars.stable.err
--- a/sql/test/Tests/session_vars.stable.err
+++ b/sql/test/Tests/session_vars.stable.err
@@ -79,14 +79,30 @@ stderr of test 'session_vars` in directo
# 20:30:42 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=39627
# 20:30:42 >
-MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
-QUERY = set test_nr = 'help';
+MAPI = (monetdb) /var/tmp/mtest-222303/.s.monetdb.38750
+QUERY = set test_nr = 'help'; --error, conversion failed
ERROR = !conversion of string 'help' to type int failed.
CODE = 22018
-MAPI = (monetdb) /var/tmp/mtest-30274/.s.monetdb.37685
-QUERY = set test_boolean = 'help';
-ERROR = !conversion of string 'help' to type bit failed.
-CODE = 22018
+MAPI = (monetdb) /var/tmp/mtest-222303/.s.monetdb.38750
+QUERY = set test_str = 1; --error, variable no longer in cache
+ERROR = !Variable test_str unknown
+CODE = 42000
+MAPI = (monetdb) /var/tmp/mtest-222303/.s.monetdb.38750
+QUERY = set test_boolean = 'help'; --error, variable no longer in cache
+ERROR = !Variable test_boolean unknown
+CODE = 42000
+MAPI = (monetdb) /var/tmp/mtest-222303/.s.monetdb.38750
+QUERY = select @test_nr; --error, variable no longer in cache
+ERROR = !SELECT: '@test_nr' unknown
+CODE = 42000
+MAPI = (monetdb) /var/tmp/mtest-222303/.s.monetdb.38750
+QUERY = select @test_str; --error, variable no longer in cache
+ERROR = !SELECT: '@test_str' unknown
+CODE = 42000
+MAPI = (monetdb) /var/tmp/mtest-222303/.s.monetdb.38750
+QUERY = select @test_boolean; --error, variable no longer in cache
+ERROR = !SELECT: '@test_boolean' unknown
+CODE = 42000
# 20:30:43 >
# 20:30:43 > Done.
diff --git a/sql/test/Tests/session_vars.stable.out
b/sql/test/Tests/session_vars.stable.out
--- a/sql/test/Tests/session_vars.stable.out
+++ b/sql/test/Tests/session_vars.stable.out
@@ -104,25 +104,6 @@ stdout of test 'session_vars` in directo
% varchar # type
% 7 # length
[ "monetdb" ]
-#set test_str = 1;
-#select @test_nr;
-% . # table_name
-% single_value # name
-% int # type
-% 1 # length
-[ 1 ]
-#select @test_str;
-% . # table_name
-% single_value # name
-% varchar # type
-% 1 # length
-[ "1" ]
-#select @test_boolean;
-% . # table_name
-% single_value # name
-% boolean # type
-% 5 # length
-[ true ]
# 12:30:00 >
# 12:30:00 > Done.
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
