CC5 cleanup merge conflict markers after porting CNDB-13457

djatnieks · djatnieks · commit 124be376d3e7 · 2025-04-21T18:45:15.000-07:00
diff --git a/src/java/org/apache/cassandra/index/sai/memory/TrieMemoryIndex.java b/src/java/org/apache/cassandra/index/sai/memory/TrieMemoryIndex.java
@@ -273,7 +273,6 @@ private void applyTransformer(PrimaryKey primaryKey,
     }
 
     @Override
-//<<<<<<< HEAD
     public KeyRangeIterator search(Expression expression, AbstractBounds<PartitionPosition> keyRange)
     {
         if (logger.isTraceEnabled())
@@ -294,10 +293,7 @@ public KeyRangeIterator search(Expression expression, AbstractBounds<PartitionPo
     }
 
     @Override
-//    public Iterator<Pair<ByteComparable, List<PkWithFrequency>>> iterator()
-//=======
     public Iterator<Pair<ByteComparable.Preencoded, List<PkWithFrequency>>> iterator()
-//>>>>>>> 362af8d863 (CNDB-13457: Fix problems with byte-comparable versions in SAI  (#1655))
     {
         Iterator<Map.Entry<ByteComparable.Preencoded, PrimaryKeys>> iterator = data.entrySet().iterator();
         return new Iterator<>()

Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,6 @@ private void applyTransformer(PrimaryKey primaryKey,`
`273`	`273`	`}`
`274`	`274`
`275`	`275`	`@Override`
`276`		`-//<<<<<<< HEAD`
`277`	`276`	`public KeyRangeIterator search(Expression expression, AbstractBounds<PartitionPosition> keyRange)`
`278`	`277`	`{`
`279`	`278`	`if (logger.isTraceEnabled())`
`@@ -294,10 +293,7 @@ public KeyRangeIterator search(Expression expression, AbstractBounds<PartitionPo`
`294`	`293`	`}`
`295`	`294`
`296`	`295`	`@Override`
`297`		`-// public Iterator<Pair<ByteComparable, List<PkWithFrequency>>> iterator()`
`298`		`-//=======`
`299`	`296`	`public Iterator<Pair<ByteComparable.Preencoded, List<PkWithFrequency>>> iterator()`
`300`		`-//>>>>>>> 362af8d863 (CNDB-13457: Fix problems with byte-comparable versions in SAI (#1655))`
`301`	`297`	`{`
`302`	`298`	`Iterator<Map.Entry<ByteComparable.Preencoded, PrimaryKeys>> iterator = data.entrySet().iterator();`
`303`	`299`	`return new Iterator<>()`