Changeset: 965734b85139 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=965734b85139
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
monetdb5/ChangeLog
monetdb5/modules/mal/mat.c
monetdb5/modules/mal/mat.h
monetdb5/modules/mal/mat.mal
Branch: default
Log Message:
Removed unused functions from mat module.
diffs (truncated from 1910 to 300 lines):
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -38633,30 +38633,10 @@ pattern manual.help(text:str):void
address MANUALhelp;
comment Produces a list of all <module>.<function> that match the text
pattern. The wildcard '*' can be used for <module>and <function>. Using the '('
asks for signature information andusing ')' asks for the complete help record.
-pattern mat.hasMoreElements(grp:bat[:oid,:any_2]...):bat[:oid,:any_2]
-address MAThasMoreElements;
-comment Find the next element in the merge table
-
-command mat.info(g:str,e:str):bat[:oid,:any_2]
-address MATinfo;
-comment retrieve the definition from the partition catalogue
-
-pattern mat.mergepack(b:bat[:oid,:oid]...):bat[:oid,:oid]
-address MATmergepack;
-comment Merge multiple candidate lists
-
-pattern mat.newIterator(grp:bat[:oid,:any_2]...):bat[:oid,:any_2]
-address MATnewIterator;
-comment Create an iterator over a MAT
-
pattern mat.new(b:bat[:oid,:any_2]...):bat[:oid,:any_2]
address MATpack;
comment Define a Merge Association Table (MAT). Fall back to the pack
operationwhen this is called
-pattern mat.project(map:bat[:oid,:bte],b:bat[:oid,:any_2]...):bat[:oid,:any_2]
-address MATproject;
-comment project using the map bat (contains which bat to use in scan order)
-
pattern
mat.packIncrement(b:bat[:oid,:any_2],c:bat[:oid,:any_2]):bat[:oid,:any_2]
address MATpackIncrement;
comment Prepare incremental mat pack
@@ -38665,10 +38645,6 @@ pattern mat.packIncrement(b:bat[:oid,:an
address MATpackIncrement;
comment Prepare incremental mat pack
-pattern mat.pack2(b:bat[:oid,:any_2]...):bat[:oid,:any_2]
-address MATpack2;
-comment Materialize the MAT into a BAT (by an append all)
-
pattern mat.pack(b:bat[:oid,:any_2]...):bat[:oid,:any_2]
address MATpack;
comment Materialize the MAT into a BAT
@@ -38677,26 +38653,6 @@ pattern mat.pack(X_1:any_2...):bat[:oid,
address MATpackValues;
comment Materialize the MAT (of values) into a BAT
-pattern mat.sortReverse(b:bat[:oid,:any_2]...)
(sorted:bat[:oid,:any_2],map:bat[:oid,:bte])
-address MATsortReverse;
-comment Returns a BAT copy sorted on the tail column.
-
-pattern mat.sort(b:bat[:oid,:any_2]...)
(sorted:bat[:oid,:any_2],map:bat[:oid,:bte])
-address MATsort;
-comment Returns a BAT copy sorted on the tail column.
-
-pattern mat.slice(first:lng,last:lng,b:bat[:oid,:any_2]...):bat[:oid,:any_2]
-address MATpackSlice;
-comment Materialize a sliced MAT into a BAT
-
-pattern mat.slice(first:int,last:int,b:bat[:oid,:any_2]...):bat[:oid,:any_2]
-address MATpackSlice;
-comment Materialize a sliced MAT into a BAT
-
-pattern mat.slice(first:wrd,last:wrd,b:bat[:oid,:any_2]...):bat[:oid,:any_2]
-address MATpackSlice;
-comment Materialize a sliced MAT into a BAT
-
pattern mal.manifold(mod:str,fcn:str,a:any...):bat[:oid,:any]
address MANIFOLDevaluate;
pattern mal.multiplex(mod:str,fcn:str,a:any...):any...
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -49488,30 +49488,10 @@ pattern manual.help(text:str):void
address MANUALhelp;
comment Produces a list of all <module>.<function> that match the text
pattern. The wildcard '*' can be used for <module>and <function>. Using the '('
asks for signature information andusing ')' asks for the complete help record.
-pattern mat.hasMoreElements(grp:bat[:oid,:any_2]...):bat[:oid,:any_2]
-address MAThasMoreElements;
-comment Find the next element in the merge table
-
-command mat.info(g:str,e:str):bat[:oid,:any_2]
-address MATinfo;
-comment retrieve the definition from the partition catalogue
-
-pattern mat.mergepack(b:bat[:oid,:oid]...):bat[:oid,:oid]
-address MATmergepack;
-comment Merge multiple candidate lists
-
-pattern mat.newIterator(grp:bat[:oid,:any_2]...):bat[:oid,:any_2]
-address MATnewIterator;
-comment Create an iterator over a MAT
-
pattern mat.new(b:bat[:oid,:any_2]...):bat[:oid,:any_2]
address MATpack;
comment Define a Merge Association Table (MAT). Fall back to the pack
operationwhen this is called
-pattern mat.project(map:bat[:oid,:bte],b:bat[:oid,:any_2]...):bat[:oid,:any_2]
-address MATproject;
-comment project using the map bat (contains which bat to use in scan order)
-
pattern
mat.packIncrement(b:bat[:oid,:any_2],c:bat[:oid,:any_2]):bat[:oid,:any_2]
address MATpackIncrement;
comment Prepare incremental mat pack
@@ -49520,10 +49500,6 @@ pattern mat.packIncrement(b:bat[:oid,:an
address MATpackIncrement;
comment Prepare incremental mat pack
-pattern mat.pack2(b:bat[:oid,:any_2]...):bat[:oid,:any_2]
-address MATpack2;
-comment Materialize the MAT into a BAT (by an append all)
-
pattern mat.pack(b:bat[:oid,:any_2]...):bat[:oid,:any_2]
address MATpack;
comment Materialize the MAT into a BAT
@@ -49532,26 +49508,6 @@ pattern mat.pack(X_1:any_2...):bat[:oid,
address MATpackValues;
comment Materialize the MAT (of values) into a BAT
-pattern mat.sortReverse(b:bat[:oid,:any_2]...)
(sorted:bat[:oid,:any_2],map:bat[:oid,:bte])
-address MATsortReverse;
-comment Returns a BAT copy sorted on the tail column.
-
-pattern mat.sort(b:bat[:oid,:any_2]...)
(sorted:bat[:oid,:any_2],map:bat[:oid,:bte])
-address MATsort;
-comment Returns a BAT copy sorted on the tail column.
-
-pattern mat.slice(first:lng,last:lng,b:bat[:oid,:any_2]...):bat[:oid,:any_2]
-address MATpackSlice;
-comment Materialize a sliced MAT into a BAT
-
-pattern mat.slice(first:int,last:int,b:bat[:oid,:any_2]...):bat[:oid,:any_2]
-address MATpackSlice;
-comment Materialize a sliced MAT into a BAT
-
-pattern mat.slice(first:wrd,last:wrd,b:bat[:oid,:any_2]...):bat[:oid,:any_2]
-address MATpackSlice;
-comment Materialize a sliced MAT into a BAT
-
pattern mal.manifold(mod:str,fcn:str,a:any...):bat[:oid,:any]
address MANIFOLDevaluate;
pattern mal.multiplex(mod:str,fcn:str,a:any...):any...
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1313,18 +1313,9 @@ str MATHunary_TANHdbl(dbl *res, const db
str MATHunary_TANHflt(flt *res, const flt *a);
str MATHunary_TANdbl(dbl *res, const dbl *a);
str MATHunary_TANflt(flt *res, const flt *a);
-str MAThasMoreElements(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MATinfo(bat *ret, str *grp, str *elm);
-str MATmergepack(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MATnewIterator(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str MATpack(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MATpack2(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str MATpackIncrement(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MATpackSlice(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str MATpackValues(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MATproject(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str MATsort(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str MATsortReverse(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str MBMmix(bat *ret, bat *batid);
str MBMnormal(bat *ret, oid *base, wrd *size, int *domain, int *stddev, int
*mean);
str MBMrandom(bat *ret, oid *base, wrd *size, int *domain);
diff --git a/monetdb5/ChangeLog b/monetdb5/ChangeLog
--- a/monetdb5/ChangeLog
+++ b/monetdb5/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
+* Tue Dec 15 2015 Sjoerd Mullender <[email protected]>
+- Removed functions mat.hasMoreElements, mat.info, mat.mergepack,
+ mat. newIterator, mat.project, mat.pack2, mat.sortReverse, mat.sort,
+ and mat.slice.
+
* Thu Dec 10 2015 Sjoerd Mullender <[email protected]>
- Removed grouped aggregate functions from the aggr module in which the
groups were indicated by the head column of the bat to be aggregated.
diff --git a/monetdb5/modules/mal/mat.c b/monetdb5/modules/mal/mat.c
--- a/monetdb5/modules/mal/mat.c
+++ b/monetdb5/modules/mal/mat.c
@@ -29,38 +29,6 @@
#include "monetdb_config.h"
#include "mat.h"
-str
-MATnewIterator(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
-{
- int *ret = getArgReference_int(stk,p,0);
- (void) cntxt;
- (void) mb;
- if( p->argc == 1){
- *ret = 0;
- } else
- *ret= *getArgReference_int(stk,p,1);
- return MAL_SUCCEED;
-}
-str
-MAThasMoreElements(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
-{
- int *ret = getArgReference_int(stk,p,0);
- int i, idx = *ret;
-
- (void) cntxt;
- (void) mb;
- for(i=1; i< p->argc; i++)
- if( *getArgReference_int(stk,p,i) == idx){
- i++;
- break;
- }
- if( i < p->argc)
- *ret= *getArgReference_int(stk,p,i);
- else
- *ret = 0;
- (void) mb;
- return MAL_SUCCEED;
-}
/*
* The pack is an ordinary multi BAT insert. Oid synchronistion
* between pieces should be ensured by the code generators.
@@ -180,302 +148,12 @@ MATpackIncrement(Client cntxt, MalBlkPtr
return MAL_SUCCEED;
}
-static str
-MATpackSliceInternal(MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
-{
- int i, i1 = p->argc, i2 = -1;
- bat *ret = getArgReference_bat(stk,p,0);
- BAT *b, *bn;
- BUN cap = 0, fst, lst, cnt, c;
- int tt = TYPE_any;
-
- assert(p->argc > 3);
- switch getArgType(mb,p,1) {
- case TYPE_wrd:
- fst = (BUN) *getArgReference_wrd(stk,p,1);
- break;
- case TYPE_lng:
- fst = (BUN) *getArgReference_lng(stk,p,1);
- break;
- case TYPE_int:
- fst = (BUN) *getArgReference_int(stk,p,1);
- break;
- default:
- throw(MAL, "mat.packSlice", "wrong type for lower bound");
- }
- switch getArgType(mb,p,2) {
- case TYPE_wrd: {
- wrd l = *getArgReference_wrd(stk,p,2);
- if (l == wrd_nil)
- lst = BUN_MAX; /* no upper bound */
- else
- lst = (BUN) l;
- break;
- }
- case TYPE_lng: {
- lng l = *getArgReference_lng(stk,p,2);
- if (l == lng_nil)
- lst = BUN_MAX; /* no upper bound */
- else
- lst = (BUN) l;
- break;
- }
- case TYPE_int: {
- int l = *getArgReference_int(stk,p,2);
- if (l == int_nil)
- lst = BUN_MAX; /* no upper bound */
- else
- lst = (BUN) l;
- break;
- }
- default:
- throw(MAL, "mat.packSlice", "wrong type for upper bound");
- }
- if (lst < BUN_MAX)
- lst++; /* inclusive -> exclusive upper bound */
- if (lst < fst)
- lst = fst;
- cnt = lst - fst;
-
- for (i = 3; i < p->argc && cap < lst; i++) {
- int bid = stk->stk[getArg(p,i)].val.ival;
- b = BBPquickdesc(abs(bid),FALSE);
- if (b && bid < 0)
- b = BATmirror(b);
- if (b == NULL)
- throw(MAL, "mat.packSlice", RUNTIME_OBJECT_MISSING);
- if (tt == TYPE_any)
- tt = b->ttype;
- c = BATcount(b);
- if (cap <= fst) {
- /* The optimal case is when the requested slice falls
completely in one BAT.
- * In that case, we can simply return a slice (view) of
that BAT.
- * (A pitty that we have calculated the other slices as
well.)
- */
- if (lst <= cap + c) {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
