Changeset: dc439fc41837 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dc439fc41837
Modified Files:
clients/Tests/exports.stable.out
sql/test/BugTracker-2016/Tests/storagemodel.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out.int128
sql/test/mosaic/Tests/compression.stable.out
sql/test/mosaic/Tests/compressionRLE.stable.out
sql/test/mosaic/Tests/compressionRLE2.sql
sql/test/mosaic/Tests/compressionRLE2.stable.out
sql/test/mosaic/Tests/session_exit.stable.out
sql/test/mosaic/Tests/xqueries.stable.out
sql/test/mosaic/Tests/xqueries_delta.stable.out
sql/test/mosaic/Tests/xqueries_rle.stable.out
Branch: mosaic
Log Message:
Approve output
diffs (truncated from 2456 to 300 lines):
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
@@ -101,6 +101,7 @@ dbl BATcalcvariance_population(dbl *avgp
dbl BATcalcvariance_sample(dbl *avgp, BAT *b);
BAT *BATcalcxor(BAT *b1, BAT *b2, BAT *s);
BAT *BATcalcxorcst(BAT *b, const ValRecord *v, BAT *s);
+int BATcheckmosaic(BAT *b);
gdk_return BATclear(BAT *b, int force);
void BATcommit(BAT *b);
BAT *BATconstant(oid hseq, int tt, const void *val, BUN cnt, int role);
@@ -283,6 +284,8 @@ size_t HEAPmemsize(Heap *h);
size_t HEAPvmsize(Heap *h);
void IMPSdestroy(BAT *b);
lng IMPSimprintsize(BAT *b);
+gdk_return MOSalloc(BAT *b, BUN cap);
+void MOSdestroy(BAT *b);
int MT_check_nr_cores(void);
int MT_create_thread(MT_Id *t, void( *function)(void *), void *arg, enum
MT_thr_detach d);
void MT_exiting_thread(void);
@@ -372,6 +375,7 @@ int bteFromStr(const char *src, int *len
int bteToStr(str *dst, int *len, const bte *src);
const bte bte_nil;
int closedir(DIR *dir);
+void clrBitVector(BitVector vector, BUN i, int bits);
int dblFromStr(const char *src, int *len, dbl **dst);
int dblToStr(str *dst, int *len, const dbl *src);
const dbl dbl_nil;
@@ -392,12 +396,14 @@ void geomsqlfix_set(geomsqlfix_fptr);
int geomversion_get(void);
void geomversion_set(void);
bat getBBPsize(void);
+int getBitVector(BitVector vector, BUN i, int bits);
char *get_bin_path(void);
int gettimeofday(struct timeval *tv, int *ignore_zone);
int gprof_pthread_create(pthread_t *__restrict, __const pthread_attr_t
*__restrict, void *( *fcn)(void *), void *__restrict);
int hgeFromStr(const char *src, int *len, hge **dst);
int hgeToStr(str *dst, int *len, const hge *src);
const hge hge_nil;
+void initBitMasks(void);
int intFromStr(const char *src, int *len, int **dst);
int intToStr(str *dst, int *len, const int *src);
const int int_nil;
@@ -450,6 +456,7 @@ char *msab_registerStop(void);
char *msab_retreatScenario(const char *lang);
char *msab_serialise(char **ret, const sabdb *db);
char *msab_wildRetreat(void);
+BitVector newBitVector(BUN cnt, int width);
const oid oid_nil;
DIR *opendir(const char *dirname);
void print_trace(void);
@@ -471,6 +478,7 @@ int ptrToStr(str *dst, int *len, const p
const ptr ptr_nil;
struct dirent *readdir(DIR *dir);
void rewinddir(DIR *dir);
+void setBitVector(BitVector vector, const BUN i, const int bits, const int
value);
int shtFromStr(const char *src, int *len, sht **dst);
int shtToStr(str *dst, int *len, const sht *src);
const sht sht_nil;
@@ -480,6 +488,7 @@ int strLen(const char *s);
int strNil(const char *s);
int strToStr(str *dst, int *len, const char *src);
const char str_nil[2];
+int tstBitVector(BitVector vector, BUN i, int bits);
gdk_return void_inplace(BAT *b, oid id, const void *val, bit force);
BUN void_replace_bat(BAT *b, BAT *p, BAT *u, bit force);
int win_mkdir(const char *, const int mode);
@@ -1348,6 +1357,7 @@ int MCactiveClients(void);
str MCawakeClient(int id);
void MCcloseClient(Client c);
int MCdefault;
+str MCexitMaintenance(Client cntxt);
Client MCforkClient(Client father);
Client MCgetClient(int id);
void MCinit(void);
@@ -1356,6 +1366,7 @@ Client MCinitClientRecord(Client c, oid
int MCinitClientThread(Client c);
int MCpushClientInput(Client c, bstream *new_input, int listing, char *prompt);
int MCshutdowninprogress(void);
+str MCstartMaintenance(Client cntxt, lng timeout, int abort);
void MCstopClients(Client c);
str MCsuspendClient(int id);
int MCvalid(Client c);
@@ -1397,6 +1408,111 @@ str MKEYconstbulk_rotate_xor_hash(bat *r
str MKEYhash(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str MKEYrotate(lng *ret, const lng *v, const int *nbits);
str MKEYrotate_xor_hash(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
+void MOSadvance_delta(Client cntxt, MOStask task);
+void MOSadvance_dictionary(Client cntxt, MOStask task);
+void MOSadvance_frame(Client cntxt, MOStask task);
+void MOSadvance_linear(Client cntxt, MOStask task);
+void MOSadvance_literal(Client cntxt, MOStask task);
+void MOSadvance_prefix(Client cntxt, MOStask task);
+void MOSadvance_runlength(Client cntxt, MOStask task);
+str MOSanalyse(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+int MOSanalyseInternal(Client cntxt, int threshold, MOStask task, bat bid);
+void MOSanalyseReport(Client cntxt, BAT *b, BAT *btech, BAT *output, BAT
*factor, BAT *run, str compressions);
+void MOSblk(MosaicBlk blk);
+BUN MOSblocklimit;
+str MOScompress(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str MOScompressInternal(Client cntxt, bat *ret, bat *bid, MOStask task, int
debug);
+void MOScompress_delta(Client cntxt, MOStask task);
+void MOScompress_dictionary(Client cntxt, MOStask task);
+void MOScompress_frame(Client cntxt, MOStask task);
+void MOScompress_linear(Client cntxt, MOStask task);
+void MOScompress_literal(Client cntxt, MOStask task);
+void MOScompress_prefix(Client cntxt, MOStask task);
+void MOScompress_runlength(Client cntxt, MOStask task);
+void MOScreatedictionary(Client cntxt, MOStask task);
+void MOScreateframeDictionary(Client cntxt, MOStask task);
+str MOSdecompress(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str MOSdecompressInternal(Client cntxt, bat *ret, bat *bid);
+str MOSdecompressStorage(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
+void MOSdecompress_delta(Client cntxt, MOStask task);
+void MOSdecompress_dictionary(Client cntxt, MOStask task);
+void MOSdecompress_frame(Client cntxt, MOStask task);
+void MOSdecompress_linear(Client cntxt, MOStask task);
+void MOSdecompress_literal(Client cntxt, MOStask task);
+void MOSdecompress_prefix(Client cntxt, MOStask task);
+void MOSdecompress_runlength(Client cntxt, MOStask task);
+str MOSdump(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+void MOSdumpHeader(Client cntxt, MOStask task);
+void MOSdump_delta(Client cntxt, MOStask task);
+void MOSdump_dictionary(Client cntxt, MOStask task);
+void MOSdump_frame(Client cntxt, MOStask task);
+void MOSdump_linear(Client cntxt, MOStask task);
+void MOSdump_literal(Client cntxt, MOStask task);
+void MOSdump_prefix(Client cntxt, MOStask task);
+void MOSdump_runlength(Client cntxt, MOStask task);
+flt MOSestimate_delta(Client cntxt, MOStask task);
+flt MOSestimate_dictionary(Client cntxt, MOStask task);
+flt MOSestimate_frame(Client cntxt, MOStask task);
+flt MOSestimate_linear(Client cntxt, MOStask task);
+flt MOSestimate_prefix(Client cntxt, MOStask task);
+flt MOSestimate_runlength(Client cntxt, MOStask task);
+char *MOSfiltername[];
+void MOSinitHeader(MOStask task);
+void MOSinitializeScan(Client cntxt, MOStask task, int startblk, int stopblk);
+str MOSlayout(Client cntxt, BAT *b, BAT *btech, BAT *bcount, BAT *binput, BAT
*boutput, BAT *bproperties, str compressionscheme);
+void MOSlayout_delta(Client cntxt, MOStask task, BAT *btech, BAT *bcount, BAT
*binput, BAT *boutput, BAT *bproperties);
+void MOSlayout_dictionary(Client cntxt, MOStask task, BAT *btech, BAT *bcount,
BAT *binput, BAT *boutput, BAT *bproperties);
+void MOSlayout_dictionary_hdr(Client cntxt, MOStask task, BAT *btech, BAT
*bcount, BAT *binput, BAT *boutput, BAT *bproperties);
+void MOSlayout_frame(Client cntxt, MOStask task, BAT *btech, BAT *bcount, BAT
*binput, BAT *boutput, BAT *bproperties);
+void MOSlayout_frame_hdr(Client cntxt, MOStask task, BAT *btech, BAT *bcount,
BAT *binput, BAT *boutput, BAT *bproperties);
+void MOSlayout_linear(Client cntxt, MOStask task, BAT *btech, BAT *bcount, BAT
*binput, BAT *boutput, BAT *bproperties);
+void MOSlayout_literal(Client cntxt, MOStask task, BAT *btech, BAT *bcount,
BAT *binput, BAT *boutput, BAT *bproperties);
+void MOSlayout_prefix(Client cntxt, MOStask task, BAT *btech, BAT *bcount, BAT
*binput, BAT *boutput, BAT *bproperties);
+void MOSlayout_runlength(Client cntxt, MOStask task, BAT *btech, BAT *bcount,
BAT *binput, BAT *boutput, BAT *bproperties);
+BUN MOSlimit(void);
+str MOSoptimize(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str MOSprojection(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str MOSprojection_delta(Client cntxt, MOStask task);
+str MOSprojection_dictionary(Client cntxt, MOStask task);
+str MOSprojection_frame(Client cntxt, MOStask task);
+str MOSprojection_linear(Client cntxt, MOStask task);
+str MOSprojection_literal(Client cntxt, MOStask task);
+str MOSprojection_prefix(Client cntxt, MOStask task);
+str MOSprojection_runlength(Client cntxt, MOStask task);
+void MOSskip_delta(Client cntxt, MOStask task);
+void MOSskip_dictionary(Client cntxt, MOStask task);
+void MOSskip_frame(Client cntxt, MOStask task);
+void MOSskip_linear(Client cntxt, MOStask task);
+void MOSskip_literal(Client cntxt, MOStask task);
+void MOSskip_prefix(Client cntxt, MOStask task);
+void MOSskip_runlength(Client cntxt, MOStask task);
+str MOSslice(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str MOSsliceInternal(Client cntxt, bat *slices, BUN size, BAT *b);
+str MOSsubjoin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str MOSsubjoin_delta(Client cntxt, MOStask task);
+str MOSsubjoin_dictionary(Client cntxt, MOStask task);
+str MOSsubjoin_frame(Client cntxt, MOStask task);
+str MOSsubjoin_linear(Client cntxt, MOStask task);
+str MOSsubjoin_literal(Client cntxt, MOStask task);
+str MOSsubjoin_prefix(Client cntxt, MOStask task);
+str MOSsubjoin_runlength(Client cntxt, MOStask task);
+str MOSsubselect(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str MOSsubselect_delta(Client cntxt, MOStask task, void *low, void *hgh, bit
*li, bit *hi, bit *anti);
+str MOSsubselect_dictionary(Client cntxt, MOStask task, void *low, void *hgh,
bit *li, bit *hi, bit *anti);
+str MOSsubselect_frame(Client cntxt, MOStask task, void *low, void *hgh, bit
*li, bit *hi, bit *anti);
+str MOSsubselect_linear(Client cntxt, MOStask task, void *low, void *hgh, bit
*li, bit *hi, bit *anti);
+str MOSsubselect_literal(Client cntxt, MOStask task, void *low, void *hgh, bit
*li, bit *hi, bit *anti);
+str MOSsubselect_prefix(Client cntxt, MOStask task, void *low, void *hgh, bit
*li, bit *hi, bit *anti);
+str MOSsubselect_runlength(Client cntxt, MOStask task, void *low, void *hgh,
bit *li, bit *hi, bit *anti);
+str MOSthetasubselect(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str MOSthetasubselect_delta(Client cntxt, MOStask task, void *val, str oper);
+str MOSthetasubselect_dictionary(Client cntxt, MOStask task, void *val, str
oper);
+str MOSthetasubselect_frame(Client cntxt, MOStask task, void *val, str oper);
+str MOSthetasubselect_linear(Client cntxt, MOStask task, void *val, str oper);
+str MOSthetasubselect_literal(Client cntxt, MOStask task, void *val, str oper);
+str MOSthetasubselect_prefix(Client cntxt, MOStask task, void *val, str oper);
+str MOSthetasubselect_runlength(Client cntxt, MOStask task, void *val, str
oper);
+void MOSupdateHeader(Client cntxt, MOStask task);
void MPresetProfiler(stream *fdout);
char *MSP_locate_sqlscript(const char *mod_name, bit recurse);
void MSinitClientPrg(Client cntxt, str mod, str nme);
@@ -1560,6 +1676,7 @@ int OPTmacroImplementation(Client cntxt,
int OPTmatpackImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
int OPTmergetableImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
int OPTmitosisImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
+int OPTmosaicImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
int OPTmultiplexImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
str OPTmultiplexSimple(Client cntxt, MalBlkPtr mb);
str OPTorcam(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
@@ -2008,6 +2125,7 @@ str columnRef;
str commitRef;
str compileOptimizer(Client cntxt, str name);
str compileString(Symbol *fcn, Client c, str s);
+str compressRef;
str connectRef;
str constraintsRef;
str convertConstant(malType type, ValPtr vr);
@@ -2035,6 +2153,7 @@ str deblockdataflow(Client cntxt, MalBlk
void debugFunction(stream *fd, MalBlkPtr mb, MalStkPtr stk, int flg, int
first, int size);
str debugOptimizers(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str debugScheduler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str decompressRef;
int defConstant(MalBlkPtr mb, int type, ValPtr cst);
str defineRef;
void delArgument(InstrPtr p, int varid);
@@ -2304,6 +2423,7 @@ str mnstr_write_stringwrap(void *ret, St
char monet_characteristics[PATHLENGTH];
char monet_cwd[PATHLENGTH];
size_t monet_memory;
+str mosaicRef;
void moveInstruction(MalBlkPtr mb, int pc, int target);
void mserver_reset(void);
str mtimeRef;
diff --git a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out
b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out
--- a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out
+++ b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out
@@ -84,11 +84,11 @@ Ready.
#update storagemodelinput set "distinct" =10 where "table" ='bug3923' and
"column" ='i';
[ 1 ]
#select * from storagemodel() where "table" = 'bug3923';
-% ., ., ., ., ., ., ., ., ., .,
. # table_name
-% schema, table, column, type, count, columnsize, heapsize,
hashes, imprints, sorted, orderidx # name
-% clob, clob, clob, clob, bigint, bigint, bigint, bigint, bigint,
boolean, bigint # type
-% 3, 7, 1, 3, 5, 5, 1, 1, 4, 5,
1 # length
-[ "sys", "bug3923", "i", "int", 10000, 40000, 0, 0,
1200, true, 0 ]
+% ., ., ., ., ., ., ., ., ., .,
., . # table_name
+% schema, table, column, type, count, columnsize, heapsize,
hashes, imprints, sorted, orderidx, compressed # name
+% clob, clob, clob, clob, bigint, bigint, bigint, bigint, bigint,
boolean, bigint, boolean # type
+% 3, 7, 1, 3, 5, 5, 1, 1, 4, 5,
1, 5 # length
+[ "sys", "bug3923", "i", "int", 10000, 40000, 0, 0,
1200, true, 0, false ]
#drop table bug3923;
#create table bug3923(i integer);
#select "schema", "table", "column", "type", "mode", typewidth, hashes, phash,
imprints, sorted from storage('sys','_tables');
@@ -109,11 +109,11 @@ Ready.
#update storagemodelinput set "distinct" =10 where "table" ='bug3923' and
"column" ='i';
[ 1 ]
#select * from storagemodel() where "table" = 'bug3923';
-% ., ., ., ., ., ., ., ., ., .,
. # table_name
-% schema, table, column, type, count, columnsize, heapsize,
hashes, imprints, sorted, orderidx # name
-% clob, clob, clob, clob, bigint, bigint, bigint, bigint, bigint,
boolean, bigint # type
-% 3, 7, 1, 3, 5, 5, 1, 1, 4, 5,
1 # length
-[ "sys", "bug3923", "i", "int", 10000, 40000, 0, 0,
1200, true, 0 ]
+% ., ., ., ., ., ., ., ., ., .,
., . # table_name
+% schema, table, column, type, count, columnsize, heapsize,
hashes, imprints, sorted, orderidx, compressed # name
+% clob, clob, clob, clob, bigint, bigint, bigint, bigint, bigint,
boolean, bigint, boolean # type
+% 3, 7, 1, 3, 5, 5, 1, 1, 4, 5,
1, 5 # length
+[ "sys", "bug3923", "i", "int", 10000, 40000, 0, 0,
1200, true, 0, false ]
#drop table bug3923;
# 23:38:44 >
diff --git a/sql/test/Dependencies/Tests/Dependencies.stable.out
b/sql/test/Dependencies/Tests/Dependencies.stable.out
--- a/sql/test/Dependencies/Tests/Dependencies.stable.out
+++ b/sql/test/Dependencies/Tests/Dependencies.stable.out
@@ -203,6 +203,7 @@ Dependencies between database objects
% 11, 35, 8 # length
[ "atomwidth", "storagemodel", "DEP_FUNC" ]
[ "column", "storagemodel", "DEP_FUNC" ]
+[ "compressed", "storagemodel", "DEP_FUNC" ]
[ "count", "storagemodel", "DEP_FUNC" ]
[ "depend_id", "dependencies_columns_on_functions", "DEP_FUNC" ]
[ "depend_id", "dependencies_columns_on_triggers", "DEP_FUNC" ]
@@ -576,6 +577,7 @@ Cleanup
% 11, 35, 8 # length
[ "atomwidth", "storagemodel", "DEP_FUNC" ]
[ "column", "storagemodel", "DEP_FUNC" ]
+[ "compressed", "storagemodel", "DEP_FUNC" ]
[ "count", "storagemodel", "DEP_FUNC" ]
[ "depend_id", "dependencies_columns_on_functions", "DEP_FUNC" ]
[ "depend_id", "dependencies_columns_on_triggers", "DEP_FUNC" ]
diff --git a/sql/test/Dependencies/Tests/Dependencies.stable.out.int128
b/sql/test/Dependencies/Tests/Dependencies.stable.out.int128
--- a/sql/test/Dependencies/Tests/Dependencies.stable.out.int128
+++ b/sql/test/Dependencies/Tests/Dependencies.stable.out.int128
@@ -203,6 +203,7 @@ Dependencies between database objects
% 11, 35, 8 # length
[ "atomwidth", "storagemodel", "DEP_FUNC" ]
[ "column", "storagemodel", "DEP_FUNC" ]
+[ "compressed", "storagemodel", "DEP_FUNC" ]
[ "count", "storagemodel", "DEP_FUNC" ]
[ "depend_id", "dependencies_columns_on_functions", "DEP_FUNC" ]
[ "depend_id", "dependencies_columns_on_triggers", "DEP_FUNC" ]
@@ -576,6 +577,7 @@ Cleanup
% 11, 35, 8 # length
[ "atomwidth", "storagemodel", "DEP_FUNC" ]
[ "column", "storagemodel", "DEP_FUNC" ]
+[ "compressed", "storagemodel", "DEP_FUNC" ]
[ "count", "storagemodel", "DEP_FUNC" ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
