Changeset: 5236fb638aaa for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5236fb638aaa
Modified Files:
clients/Tests/exports.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
Branch: mosaic
Log Message:
Approve output
diffs (261 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
@@ -395,7 +395,7 @@ int geomversion_get(void);
void geomversion_set(void);
bat getBBPsize(void);
int getBitVector(BitVector vector, BUN i, int bits);
-lng getBitVectorSize(const BUN cnt, const int width);
+size_t getBitVectorSize(const BUN cnt, const int width);
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);
@@ -1404,6 +1404,7 @@ 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_calendar(Client cntxt, MOStask task);
void MOSadvance_delta(Client cntxt, MOStask task);
void MOSadvance_dictionary(Client cntxt, MOStask task);
void MOSadvance_frame(Client cntxt, MOStask task);
@@ -1413,11 +1414,12 @@ void MOSadvance_prefix(Client cntxt, MOS
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 MOSanalyseReport(Client cntxt, BAT *b, BAT *btech, BAT *output, BAT
*factor, BAT *compress, BAT *decompress, str compressions);
void MOSblk(MosaicBlk blk);
BUN MOSblocklimit;
str MOScompress(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str MOScompressInternal(Client cntxt, bat *bid, MOStask task, int debug);
+void MOScompress_calendar(Client cntxt, MOStask task);
void MOScompress_delta(Client cntxt, MOStask task);
void MOScompress_dictionary(Client cntxt, MOStask task);
void MOScompress_frame(Client cntxt, MOStask task);
@@ -1425,11 +1427,13 @@ void MOScompress_linear(Client cntxt, MO
void MOScompress_literal(Client cntxt, MOStask task);
void MOScompress_prefix(Client cntxt, MOStask task);
void MOScompress_runlength(Client cntxt, MOStask task);
+void MOScreatecalendar(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 *bid);
str MOSdecompressStorage(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
+void MOSdecompress_calendar(Client cntxt, MOStask task);
void MOSdecompress_delta(Client cntxt, MOStask task);
void MOSdecompress_dictionary(Client cntxt, MOStask task);
void MOSdecompress_frame(Client cntxt, MOStask task);
@@ -1439,6 +1443,7 @@ void MOSdecompress_prefix(Client cntxt,
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_calendar(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);
@@ -1446,6 +1451,7 @@ void MOSdump_linear(Client cntxt, MOStas
void MOSdump_literal(Client cntxt, MOStask task);
void MOSdump_prefix(Client cntxt, MOStask task);
void MOSdump_runlength(Client cntxt, MOStask task);
+flt MOSestimate_calendar(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);
@@ -1456,6 +1462,8 @@ 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);
+void MOSlayout_calendar(Client cntxt, MOStask task, BAT *btech, BAT *bcount,
BAT *binput, BAT *boutput, BAT *bproperties);
+void MOSlayout_calendar_hdr(Client cntxt, MOStask task, BAT *btech, BAT
*bcount, BAT *binput, BAT *boutput, BAT *bproperties);
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);
@@ -1468,6 +1476,7 @@ void MOSlayout_runlength(Client cntxt, M
BUN MOSlimit(void);
str MOSoptimizer(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str MOSprojection(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str MOSprojection_calendar(Client cntxt, MOStask task);
str MOSprojection_delta(Client cntxt, MOStask task);
str MOSprojection_dictionary(Client cntxt, MOStask task);
str MOSprojection_frame(Client cntxt, MOStask task);
@@ -1475,6 +1484,7 @@ str MOSprojection_linear(Client cntxt, M
str MOSprojection_literal(Client cntxt, MOStask task);
str MOSprojection_prefix(Client cntxt, MOStask task);
str MOSprojection_runlength(Client cntxt, MOStask task);
+void MOSskip_calendar(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);
@@ -1485,6 +1495,7 @@ void MOSskip_runlength(Client cntxt, MOS
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_calendar(Client cntxt, MOStask task);
str MOSsubjoin_delta(Client cntxt, MOStask task);
str MOSsubjoin_dictionary(Client cntxt, MOStask task);
str MOSsubjoin_frame(Client cntxt, MOStask task);
@@ -1493,6 +1504,7 @@ str MOSsubjoin_literal(Client cntxt, MOS
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_calendar(Client cntxt, MOStask task, void *low, void *hgh,
bit *li, bit *hi, bit *anti);
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);
@@ -1501,6 +1513,7 @@ str MOSsubselect_literal(Client cntxt, M
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_calendar(Client cntxt, MOStask task, void *val, str
oper);
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);
diff --git a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
--- a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
+++ b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
@@ -41,46 +41,46 @@ Operation successful
| X_1:bat[:str] := bat.new(nil:str);
|
| X_0 := sql.mvc();
|
| X_6:bat[:sht] := sql.bind(X_0,"sys","_tables","type",0);
|
-| X_3:bat[:oid] := sql.tid(X_0,"sys","_tables");
|
-| X_63 := algebra.subselect(X_6,X_3,2,2,true,true,true);
|
-| (X_9,r1_10) := sql.bind(X_0,"sys","_tables","type",2);
|
-| X_64 := algebra.subselect(r1_10,nil:bat[:oid],2,2,true,true,true);
|
+| C_3:bat[:oid] := sql.tid(X_0,"sys","_tables");
|
+| C_63 := algebra.subselect(X_6,C_3,2,2,true,true,true);
|
+| (C_9:bat[:oid],r1_10:bat[:sht]) :=
sql.bind(X_0,"sys","_tables","type",2); |
+| C_64 := algebra.subselect(r1_10,nil:bat[:oid],2,2,true,true,true);
|
| X_12:bat[:sht] := sql.bind(X_0,"sys","_tables","type",1);
|
-| X_66 := algebra.subselect(X_12,X_3,2,2,true,true,true);
|
-| X_18 := sql.subdelta(X_63,X_3,X_9,X_64,X_66);
|
+| C_66 := algebra.subselect(X_12,C_3,2,2,true,true,true);
|
+| C_18 := sql.subdelta(C_63,C_3,C_9,C_64,C_66);
|
| X_21:bat[:str] := sql.bind(X_0,"sys","_tables","name",0);
|
-| (X_23,r1_24) := sql.bind(X_0,"sys","_tables","name",2);
|
+| (C_23:bat[:oid],r1_24:bat[:str]) :=
sql.bind(X_0,"sys","_tables","name",2); |
| X_25:bat[:str] := sql.bind(X_0,"sys","_tables","name",1);
|
-| X_28 := sql.projectdelta(X_18,X_21,X_23,r1_24,X_25);
|
+| X_28 := sql.projectdelta(C_18,X_21,C_23,r1_24,X_25);
|
| X_29 := bat.append(X_1,X_28,true);
|
-| X_30:bat[:oid] := sql.tid(X_0,"tmp","_tables");
|
+| C_30:bat[:oid] := sql.tid(X_0,"tmp","_tables");
|
| X_32:bat[:str] := sql.bind(X_0,"tmp","_tables","name",0);
|
-| X_33 := mosaic.projection(X_30,X_32);
|
+| X_33 := mosaic.projection(C_30,X_32);
|
| X_34 := bat.append(X_29,X_33,true);
|
| sql.resultSet(X_43,X_45,X_46,X_48,X_50,X_34);
|
| end user.s2_1;
|
| #inline actions= 0 time=1 usec
|
-| #remap actions= 0 time=3 usec
|
+| #remap actions= 0 time=2 usec
|
| #costmodel actions= 1 time=2 usec
|
| #coercion actions= 1 time=6 usec
|
| #evaluate actions= 0 time=4 usec
|
| #aliases actions= 0 time=6 usec
|
-| #pushselect actions= 4 time=30 usec
|
-| #mergetable actions= 0 time=31 usec
|
+| #pushselect actions= 4 time=27 usec
|
+| #mergetable actions= 0 time=29 usec
|
| #deadcode actions= 4 time=7 usec
|
| #aliases actions= 0 time=5 usec
|
-| #constants actions= 3 time=7 usec
|
+| #constants actions= 3 time=6 usec
|
| #commonTerms actions= 0 time=6 usec
|
| #projectionpath actions= 0 time=4 usec
|
| #reorder actions= 1 time=25 usec
|
-| #deadcode actions= 0 time=6 usec
|
+| #deadcode actions= 0 time=5 usec
|
| #reduce actions=26 time=8 usec
|
| #matpack actions= 0 time=2 usec
|
-| #multiplex actions= 0 time=3 usec
|
-| #profiler actions= 1 time=5 usec
|
+| #multiplex actions= 0 time=2 usec
|
+| #profiler actions= 1 time=3 usec
|
| #candidates actions= 1 time=1 usec
|
-| #garbagecollector actions= 1 time=18 usec
|
-| #total actions= 1 time=273 usec
|
+| #garbagecollector actions= 1 time=37 usec
|
+| #total actions= 1 time=303 usec
|
+------------------------------------------------------------------------------------------------------+
55 rows
diff --git a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
+++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
@@ -53,50 +53,50 @@ Operation successful
| X_1:bat[:lng] := bat.new(nil:lng);
|
| X_0 := sql.mvc();
|
| X_6:bat[:sht] := sql.bind(X_0,"sys","_tables","type",0);
|
-| X_3:bat[:oid] := sql.tid(X_0,"sys","_tables");
|
-| X_57 := algebra.subselect(X_6,X_3,2,2,true,true,true);
|
-| (X_9,r1_10) := sql.bind(X_0,"sys","_tables","type",2);
|
-| X_58 := algebra.subselect(r1_10,nil:bat[:oid],2,2,true,true,true);
|
+| C_3:bat[:oid] := sql.tid(X_0,"sys","_tables");
|
+| C_57 := algebra.subselect(X_6,C_3,2,2,true,true,true);
|
+| (C_9:bat[:oid],r1_10:bat[:sht]) :=
sql.bind(X_0,"sys","_tables","type",2); |
+| C_58 := algebra.subselect(r1_10,nil:bat[:oid],2,2,true,true,true);
|
| X_12:bat[:sht] := sql.bind(X_0,"sys","_tables","type",1);
|
-| X_60 := algebra.subselect(X_12,X_3,2,2,true,true,true);
|
-| X_18 := sql.subdelta(X_57,X_3,X_9,X_58,X_60);
|
+| C_60 := algebra.subselect(X_12,C_3,2,2,true,true,true);
|
+| C_18 := sql.subdelta(C_57,C_3,C_9,C_58,C_60);
|
| X_21:bat[:int] := sql.bind(X_0,"sys","_tables","id",0);
|
-| (X_23,r1_24) := sql.bind(X_0,"sys","_tables","id",2);
|
+| (C_23:bat[:oid],r1_24:bat[:int]) :=
sql.bind(X_0,"sys","_tables","id",2); |
| X_25:bat[:int] := sql.bind(X_0,"sys","_tables","id",1);
|
-| X_28 := sql.projectdelta(X_18,X_21,X_23,r1_24,X_25);
|
+| X_28 := sql.projectdelta(C_18,X_21,C_23,r1_24,X_25);
|
| X_29 := aggr.count(X_28);
|
| X_30 := sql.single(X_29);
|
| X_31 := bat.append(X_1,X_30,true);
|
-| X_32:bat[:oid] := sql.tid(X_0,"tmp","_tables");
|
+| C_32:bat[:oid] := sql.tid(X_0,"tmp","_tables");
|
| X_34:bat[:int] := sql.bind(X_0,"tmp","_tables","id",0);
|
-| X_35 := mosaic.projection(X_32,X_34);
|
+| X_35 := mosaic.projection(C_32,X_34);
|
| X_36 := aggr.count(X_35);
|
| X_37 := bat.append(X_31,X_36,true);
|
| X_38:lng := aggr.sum(X_37);
|
| sql.resultSet(".L3","L3","bigint",64,0,7,X_38);
|
| end user.s2_1;
|
| #inline actions= 0 time=1 usec
|
-| #remap actions= 0 time=3 usec
|
-| #costmodel actions= 1 time=2 usec
|
+| #remap actions= 0 time=2 usec
|
+| #costmodel actions= 1 time=1 usec
|
| #coercion actions= 1 time=6 usec
|
| #evaluate actions= 0 time=3 usec
|
+| #aliases actions= 0 time=5 usec
|
+| #pushselect actions= 4 time=26 usec
|
+| #mergetable actions= 0 time=26 usec
|
+| #deadcode actions= 4 time=6 usec
|
| #aliases actions= 0 time=6 usec
|
-| #pushselect actions= 4 time=29 usec
|
-| #mergetable actions= 0 time=30 usec
|
-| #deadcode actions= 4 time=7 usec
|
-| #aliases actions= 0 time=5 usec
|
-| #constants actions= 2 time=6 usec
|
-| #commonTerms actions= 0 time=6 usec
|
-| #projectionpath actions= 0 time=4 usec
|
-| #reorder actions= 1 time=22 usec
|
+| #constants actions= 2 time=5 usec
|
+| #commonTerms actions= 0 time=5 usec
|
+| #projectionpath actions= 0 time=3 usec
|
+| #reorder actions= 1 time=20 usec
|
| #deadcode actions= 0 time=5 usec
|
| #reduce actions=25 time=7 usec
|
-| #matpack actions= 0 time=3 usec
|
-| #multiplex actions= 0 time=11 usec
|
-| #profiler actions= 1 time=5 usec
|
+| #matpack actions= 0 time=2 usec
|
+| #multiplex actions= 0 time=2 usec
|
+| #profiler actions= 1 time=4 usec
|
| #candidates actions= 1 time=1 usec
|
-| #garbagecollector actions= 1 time=16 usec
|
-| #total actions= 1 time=271 usec
|
+| #garbagecollector actions= 1 time=14 usec
|
+| #total actions= 1 time=234 usec
|
+--------------------------------------------------------------------------------------------------+
49 rows
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
