MonetDB: Jan2022 - Do a better test for assign statements

[Pedro Ferreira]

Changeset: ed685a37a392 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/ed685a37a392
Modified Files:
        monetdb5/optimizer/opt_dict.c
        monetdb5/optimizer/opt_for.c
        sql/test/dict/Tests/dict02.SQL.py
Branch: Jan2022
Log Message:

Do a better test for assign statements


diffs (36 lines):

diff --git a/monetdb5/optimizer/opt_dict.c b/monetdb5/optimizer/opt_dict.c
--- a/monetdb5/optimizer/opt_dict.c
+++ b/monetdb5/optimizer/opt_dict.c
@@ -94,7 +94,7 @@ OPTdictImplementation(Client cntxt, MalB
                                        freeInstruction(p);
                                        done = 1;
                                        break;
-                               } else if (p->argc == 2 && p->retc == 1 && 
getFunctionId(p) == NULL) {
+                               } else if (p->argc == 2 && p->retc == 1 && 
p->barrier == ASSIGNsymbol) {
                                        /* a = b */
                                        int l = getArg(p, 0);
                                        varisdict[l] = varisdict[k];
diff --git a/monetdb5/optimizer/opt_for.c b/monetdb5/optimizer/opt_for.c
--- a/monetdb5/optimizer/opt_for.c
+++ b/monetdb5/optimizer/opt_for.c
@@ -91,7 +91,7 @@ OPTforImplementation(Client cntxt, MalBl
                                        freeInstruction(p);
                                        done = 1;
                                        break;
-                               } else if (p->argc == 2 && p->retc == 1 && 
getFunctionId(p) == NULL) {
+                               } else if (p->argc == 2 && p->retc == 1 && 
p->barrier == ASSIGNsymbol) {
                                        /* a = b */
                                        int l = getArg(p, 0);
                                        varisfor[l] = varisfor[k];
diff --git a/sql/test/dict/Tests/dict02.SQL.py 
b/sql/test/dict/Tests/dict02.SQL.py
--- a/sql/test/dict/Tests/dict02.SQL.py
+++ b/sql/test/dict/Tests/dict02.SQL.py
@@ -20,7 +20,7 @@ with SQLTestCase() as cli:
 
     cli.execute('SELECT mct00.c1 FROM mct00;') \
         .assertSucceeded().assertDataResultMatch([(True,),(False,)])
-    cli.execute('SELECT rmct00.c1 FROM rmct00') \
+    cli.execute('SELECT rmct00.c1 FROM rmct00;') \
         .assertSucceeded().assertDataResultMatch([(True,),(False,)])
 
     cli.execute("""
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list