Changeset: 4e7ff3e2b6ba for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4e7ff3e2b6ba
Modified Files:
sql/backends/monet5/sql_cat.c
Branch: mosaic
Log Message:
Work around for compressing dict256.
diffs (20 lines):
diff --git a/sql/backends/monet5/sql_cat.c b/sql/backends/monet5/sql_cat.c
--- a/sql/backends/monet5/sql_cat.c
+++ b/sql/backends/monet5/sql_cat.c
@@ -926,11 +926,15 @@ alter_table(Client cntxt, mvc *sql, char
"sql.alter",
MOSAIC_STRATEGY_NOT_ALLOWED);
int contains_explicit_raw =
strstr(c->storage_type,"raw") != NULL ? 1 : 0;
+ /* TODO: ugly work around to handle the fact
that dict256 will match dict and dict256.
+ * Will be removed once we get rid of the
restriction on non-trivial mixes of compression methods.
+ */
+ int contains_explicit_dict256 =
strstr(c->storage_type,"dict256") != NULL ? 1 : 0;
for(int i = 0, nr_strategies = 0; i<
MOSAIC_METHODS; i++){
if (
(strstr(c->storage_type,MOSmethods[i].name) && MOSisTypeAllowed(i, b) ))
{
- if ( (++nr_strategies -
contains_explicit_raw) > 1) {
+ if ( (++nr_strategies -
contains_explicit_raw - contains_explicit_dict256) > 1) {
BBPunfix(b->batCacheid);
throw(SQL, "sql.alter",
NON_TRIVIAL_MIX_NOT_ALLOWED);
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
