Changeset: 4f74282eef5e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4f74282eef5e
Modified Files:
monetdb5/modules/mosaic/mosaic.c
sql/test/mosaic/Tests/analysis.stable.out
Branch: mosaic
Log Message:
Include analysis facts for mixes containing unused methods.
diffs (132 lines):
diff --git a/monetdb5/modules/mosaic/mosaic.c b/monetdb5/modules/mosaic/mosaic.c
--- a/monetdb5/modules/mosaic/mosaic.c
+++ b/monetdb5/modules/mosaic/mosaic.c
@@ -1421,7 +1421,6 @@ MOSAnalysis(BAT *b, BAT *btech, BAT *bla
for(j=0; j < MOSAIC_METHODS; j++){
if ( ((MosaicHdr) b->tmosaic->base)->blks[j] == 0) {
antipattern[antipatternSize++] = pattern[i];
- pat[i].include = false;
}
}
diff --git a/sql/test/mosaic/Tests/analysis.stable.out
b/sql/test/mosaic/Tests/analysis.stable.out
--- a/sql/test/mosaic/Tests/analysis.stable.out
+++ b/sql/test/mosaic/Tests/analysis.stable.out
@@ -33,17 +33,39 @@ stdout of test 'analysis` in directory '
% clob, double, json, json # type
% 18, 24, 39, 41 # length
[ "delta ", 15.998, "[[{\"delta\":1}]]", "[[{\"delta\":10000000}]]"
]
+[ "delta frame ", 15.998, "[[{\"delta\":1}]]",
"[[{\"delta\":10000000}]]" ]
+[ "delta linear ", 188679.25, "[[{\"linear\":1}]]",
"[[{\"linear\":10000000}]]" ]
+[ "delta prefix ", 15.998, "[[{\"delta\":1}]]",
"[[{\"delta\":10000000}]]" ]
[ "dict ", 0.571, "[[{\"dict\":1}]]", "[[{\"dict\":10000000}]]"
]
+[ "dict delta ", 15.998, "[[{\"delta\":1}]]",
"[[{\"delta\":10000000}]]" ]
[ "dict frame ", 0.572, "[[{\"dict\":1},{\"frame\":1}]]",
"[[{\"dict\":9967232},{\"frame\":32768}]]" ]
+[ "dict linear ", 188679.25, "[[{\"linear\":1}]]",
"[[{\"linear\":10000000}]]" ]
[ "dict prefix ", 0.572, "[[{\"dict\":1},{\"prefix\":1}]]",
"[[{\"dict\":9967232},{\"prefix\":32768}]]" ]
+[ "dict256 delta ", 15.998, "[[{\"delta\":1}]]",
"[[{\"delta\":10000000}]]" ]
[ "dict256 dict ", 0.571, "[[{\"dict256\":1},{\"dict\":1}]]",
"[[{\"dict256\":256},{\"dict\":9999744}]]" ]
+[ "dict256 frame ", 2.132, "[[{\"frame\":306}]]",
"[[{\"frame\":10000000}]]" ]
+[ "dict256 linear ", 188679.25, "[[{\"linear\":1}]]",
"[[{\"linear\":10000000}]]" ]
+[ "dict256 prefix ", 2.132, "[[{\"prefix\":306}]]",
"[[{\"prefix\":10000000}]]" ]
[ "frame ", 2.132, "[[{\"frame\":306}]]", "[[{\"frame\":10000000}]]"
]
+[ "frame prefix ", 2.132, "[[{\"frame\":306}]]",
"[[{\"frame\":10000000}]]" ]
[ "linear ", 188679.25, "[[{\"linear\":1}]]",
"[[{\"linear\":10000000}]]" ]
+[ "linear frame ", 188679.25, "[[{\"linear\":1}]]",
"[[{\"linear\":10000000}]]" ]
+[ "linear prefix ", 188679.25, "[[{\"linear\":1}]]",
"[[{\"linear\":10000000}]]" ]
[ "prefix ", 2.132, "[[{\"prefix\":306}]]", "[[{\"prefix\":10000000}]]"
]
+[ "raw delta ", 15.998, "[[{\"delta\":1}]]",
"[[{\"delta\":10000000}]]" ]
[ "raw dict ", 0.571, "[[{\"raw\":1},{\"dict\":1}]]",
"[[{\"raw\":1},{\"dict\":9999999}]]" ]
[ "raw dict256 ", 0.999, "[[{\"raw\":2},{\"dict256\":1}]]",
"[[{\"raw\":9999745},{\"dict256\":255}]]" ]
+[ "raw frame ", 2.132, "[[{\"frame\":306}]]",
"[[{\"frame\":10000000}]]" ]
+[ "raw linear ", 188679.25, "[[{\"linear\":1}]]",
"[[{\"linear\":10000000}]]" ]
+[ "raw prefix ", 2.132, "[[{\"prefix\":306}]]",
"[[{\"prefix\":10000000}]]" ]
+[ "raw runlength ", 0.999, "[[{\"raw\":1}]]",
"[[{\"raw\":10000000}]]" ]
[ "runlength ", 0.333, "[[{\"runlength\":10000000}]]",
"[[{\"runlength\":10000000}]]" ]
+[ "runlength delta ", 15.998, "[[{\"delta\":1}]]",
"[[{\"delta\":10000000}]]" ]
+[ "runlength dict ", 0.571, "[[{\"dict\":1}]]",
"[[{\"dict\":10000000}]]" ]
[ "runlength dict256 ", 0.333,
"[[{\"runlength\":9999744},{\"dict256\":1}]]",
"[[{\"runlength\":9999744},{\"dict256\":256}]]" ]
+[ "runlength frame ", 2.132, "[[{\"frame\":306}]]",
"[[{\"frame\":10000000}]]" ]
+[ "runlength linear ", 188679.25, "[[{\"linear\":1}]]",
"[[{\"linear\":10000000}]]" ]
+[ "runlength prefix ", 2.132, "[[{\"prefix\":306}]]",
"[[{\"prefix\":10000000}]]" ]
#insert into tmp4 select 10000000 from tmp4;
[ 10000000 ]
#select technique, factor, json.filter(layout, 'blks') as blocks,
json.filter(layout, 'elms') as elements from mosaic.analysis('sys', 'tmp4',
'i') order by technique, factor desc;
@@ -53,24 +75,38 @@ stdout of test 'analysis` in directory '
% 18, 24, 39, 46 # length
[ "delta ", 15.999, "[[{\"delta\":2}]]", "[[{\"delta\":20000000}]]"
]
[ "delta frame ", 17.401, "[[{\"delta\":1},{\"frame\":1}]]",
"[[{\"delta\":16777215},{\"frame\":3222785}]]" ]
+[ "delta linear ", 350877.187, "[[{\"linear\":2}]]",
"[[{\"linear\":20000000}]]" ]
[ "delta prefix ", 17.401, "[[{\"delta\":1},{\"prefix\":1}]]",
"[[{\"delta\":16777215},{\"prefix\":3222785}]]" ]
[ "dict ", 0.799, "[[{\"dict\":2}]]", "[[{\"dict\":20000000}]]"
]
[ "dict delta ", 1.485, "[[{\"dict\":1},{\"delta\":1}]]",
"[[{\"dict\":3222785},{\"delta\":16777215}]]" ]
[ "dict frame ", 0.882, "[[{\"dict\":1},{\"frame\":2}]]",
"[[{\"dict\":16777215},{\"frame\":3222785}]]" ]
+[ "dict linear ", 350877.187, "[[{\"linear\":2}]]",
"[[{\"linear\":20000000}]]" ]
[ "dict prefix ", 0.882, "[[{\"dict\":1},{\"prefix\":2}]]",
"[[{\"dict\":16777215},{\"prefix\":3222785}]]" ]
[ "dict256 delta ", 17.401, "[[{\"dict256\":1},{\"delta\":1}]]",
"[[{\"dict256\":3222785},{\"delta\":16777215}]]" ]
[ "dict256 dict ", 0.881, "[[{\"dict256\":1},{\"dict\":1}]]",
"[[{\"dict256\":3222785},{\"dict\":16777215}]]" ]
+[ "dict256 frame ", 2.285, "[[{\"frame\":306}]]",
"[[{\"frame\":20000000}]]" ]
+[ "dict256 linear ", 350877.187, "[[{\"linear\":2}]]",
"[[{\"linear\":20000000}]]" ]
+[ "dict256 prefix ", 2.285, "[[{\"prefix\":306}]]",
"[[{\"prefix\":20000000}]]" ]
[ "frame ", 2.285, "[[{\"frame\":306}]]", "[[{\"frame\":20000000}]]"
]
+[ "frame prefix ", 2.285, "[[{\"frame\":306}]]",
"[[{\"frame\":20000000}]]" ]
[ "linear ", 350877.187, "[[{\"linear\":2}]]",
"[[{\"linear\":20000000}]]" ]
+[ "linear frame ", 350877.187, "[[{\"linear\":2}]]",
"[[{\"linear\":20000000}]]" ]
+[ "linear prefix ", 350877.187, "[[{\"linear\":2}]]",
"[[{\"linear\":20000000}]]" ]
[ "prefix ", 2.285, "[[{\"prefix\":306}]]", "[[{\"prefix\":20000000}]]"
]
+[ "raw delta ", 15.999, "[[{\"delta\":2}]]",
"[[{\"delta\":20000000}]]" ]
[ "raw dict ", 0.775, "[[{\"raw\":2},{\"dict\":1}]]",
"[[{\"raw\":3222785},{\"dict\":16777215}]]" ]
[ "raw dict256 ", 1.56, "[[{\"raw\":1},{\"dict256\":1}]]",
"[[{\"raw\":9999745},{\"dict256\":10000255}]]" ]
+[ "raw frame ", 2.285, "[[{\"frame\":306}]]",
"[[{\"frame\":20000000}]]" ]
+[ "raw linear ", 350877.187, "[[{\"linear\":2}]]",
"[[{\"linear\":20000000}]]" ]
+[ "raw prefix ", 2.285, "[[{\"prefix\":306}]]",
"[[{\"prefix\":20000000}]]" ]
[ "raw runlength ", 1.999, "[[{\"raw\":1},{\"runlength\":1}]]",
"[[{\"raw\":10000000},{\"runlength\":10000000}]]" ]
[ "runlength ", 0.666, "[[{\"runlength\":10000001}]]",
"[[{\"runlength\":20000000}]]" ]
[ "runlength delta ", 19.072, "[[{\"runlength\":1},{\"delta\":1}]]",
"[[{\"runlength\":3222785},{\"delta\":16777215}]]" ]
[ "runlength dict ", 0.885, "[[{\"runlength\":1},{\"dict\":1}]]",
"[[{\"runlength\":3222785},{\"dict\":16777215}]]" ]
[ "runlength dict256 ", 0.609,
"[[{\"runlength\":9999745},{\"dict256\":1}]]",
"[[{\"runlength\":9999745},{\"dict256\":10000255}]]" ]
+[ "runlength frame ", 2.285, "[[{\"frame\":306}]]",
"[[{\"frame\":20000000}]]" ]
[ "runlength linear ", 357142.843, "[[{\"runlength\":1},{\"linear\":1}]]",
"[[{\"runlength\":9999999},{\"linear\":10000001}]]" ]
+[ "runlength prefix ", 2.285, "[[{\"prefix\":306}]]",
"[[{\"prefix\":20000000}]]" ]
#select technique, factor, json.filter(layout, 'blks') as blocks,
json.filter(layout, 'elms') as elements from mosaic.analysis('sys', 'tmp4',
'i', 'linear, runlength') order by technique, factor desc;
% .%5, .%5, ., . # table_name
% technique, factor, blocks, elements # name
@@ -88,24 +124,38 @@ stdout of test 'analysis` in directory '
% 18, 24, 39, 46 # length
[ "delta ", 15.999, "[[{\"delta\":2}]]", "[[{\"delta\":20000000}]]"
]
[ "delta frame ", 17.401, "[[{\"delta\":1},{\"frame\":1}]]",
"[[{\"delta\":16777215},{\"frame\":3222785}]]" ]
+[ "delta linear ", 350877.187, "[[{\"linear\":2}]]",
"[[{\"linear\":20000000}]]" ]
[ "delta prefix ", 17.401, "[[{\"delta\":1},{\"prefix\":1}]]",
"[[{\"delta\":16777215},{\"prefix\":3222785}]]" ]
[ "dict ", 0.799, "[[{\"dict\":2}]]", "[[{\"dict\":20000000}]]"
]
[ "dict delta ", 1.485, "[[{\"dict\":1},{\"delta\":1}]]",
"[[{\"dict\":3222785},{\"delta\":16777215}]]" ]
[ "dict frame ", 0.882, "[[{\"dict\":1},{\"frame\":2}]]",
"[[{\"dict\":16777215},{\"frame\":3222785}]]" ]
+[ "dict linear ", 350877.187, "[[{\"linear\":2}]]",
"[[{\"linear\":20000000}]]" ]
[ "dict prefix ", 0.882, "[[{\"dict\":1},{\"prefix\":2}]]",
"[[{\"dict\":16777215},{\"prefix\":3222785}]]" ]
[ "dict256 delta ", 17.401, "[[{\"dict256\":1},{\"delta\":1}]]",
"[[{\"dict256\":3222785},{\"delta\":16777215}]]" ]
[ "dict256 dict ", 0.881, "[[{\"dict256\":1},{\"dict\":1}]]",
"[[{\"dict256\":3222785},{\"dict\":16777215}]]" ]
+[ "dict256 frame ", 2.285, "[[{\"frame\":306}]]",
"[[{\"frame\":20000000}]]" ]
+[ "dict256 linear ", 350877.187, "[[{\"linear\":2}]]",
"[[{\"linear\":20000000}]]" ]
+[ "dict256 prefix ", 2.285, "[[{\"prefix\":306}]]",
"[[{\"prefix\":20000000}]]" ]
[ "frame ", 2.285, "[[{\"frame\":306}]]", "[[{\"frame\":20000000}]]"
]
+[ "frame prefix ", 2.285, "[[{\"frame\":306}]]",
"[[{\"frame\":20000000}]]" ]
[ "linear ", 350877.187, "[[{\"linear\":2}]]",
"[[{\"linear\":20000000}]]" ]
+[ "linear frame ", 350877.187, "[[{\"linear\":2}]]",
"[[{\"linear\":20000000}]]" ]
+[ "linear prefix ", 350877.187, "[[{\"linear\":2}]]",
"[[{\"linear\":20000000}]]" ]
[ "prefix ", 2.285, "[[{\"prefix\":306}]]", "[[{\"prefix\":20000000}]]"
]
+[ "raw delta ", 15.999, "[[{\"delta\":2}]]",
"[[{\"delta\":20000000}]]" ]
[ "raw dict ", 0.775, "[[{\"raw\":2},{\"dict\":1}]]",
"[[{\"raw\":3222785},{\"dict\":16777215}]]" ]
[ "raw dict256 ", 1.56, "[[{\"raw\":1},{\"dict256\":1}]]",
"[[{\"raw\":9999745},{\"dict256\":10000255}]]" ]
+[ "raw frame ", 2.285, "[[{\"frame\":306}]]",
"[[{\"frame\":20000000}]]" ]
+[ "raw linear ", 350877.187, "[[{\"linear\":2}]]",
"[[{\"linear\":20000000}]]" ]
+[ "raw prefix ", 2.285, "[[{\"prefix\":306}]]",
"[[{\"prefix\":20000000}]]" ]
[ "raw runlength ", 1.999, "[[{\"raw\":1},{\"runlength\":1}]]",
"[[{\"raw\":10000000},{\"runlength\":10000000}]]" ]
[ "runlength ", 0.666, "[[{\"runlength\":10000001}]]",
"[[{\"runlength\":20000000}]]" ]
[ "runlength delta ", 19.072, "[[{\"runlength\":1},{\"delta\":1}]]",
"[[{\"runlength\":3222785},{\"delta\":16777215}]]" ]
[ "runlength dict ", 0.885, "[[{\"runlength\":1},{\"dict\":1}]]",
"[[{\"runlength\":3222785},{\"dict\":16777215}]]" ]
[ "runlength dict256 ", 0.609,
"[[{\"runlength\":9999745},{\"dict256\":1}]]",
"[[{\"runlength\":9999745},{\"dict256\":10000255}]]" ]
+[ "runlength frame ", 2.285, "[[{\"frame\":306}]]",
"[[{\"frame\":20000000}]]" ]
[ "runlength linear ", 357142.843, "[[{\"runlength\":1},{\"linear\":1}]]",
"[[{\"runlength\":9999999},{\"linear\":10000001}]]" ]
+[ "runlength prefix ", 2.285, "[[{\"prefix\":306}]]",
"[[{\"prefix\":20000000}]]" ]
#select technique, factor, json.filter(layout, 'blks') as blocks,
json.filter(layout, 'elms') as elements from mosaic.analysis('sys', 'tmp4',
'i', 'linear, runlength') order by technique, factor desc;
% .%5, .%5, ., . # table_name
% technique, factor, blocks, elements # name
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
