Migrate plugin to elasticsearch 6.5

Clément Tourrière · Clément Tourrière · commit ceb78f1292c8 · 2018-11-19T12:08:36.000+01:00
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
-es_version = 6.4.3
-plugin_version = 6.4.3.0
+es_version = 6.5.0
+plugin_version = 6.5.0.0
diff --git a/src/main/java/org/opendatasoft/elasticsearch/search/aggregations/bucket/PathHierarchyAggregatorFactory.java b/src/main/java/org/opendatasoft/elasticsearch/search/aggregations/bucket/PathHierarchyAggregatorFactory.java
@@ -95,7 +95,7 @@ protected Aggregator doCreateInternal(
             // heuristic to avoid any wrong-ranking caused by distributed
             // counting
             bucketCountThresholds.setShardSize(BucketUtils.suggestShardSideQueueSize(bucketCountThresholds.getRequiredSize(),
-                    context.numberOfShards()));
+                    context.numberOfShards() == 1));
         }
         bucketCountThresholds.ensureValidity();
         return new PathHierarchyAggregator(

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ protected Aggregator doCreateInternal(`
`95`	`95`	`// heuristic to avoid any wrong-ranking caused by distributed`
`96`	`96`	`// counting`
`97`	`97`	`bucketCountThresholds.setShardSize(BucketUtils.suggestShardSideQueueSize(bucketCountThresholds.getRequiredSize(),`
`98`		`- context.numberOfShards()));`
	`98`	`+ context.numberOfShards() == 1));`
`99`	`99`	`}`
`100`	`100`	`bucketCountThresholds.ensureValidity();`
`101`	`101`	`return new PathHierarchyAggregator(`