Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31058
Modified Files:
sql.mx
Log Message:
Use the SQL schema naming for compressed files.
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -d -r1.402 -r1.403
--- sql.mx 23 Feb 2010 21:20:26 -0000 1.402
+++ sql.mx 26 Feb 2010 20:37:56 -0000 1.403
@@ -797,11 +797,11 @@
address SQLcluster2
comment "Cluster the columns of a table on the (first) primary key";
-pattern dictionary(sch:str, tbl:str):void
-address SQLdictcompress
+pattern newdictionary(sch:str, tbl:str):void
+address SQLnewDictionary
comment "Perform dictionary compression on a table";
-pattern dictionary(sch:str, tbl:str):void
-address SQLdictdecompress
+pattern dropdictionary(sch:str, tbl:str):void
+address SQLdropDictionary
comment "Perform dictionary decompression on a table";
pattern gzcompress(sch:str, tbl:str):void
@@ -1070,8 +1070,8 @@
sql5_export str not_unique(bit *ret, int *bid);
sql5_export str not_unique_oids(bat *ret, bat *bid);
sql5_export str SQLcluster(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-sql5_export str SQLdictcompress(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
-sql5_export str SQLdictdecompress(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
+sql5_export str SQLnewDictionary(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
+sql5_export str SQLdropDictionary(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
sql5_export str SQLgzcompress(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
sql5_export str SQLgzdecompress(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
sql5_export str SQLtruncate(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
@@ -5015,10 +5015,10 @@
t->base.rtime = s->base.rtime = tr->rtime = tr->stime;
return MAL_SUCCEED;
@c
-str SQLdictcompress(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci){
+str SQLnewDictionary(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci){
@:compression(DICTcompress(&ret, &nme, &b->batCacheid))@
}
-str SQLdictdecompress(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci){
+str SQLdropDictionary(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci){
@:compression(DICTdecompress(&ret, &nme))@
}
@-
@@ -5032,7 +5032,8 @@
str msg = getContext(cntxt,mb, &m, NULL);
sql_trans *tr = m->session->tr;
node *o;
- int ret;
+ int ret,i;
+ char buf[PATHLENGTH], *sbuf= buf;
if (msg)
return msg;
@@ -5049,25 +5050,28 @@
BAT *b;
sql_column *c = o->data;
- b = store_funcs.bind_col(tr, c, 0);
- if (b == NULL)
- throw(MAL,"s...@2","Can not access descriptor");
- msg = @1;
- BBPreleaseref(b->batCacheid);
+ for ( i= 0; i<3; i++) {
+ b = store_funcs.bind_col(tr, c, i);
+ if (b == NULL)
+ throw(MAL,"s...@2","Can not access descriptor");
+ snprintf(buf,PATHLENGTH,"%s_%s_%s_%d", *sch, *tbl,
c->base.name,i);
+ msg = @1;
+ BBPreleaseref(b->batCacheid);
+ }
}
return MAL_SUCCEED;
@c
str SQLgzcompress(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci){
- @:gzcompression(CMDbbpcompress(&ret, &b->batCacheid),gzcompress)@
+ @:gzcompression(CMDbbpcompress(&ret, &b->batCacheid,&sbuf),gzcompress)@
}
str SQLgzdecompress(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci){
- @:gzcompression(CMDbbpdecompress(&ret, &b->batCacheid),gzdecompress)@
+ @:gzcompression(CMDbbpdecompress(&ret,
&b->batCacheid,&sbuf),gzdecompress)@
}
str SQLtruncate(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci){
- @:gzcompression(CMDbbptruncate(&ret, &b->batCacheid),truncate)@
+ @:gzcompression(CMDbbptruncate(&ret, &b->batCacheid,&sbuf),truncate)@
}
str SQLexpand(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci){
- @:gzcompression(CMDbbpexpand(&ret, &b->batCacheid),expand)@
+ @:gzcompression(CMDbbpexpand(&ret, &b->batCacheid,&sbuf),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
