MonetDB: Aug2011 - fixed typo

2011-08-13 Thread Stefan Manegold 
Changeset: 4416b1482368 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4416b1482368
Modified Files:
testing/Mfilter.py.in
Branch: Aug2011
Log Message:

fixed typo


diffs (12 lines):

diff --git a/testing/Mfilter.py.in b/testing/Mfilter.py.in
--- a/testing/Mfilter.py.in
+++ b/testing/Mfilter.py.in
@@ -170,7 +170,7 @@ norm_out = (
 None, 'localhost', None,   
 # 25: 3
 ##  None, '...', None, 
 # 26: 3
 #   None, 'un', 'known',   
 # 27: 3
-None, ,None, '', None, 
 # 28: 3
+None, None, '', None,  
 # 28: 3
 ##  None, ' !ERROR', '', ': ', None,   
 # 90: 5
 #   None, '...', None, 
 # 91: 3
 ##  '=ERROR', None, '\n#', 
 # 99: 3
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Aug2011 - approved the removal of some mat pattern sign...

2011-08-13 Thread Stefan Manegold 
Changeset: 48a0b158fa15 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=48a0b158fa15
Modified Files:
monetdb5/modules/mal/Tests/inspect05.stable.out
monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
Branch: Aug2011
Log Message:

approved the removal of some mat pattern signatures ...
... assuming their removal was indeed intended ...


diffs (70 lines):

diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out 
b/monetdb5/modules/mal/Tests/inspect05.stable.out
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out
@@ -524,7 +524,6 @@ end main;
 [ stop,command,  mapi, ():void ,   

  SERVERstop; 
  ]
 [ trace,   command,  mapi, 
(mid:int,flag:int):void , 
SERVERtrace;  
]
 [ emptySet,command,  constraints,  
(b:bat[:oid,:any_2]):void ,   
CemptySet;
]
-[ parts,   pattern,  constraints,  
(sname:str,tname:str,cname:str,access:int,nrparts:int):void , 
Cparts;   ]
 [ assertSpace, pattern,  language, 
(depth:int):void ,
safeguardStack;   
]
 [ assert,  pattern,  language, 
(v:any_1,pname:str,oper:str,val:any_2):void , 
MALassertTriple;  
]
 [ assert,  command,  language, 
(v:oid,term:str):void ,   
MALassertOid; 
]
@@ -587,15 +586,10 @@ end main;
 [ getAddress,  pattern,  inspect,
  (mod:str,fcn:str):bat[:str,:str] ,  
  INSPECTgetAddress;  
  ]
 [ getSignature,pattern,  inspect,
  (mod:str,fcn:str):bat[:str,:str] ,  
  INSPECTgetSignature;
  ]
 [ getDefinition,   pattern,  inspect,
  (mod:str,fcn:str):bat[:str,:str] ,  
  INSPECTgetDefinition;   
  ]
-[ bind_idxbat, pattern,  mat,  
(sname:str,tname:str,iname:str,access:int,part:int):bat[:oid,:any_1] ,
mat_bind_idxbat_wrap; ]
-[ bind,pattern,  mat,  
(sname:str,tname:str,cname:str,access:int,part:int):bat[:oid,:any_1] ,
mat_bind_wrap;]
-[ get_part,pattern,  mat,  
(sname:str,tname:str,column:str,part:int):bat[:oid,:any_1] ,  
get_part_wrap;]
 [ hasMoreElements, pattern,  mat,  
(grp:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ,  
MAThasMoreElements;   
]
-[ inc_parts,   pattern,  mat,  
(sname:str,tname:str):void ,  
inc_parts_wrap;   ]
 [ info,command,  mat,  
(g:str,e:str):bat[:any_1,:any_2] ,
MATinfo;  
]
 [ newIterator, pattern,  mat,  
(grp:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ,  
MATnewIterator;   
]
 [ new, pattern,  mat,  
(b:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ,
MATpack;  
]
-[ print_part,  pattern,  mat,  
(sname:str,tname:str,column:str,part:int):void ,

MonetDB: default - Merge with Aug2011 branch.

2011-08-13 Thread Stefan Manegold 
Changeset: 82167f39726f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=82167f39726f
Modified Files:
monetdb5/modules/mal/Tests/inspect05.stable.out
monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
Branch: default
Log Message:

Merge with Aug2011 branch.


diffs (91 lines):

diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out 
b/monetdb5/modules/mal/Tests/inspect05.stable.out
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out
@@ -535,7 +535,6 @@ end main;
 [ stop,command,  mapi, ():void ,   

  SERVERstop; 
  ]
 [ trace,   command,  mapi, 
(mid:int,flag:int):void , 
SERVERtrace;  
]
 [ emptySet,command,  constraints,  
(b:bat[:oid,:any_2]):void ,   
CemptySet;
]
-[ parts,   pattern,  constraints,  
(sname:str,tname:str,cname:str,access:int,nrparts:int):void , 
Cparts;   ]
 [ assertSpace, pattern,  language, 
(depth:int):void ,
safeguardStack;   
]
 [ assert,  pattern,  language, 
(v:any_1,pname:str,oper:str,val:any_2):void , 
MALassertTriple;  
]
 [ assert,  command,  language, 
(v:oid,term:str):void ,   
MALassertOid; 
]
@@ -598,15 +597,10 @@ end main;
 [ getAddress,  pattern,  inspect,
  (mod:str,fcn:str):bat[:str,:str] ,  
  INSPECTgetAddress;  
  ]
 [ getSignature,pattern,  inspect,
  (mod:str,fcn:str):bat[:str,:str] ,  
  INSPECTgetSignature;
  ]
 [ getDefinition,   pattern,  inspect,
  (mod:str,fcn:str):bat[:str,:str] ,  
  INSPECTgetDefinition;   
  ]
-[ bind_idxbat, pattern,  mat,  
(sname:str,tname:str,iname:str,access:int,part:int):bat[:oid,:any_1] ,
mat_bind_idxbat_wrap; ]
-[ bind,pattern,  mat,  
(sname:str,tname:str,cname:str,access:int,part:int):bat[:oid,:any_1] ,
mat_bind_wrap;]
-[ get_part,pattern,  mat,  
(sname:str,tname:str,column:str,part:int):bat[:oid,:any_1] ,  
get_part_wrap;]
 [ hasMoreElements, pattern,  mat,  
(grp:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ,  
MAThasMoreElements;   
]
-[ inc_parts,   pattern,  mat,  
(sname:str,tname:str):void ,  
inc_parts_wrap;   ]
 [ info,command,  mat,  
(g:str,e:str):bat[:any_1,:any_2] ,
MATinfo;  
]
 [ newIterator, pattern,  mat,  
(grp:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ,  
MATnewIterator;   
]
 [ new, pattern,  mat,  
(b:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ,
MATpack;  
]
-[ print_part,  pattern,  mat,  
(sname:str,tname:str,column:str,part:int):void ,  
print_part_wrap;  ]
 [ print,

MonetDB: Aug2011 - approved minor output change

2011-08-13 Thread Stefan Manegold 
Changeset: 6fe34b9259e3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6fe34b9259e3
Modified Files:

sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
Branch: Aug2011
Log Message:

approved minor output change


diffs (12 lines):

diff --git 
a/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
 
b/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
--- 
a/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
+++ 
b/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
@@ -26,7 +26,7 @@ Over..
 # 12:13:20   
 
 mdb#mdb.start();
-mdb#user.s0_1();
+mdb#user.s1_1();
 
 # 12:13:21   
 # 12:13:21   Done.
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Aug2011 - Avoid profiler trace

2011-08-13 Thread Martin Kersten 
Changeset: e2984d191b6a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e2984d191b6a
Modified Files:
monetdb5/optimizer/Tests/dataflow.mal
Branch: Aug2011
Log Message:

Avoid profiler trace


diffs (14 lines):

diff --git a/monetdb5/optimizer/Tests/dataflow.mal 
b/monetdb5/optimizer/Tests/dataflow.mal
--- a/monetdb5/optimizer/Tests/dataflow.mal
+++ b/monetdb5/optimizer/Tests/dataflow.mal
@@ -15,8 +15,8 @@ function tst();
 s:= slow();
 l:= aggr.min(s);
 h:= l;
-mdb.setTimer(true);
-mdb.setThread(true);
+#mdb.setTimer(true);
+#mdb.setThread(true);
 z:= nil:bat[:oid,:lng];
 barrier go:= language.dataflow();
t1:= algebra.select(s,l,h);
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Aug2011 - approved stable output according to changeset...

2011-08-13 Thread Stefan Manegold 
Changeset: 4af45f140b0f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4af45f140b0f
Modified Files:
monetdb5/optimizer/Tests/dataflow.stable.out
Branch: Aug2011
Log Message:

approved stable output according to changeset e2984d191b6a

this fixes bug 2856


diffs (43 lines):

diff --git a/monetdb5/optimizer/Tests/dataflow.stable.out 
b/monetdb5/optimizer/Tests/dataflow.stable.out
--- a/monetdb5/optimizer/Tests/dataflow.stable.out
+++ b/monetdb5/optimizer/Tests/dataflow.stable.out
@@ -30,8 +30,8 @@ function user.tst():void;
 s := user.slow();
 l := aggr.min(s);
 h := l;
-mdb.setTimer(true);
-mdb.setThread(true);
+#mdb.setTimer(true); 
+#mdb.setThread(true); 
 z := nil:bat[:oid,:lng];
 barrier go := language.dataflow();
 t1 := algebra.select(s,l,h);
@@ -58,9 +58,9 @@ function user.tst():void;   
 s := user.slow();   #  1 s:bat[:oid,:lng] := user.slow() 
{G}
 l := aggr.min(s);   #  2 l:lng := 
ALGmin_lng(s:bat[:oid,:lng]) {G}
 h := l; #  3 h:lng := l:lng 
-mdb.setTimer(true); #  4 _4:void := MDBsetTimer(_5:bit) 
-mdb.setThread(true);#  5 _6:void := MDBsetThread(_5:bit) 
-z := nil:bat[:oid,:lng];#  6 z:bat[:oid,:lng] := 
_8:bat[:oid,:lng] {G}
+#mdb.setTimer(true); 
+#mdb.setThread(true); 
+z := nil:bat[:oid,:lng];#  6 z:bat[:oid,:lng] := 
_7:bat[:oid,:lng] {G}
 barrier go := language.dataflow();  #  7 go:int := MALstartDataflow() {J17}
 t1 := algebra.select(s,l,h);#  8 t1:bat[:oid,:lng] := 
ALGselect(s:bat[:oid,:lng], l:lng, h:lng) {G}
 t2 := algebra.select(s,l,h);#  9 t2:bat[:oid,:lng] := 
ALGselect(s:bat[:oid,:lng], l:lng, h:lng) {G}
@@ -72,11 +72,11 @@ barrier go := language.dataflow();  
 t8 := algebra.select(s,l,h);# 15 t8:bat[:oid,:lng] := 
ALGselect(s:bat[:oid,:lng], l:lng, h:lng) {G}
 z := mat.pack(t1,t2,t3,t4,t5,t6,t7,t8);# 16 z:bat[:oid,:lng] := 
MATpack(t1:bat[:oid,:lng], t2:bat[:oid,:lng], t3:bat[:oid,:lng], 
t4:bat[:oid,:lng], t5:bat[:oid,:lng], t6:bat[:oid,:lng], t7:bat[:oid,:lng], 
t8:bat[:oid,:lng]) {G}
 exit go;# 17 go:int 
-s := nil:BAT;   # 18 s:bat[:oid,:lng] := _24:BAT {G}
-mdb.var();  # 19 _18:void := MDBvar() 
+s := nil:BAT;   # 18 s:bat[:oid,:lng] := _23:BAT {G}
+mdb.var();  # 19 _17:void := MDBvar() 
 c := aggr.count(z); # 20 c:wrd := 
ALGcount_bat(z:bat[:oid,:lng]) {G}
-io.print(c);# 21 _20:void := IOprint_val(c:wrd) 
-io.print(done);   # 22 _21:void := IOprint_val(_22:str) 
{G}
+io.print(c);# 21 _19:void := IOprint_val(c:wrd) 
+io.print(done);   # 22 _20:void := IOprint_val(_21:str) 
{G}
 end tst;# 23  
 
 
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge with Aug2011 branch.

2011-08-13 Thread Stefan Manegold 
Changeset: a64300e596bf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a64300e596bf
Modified Files:

Branch: default
Log Message:

Merge with Aug2011 branch.


diffs (69 lines):

diff --git a/monetdb5/optimizer/Tests/dataflow.mal 
b/monetdb5/optimizer/Tests/dataflow.mal
--- a/monetdb5/optimizer/Tests/dataflow.mal
+++ b/monetdb5/optimizer/Tests/dataflow.mal
@@ -15,8 +15,8 @@ function tst();
 s:= slow();
 l:= aggr.min(s);
 h:= l;
-mdb.setTimer(true);
-mdb.setThread(true);
+#mdb.setTimer(true);
+#mdb.setThread(true);
 z:= nil:bat[:oid,:lng];
 barrier go:= language.dataflow();
t1:= algebra.select(s,l,h);
diff --git a/monetdb5/optimizer/Tests/dataflow.stable.out 
b/monetdb5/optimizer/Tests/dataflow.stable.out
--- a/monetdb5/optimizer/Tests/dataflow.stable.out
+++ b/monetdb5/optimizer/Tests/dataflow.stable.out
@@ -30,8 +30,8 @@ function user.tst():void;
 s := user.slow();
 l := aggr.min(s);
 h := l;
-mdb.setTimer(true);
-mdb.setThread(true);
+#mdb.setTimer(true); 
+#mdb.setThread(true); 
 z := nil:bat[:oid,:lng];
 barrier go := language.dataflow();
 t1 := algebra.select(s,l,h);
@@ -58,9 +58,9 @@ function user.tst():void;   
 s := user.slow();   #  1 s:bat[:oid,:lng] := user.slow() 
{G}
 l := aggr.min(s);   #  2 l:lng := 
ALGmin_lng(s:bat[:oid,:lng]) {G}
 h := l; #  3 h:lng := l:lng 
-mdb.setTimer(true); #  4 _4:void := MDBsetTimer(_5:bit) 
-mdb.setThread(true);#  5 _6:void := MDBsetThread(_5:bit) 
-z := nil:bat[:oid,:lng];#  6 z:bat[:oid,:lng] := 
_8:bat[:oid,:lng] {G}
+#mdb.setTimer(true); 
+#mdb.setThread(true); 
+z := nil:bat[:oid,:lng];#  6 z:bat[:oid,:lng] := 
_7:bat[:oid,:lng] {G}
 barrier go := language.dataflow();  #  7 go:int := MALstartDataflow() {J17}
 t1 := algebra.select(s,l,h);#  8 t1:bat[:oid,:lng] := 
ALGselect(s:bat[:oid,:lng], l:lng, h:lng) {G}
 t2 := algebra.select(s,l,h);#  9 t2:bat[:oid,:lng] := 
ALGselect(s:bat[:oid,:lng], l:lng, h:lng) {G}
@@ -72,11 +72,11 @@ barrier go := language.dataflow();  
 t8 := algebra.select(s,l,h);# 15 t8:bat[:oid,:lng] := 
ALGselect(s:bat[:oid,:lng], l:lng, h:lng) {G}
 z := mat.pack(t1,t2,t3,t4,t5,t6,t7,t8);# 16 z:bat[:oid,:lng] := 
MATpack(t1:bat[:oid,:lng], t2:bat[:oid,:lng], t3:bat[:oid,:lng], 
t4:bat[:oid,:lng], t5:bat[:oid,:lng], t6:bat[:oid,:lng], t7:bat[:oid,:lng], 
t8:bat[:oid,:lng]) {G}
 exit go;# 17 go:int 
-s := nil:BAT;   # 18 s:bat[:oid,:lng] := _24:BAT {G}
-mdb.var();  # 19 _18:void := MDBvar() 
+s := nil:BAT;   # 18 s:bat[:oid,:lng] := _23:BAT {G}
+mdb.var();  # 19 _17:void := MDBvar() 
 c := aggr.count(z); # 20 c:wrd := 
ALGcount_bat(z:bat[:oid,:lng]) {G}
-io.print(c);# 21 _20:void := IOprint_val(c:wrd) 
-io.print(done);   # 22 _21:void := IOprint_val(_22:str) 
{G}
+io.print(c);# 21 _19:void := IOprint_val(c:wrd) 
+io.print(done);   # 22 _20:void := IOprint_val(_21:str) 
{G}
 end tst;# 23  
 
 
diff --git 
a/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
 
b/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
--- 
a/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
+++ 
b/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
@@ -26,7 +26,7 @@ Over..
 # 12:13:20   
 
 mdb#mdb.start();
-mdb#user.s0_1();
+mdb#user.s1_1();
 
 # 12:13:21   
 # 12:13:21   Done.
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Simple flow includes simple arithmetic

2011-08-13 Thread Martin Kersten 
Changeset: 13b1b8e721a1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=13b1b8e721a1
Modified Files:
monetdb5/optimizer/opt_dataflow.mx
Branch: default
Log Message:

Simple flow includes simple arithmetic


diffs (23 lines):

diff --git a/monetdb5/optimizer/opt_dataflow.mx 
b/monetdb5/optimizer/opt_dataflow.mx
--- a/monetdb5/optimizer/opt_dataflow.mx
+++ b/monetdb5/optimizer/opt_dataflow.mx
@@ -110,6 +110,11 @@ opt_export void removeDataflow(InstrPtr 
 #include mal_instruction.h
 #include mal_interpreter.h
 
+/*
+ * dataflow processing incurs overhead and is only
+ * relevant if multiple tasks kan be handled at the same time.
+ * Also simple expressions dont had to be done in parallel.
+*/
 static int
 simpleFlow(InstrPtr *old, int start, int last)
 {
@@ -124,6 +129,7 @@ simpleFlow(InstrPtr *old, int start, int
for( j= q-retc; jq-argc; j++)
if( getArg(p,0) == getArg(q,j))
simple= TRUE;
+   simple |= getModuleId(p) == calcRef || getModuleId(p) == 
mtimeRef || getModuleId(p) == strRef || getModuleId(p)== mmathRef;
if( !simple)
return 0;
p = q;
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Initialized variable a.s.a.p

2011-08-13 Thread Martin Kersten 
Changeset: 92e7b926c6bd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=92e7b926c6bd
Modified Files:
monetdb5/mal/mal_resolve.mx
Branch: default
Log Message:

Initialized variable a.s.a.p


diffs (11 lines):

diff --git a/monetdb5/mal/mal_resolve.mx b/monetdb5/mal/mal_resolve.mx
--- a/monetdb5/mal/mal_resolve.mx
+++ b/monetdb5/mal/mal_resolve.mx
@@ -162,6 +162,7 @@ findFunctionType(Module scope, MalBlkPtr
if (s == 0) return -1;
 
returntype= (int*) GDKzalloc(p-retc * sizeof(int));
+   if ( returntype == 0) return -1;
 
while (s != NULL) {  /* single scope element check */
if (getFunctionId(p) != s-name) {
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Simple flow include simple arithematic

2011-08-13 Thread Martin Kersten 
Changeset: 312103816fd6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=312103816fd6
Modified Files:
monetdb5/optimizer/opt_dataflow.mx
Branch: default
Log Message:

Simple flow include simple arithematic


diffs (13 lines):

diff --git a/monetdb5/optimizer/opt_dataflow.mx 
b/monetdb5/optimizer/opt_dataflow.mx
--- a/monetdb5/optimizer/opt_dataflow.mx
+++ b/monetdb5/optimizer/opt_dataflow.mx
@@ -129,7 +129,8 @@ simpleFlow(InstrPtr *old, int start, int
for( j= q-retc; jq-argc; j++)
if( getArg(p,0) == getArg(q,j))
simple= TRUE;
-   simple |= getModuleId(p) == calcRef || getModuleId(p) == 
mtimeRef || getModuleId(p) == strRef || getModuleId(p)== mmathRef;
+   if( !simple)
+   simple = !(getModuleId(p) == calcRef || getModuleId(p) 
== mtimeRef || getModuleId(p) == strRef || getModuleId(p)== mmathRef);
if( !simple)
return 0;
p = q;
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Use proper predicate

2011-08-13 Thread Martin Kersten 
Changeset: 2d77045f58f0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2d77045f58f0
Modified Files:
monetdb5/optimizer/opt_dataflow.mx
Branch: default
Log Message:

Use proper predicate
All scalar operations are simple and there is no requirement
for argument dependency.


diffs (12 lines):

diff --git a/monetdb5/optimizer/opt_dataflow.mx 
b/monetdb5/optimizer/opt_dataflow.mx
--- a/monetdb5/optimizer/opt_dataflow.mx
+++ b/monetdb5/optimizer/opt_dataflow.mx
@@ -130,7 +130,7 @@ simpleFlow(InstrPtr *old, int start, int
if( getArg(p,0) == getArg(q,j))
simple= TRUE;
if( !simple)
-   simple = !(getModuleId(p) == calcRef || getModuleId(p) 
== mtimeRef || getModuleId(p) == strRef || getModuleId(p)== mmathRef);
+   simple = getModuleId(p) == calcRef || getModuleId(p) == 
mtimeRef || getModuleId(p) == strRef || getModuleId(p)== mmathRef;
if( !simple)
return 0;
p = q;
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Allocate space directly.

2011-08-13 Thread Martin Kersten 
Changeset: 906ed4e43830 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=906ed4e43830
Modified Files:
monetdb5/mal/mal_resolve.mx
Branch: default
Log Message:

Allocate space directly.
There are paths through the code that otherwise might
encounter an non-initialized returtype variable.


diffs (21 lines):

diff --git a/monetdb5/mal/mal_resolve.mx b/monetdb5/mal/mal_resolve.mx
--- a/monetdb5/mal/mal_resolve.mx
+++ b/monetdb5/mal/mal_resolve.mx
@@ -160,6 +160,9 @@ findFunctionType(Module scope, MalBlkPtr
m = scope;
s = m-subscope[(int)(getSubScope(getFunctionId(p)))];
if (s == 0) return -1;
+
+   returntype= (int*) GDKzalloc(p-retc * sizeof(int));
+
while (s != NULL) {  /* single scope element check */
if (getFunctionId(p) != s-name) {
s = s-skip; continue;
@@ -357,7 +360,6 @@ findFunctionType(Module scope, MalBlkPtr
 * the resulting type can not be determined.
 */
s1 = 0;
-   returntype= (int*) GDKzalloc(p-retc * sizeof(int));
if (sig-polymorphic)
for (k = i = 0; i  p-retc; k++, i++) {
int actual = getArgType(mb, p, i);
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - approved output (prepare/exec nr's shifted be...

2011-08-13 Thread Niels Nes 
Changeset: d6e32a17f424 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d6e32a17f424
Modified Files:
sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.err
Branch: default
Log Message:

approved output (prepare/exec nr's shifted because of set timezone)


diffs (14 lines):

diff --git 
a/sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.err 
b/sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.err
--- a/sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.err
+++ b/sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.err
@@ -71,8 +71,8 @@ stderr of test 'prepare_stmt.Bug-2533.Bu
 # 09:32:45   mclient -lsql -ftest -i -e --host=rig --port=33580 
 # 09:32:45   
 
-MAPI  = monetdb@rig:35262
-QUERY = exec 0(2.3);
+MAPI  = monetdb@alf:32346
+QUERY = exec 1(2.3);
 ERROR = !SQLException:sql.prepare:wrong type for argument 1 of prepared 
statement: decimal, expected wrd
 
 # 09:32:45   
___
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - merging

2011-08-13 Thread Niels Nes 
Changeset: cc2956f1a6eb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cc2956f1a6eb
Modified Files:

Branch: default
Log Message:

merging


diffs (truncated from 354 to 300 lines):

diff --git a/monetdb5/mal/mal_resolve.mx b/monetdb5/mal/mal_resolve.mx
--- a/monetdb5/mal/mal_resolve.mx
+++ b/monetdb5/mal/mal_resolve.mx
@@ -160,6 +160,10 @@ findFunctionType(Module scope, MalBlkPtr
m = scope;
s = m-subscope[(int)(getSubScope(getFunctionId(p)))];
if (s == 0) return -1;
+
+   returntype= (int*) GDKzalloc(p-retc * sizeof(int));
+   if ( returntype == 0) return -1;
+
while (s != NULL) {  /* single scope element check */
if (getFunctionId(p) != s-name) {
s = s-skip; continue;
@@ -357,7 +361,6 @@ findFunctionType(Module scope, MalBlkPtr
 * the resulting type can not be determined.
 */
s1 = 0;
-   returntype= (int*) GDKzalloc(p-retc * sizeof(int));
if (sig-polymorphic)
for (k = i = 0; i  p-retc; k++, i++) {
int actual = getArgType(mb, p, i);
diff --git a/monetdb5/optimizer/opt_dataflow.mx 
b/monetdb5/optimizer/opt_dataflow.mx
--- a/monetdb5/optimizer/opt_dataflow.mx
+++ b/monetdb5/optimizer/opt_dataflow.mx
@@ -110,6 +110,11 @@ opt_export void removeDataflow(InstrPtr 
 #include mal_instruction.h
 #include mal_interpreter.h
 
+/*
+ * dataflow processing incurs overhead and is only
+ * relevant if multiple tasks kan be handled at the same time.
+ * Also simple expressions dont had to be done in parallel.
+*/
 static int
 simpleFlow(InstrPtr *old, int start, int last)
 {
@@ -125,6 +130,8 @@ simpleFlow(InstrPtr *old, int start, int
if( getArg(p,0) == getArg(q,j))
simple= TRUE;
if( !simple)
+   simple = getModuleId(p) == calcRef || getModuleId(p) == 
mtimeRef || getModuleId(p) == strRef || getModuleId(p)== mmathRef;
+   if( !simple)
return 0;
p = q;
}
diff --git a/monetdb5/optimizer/opt_partition.mx 
b/monetdb5/optimizer/opt_partition.mx
--- a/monetdb5/optimizer/opt_partition.mx
+++ b/monetdb5/optimizer/opt_partition.mx
@@ -38,10 +38,6 @@ address OPTpartitionMaterialize
 comment Implement the partition operation. Throw an exception if the 
partition was empty, 
 because then the subquery should produce a NIL ;
 
-command partition.markH( b:bat[:any_1,:any_2] ) :bat[:oid,:any_2] 
-address OPTmarkHead
-comment Ignore a NIL bat;
-
 pattern partition.vector(b:bat[:oid,:any_1]) :any_1...
 address OPTvector
 comment Derive a series of slices values based on sampling;
@@ -57,7 +53,6 @@ comment Derive a series of slices value
 
 opt_export str OPTvector(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
 opt_export str OPTpartitionMaterialize(int *result, int *bid, ptr low, ptr 
high);
-opt_export str OPTmarkHead(int *result, int *bid);
 
 /* #define DEBUG_DETAIL*/
 #define _DEBUG_OPT_PARTITION_ 
@@ -81,6 +76,11 @@ typedef  struct{
ValRecord bounds[MAXSITES];
 } Slices;
 
+/*
+ * The query will be controlled from the coordinator with a plan
+ * geared at parallel execution 
+ * TODO pack is expensive, move to mat.new
+*/
 static MalBlkPtr
 OPTplanCntrl(Client cntxt, MalBlkPtr mb, MalBlkPtr pmb, Slices *slices)
 {
@@ -181,18 +181,13 @@ OPTplanCntrl(Client cntxt, MalBlkPtr mb,
pushInstruction(cmb,q);
}
/* put all mat.pack instructions into the program
- and make sure that they have contiguous void headed columns 
+ make sure that they have contiguous void headed columns 
*/
p = getInstrPtr(pmb,0);
if ( slices-column) 
for ( k=0 ; k  nrpack; k++) {
pushInstruction(cmb, pack[k]);
getArg(pack[k],0)= getArg(p,k);
-/*
-   q= newFcnCall(cmb,partitionRef,markHRef);
-   getArg(q,0) = getArg(p,k); 
-   q= pushArgument(cmb,q, getArg(pack[k],0));
-*/
}
 
/* finalize the dataflow block */
@@ -218,7 +213,7 @@ OPTplanCntrl(Client cntxt, MalBlkPtr mb,
return cmb;
 }
 
-/* prepare slicing a column  by addition over the target */
+/* prepare access to partitions by injection of the materialize instructions */
 static int
 OPTpreparePartition(MalBlkPtr nmb, InstrPtr p, Slices *slices, int pc)
 {
@@ -256,6 +251,9 @@ OPTpreparePartition(MalBlkPtr nmb, Instr
return parallel;
 }
 
+/*
+ * For bind instructions we have to inject materialize and semijoin 
instructions
+*/
 static int 
 OPTsliceColumn(Client cntxt, MalBlkPtr nmb, MalBlkPtr mb, InstrPtr p, Slices 
*slices, int pc)
 {
@@ -307,12 +305,15 @@ OPTsliceColumn(Client cntxt, MalBlkPtr n
 /* 
  * The plan is analysed for the maximal subplan that involves a partitioned 
table
  * and that does not require data