Update of /cvsroot/monetdb/MonetDB5/src/modules/mal
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28759/src/modules/mal
Modified Files:
Tag: GDK-2
bpm.mx constraints.mx mdb.mx mserver.mx pcre.mx
Log Message:
propagated changes of Friday Aug 17 2007
from the development trunk to the GDK-2 branch
Index: bpm.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/bpm.mx,v
retrieving revision 1.118.2.2
retrieving revision 1.118.2.3
diff -u -d -r1.118.2.2 -r1.118.2.3
--- bpm.mx 11 Aug 2007 21:16:10 -0000 1.118.2.2
+++ bpm.mx 17 Aug 2007 15:36:57 -0000 1.118.2.3
@@ -2122,8 +2122,8 @@
throw(MAL,"bpm.takePartition","not yet implemented");
}
@-
-For the time being we simulate a partitioned SQL environment.
-It contains two pieces for each.
+The Mergetable optimizer may request a list of fragments
+to be included.
@c
str
BPMexpand(MalBlkPtr mb, int alias){
@@ -2134,7 +2134,7 @@
BPMunfold( &i, &alias);
p= getByNumber(alias);
if( p==0)
- throw(MAL,"bpm.expand","Partition not known");
+ return MAL_SUCCEED;
for(i= p->nxt ; i!=p->bid && bpmcat[i] ; i= bpmcat[i]->nxt) {
q = newStmt(mb,"bpm","take");
@@ -2477,8 +2477,10 @@
BPMopen();
- if( (p= getAlias(*bid)) == 0)
+ if( (p= getAlias(*bid)) == 0){
+ mdbDump(mb,stk,pci);
throw(MAL,"bpm.newIterator","Can not access alias BAT");
+ }
if( emptyRing(p)){
*ret= 0;
@@ -2550,8 +2552,10 @@
BPMopen();
- if( (p= getAlias(*bid)) == 0)
+ if( (p= getAlias(*bid)) == 0){
+ mdbDump(mb,stk,pci);
throw(MAL,"bpm.newIterator","Can not access alias BAT");
+ }
@:getBATdescriptor(&p->bid,b,"bpm.newIterator")@
/* get the comparison function */
@@ -2611,8 +2615,10 @@
bid= *(bat *)getArgReference(stk, pci, 1);
BPMopen();
- if( (p= getAlias(bid)) == 0)
+ if( (p= getAlias(bid)) == 0){
+ mdbDump(mb,stk,pci);
throw(MAL,"bpm.hasMoreElements","Can not access alias BAT");
+ }
if( bpmcat[idx] == 0)
throw(MAL,"bpm.hasMoreElements","Can not access BAT");
if( bpmcat[idx]->nxt == p->alias)
Index: mserver.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/mserver.mx,v
retrieving revision 1.88
retrieving revision 1.88.2.1
diff -u -d -r1.88 -r1.88.2.1
--- mserver.mx 12 Jun 2007 17:21:26 -0000 1.88
+++ mserver.mx 17 Aug 2007 15:37:03 -0000 1.88.2.1
@@ -460,6 +460,7 @@
if ((len = stream_read_block(fdin, buf, 1, BLOCK)) < 0 ||
/* in embedded mode we allow just one client */
(GDKembedded && MCcountClients() > 1)) {
+ /* FIXME: tell the client in a normal way! */
stream_close(fdin);
stream_destroy(fdin);
stream_close(fdout);
Index: mdb.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/mdb.mx,v
retrieving revision 1.60
retrieving revision 1.60.2.1
diff -u -d -r1.60 -r1.60.2.1
--- mdb.mx 7 Aug 2007 23:51:07 -0000 1.60
+++ mdb.mx 17 Aug 2007 15:37:00 -0000 1.60.2.1
@@ -162,6 +162,10 @@
pattern getStackTrace():bat[:void,:str]
address MDBStkTrace;
+pattern dump()
+address MDBdump
+comment "Dump instruction, stacktrace, and stack";
+
pattern getDefinition():bat[:void,:str]
address MDBgetDefinition
comment "Returns a string representation of the current function
@@ -835,6 +839,10 @@
(void) ret;
return MAL_SUCCEED;
}
+str MDBdump(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci){
+ mdbDump(mb,stk,pci);
+ return MAL_SUCCEED;
+}
str MDBdummy(int *ret){
(void) ret;
throw(MAL, "mdb.dummy", "Dummy routine called");
Index: pcre.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/pcre.mx,v
retrieving revision 1.48.4.1
retrieving revision 1.48.4.2
diff -u -d -r1.48.4.1 -r1.48.4.2
--- pcre.mx 10 Aug 2007 14:54:52 -0000 1.48.4.1
+++ pcre.mx 17 Aug 2007 15:37:05 -0000 1.48.4.2
@@ -17,8 +17,8 @@
@f pcre
@a N. Nes
@+ PCRE library interface
-The PCRE library is a set of functions that implement regular expression
-pattern matching using the same syntax and semantics as Perl,
+The PCRE library is a set of functions that implement regular
+expression pattern matching using the same syntax and semantics as Perl,
with just a few differences. The current implementation of PCRE
(release 4.x) corresponds approximately with Perl 5.8, including support
for UTF-8 encoded strings. However, this support has to be
Index: constraints.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/constraints.mx,v
retrieving revision 1.8
retrieving revision 1.8.6.1
diff -u -d -r1.8 -r1.8.6.1
--- constraints.mx 3 Jan 2007 12:20:24 -0000 1.8
+++ constraints.mx 17 Aug 2007 15:36:58 -0000 1.8.6.1
@@ -63,5 +63,5 @@
BBPunfix(b->batCacheid);
if (cnt)
throw(OPTIMIZER, "mal.assert", "emptySet");
- return MAL_SUCCEED;
+ return MAL_SUCCEED;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
