Changeset: c0edb092198c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c0edb092198c
Modified Files:
sql/storage/bat/bat_storage.c
sql/storage/store.c
Branch: default
Log Message:
Not only strings are duplicate eliminated
diffs (24 lines):
diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -2397,7 +2397,7 @@ double_elim_col(sql_trans *tr, sql_colum
else if (b && b->ttype == TYPE_sht)
de = 2;
}
- } else if (col && ATOMIC_PTR_GET(&col->data)) {
+ } else if (col && ATOMstorage(col->type.type->localtype) == TYPE_str &&
ATOMIC_PTR_GET(&col->data)) {
BAT *b = bind_col(tr, col, QUICK);
if (b && ATOMstorage(b->ttype) == TYPE_str) { /* check double
elimination */
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -6184,7 +6184,7 @@ int
sql_trans_is_duplicate_eliminated( sql_trans *tr, sql_column *col )
{
sqlstore *store = tr->store;
- if (col && isTable(col->t) && ATOMstorage(col->type.type->localtype) ==
TYPE_str && store->storage_api.double_elim_col)
+ if (col && isTable(col->t) && store->storage_api.double_elim_col)
return store->storage_api.double_elim_col(tr, col);
return 0;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
