This is an automated email from the ASF dual-hosted git repository.
mikea pushed a change to branch cassandra-5.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 790798dea0 Merge branch 'cassandra-4.1' into cassandra-5.0
add 3b05051f86 Simplify segment building in SAI to use single in-memory
structure This removes the RAMStringIndexer for literal indexes and replaces
it with a SegmentTrieBuffer that replaces BlockBalancedTreeRamBuffer for
literal and numeric indexes.
No new revisions were added by this update.
Summary of changes:
.../config/CassandraRelevantProperties.java | 2 +-
.../index/sai/disk/v1/MemtableIndexWriter.java | 35 ++---
.../index/sai/disk/v1/SSTableIndexWriter.java | 18 +--
.../disk/v1/bbtree/BlockBalancedTreeIterator.java | 103 -------------
.../disk/v1/bbtree/BlockBalancedTreeWriter.java | 49 +++---
.../sai/disk/v1/bbtree/NumericIndexWriter.java | 41 ++---
.../v1/segment/LiteralIndexSegmentSearcher.java | 2 +-
.../index/sai/disk/v1/segment/SegmentBuilder.java | 116 ++++----------
.../SegmentTrieBuffer.java} | 65 ++++++--
.../sai/disk/v1/segment/SegmentWriter.java} | 27 ++--
.../index/sai/disk/v1/trie/LiteralIndexWriter.java | 89 +++++------
.../index/sai/memory/ByteSliceReader.java | 128 ----------------
.../index/sai/memory/MemtableTermsIterator.java | 48 +++---
.../index/sai/memory/RAMPostingSlices.java | 137 -----------------
.../index/sai/memory/RAMStringIndexer.java | 167 ---------------------
.../index/sai/memory/TrieMemoryIndex.java | 37 +----
.../sai/utils/{RangeUtil.java => IndexEntry.java} | 21 ++-
.../cassandra/index/sai/utils/IndexTermType.java | 6 +-
.../cassandra/index/sai/utils/TermsIterator.java | 16 +-
.../test/sai/IndexStreamingFailureTest.java | 3 +-
.../org/apache/cassandra/index/sai/SAITester.java | 29 ++--
.../sai/disk/v1/BalancedTreeIndexSearcherTest.java | 36 ++---
.../index/sai/disk/v1/InvertedIndexBuilder.java | 4 +-
.../sai/disk/v1/InvertedIndexSearcherTest.java | 13 +-
.../index/sai/disk/v1/SegmentFlushTest.java | 10 +-
.../index/sai/disk/v1/TermsReaderTest.java | 17 +--
.../cassandra/index/sai/disk/v1/TermsScanner.java | 38 ++---
.../v1/bbtree/BlockBalancedTreeIndexBuilder.java | 13 +-
.../v1/bbtree/BlockBalancedTreeQueriesTest.java | 4 +-
.../v1/bbtree/BlockBalancedTreeReaderTest.java | 63 +++-----
.../sai/disk/v1/bbtree/BlockBalancedTreeTest.java | 10 +-
.../sai/disk/v1/bbtree/NumericIndexWriterTest.java | 19 +--
.../SegmentRamBufferTest.java} | 23 ++-
.../index/sai/memory/RAMPostingSlicesTest.java | 80 ----------
.../index/sai/memory/RAMStringIndexerTest.java | 115 --------------
.../index/sai/memory/TrieMemoryIndexTest.java | 4 +-
.../index/sai/memory/VectorMemoryIndexTest.java | 2 +-
37 files changed, 366 insertions(+), 1224 deletions(-)
delete mode 100644
src/java/org/apache/cassandra/index/sai/disk/v1/bbtree/BlockBalancedTreeIterator.java
rename
src/java/org/apache/cassandra/index/sai/disk/v1/{bbtree/BlockBalancedTreeRamBuffer.java
=> segment/SegmentTrieBuffer.java} (59%)
copy src/java/org/apache/cassandra/{schema/Difference.java =>
index/sai/disk/v1/segment/SegmentWriter.java} (52%)
delete mode 100644
src/java/org/apache/cassandra/index/sai/memory/ByteSliceReader.java
delete mode 100644
src/java/org/apache/cassandra/index/sai/memory/RAMPostingSlices.java
delete mode 100644
src/java/org/apache/cassandra/index/sai/memory/RAMStringIndexer.java
copy src/java/org/apache/cassandra/index/sai/utils/{RangeUtil.java =>
IndexEntry.java} (62%)
rename
test/unit/org/apache/cassandra/index/sai/disk/v1/{bbtree/BlockBalancedTreeRamBufferTest.java
=> segment/SegmentRamBufferTest.java} (74%)
delete mode 100644
test/unit/org/apache/cassandra/index/sai/memory/RAMPostingSlicesTest.java
delete mode 100644
test/unit/org/apache/cassandra/index/sai/memory/RAMStringIndexerTest.java
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
