-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
ebf2c40
commit c441c7c
Showing
4 changed files
with
280 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.palantir.cassandra.utils; | ||
|
|
||
| import java.net.InetAddress; | ||
| import java.util.*; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| import com.google.common.collect.Multimap; | ||
| import com.google.common.collect.Sets; | ||
|
|
||
| import org.apache.cassandra.dht.Range; | ||
| import org.apache.cassandra.dht.Token; | ||
| import org.apache.cassandra.locator.PendingRangeMaps; | ||
| import org.apache.cassandra.utils.Pair; | ||
|
|
||
|
|
||
| public final class MapUtils | ||
| { | ||
| private MapUtils() | ||
| { | ||
| } | ||
|
|
||
| /** | ||
| * Returns a list of endpoints where its token range intersect with any token ranges in the input list. | ||
| */ | ||
| public static Set<InetAddress> intersection(Multimap<Range<Token>, InetAddress> addressRanges, Collection<Range<Token>> tokenRanges) | ||
| { | ||
| Set<InetAddress> intersection = new HashSet<>(); | ||
|
|
||
| for (Map.Entry<Range<Token>, InetAddress> entry : addressRanges.entries()) | ||
| { | ||
| for (Range<Token> range : tokenRanges) | ||
| { | ||
| if (entry.getKey().intersects(range)) | ||
| { | ||
| intersection.add(entry.getValue()); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return intersection; | ||
| } | ||
|
|
||
| /** | ||
| * Merge the pending ranges per endpoint and return as a sorted list. | ||
| */ | ||
| public static Map<InetAddress, List<Range<Token>>> coalesce(PendingRangeMaps pendingRangeMaps) | ||
| { | ||
| Map<InetAddress, List<Range<Token>>> coalesced = new HashMap<>(); | ||
|
|
||
| for (Map.Entry<Range<Token>, List<InetAddress>> entry : pendingRangeMaps) | ||
| { | ||
| for (InetAddress endpoint : entry.getValue()) | ||
| { | ||
| coalesced.computeIfAbsent(endpoint, _k -> new ArrayList<>()).add(entry.getKey()); | ||
| } | ||
| } | ||
| coalesced.replaceAll((_k, tokenRanges) -> sort(tokenRanges)); | ||
|
|
||
| return coalesced; | ||
| } | ||
|
|
||
| /** | ||
| * Similar to {@link MapUtils#coalesce(Multimap)} | ||
| */ | ||
| public static Map<InetAddress, List<Token>> coalesce(Multimap<InetAddress, Token> endpointToken) | ||
| { | ||
| Map<InetAddress, List<Token>> coalesced = new HashMap<>(); | ||
|
|
||
| for (InetAddress endpoint : endpointToken.keys()) | ||
| { | ||
| coalesced.put(endpoint, sort(endpointToken.get(endpoint))); | ||
| } | ||
|
|
||
| return coalesced; | ||
| } | ||
|
|
||
| private static <T> List<T> sort(Collection<T> collection) { | ||
| return collection.stream().sorted().collect(Collectors.toList()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
120 changes: 120 additions & 0 deletions
120
test/unit/com/palantir/cassandra/utils/MapUtilsTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.palantir.cassandra.utils; | ||
|
|
||
| import java.net.InetAddress; | ||
| import java.util.*; | ||
|
|
||
| import com.google.common.collect.HashMultimap; | ||
| import com.google.common.collect.Multimap; | ||
| import org.apache.cassandra.dht.RandomPartitioner; | ||
| import org.apache.cassandra.dht.Range; | ||
| import org.apache.cassandra.locator.PendingRangeMaps; | ||
| import org.apache.cassandra.service.StorageService; | ||
| import org.apache.cassandra.utils.ByteBufferUtil; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
|
|
||
| import org.apache.cassandra.dht.Token; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| public final class MapUtilsTest | ||
| { | ||
| private InetAddress ep1; | ||
|
|
||
| private InetAddress ep2; | ||
|
|
||
| private Multimap<Range<Token>, InetAddress> addressRange; | ||
|
|
||
| @Before | ||
| public void before() throws Exception | ||
| { | ||
| addressRange = HashMultimap.create(); | ||
|
|
||
| ep1 = InetAddress.getByName("127.0.0.1"); | ||
| ep2 = InetAddress.getByName("127.0.0.2"); | ||
| } | ||
|
|
||
| @Test | ||
| public void intersection_noIntersectionReturnsEmptySet() | ||
| { | ||
| putAll(addressRange, rangeOf("0", "8"), ep1); | ||
| assertThat(MapUtils.intersection(addressRange, rangesOf(rangeOf("10", "12")))).isEmpty(); | ||
| } | ||
|
|
||
| @Test | ||
| public void intersection_overlappingIntervalReturnsNonEmptySet() | ||
| { | ||
| putAll(addressRange, rangeOf("0", "10"), ep1); | ||
| putAll(addressRange, rangeOf("15", "30"), ep2); | ||
| assertThat(MapUtils.intersection(addressRange, rangesOf(rangeOf("4", "18")))) | ||
| .containsExactlyInAnyOrder(ep1, ep2); | ||
| } | ||
|
|
||
| @Test | ||
| public void coalesce_sortRanges() | ||
| { | ||
| PendingRangeMaps pendingRangeMaps = new PendingRangeMaps(); | ||
| Range<Token> range1 = rangeOf("50", "60"); | ||
| Range<Token> range2 = rangeOf("10", "20"); | ||
| Range<Token> range3 = rangeOf("30", "32"); | ||
| pendingRangeMaps.addPendingRange(range1, ep1); | ||
| pendingRangeMaps.addPendingRange(range2, ep1); | ||
| pendingRangeMaps.addPendingRange(range3, ep1); | ||
| assertThat(MapUtils.coalesce(pendingRangeMaps).keySet()).containsExactly(ep1); | ||
| assertThat(MapUtils.coalesce(pendingRangeMaps).get(ep1)) | ||
| .isNotNull() | ||
| .containsExactly(range2, range3, range1); | ||
| } | ||
|
|
||
| @Test | ||
| public void coalesce_sortTokens() | ||
| { | ||
| Multimap<InetAddress, Token> endpointToken = HashMultimap.create(); | ||
| putAll(endpointToken, ep1, token("f"), token("0"), token("a")); | ||
| Map<InetAddress, List<Token>> sortedEndpointToken = MapUtils.coalesce(endpointToken); | ||
| assertThat(sortedEndpointToken.keySet()).containsExactly(ep1); | ||
| assertThat(sortedEndpointToken.get(ep1)) | ||
| .isNotNull() | ||
| .containsExactly(token("0"), token("a"), token("f")); | ||
| } | ||
|
|
||
| @SafeVarargs | ||
| private final <U, V> void putAll(Multimap<U, V> map, U key, V... tokens) | ||
| { | ||
| map.putAll(key, Arrays.asList(tokens)); | ||
| } | ||
|
|
||
| @SafeVarargs | ||
| private final List<Range<Token>> rangesOf(Range<Token>... ranges) | ||
| { | ||
| return new ArrayList<>(Arrays.asList(ranges)); | ||
| } | ||
|
|
||
| private Range<Token> rangeOf(String leftBound, String rightBound) | ||
| { | ||
| return new Range<>(new RandomPartitioner.BigIntegerToken(leftBound), new RandomPartitioner.BigIntegerToken(rightBound)); | ||
| } | ||
|
|
||
| public static Token token(String key) | ||
| { | ||
| return StorageService.getPartitioner().getToken(ByteBufferUtil.bytes(key)); | ||
| } | ||
| } |