dcapwell commented on code in PR #4257:
URL: https://github.com/apache/cassandra/pull/4257#discussion_r2211285108
##########
src/java/org/apache/cassandra/service/accord/RouteInMemoryIndex.java:
##########
@@ -151,46 +166,74 @@ private void add(TxnId id, Unseekable keyOrRange)
tableIndex.computeIfAbsent(tableId, i -> new TableIndex()).add(id,
ts);
}
- public void search(TableId tableId, byte[] start, byte[] end,
Consumer<Map.Entry<IndexRange, TxnId>> fn)
+ public void search(TableId tableId,
+ byte[] start, byte[] end,
+ TxnId minTxnId, Timestamp maxTxnId,
+ Consumer<Map.Entry<IndexRange, TxnId>> fn)
{
TableIndex index = tableIndex.get(tableId);
if (index == null) return;
- index.search(start, end, fn);
+ index.search(start, end, minTxnId, maxTxnId, fn);
}
- public void search(TableId tableId, byte[] key,
Consumer<Map.Entry<IndexRange, TxnId>> fn)
+ public void search(TableId tableId,
+ byte[] key,
+ TxnId minTxnId, Timestamp maxTxnId,
+ Consumer<Map.Entry<IndexRange, TxnId>> fn)
{
TableIndex index = tableIndex.get(tableId);
if (index == null) return;
- index.search(key, fn);
+ index.search(key, minTxnId, maxTxnId, fn);
}
}
private static class TableIndex
{
private final RangeTree<byte[], IndexRange, TxnId> index =
createRangeTree();
+ private TxnId min = TxnId.MAX;
+ private TxnId max = TxnId.NONE;
private TableIndex()
{
}
- public void add(TxnId id, TokenRange ts)
+ private void add(TxnId id, TokenRange ts)
{
byte[] start =
OrderedRouteSerializer.serializeTokenOnly(ts.start());
byte[] end = OrderedRouteSerializer.serializeTokenOnly(ts.end());
IndexRange range = new IndexRange(start, end);
index.add(range, id);
+ if (min.compareTo(id) > 0)
+ min = id;
+ if (max.compareTo(id) < 0)
+ max = id;
}
- public void search(byte[] start, byte[] end,
Consumer<Map.Entry<IndexRange, TxnId>> fn)
+ private void search(byte[] start, byte[] end,
+ TxnId minTxnId, Timestamp maxTxnId,
+ Consumer<Map.Entry<IndexRange, TxnId>> fn)
{
- index.search(new IndexRange(start, end), fn);
+ if (minTxnId.compareTo(max) > 0) return;
+ if (maxTxnId.compareTo(min) < 0) return;
+ index.search(new IndexRange(start, end), e -> {
+ if (minTxnId.compareTo(e.getValue()) > 0) return;
+ if (maxTxnId.compareTo(e.getValue()) < 0) return;
Review Comment:
stated in other comments, this is going to happen higher up so its not 100%
needed, but it will drastically shrink the amount of data put into the
`TreeSet` that requires post-filtering; so still best to keep it.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
