MonetDB: mosaic - Allow the 'raw' storage strategy to be combine...

[Aris Koning]

Changeset: 9f399f7875c0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9f399f7875c0
Modified Files:
        sql/backends/monet5/sql_cat.c
        sql/backends/monet5/sql_cat.h
Branch: mosaic
Log Message:

Allow the 'raw' storage strategy to be combined with a single other non-trivial 
strategy.


diffs (25 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
@@ -908,8 +908,8 @@ alter_table(Client cntxt, mvc *sql, char
                                for(int i = 0, nr_strategies = 0; i< 
MOSAIC_METHODS; i++){
                                        if ( (task->filter[i] = 
strstr(c->storage_type,MOSfiltername[i]) != 0) )
                                        {
-                                               if (++nr_strategies > 1)
-                                                       throw(SQL, "sql.alter", 
"Illegal additional compression strategy: %s.", MOSfiltername[i]);
+                                               if 
(strstr(c->storage_type,"raw") == 0 && ++nr_strategies > 1)
+                                                       throw(SQL, "sql.alter", 
NON_TRIVIAL_MIX_NOT_ALLOWED);
                                        }
                                }
 
diff --git a/sql/backends/monet5/sql_cat.h b/sql/backends/monet5/sql_cat.h
--- a/sql/backends/monet5/sql_cat.h
+++ b/sql/backends/monet5/sql_cat.h
@@ -23,6 +23,7 @@
 #endif
 
 #define MOSAIC_STRATEGY_NOT_ALLOWED "Currently MonetDB does not support the 
mosaic storage strategy."
+#define NON_TRIVIAL_MIX_NOT_ALLOWED "Currently only one non-trivial 
compression strategy is allowed."
 
 #include "sql.h"
 #include "mal_backend.h"
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list