Merge pull request #566 from metamx/fix-cached-segments-order

preserve segment order when pulling from cache

Merge pull request #566 from metamx/fix-cached-segments-order
preserve segment order when pulling from cache
da497271 · fjy · 18685542 · 347815cf · da497271
隐藏空白更改
内联并排

Showing with 2 addition and 1 deletion

server/src/main/java/io/druid/client/CachingClusteredClient.java ...src/main/java/io/druid/client/CachingClusteredClient.java +2 -1

未找到文件。
--- a/server/src/main/java/io/druid/client/CachingClusteredClient.java
+++ b/server/src/main/java/io/druid/client/CachingClusteredClient.java
@@ -183,7 +183,8 @@ public class CachingClusteredClient<T> implements QueryRunner<T>
    }

    if (queryCacheKey != null) {
-      Map<Pair<ServerSelector, SegmentDescriptor>, Cache.NamedKey> cacheKeys = Maps.newHashMap();
+      // cache keys must preserve segment ordering, in order for shards to always be combined in the same order
+      Map<Pair<ServerSelector, SegmentDescriptor>, Cache.NamedKey> cacheKeys = Maps.newLinkedHashMap();
      for (Pair<ServerSelector, SegmentDescriptor> segment : segments) {
        final Cache.NamedKey segmentCacheKey = CacheUtil.computeSegmentCacheKey(
            segment.lhs.getSegment().getIdentifier(),