storage_proxy: Fix ordering comparator used during merging and reconciliation

This commit is contained in:
Tomasz Grabiec
2015-07-20 17:06:53 +02:00
parent bad7602299
commit abdb36a0f6

View File

@@ -1479,7 +1479,7 @@ public:
} else {
auto lhk = lh.result->partitions().back().mut().key(s);
auto rhk = rh.result->partitions().back().mut().key(s);
return lhk.legacy_tri_compare(s, rhk) > 0;
return lhk.ring_order_tri_compare(s, rhk) > 0;
}
};
@@ -2978,7 +2978,7 @@ public:
auto cmp = [this] (const partition_run& r1, const partition_run& r2) {
const partition& p1 = r1.current();
const partition& p2 = r2.current();
return p1._m.key(*_schema).legacy_tri_compare(*_schema, p2._m.key(*_schema)) > 0;
return p1._m.key(*_schema).ring_order_tri_compare(*_schema, p2._m.key(*_schema)) > 0;
};
boost::range::make_heap(_runs, cmp);