Changeset: dc33fd644069 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dc33fd644069
Removed Files:
monetdb5/optimizer/Tests/tst4602.malC
monetdb5/optimizer/Tests/tst4602.stable.err
monetdb5/optimizer/Tests/tst4602.stable.out
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
gdk/ChangeLog
gdk/gdk.h
gdk/gdk_align.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_delta.c
gdk/gdk_logger.c
gdk/gdk_private.h
gdk/gdk_select.c
gdk/gdk_storage.c
monetdb5/ChangeLog
monetdb5/mal/Tests/flowchk.stable.err
monetdb5/mal/Tests/flowchk.stable.out
monetdb5/mal/mal_authorize.c
monetdb5/mal/mal_debugger.c
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/mtime.c
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/bat5.h
monetdb5/modules/kernel/bat5.mal
monetdb5/modules/mal/Tests/inspect05.stable.out.int128
monetdb5/modules/mal/iterator.c
monetdb5/modules/mal/mal_io.c
monetdb5/modules/mal/mat.c
monetdb5/modules/mal/mat.h
monetdb5/modules/mal/mat.mal
monetdb5/modules/mal/mkey.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/tokenizer.c
monetdb5/modules/mal/zorder.c
monetdb5/optimizer/Tests/ARexample.malC
monetdb5/optimizer/Tests/ARexample.stable.out
monetdb5/optimizer/Tests/All
monetdb5/optimizer/Tests/CXexample.malC
monetdb5/optimizer/Tests/CXexample.stable.out
monetdb5/optimizer/Tests/DCexample.malC
monetdb5/optimizer/Tests/DCexample.stable.out
monetdb5/optimizer/Tests/DCexample2.malC
monetdb5/optimizer/Tests/DCexample2.stable.out
monetdb5/optimizer/Tests/FTexample.malC
monetdb5/optimizer/Tests/GCexample01.malC
monetdb5/optimizer/Tests/GCexample01.stable.out
monetdb5/optimizer/Tests/JPexample.malC
monetdb5/optimizer/Tests/JPexample.stable.out
monetdb5/optimizer/Tests/Mexample.malC
monetdb5/optimizer/Tests/Mexample.stable.out
monetdb5/optimizer/Tests/cst00.stable.out
monetdb5/optimizer/Tests/cst01.stable.out
monetdb5/optimizer/Tests/cst02.malC
monetdb5/optimizer/Tests/cst02.stable.out
monetdb5/optimizer/Tests/dataflow.stable.out
monetdb5/optimizer/Tests/dataflow3.stable.out
monetdb5/optimizer/Tests/dataflow4.stable.out
monetdb5/optimizer/Tests/dataflow5.stable.out
monetdb5/optimizer/Tests/ifthencst.malC
monetdb5/optimizer/Tests/ifthencst.stable.out
monetdb5/optimizer/Tests/inline00.stable.out
monetdb5/optimizer/Tests/inline01.stable.out
monetdb5/optimizer/Tests/inline04.stable.out
monetdb5/optimizer/Tests/inline07.stable.out
monetdb5/optimizer/Tests/inline09.stable.out
monetdb5/optimizer/Tests/inline10.stable.out
monetdb5/optimizer/Tests/inlineFunction.malC
monetdb5/optimizer/Tests/inlineFunction1.malC
monetdb5/optimizer/Tests/inlineFunction1.stable.out
monetdb5/optimizer/Tests/inlineFunction2.stable.out
monetdb5/optimizer/Tests/inlineFunction3.stable.out
monetdb5/optimizer/Tests/inlineFunction4.stable.out
monetdb5/optimizer/Tests/joinchain.malC
monetdb5/optimizer/Tests/joinchain.stable.out
monetdb5/optimizer/Tests/manifold2.stable.out
monetdb5/optimizer/Tests/remap.malC
monetdb5/optimizer/Tests/tst4000.malC
monetdb5/optimizer/Tests/tst4000.stable.out
monetdb5/optimizer/Tests/tst4001.stable.out
monetdb5/optimizer/Tests/tst4002.malC
monetdb5/optimizer/Tests/tst4002.stable.out
monetdb5/optimizer/Tests/tst4003.malC
monetdb5/optimizer/Tests/tst4003.stable.out
monetdb5/optimizer/Tests/tst4004.malC
monetdb5/optimizer/Tests/tst4004.stable.out
monetdb5/optimizer/Tests/tst4005.stable.out
monetdb5/optimizer/Tests/tst4010.malC
monetdb5/optimizer/Tests/tst4010.stable.out
monetdb5/optimizer/Tests/tst4030.malC
monetdb5/optimizer/Tests/tst4030.stable.out
monetdb5/optimizer/Tests/tst4601.malC
monetdb5/optimizer/Tests/tst4601.stable.out
monetdb5/optimizer/Tests/tst4630.stable.out
sql/backends/monet5/gsl/gsl.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_bat2time.c
sql/backends/monet5/sql_cast.c
sql/backends/monet5/sql_cast_impl_down_from_flt.h
sql/backends/monet5/sql_cast_impl_down_from_int.h
sql/backends/monet5/sql_cast_impl_up_to_flt.h
sql/backends/monet5/sql_cast_impl_up_to_int.h
sql/backends/monet5/sql_round_impl.h
sql/storage/bat/bat_table.c
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5.stable.out.int128
Branch: embedded
Log Message:
merge default
diffs (truncated from 9598 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
@@ -30848,14 +30848,6 @@ command bat.delete(b:bat[:oid,:any_1]):b
address BKCdelete_all;
comment Delete all entries.
-command bat.delete(b:bat[:oid,:any_1],h:oid):bat[:oid,:any_1]
-address BKCdelete;
-comment Delete an entry with a certain head value.
-
-command bat.delete(b:bat[:oid,:any_1],src:bat[:oid,:any_1]):bat[:oid,:any_1]
-address BKCdelete_bat_bun;
-comment Delete from the first BAT all BUNs with a corresponding BUN in
the second.
-
command bat.getName(b:bat[:oid,:any_1]):str
address BKCgetBBPname;
comment Gives back the logical name of a BAT.
@@ -38633,30 +38625,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 +38637,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 +38645,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
@@ -39817,14 +39817,6 @@ command bat.delete(b:bat[:oid,:any_1]):b
address BKCdelete_all;
comment Delete all entries.
-command bat.delete(b:bat[:oid,:any_1],h:oid):bat[:oid,:any_1]
-address BKCdelete;
-comment Delete an entry with a certain head value.
-
-command bat.delete(b:bat[:oid,:any_1],src:bat[:oid,:any_1]):bat[:oid,:any_1]
-address BKCdelete_bat_bun;
-comment Delete from the first BAT all BUNs with a corresponding BUN in
the second.
-
command bat.getName(b:bat[:oid,:any_1]):str
address BKCgetBBPname;
comment Gives back the logical name of a BAT.
@@ -49488,30 +49480,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 +49492,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 +49500,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
@@ -107,8 +107,8 @@ BAT *BATconst(BAT *l, int tt, const void
BAT *BATconstant(int tt, const void *val, BUN cnt, int role);
BAT *BATconvert(BAT *b, BAT *s, int tp, int abort_on_error);
BUN BATcount_no_nil(BAT *b);
-gdk_return BATdel(BAT *b, BAT *c, bit force);
BAT *BATdelta(BAT *b);
+BAT *BATdense(oid hseq, oid tseq, BUN cnt) __attribute__((warn_unused_result));
void BATderiveHeadProps(BAT *b, int expensive);
void BATderiveProps(BAT *b, int expensive);
BAT *BATdiff(BAT *l, BAT *r, BAT *sl, BAT *sr, int nil_matches, BUN estimate);
@@ -135,13 +135,10 @@ BAT *BATgroupvariance_sample(BAT *b, BAT
BUN BATgrows(BAT *b);
gdk_return BAThash(BAT *b, BUN masksize);
gdk_return BATimprints(BAT *b);
-gdk_return BATins(BAT *b, BAT *c, bit force);
BAT *BATintersectcand(BAT *a, BAT *b);
gdk_return BATjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr, int
nil_matches, BUN estimate);
gdk_return BATkey(BAT *b, int onoff);
gdk_return BATleftjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr,
int nil_matches, BUN estimate);
-BAT *BATmark(BAT *b, oid base);
-BAT *BATmark_grp(BAT *b, BAT *g, const oid *base);
void *BATmax(BAT *b, void *aggr);
size_t BATmemsize(BAT *b, int dirty);
BAT *BATmergecand(BAT *a, BAT *b);
@@ -205,10 +202,8 @@ void BBPshare(bat b);
gdk_return BBPsync(int cnt, bat *subcommit);
void BBPunlock(const char *s);
gdk_return BUNappend(BAT *b, const void *right, bit force);
-gdk_return BUNdel(BAT *b, const void *left, const void *right, bit force);
-BUN BUNdelete(BAT *b, BUN p, bit force);
BUN BUNfnd(BAT *b, const void *right);
-gdk_return BUNinplace(BAT *b, BUN p, const void *left, const void *right, bit
force);
+gdk_return BUNinplace(BAT *b, BUN p, const void *right, bit force);
gdk_return BUNreplace(BAT *b, const void *left, const void *right, bit force);
BAT *COLcopy(BAT *b, int tt, int writeable, int role);
size_t GDK_mem_maxsize;
@@ -338,9 +333,8 @@ gdk_return VARcalcsub(ValPtr ret, const
gdk_return VARcalcxor(ValPtr ret, const ValRecord *lft, const ValRecord *rgt);
gdk_return VARconvert(ValPtr ret, const ValRecord *v, int abort_on_error);
void VIEWbounds(BAT *b, BAT *view, BUN l, BUN h);
-BAT *VIEWcombine(BAT *b);
-BAT *VIEWcreate(BAT *h, BAT *t);
-BAT *VIEWcreate_(BAT *h, BAT *t, int stable);
+BAT *VIEWcreate(oid seq, BAT *b);
+BAT *VIEWcreate_(oid seq, BAT *b, int stable);
size_t _MT_npages;
size_t _MT_pagesize;
int batFromStr(const char *src, int *len, bat **dst);
@@ -769,10 +763,7 @@ str BKCbat_inplace(bat *r, const bat *bi
str BKCbat_inplace_force(bat *r, const bat *bid, const bat *rid, const bat
*uid, const bit *force);
str BKCbun_inplace(bat *r, const bat *bid, const oid *id, const void *t);
str BKCbun_inplace_force(bat *r, const bat *bid, const oid *id, const void *t,
const bit *force);
-char *BKCdelete(bat *r, const bat *bid, const oid *h);
str BKCdelete_all(bat *r, const bat *bid);
-str BKCdelete_bat_bun(bat *r, const bat *bid, const bat *sid);
-char *BKCdelete_bun(bat *r, const bat *bid, const oid *h, const void *t);
str BKCdensebat(bat *ret, const wrd *size);
str BKCgetAccess(str *res, const bat *bid);
str BKCgetBBPname(str *ret, const bat *bid);
@@ -783,8 +774,6 @@ str BKCgetRole(str *res, const bat *bid)
str BKCgetSequenceBase(oid *r, const bat *bid);
str BKCgetSize(lng *tot, const bat *bid);
str BKCinfo(bat *ret1, bat *ret2, const bat *bid);
-str BKCinsert_bat(bat *r, const bat *bid, const bat *sid);
-str BKCinsert_bat_force(bat *r, const bat *bid, const bat *sid, const bit
*force);
str BKCintersectcand(bat *ret, const bat *aid, const bat *bid);
str BKCisPersistent(bit *res, const bat *bid);
str BKCisSorted(bit *res, const bat *bid);
@@ -1313,18 +1302,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/gdk/ChangeLog b/gdk/ChangeLog
--- a/gdk/ChangeLog
+++ b/gdk/ChangeLog
@@ -1,7 +1,17 @@
# ChangeLog file for MonetDB
# This file is updated with Maddlog
+* Mon Dec 14 2015 Sjoerd Mullender <sjo...@acm.org>
+- Removed functions BATins, BATdel, BUNdel and BUNdelete.
+
* Fri Dec 11 2015 Sjoerd Mullender <sjo...@acm.org>
+- Removed function VIEWcombine. Use BATdense instead.
+- Removed "left" parameter from BUNinplace. It wasn't used since the
+ BAT it works on is dense headed.
+- Created function BATdense to easily create a [void,void] BAT with
+ specified seqbases for head and tail and a count.
+- Removed function BATmark. When all head columns are dense, BATmark
+ basically only created a new [void,void] BAT.
- Renamed BATsubsort to BATsort.
* Thu Dec 3 2015 Sjoerd Mullender <sjo...@acm.org>
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1064,6 +1064,8 @@ gdk_export void HEAP_free(Heap *heap, va
gdk_export BAT *BATnew(int hdtype, int tltype, BUN capacity, int role)
__attribute__((warn_unused_result));
+gdk_export BAT *BATdense(oid hseq, oid tseq, BUN cnt)
+ __attribute__((warn_unused_result));
gdk_export gdk_return BATextend(BAT *b, BUN newcap);
/* internal */
@@ -1073,20 +1075,12 @@ gdk_export bte ATOMelmshift(int sz);
* @- BUN manipulation
* @multitable @columnfractions 0.08 0.7
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
