Changeset: 9738e3a0fdd8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9738e3a0fdd8
Added Files:
clients/python2/test/run.cmd
clients/python3/test/run.cmd
Modified Files:
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
Branch: default
Log Message:
merged
diffs (95 lines):
diff --git a/clients/python2/test/run.cmd b/clients/python2/test/run.cmd
new file mode 100644
--- /dev/null
+++ b/clients/python2/test/run.cmd
@@ -0,0 +1,8 @@
+set TSTDB=demo
+set TSTHOSTNAME=localhost
+set TSTUSERNAME=monetdb
+set TSTPASSWORD=monetdb
+set TSTDEBUG=no
+
+nosetests ./runtests.py
+nosetests ./test_control.py
diff --git a/clients/python3/test/run.cmd b/clients/python3/test/run.cmd
new file mode 100644
--- /dev/null
+++ b/clients/python3/test/run.cmd
@@ -0,0 +1,8 @@
+set TSTDB=demo
+set TSTHOSTNAME=localhost
+set TSTUSERNAME=monetdb
+set TSTPASSWORD=monetdb
+set TSTDEBUG=no
+
+nosetests ./runtests.py
+nosetests ./test_control.py
diff --git a/monetdb5/optimizer/opt_prelude.c b/monetdb5/optimizer/opt_prelude.c
--- a/monetdb5/optimizer/opt_prelude.c
+++ b/monetdb5/optimizer/opt_prelude.c
@@ -85,8 +85,6 @@ str tinterRef;
str mergecandRef;
str intersectcandRef;
str eqRef;
-str divRef;
-str mulRef;
str disconnectRef;
str evalRef;
str execRef;
@@ -172,9 +170,11 @@ str passRef;
str partitionRef;
str pcreRef;
str pinRef;
+str singleRef;
str plusRef;
-str singleRef;
-str sqlplusRef;
+str minusRef;
+str mulRef;
+str divRef;
str printRef;
str preludeRef;
str prodRef;
@@ -347,8 +347,6 @@ void optimizerInit(void){
mergecandRef= putName("mergecand",9);
intersectcandRef= putName("intersectcand",13);
eqRef = putName("==",2);
- divRef = putName("/",1);
- mulRef = putName("*",1);
disconnectRef= putName("disconnect",10);
evalRef = putName("eval",4);
execRef = putName("exec",4);
@@ -435,7 +433,9 @@ void optimizerInit(void){
pcreRef = putName("pcre",4);
pinRef = putName("pin",3);
plusRef = putName("+",1);
- sqlplusRef = putName("sqladd",6);
+ minusRef = putName("-",1);
+ mulRef = putName("*",1);
+ divRef = putName("/",1);
printRef = putName("print",5);
preludeRef = putName("prelude",7);
prodRef = putName("prod",4);
diff --git a/monetdb5/optimizer/opt_prelude.h b/monetdb5/optimizer/opt_prelude.h
--- a/monetdb5/optimizer/opt_prelude.h
+++ b/monetdb5/optimizer/opt_prelude.h
@@ -84,8 +84,6 @@ opt_export str tinterRef;
opt_export str mergecandRef;
opt_export str intersectcandRef;
opt_export str eqRef;
-opt_export str divRef;
-opt_export str mulRef;
opt_export str disconnectRef;
opt_export str evalRef;
opt_export str execRef;
@@ -172,7 +170,9 @@ opt_export str partitionRef;
opt_export str pcreRef;
opt_export str pinRef;
opt_export str plusRef;
-opt_export str sqlplusRef;
+opt_export str minusRef;
+opt_export str mulRef;
+opt_export str divRef;
opt_export str printRef;
opt_export str preludeRef;
opt_export str prodRef;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
