Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21831/backends/monet5
Modified Files:
sql.mx
Log Message:
Avoid name clashes with existing functions.
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.401
retrieving revision 1.402
diff -u -d -r1.401 -r1.402
--- sql.mx 23 Feb 2010 17:07:57 -0000 1.401
+++ sql.mx 23 Feb 2010 21:20:26 -0000 1.402
@@ -810,10 +810,10 @@
pattern gzdecompress(sch:str, tbl:str):void
address SQLgzdecompress
comment "Perform LZ decompression on a table";
-pattern truncate(sch:str, tbl:str):void
+pattern gztruncate(sch:str, tbl:str):void
address SQLtruncate
comment "Remove the tables when you have a compressed image";
-pattern expand(sch:str, tbl:str):void
+pattern gzexpand(sch:str, tbl:str):void
address SQLexpand
comment "Remove the compressed image";
@@ -5038,10 +5038,10 @@
return msg;
s = mvc_bind_schema(m, *sch);
if ( s == NULL)
- throw(MAL,"sql.cluster","Schema missing");
+ throw(MAL,"s...@2","Schema missing");
t = mvc_bind_table(m, s, *tbl);
if ( t == NULL)
- throw(MAL,"sql.cluster","Table missing");
+ throw(MAL,"s...@2","Table missing");
/* actually build the hash on the multi-column primary key */
@@ -5051,23 +5051,23 @@
b = store_funcs.bind_col(tr, c, 0);
if (b == NULL)
- throw(MAL,"sql.compress","Can not access descriptor");
+ throw(MAL,"s...@2","Can not access descriptor");
msg = @1;
BBPreleaseref(b->batCacheid);
}
return MAL_SUCCEED;
@c
str SQLgzcompress(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci){
- @:gzcompression(CMDbbpcompress(&ret, &b->batCacheid))@
+ @:gzcompression(CMDbbpcompress(&ret, &b->batCacheid),gzcompress)@
}
str SQLgzdecompress(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci){
- @:gzcompression(CMDbbpdecompress(&ret, &b->batCacheid))@
+ @:gzcompression(CMDbbpdecompress(&ret, &b->batCacheid),gzdecompress)@
}
str SQLtruncate(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci){
- @:gzcompression(CMDbbptruncate(&ret, &b->batCacheid))@
+ @:gzcompression(CMDbbptruncate(&ret, &b->batCacheid),truncate)@
}
str SQLexpand(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci){
- @:gzcompression(CMDbbpexpand(&ret, &b->batCacheid))@
+ @:gzcompression(CMDbbpexpand(&ret, &b->batCacheid),expand)@
}
@- Shredding RDF documents through SQL
Wrapper around the RDF shredder of the rdf module of M5. The first time
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
