Changeset: 853a52c74481 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/853a52c74481
Modified Files:
sql/storage/bat/bat_table.c
Branch: Jul2021
Log Message:
Partly revert my last commit, I am not sure about this optimization
diffs (31 lines):
diff --git a/sql/storage/bat/bat_table.c b/sql/storage/bat/bat_table.c
--- a/sql/storage/bat/bat_table.c
+++ b/sql/storage/bat/bat_table.c
@@ -752,16 +752,25 @@ rids_diff(sql_trans *tr, rids *l, sql_co
}
rcb = s;
- diff = BATdiff(lcb, rcb, l->data, NULL, false, false, BUN_NONE);
+ s = BATproject(l->data, lcb);
+ if (s == NULL) {
+ bat_destroy(lcb);
+ bat_destroy(rcb);
+ return NULL;
+ }
+
+ diff = BATdiff(s, rcb, NULL, NULL, false, false, BUN_NONE);
bat_destroy(rcb);
if (diff == NULL) {
bat_destroy(lcb);
+ bat_destroy(s);
return NULL;
}
- ret = BATjoin(&rids, NULL, lcb, lcb, NULL, diff, false, BATcount(lcb) -
BATcount(diff));
+ ret = BATjoin(&rids, NULL, lcb, s, NULL, diff, false, BATcount(s));
bat_destroy(diff);
bat_destroy(lcb);
+ bat_destroy(s);
if (ret != GDK_SUCCEED)
return NULL;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
