natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 2a44a21e9a into 209ef2b6c4

This commit is contained in:
Dave Brosius 2026-07-28 19:01:22 -05:00 committed by GitHub
parent 209ef2b6c4 2a44a21e9a
commit c106f3b2f5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/java/org/apache/cassandra/db/lifecycle/LogAwareFileLister.java
View File

@ -190,8 +190,7 @@ final class LogAwareFileLister
private static boolean allFilesPresent(Map<LogRecord, Set<File>> oldFiles)
{
return !oldFiles.entrySet().stream()
.filter((e) -> e.getKey().numFiles > e.getValue().size())
.findFirst().isPresent();
.anyMatch((e) -> e.getKey().numFiles > e.getValue().size());
}
private void setTemporary(LogFile txnFile, Collection<Set<File>> oldFiles, Collection<Set<File>> newFiles)

2
src/java/org/apache/cassandra/index/sai/disk/IndexSearchResultIterator.java
View File

@ -124,7 +124,7 @@ public class IndexSearchResultIterator extends KeyRangeIterator
{
queryContext.sstablesHit += referencedIndexes
.stream()
.map(SSTableIndex::getSSTable).collect(Collectors.toSet()).size();
.map(SSTableIndex::getSSTable).count();
queryContext.checkpoint();
KeyRangeIterator union = KeyRangeUnionIterator.builder(sstableIntersections.size() + 1, () -> {})
.add(sstableIntersections)

2
src/java/org/apache/cassandra/index/sasi/utils/RangeUnionIterator.java
View File

@ -125,7 +125,7 @@ public class RangeUnionIterator<K extends Comparable<K>, D extends CombinedValue
FileUtils.closeQuietly(head);
}
ranges.addAll(changedRanges.stream().collect(Collectors.toList()));
ranges.addAll(changedRanges);
}
public void close() throws IOException

2
src/java/org/apache/cassandra/service/StorageService.java
View File

@ -6605,7 +6605,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
public void rebuildSecondaryIndex(String ksName, String cfName, String... idxNames)
{
String[] indices = asList(idxNames).stream()
String[] indices = Arrays.stream(idxNames)
.map(p -> isIndexColumnFamily(p) ? getIndexName(p) : p)
.collect(toList())
.toArray(new String[idxNames.length]);