MonetDB: monetdbe-proxy - Restore client protocol and fix tests.

[Aris Koning]

Changeset: 3da602f82104 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3da602f82104
Modified Files:
        design.txt
        sql/backends/monet5/Tests/simpleSQL.malC
        sql/backends/monet5/Tests/simpleSQL.stable.out
        sql/backends/monet5/sql_scenario.c
Branch: monetdbe-proxy
Log Message:

Restore client protocol and fix tests.


diffs (89 lines):

diff --git a/design.txt b/design.txt
--- a/design.txt
+++ b/design.txt
@@ -111,3 +111,23 @@ function user.%2():any;
     X_3:str := remote.put("_monetdb_0":str, "SELECT x, y, 1 AS some_int FROM 
test WHERE x > 10; ":str);
     remote.exec("_monetdb_0":str, "sql":str, "eval":str, 0x7fffffffdba0:ptr, 
X_3:str, X_0:str);
     return :void;
+
+regression reference wih changeset d760325d2974
+!ERROR:  Testing FAILED SIGNIFICANTLY (12 out of 2923 tests failed)
+
+  387 out of 2923 tests could not be executed
+    1 out of 2923 tests caused an abort (assertion failure)
+        sql/test/subquery/subquery6
+   11 out of 2923 tests produced SIGNIFICANTLY different output
+        sql/test/BugTracker-2015/timestamp_convert.Bug-3815
+        sql/test/BugTracker-2017/insert_self_ref_FK.Bug-6131
+        sql/test/BugTracker-2020/interval-math.Bug-6935
+        sql/test/BugTracker-2020/copy-empty-blob.Bug-6948
+        sql/test/SQLancer/sqlancer02
+        sql/test/Triggers/trigger_action
+        sql/test/Triggers/trigger_projection
+        sql/test/Users/createUserRollback
+        sql/test/json/jsonparser.Bug-6943
+        sql/test/mergetables/singlekeyconstraint
+        sql/test/miscellaneous/groupby_error
+
diff --git a/sql/backends/monet5/Tests/simpleSQL.malC 
b/sql/backends/monet5/Tests/simpleSQL.malC
--- a/sql/backends/monet5/Tests/simpleSQL.malC
+++ b/sql/backends/monet5/Tests/simpleSQL.malC
@@ -1,6 +1,6 @@
 #execute simple SQL queries from MAL 
 function foo();
-sql.eval("select 1;",true);
+sql.eval("select 1;",false);
 
 sql.eval("create table simpleT(i integer);");
 sql.eval("insert into simpleT values(123);");
diff --git a/sql/backends/monet5/Tests/simpleSQL.stable.out 
b/sql/backends/monet5/Tests/simpleSQL.stable.out
--- a/sql/backends/monet5/Tests/simpleSQL.stable.out
+++ b/sql/backends/monet5/Tests/simpleSQL.stable.out
@@ -25,7 +25,7 @@ stdout of test 'simpleSQL` in directory 
 # 13:03:24 >  
 
 function user.foo():void;
-    sql.eval("select 1;", true);
+    sql.eval("select 1;", false);
     sql.eval("create table simpleT(i integer);");
     sql.eval("insert into simpleT values(123);");
     sql.eval("select * from simpleT;");
@@ -45,6 +45,16 @@ end user.foo;
 % int # type
 % 3 # length
 [ 123  ]
+% sys.simplet # table_name
+% i # name
+% int # type
+% 3 # length
+[ 123  ]
+% .%2 # table_name
+% %2 # name
+% tinyint # type
+% 1 # length
+[ 1    ]
 
 # 23:37:35 >  
 # 23:37:35 >  "Done."
diff --git a/sql/backends/monet5/sql_scenario.c 
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -652,10 +652,17 @@ SQLstatement(Client cntxt, MalBlkPtr mb,
        str *expr = getArgReference_str(stk, pci, 1);
 
        (void) mb;
+
+       protocol_version backup = cntxt->protocol;
+
        if (pci->argc == 3 && *getArgReference_bit(stk, pci, 2))
                cntxt->protocol = PROTOCOL_COLUMNAR;
 
-       return SQLstatementIntern(cntxt, expr, "SQLstatement", TRUE, TRUE, 
NULL);
+       str msg = SQLstatementIntern(cntxt, expr, "SQLstatement", TRUE, TRUE, 
NULL);
+
+       cntxt->protocol = backup;
+
+       return msg;
 }
 
 str
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list