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

Minor TokenMap performance improvement 

Patch by marcuse; reviewed by Dmitry Konstantinov and Sam Tunnicliffe for CASSANDRA-21223
This commit is contained in:
Marcus Eriksson 2026-03-16 15:04:41 +01:00
parent af5eed2a32
commit b6c274933e
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,4 +1,5 @@
6.0-alpha2
* Minor TokenMap performance improvement (CASSANDRA-21223)
* Handle lost response when committing PrepareMove (CASSANDRA-21222)
* SEPExecutor.maybeExecuteImmediately does not always execute tasks immediately despite available worker capacity (CASSANDRA-21429)
* Safely regain ranges and delete retired command stores (CASSANDRA-21212)

18
src/java/org/apache/cassandra/tcm/ownership/TokenMap.java
View File

@ -55,7 +55,7 @@ public class TokenMap implements MetadataValue<TokenMap>
private static final Logger logger = LoggerFactory.getLogger(TokenMap.class);
private final SortedBiMultiValMap<Token, NodeId> map;
private final List<Token> tokens;
private final ImmutableList<Token> tokens;
private final List<Range<Token>> ranges;
// TODO: move partitioner to the users (SimpleStrategy and Uniform Range Placement?)
private final IPartitioner partitioner;
@ -71,7 +71,7 @@ public class TokenMap implements MetadataValue<TokenMap>
this.lastModified = lastModified;
this.partitioner = partitioner;
this.map = map;
this.tokens = tokens();
this.tokens = ImmutableList.copyOf(map.keySet());
this.ranges = toRanges(tokens, partitioner);
}
@ -101,18 +101,6 @@ public class TokenMap implements MetadataValue<TokenMap>
return new TokenMap(lastModified, partitioner, finalisedCopy);
}
public TokenMap unassignTokens(NodeId id, Collection<Token> tokens)
{
SortedBiMultiValMap<Token, NodeId> finalisedCopy = SortedBiMultiValMap.create(map);
for (Token token : tokens)
{
NodeId nodeId = finalisedCopy.remove(token);
assert nodeId.equals(id);
}
return new TokenMap(lastModified, partitioner, finalisedCopy);
}
public SortedBiMultiValMap<Token, NodeId> asMap()
{
return SortedBiMultiValMap.create(map);
@ -130,7 +118,7 @@ public class TokenMap implements MetadataValue<TokenMap>
public ImmutableList<Token> tokens()
{
return ImmutableList.copyOf(map.keySet());
return tokens;
}
public ImmutableList<Token> tokens(NodeId nodeId)