Changeset: c1991d0d885b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c1991d0d885b
Modified Files:
clients/python/monetdb/mapi2.py
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
Branch: default
Log Message:
Merge with Apr2012 branch.
diffs (67 lines):
diff --git a/clients/python/monetdb/mapi2.py b/clients/python/monetdb/mapi2.py
--- a/clients/python/monetdb/mapi2.py
+++ b/clients/python/monetdb/mapi2.py
@@ -41,6 +41,7 @@ logger = logging.getLogger("monetdb")
MAX_PACKAGE_LENGTH = (1024*8)-2
MSG_PROMPT = ""
+MSG_MORE = "\1\2\n"
MSG_INFO = "#"
MSG_ERROR = "!"
MSG_Q = "&"
@@ -159,6 +160,9 @@ class Server:
response = self.__getblock()
if not len(response):
return
+ if response == MSG_MORE:
+ # tell server it isn't going to get more
+ return self.cmd("")
if response[0] in [MSG_Q, MSG_HEADER, MSG_TUPLE]:
return response
elif response[0] == MSG_ERROR:
diff --git a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql
@@ -1,11 +1,11 @@
create table ttt (a int, b int, c int);
select optimizer;
select def from optimizers() where name = optimizer;
-explain copy into ttt from '/tmp/xyz';
+explain copy into ttt from '/:\tmp/xyz';
declare opt_pipe_name string; set opt_pipe_name = ( select optimizer );
declare opt_pipe_def string; set opt_pipe_def = ( select def from
optimizers() where name = opt_pipe_name );
set optimizer =
substring(opt_pipe_def,0,length(opt_pipe_def)-length('optimizer.garbageCollector();'))
|| 'optimizer.sql_append();optimizer.garbageCollector();';
select optimizer;
select def from optimizers() where name = optimizer;
-explain copy into ttt from '/tmp/xyz';
+explain copy into ttt from '/:\tmp/xyz';
drop table ttt;
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
@@ -61,10 +61,10 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 175 # length
+% 178 # length
function user.s2_1{autoCommit=true}():void;
X_2 := sql.mvc();
- (X_6:bat[:oid,:int] ,X_7:bat[:oid,:int] ,X_8:bat[:oid,:int] ) :=
sql.copy_from("sys":str,"ttt":str,"|":str,"\\n":str,nil:str,"null":str,"/tmp/xyz":str,-1:lng,0:lng,0:int);
+ (X_6:bat[:oid,:int] ,X_7:bat[:oid,:int] ,X_8:bat[:oid,:int] ) :=
sql.copy_from("sys":str,"ttt":str,"|":str,"\\n":str,nil:str,"null":str,"/:\\tmp/xyz":str,-1:lng,0:lng,0:int);
X_9 := sql.append(X_2,"sys","ttt","a",X_6);
X_11 := sql.append(X_9,"sys","ttt","b",X_7);
X_14 := sql.append(X_11,"sys":str,"ttt":str,"c",X_8);
@@ -89,10 +89,10 @@ end s2_1;
% .explain # table_name
% mal # name
% clob # type
-% 175 # length
+% 178 # length
function user.s5_1{autoCommit=true}():void;
X_2 := sql.mvc();
- (X_6:bat[:oid,:int] ,X_7:bat[:oid,:int] ,X_8:bat[:oid,:int] ) :=
sql.copy_from("sys":str,"ttt":str,"|":str,"\\n":str,nil:str,"null":str,"/tmp/xyz":str,-1:lng,0:lng,0:int);
+ (X_6:bat[:oid,:int] ,X_7:bat[:oid,:int] ,X_8:bat[:oid,:int] ) :=
sql.copy_from("sys":str,"ttt":str,"|":str,"\\n":str,nil:str,"null":str,"/:\\tmp/xyz":str,-1:lng,0:lng,0:int);
X_9 := sql.append(X_2,"sys","ttt","a",X_6);
X_11 := sql.append(X_9,"sys","ttt","b",X_7);
X_16 := aggr.count(X_8);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
