Changeset: ebfb42ba06e3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ebfb42ba06e3
Modified Files:
MonetDB5/src/mal/mal_interpreter.mx
MonetDB5/src/modules/kernel/bat5.mx
sql/src/backends/monet5/sql.mx
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (138 lines):
diff -r a11b17b29b53 -r ebfb42ba06e3 MonetDB5/src/mal/mal_interpreter.mx
--- a/MonetDB5/src/mal/mal_interpreter.mx Thu Oct 28 10:48:54 2010 +0200
+++ b/MonetDB5/src/mal/mal_interpreter.mx Thu Oct 28 11:26:49 2010 +0200
@@ -2113,7 +2113,7 @@
@= patterncall
if( pci->fcn== NULL)
ret = createScriptException(mb, stkpc, MAL, NULL,
- "address of pattern missing");
+ "address of pattern %s.%s missing",
pci->modname, pci->fcnname);
else {
@:safeTarget(@1)@
ret = (str) (*pci->fcn)(cntxt,mb,stk,pci);
diff -r a11b17b29b53 -r ebfb42ba06e3 MonetDB5/src/modules/kernel/bat5.mx
--- a/MonetDB5/src/modules/kernel/bat5.mx Thu Oct 28 10:48:54 2010 +0200
+++ b/MonetDB5/src/modules/kernel/bat5.mx Thu Oct 28 11:26:49 2010 +0200
@@ -628,6 +628,8 @@
bat5_export char *BKCbat_append_void_bat_wrap(int *r, int *bid, int *uid);
bat5_export char * BKCbat_append_val_wrap(int *r, int *bid, ptr u);
bat5_export str BKCnewBAT(int *res, int *ht, int *tt, BUN *cap);
+bat5_export str BKCattach(int *ret, int *tt, str *heapfile);
+bat5_export str BKCdensebat(int *ret, wrd *size);
bat5_export str BKCreverse(int *ret, int *bid);
bat5_export str BKCmirror(int *ret, int *bid);
bat5_export str BKCrevert(int *ret, int *bid);
diff -r a11b17b29b53 -r ebfb42ba06e3 MonetDB5/src/modules/mal/cluster.mx
--- a/MonetDB5/src/modules/mal/cluster.mx Thu Oct 28 10:48:54 2010 +0200
+++ b/MonetDB5/src/modules/mal/cluster.mx Thu Oct 28 11:26:49 2010 +0200
@@ -154,6 +154,7 @@
cluster_export str CLS_map(bat *rb, bat *cmap, bat *b);
cluster_export str CLS_map2(bat *rb, bat *psum, bat *cmap, bat *b);
+cluster_export str CLS_split( Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
#endif /* _CLUSTER_H */
@c
diff -r a11b17b29b53 -r ebfb42ba06e3 MonetDB5/src/modules/mal/mat.mx
--- a/MonetDB5/src/modules/mal/mat.mx Thu Oct 28 10:48:54 2010 +0200
+++ b/MonetDB5/src/modules/mal/mat.mx Thu Oct 28 11:26:49 2010 +0200
@@ -135,6 +135,7 @@
#endif
mat_export str MATpack(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
+mat_export str MATpack2(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
mat_export str MATpackValues(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
mat_export str MATpackSlice(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
mat_export str MATnewIterator(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
@@ -142,6 +143,11 @@
mat_export str MATdummy(int *ret, str *grp);
mat_export str MATinfo(int *ret, str *grp, str *elm);
mat_export str MATprint(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
+mat_export str MATproject(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
+mat_export str MATrefine(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
+mat_export str MATsortReverseTail(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
+mat_export str MATsortTail(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
+mat_export str MATrefineReverse(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
#endif /* _INSPECT_H */
@-
Mal symbol table and environment analysis.
diff -r a11b17b29b53 -r ebfb42ba06e3 MonetDB5/src/optimizer/opt_datacyclotron.mx
--- a/MonetDB5/src/optimizer/opt_datacyclotron.mx Thu Oct 28 10:48:54
2010 +0200
+++ b/MonetDB5/src/optimizer/opt_datacyclotron.mx Thu Oct 28 11:26:49
2010 +0200
@@ -81,6 +81,7 @@
DCYcatalog *catalog;
+opt_export str addRegWrap (Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pc);
opt_export DCYcatalog* addRegist( str sch, str tab, str col, int acc, int
part, int f_bun, int l_bun );
opt_export DCYcatalog* findRegist( str sch, str tab, str col, int acc);
opt_export DCYcatalog* removePartRegist( str sch, str tab, str col, int acc,
int part);
@@ -450,7 +451,7 @@
@:wrapOptimizer(datacyclotron,OPT_CHECK_ALL)@
@- The DataCyclotron Wrapper
@h
-opt_export str DCbind(int *ret, str *sch, str *tab, str *col, int *kind, int
*part, int *fbun, int *lbun);
+opt_export str DCYbind(int *ret, str *sch, str *tab, str *col, int *kind, int
*part, int *fbun, int *lbun);
@c
str
DCYbind(int *ret, str *sch, str *tab, str *col, int *kind, int *part, int
*fbun, int *lbun){
@@ -466,7 +467,7 @@
}
@h
-opt_export str DCpin(int *ret, int *bid);
+opt_export str DCYpin(int *ret, int *bid);
@c
str
DCYpin(int *ret, int *bid){
@@ -476,7 +477,7 @@
}
@h
-opt_export str DCunpin(int *ret, int *bid);
+opt_export str DCYunpin(int *ret, int *bid);
@c
str
DCYunpin(int *ret, int *bid){
@@ -486,7 +487,7 @@
}
@h
-opt_export str DCcopy(int *ret_bat, int *ret_id, str *sch, str *tab, str *col,
int *kind, int *part, int *fbun, int *lbun);
+opt_export str DCYcopy(int *ret_bat, int *ret_id, str *sch, str *tab, str
*col, int *kind, int *part, int *fbun, int *lbun);
@c
str
DCYcopy(int *ret_bat, int *ret_id, str *sch, str *tab, str *col, int *kind,
int *part, int *fbun, int *lbun){
diff -r a11b17b29b53 -r ebfb42ba06e3 MonetDB5/src/optimizer/opt_prejoin.mx
--- a/MonetDB5/src/optimizer/opt_prejoin.mx Thu Oct 28 10:48:54 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_prejoin.mx Thu Oct 28 11:26:49 2010 +0200
@@ -56,6 +56,7 @@
expect that we may end up with an IO access for each
possible lookup.
@c
+opt_export str ALGprejoin(int *rl, int *rr, int *l, int *r);
str
ALGprejoin(int *rl, int *rr, int *l, int *r){
BAT *bl,*br,*bn;
diff -r a11b17b29b53 -r ebfb42ba06e3 sql/src/backends/monet5/sql.mx
--- a/sql/src/backends/monet5/sql.mx Thu Oct 28 10:48:54 2010 +0200
+++ b/sql/src/backends/monet5/sql.mx Thu Oct 28 11:26:49 2010 +0200
@@ -1120,6 +1120,7 @@
sql5_export str not_unique(bit *ret, int *bid);
sql5_export str not_unique_oids(bat *ret, bat *bid);
sql5_export str SQLcluster1(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
+sql5_export str SQLcluster2(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
sql5_export str SQLshrink(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
sql5_export str SQLreuse(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
sql5_export str SQLvacuum(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
diff -r a11b17b29b53 -r ebfb42ba06e3 sql/src/backends/monet5/sql_scenario.mx
--- a/sql/src/backends/monet5/sql_scenario.mx Thu Oct 28 10:48:54 2010 +0200
+++ b/sql/src/backends/monet5/sql_scenario.mx Thu Oct 28 11:26:49 2010 +0200
@@ -56,6 +56,7 @@
sql5_export str SQLstatement(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
sql5_export str SQLstatementIntern(Client c, str *expr, str nme, int execute,
bit output);
sql5_export str SQLcompile(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
+sql5_export str SQLinclude(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
sql5_export str SQLtrace(int *ret);
sql5_export str SQLCacheRemove(Client c, str nme);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
