Changeset: 36f4d6c6d6ae for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=36f4d6c6d6ae
Modified Files:
clients/Tests/MAL-signatures_all.stable.out
clients/Tests/MAL-signatures_fits_geom.stable.out
clients/Tests/MAL-signatures_geom.stable.out
clients/Tests/MAL-signatures_none.stable.out
clients/Tests/exports.stable.out
monetdb5/modules/atoms/blob.c
monetdb5/modules/kernel/batcolor.mal
monetdb5/modules/mal/bbp.h
monetdb5/modules/mal/language.c
monetdb5/modules/mal/language.h
sql/backends/monet5/datacell/basket.h
Branch: Oct2014
Log Message:
Cleanup: removed unused functions, added batcolor.ycc definition.
diffs (170 lines):
diff --git a/clients/Tests/MAL-signatures_all.stable.out
b/clients/Tests/MAL-signatures_all.stable.out
--- a/clients/Tests/MAL-signatures_all.stable.out
+++ b/clients/Tests/MAL-signatures_all.stable.out
@@ -3042,6 +3042,10 @@ command batcolor.value(c:bat[:oid,:color
address CLRbatValueInt;
comment Extracts value component from a color atom
+command
batcolor.ycc(y:bat[:oid,:flt],cr:bat[:oid,:flt],cb:bat[:oid,:flt]):bat[:oid,:color]
+address CLRbatycc;
+comment Converts an YCC triplets to a color atom
+
command batstr.endsWith(s:bat[:oid,:str],suffix:str):bat[:oid,:bit]
address STRbatSuffixcst;
comment Suffix check.
diff --git a/clients/Tests/MAL-signatures_fits_geom.stable.out
b/clients/Tests/MAL-signatures_fits_geom.stable.out
--- a/clients/Tests/MAL-signatures_fits_geom.stable.out
+++ b/clients/Tests/MAL-signatures_fits_geom.stable.out
@@ -2963,6 +2963,10 @@ command batcolor.value(c:bat[:oid,:color
address CLRbatValueInt;
comment Extracts value component from a color atom
+command
batcolor.ycc(y:bat[:oid,:flt],cr:bat[:oid,:flt],cb:bat[:oid,:flt]):bat[:oid,:color]
+address CLRbatycc;
+comment Converts an YCC triplets to a color atom
+
command batstr.endsWith(s:bat[:oid,:str],suffix:str):bat[:oid,:bit]
address STRbatSuffixcst;
comment Suffix check.
diff --git a/clients/Tests/MAL-signatures_geom.stable.out
b/clients/Tests/MAL-signatures_geom.stable.out
--- a/clients/Tests/MAL-signatures_geom.stable.out
+++ b/clients/Tests/MAL-signatures_geom.stable.out
@@ -2963,6 +2963,10 @@ command batcolor.value(c:bat[:oid,:color
address CLRbatValueInt;
comment Extracts value component from a color atom
+command
batcolor.ycc(y:bat[:oid,:flt],cr:bat[:oid,:flt],cb:bat[:oid,:flt]):bat[:oid,:color]
+address CLRbatycc;
+comment Converts an YCC triplets to a color atom
+
command batstr.endsWith(s:bat[:oid,:str],suffix:str):bat[:oid,:bit]
address STRbatSuffixcst;
comment Suffix check.
diff --git a/clients/Tests/MAL-signatures_none.stable.out
b/clients/Tests/MAL-signatures_none.stable.out
--- a/clients/Tests/MAL-signatures_none.stable.out
+++ b/clients/Tests/MAL-signatures_none.stable.out
@@ -2958,6 +2958,10 @@ command batcolor.value(c:bat[:oid,:color
address CLRbatValueInt;
comment Extracts value component from a color atom
+command
batcolor.ycc(y:bat[:oid,:flt],cr:bat[:oid,:flt],cb:bat[:oid,:flt]):bat[:oid,:color]
+address CLRbatycc;
+comment Converts an YCC triplets to a color atom
+
command batstr.endsWith(s:bat[:oid,:str],suffix:str):bat[:oid,:bit]
address STRbatSuffixcst;
comment Suffix check.
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
@@ -943,7 +943,6 @@ str BLOB_isnil(bit *retval, blob *val);
str BLOBblob_blob(blob **d, blob **s);
str BLOBblob_fromstr(blob **b, str *d);
void BLOBdel(Heap *h, var_t *index);
-str BLOBeoln(char *src, char *end);
str BLOBfromblob(str *retval, blob **b);
str BLOBfromidx(str *retval, blob **binp, int *index);
int BLOBfromstr(char *instr, int *l, blob **val);
@@ -1112,16 +1111,13 @@ str CMDbatXOR(Client cntxt, MalBlkPtr mb
str CMDbbp(bat *ID, bat *NS, bat *HT, bat *TT, bat *CNT, bat *REFCNT, bat
*LREFCNT, bat *LOCATION, bat *HEAT, bat *DIRTY, bat *STATUS, bat *KIND);
str CMDbbpCount(bat *ret);
str CMDbbpDirty(bat *ret);
-str CMDbbpDiskReads(lng *ret);
str CMDbbpDiskSpace(lng *ret);
-str CMDbbpDiskWrites(lng *ret);
str CMDbbpHeat(bat *ret);
str CMDbbpKind(bat *ret);
str CMDbbpLRefCount(bat *ret);
str CMDbbpLocation(bat *ret);
str CMDbbpName(str *ret, bat *bid);
str CMDbbpNames(bat *ret);
-str CMDbbpRNames(int *ret);
str CMDbbpRefCount(bat *ret);
str CMDbbpStatus(bat *ret);
str CMDbbpbind(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
@@ -1159,7 +1155,6 @@ str CMDconvertsignal_wrd(Client cntxt, M
str CMDcpuloadPercentage(int *cycles, int *io, lng *user, lng *nice, lng *sys,
lng *idle, lng *iowait);
str CMDcpustats(lng *user, lng *nice, lng *sys, lng *idle, lng *iowait);
str CMDdeactivateProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-str CMDdebug(int *ret, int *flg);
str CMDdumpTrace(void *res);
str CMDendPointProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str CMDevalFile(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
diff --git a/monetdb5/modules/atoms/blob.c b/monetdb5/modules/atoms/blob.c
--- a/monetdb5/modules/atoms/blob.c
+++ b/monetdb5/modules/atoms/blob.c
@@ -62,7 +62,6 @@ blob_export int SQLBLOBtostr(str *tostr,
blob_export str BLOBtoblob(blob **retval, str *s);
blob_export str BLOBfromblob(str *retval, blob **b);
blob_export str BLOBfromidx(str *retval, blob **binp, int *index);
-blob_export str BLOBeoln(char *src, char *end);
blob_export str BLOBnitems(int *ret, blob *b);
blob_export int BLOBget(Heap *h, int *bun, int *l, blob **val);
blob_export blob * BLOBread(blob *a, stream *s, size_t cnt);
diff --git a/monetdb5/modules/kernel/batcolor.mal
b/monetdb5/modules/kernel/batcolor.mal
--- a/monetdb5/modules/kernel/batcolor.mal
+++ b/monetdb5/modules/kernel/batcolor.mal
@@ -68,6 +68,10 @@ command value(c:bat[:oid,:color]) :bat[:
address CLRbatValue
comment "Extracts value component from a color atom";
+command ycc(y:bat[:oid,:flt],cr:bat[:oid,:flt],cb:bat[:oid,:flt])
:bat[:oid,:color]
+address CLRbatycc
+comment "Converts an YCC triplets to a color atom";
+
command luminance (c:bat[:oid,:color]) :bat[:oid,:int]
address CLRbatLuminance
comment "Extracts Y(luminance) component from a color atom";
diff --git a/monetdb5/modules/mal/bbp.h b/monetdb5/modules/mal/bbp.h
--- a/monetdb5/modules/mal/bbp.h
+++ b/monetdb5/modules/mal/bbp.h
@@ -50,12 +50,9 @@
bbp_export str CMDbbpbind(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
bbp_export str CMDbbpDiskSpace(lng *ret);
-bbp_export str CMDbbpDiskReads(lng *ret);
-bbp_export str CMDbbpDiskWrites(lng *ret);
bbp_export str CMDgetPageSize(int *ret);
bbp_export str CMDbbpNames(bat *ret);
bbp_export str CMDbbpName(str *ret, bat *bid);
-bbp_export str CMDbbpRNames(int *ret);
bbp_export str CMDbbpCount(bat *ret);
bbp_export str CMDbbpLocation(bat *ret);
bbp_export str CMDbbpHeat(bat *ret);
diff --git a/monetdb5/modules/mal/language.c b/monetdb5/modules/mal/language.c
--- a/monetdb5/modules/mal/language.c
+++ b/monetdb5/modules/mal/language.c
@@ -246,12 +246,3 @@ CMDincludeFile(Client cntxt, MalBlkPtr m
(void) pci; /* fool compiler */
throw(MAL, "mal.include", PROGRAM_NYI);
}
-
-str
-CMDdebug(int *ret, int *flg)
-{
- *ret = GDKdebug;
- if (*flg)
- GDKdebug = *flg;
- return MAL_SUCCEED;
-}
diff --git a/monetdb5/modules/mal/language.h b/monetdb5/modules/mal/language.h
--- a/monetdb5/modules/mal/language.h
+++ b/monetdb5/modules/mal/language.h
@@ -56,6 +56,5 @@ language_export str CMDcallFunction(Clie
language_export str CMDcallBAT(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
language_export str CMDevalFile(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
language_export str CMDincludeFile(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
-language_export str CMDdebug(int *ret, int *flg);
language_export str MALassertTriple(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
#endif /* _LANGUAGE_H */
diff --git a/sql/backends/monet5/datacell/basket.h
b/sql/backends/monet5/datacell/basket.h
--- a/sql/backends/monet5/datacell/basket.h
+++ b/sql/backends/monet5/datacell/basket.h
@@ -88,7 +88,6 @@ datacell_export str schema_default;
datacell_export str BSKTregister(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
datacell_export str BSKTdrop(void *ret, str *tbl);
datacell_export str BSKTreset(void *ret);
-datacell_export str BSKTinventory(int *ret);
datacell_export int BSKTmemberCount(str tbl);
datacell_export int BSKTlocate(str tbl);
datacell_export str BSKTdump(void *ret);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
