Skip to content

CASSANDRA-21223 Minor TokenMap performance improvement #4677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
krummas wants to merge 1 commit into
base: trunk
Choose a base branch
from
+3 −15
Open

CASSANDRA-21223 Minor TokenMap performance improvement #4677

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 3 additions & 15 deletions src/java/org/apache/cassandra/tcm/ownership/TokenMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -71,7 +71,7 @@ private TokenMap(Epoch lastModified, IPartitioner partitioner, SortedBiMultiValM
this.lastModified = lastModified;
this.partitioner = partitioner;
this.map = map;
this.tokens = tokens();
this.tokens = ImmutableList.copyOf(map.keySet());
this.ranges = toRanges(tokens, partitioner);
}

Expand Down Expand Up @@ -101,18 +101,6 @@ public TokenMap unassignTokens(NodeId id)
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);
Expand All @@ -130,7 +118,7 @@ public IPartitioner partitioner()

public ImmutableList<Token> tokens()
{
return ImmutableList.copyOf(map.keySet());
return tokens;
}

public ImmutableList<Token> tokens(NodeId nodeId)
Expand Down