This is an automated email from the ASF dual-hosted git repository. mikea pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit f76f328622083b3f40577562c8bc698ce92b496b Merge: bc0c8f6317 3b05051f86 Author: Mike Adamson <[email protected]> AuthorDate: Wed Dec 20 15:23:13 2023 +0000 Merge branch 'cassandra-5.0' into trunk .../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 ++++++-- .../v1/segment/SegmentWriter.java} | 36 +++-- .../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 +---- .../utils/{TermsIterator.java => IndexEntry.java} | 32 ++-- .../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, 367 insertions(+), 1243 deletions(-) diff --cc test/unit/org/apache/cassandra/index/sai/memory/VectorMemoryIndexTest.java index b29f72017c,2714cab1f2..2fafaf9ce0 --- a/test/unit/org/apache/cassandra/index/sai/memory/VectorMemoryIndexTest.java +++ b/test/unit/org/apache/cassandra/index/sai/memory/VectorMemoryIndexTest.java @@@ -110,8 -100,11 +110,8 @@@ public class VectorMemoryIndexTest exte @Before public void setup() throws Throwable { - TokenMetadata metadata = StorageService.instance.getTokenMetadata(); - metadata.updateNormalTokens(BootStrapper.getRandomTokens(metadata, 10), FBUtilities.getBroadcastAddressAndPort()); - dimensionCount = getRandom().nextIntBetween(2, 2048); - index = SAITester.createMockIndex("index", VectorType.getInstance(FloatType.instance, dimensionCount)); + index = SAITester.createMockIndex(VectorType.getInstance(FloatType.instance, dimensionCount)); cfs = index.baseCfs(); partitioner = cfs.getPartitioner(); indexSearchCounter.reset(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
