Merge pull request #25 from opendatasoft/7.17

BugFix multi aggregations with PathHierarchy DateHierarchy

Author: benj-moreau

README.md

@@ -15,11 +15,11 @@ This is a multi bucket aggregation.
 Installation
 ------------
 
-`bin/plugin --install path_hierarchy --url "https://github.com/opendatasoft/elasticsearch-aggregation-pathhierarchy/releases/download/v7.17.1.0/pathhierarchy-aggregation-7.17.1.0.zip"`
+`bin/plugin --install path_hierarchy --url "https://github.com/opendatasoft/elasticsearch-aggregation-pathhierarchy/releases/download/v7.17.1.1/pathhierarchy-aggregation-7.17.1.1.zip"`
 
 Build
 -----
-Compatible with Java version from 15 to 17
+Compatible with Java version 11
 
 Development Environment Setup
 ------------
@@ -329,7 +329,7 @@ Installation
 The first 3 digits of plugin version is Elasticsearch versioning. The last digit is used for plugin versioning under an elasticsearch version.
 
 To install it, launch this command in Elasticsearch directory replacing the url by the correct link for your Elasticsearch version (see table)
-`./bin/elasticsearch-plugin install https://github.com/opendatasoft/elasticsearch-aggregation-pathhierarchy/releases/download/v7.17.1.0/pathhierarchy-aggregation-7.17.1.0.zip`
+`./bin/elasticsearch-plugin install https://github.com/opendatasoft/elasticsearch-aggregation-pathhierarchy/releases/download/v7.17.1.1/pathhierarchy-aggregation-7.17.1.1.zip`
 
 | elasticsearch version | plugin version | plugin url |
 | --------------------- | -------------- | ---------- |
@@ -351,7 +351,7 @@ To install it, launch this command in Elasticsearch directory replacing the url
 | 7.6.0 | 7.6.0.0 | https://github.com/opendatasoft/elasticsearch-aggregation-pathhierarchy/releases/download/v7.6.0.0/pathhierarchy-aggregation-7.6.0.0.zip |
 | 7.10.2 | 7.10.2.0 | https://github.com/opendatasoft/elasticsearch-aggregation-pathhierarchy/releases/download/v7.10.2.0/pathhierarchy-aggregation-7.10.2.0.zip |
 | 7.16.3 | 7.16.3.0 | https://github.com/opendatasoft/elasticsearch-aggregation-pathhierarchy/releases/download/v7.16.3.0/pathhierarchy-aggregation-7.16.3.0.zip |
-| 7.17.1 | 7.17.1.0 | https://github.com/opendatasoft/elasticsearch-aggregation-pathhierarchy/releases/download/v7.17.1.0/pathhierarchy-aggregation-7.17.1.0.zip |
+| 7.17.1 | 7.17.1.1 | https://github.com/opendatasoft/elasticsearch-aggregation-pathhierarchy/releases/download/v7.17.1.1/pathhierarchy-aggregation-7.17.1.1.zip |
 
 License
 -------

docker-compose.yml

@@ -1,5 +1,8 @@
 version: "3.7"
 
+networks:
+  es-network:
+
 services:
   elasticsearch-plugin-debug:
     build:
@@ -15,4 +18,15 @@ services:
     ports:
       - "9200:9200"
       # DEBUG
-      - "5005:5005"
+      - "5005:5005"
+    networks:
+      - es-network
+
+  kibana:
+    image: docker.elastic.co/kibana/kibana:7.17.1
+    environment:
+      ELASTICSEARCH_HOSTS: http://elasticsearch-plugin-debug:9200/
+    ports:
+      - "5602:5601"
+    networks:
+      - es-network

docker/Dockerfile

@@ -1,4 +1,4 @@
 FROM docker.elastic.co/elasticsearch/elasticsearch:7.17.1 AS elasticsearch-plugin-debug
 
-COPY /build/distributions/pathhierarchy-aggregation-7.17.1.0.zip /tmp/pathhierarchy-aggregation-7.17.1.0.zip
-RUN ./bin/elasticsearch-plugin install file:/tmp/pathhierarchy-aggregation-7.17.1.0.zip
+COPY /build/distributions/pathhierarchy-aggregation-7.17.1.1.zip /tmp/pathhierarchy-aggregation-7.17.1.1.zip
+RUN ./bin/elasticsearch-plugin install file:/tmp/pathhierarchy-aggregation-7.17.1.1.zip

gradle.properties

@@ -1,2 +1,2 @@
 es_version = 7.17.1
-plugin_version = 7.17.1.0
+plugin_version = 7.17.1.1

src/main/java/org/opendatasoft/elasticsearch/search/aggregations/bucket/DateHierarchyAggregationBuilder.java

@@ -373,16 +373,16 @@ protected XContentBuilder doXContentBody(XContentBuilder builder, Params params)
         return builder.endObject();
     }
 
-    /**
-     * Used for caching requests, amongst other things.
-     */
     @Override
     public int hashCode() {
-        return Objects.hash(interval, order, minDocCount, bucketCountThresholds, timeZone);
+        return Objects.hash(super.hashCode(), interval, order, minDocCount, bucketCountThresholds, timeZone);
     }
 
     @Override
     public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (obj == null || getClass() != obj.getClass()) return false;
+        if (!super.equals(obj)) return false;
         DateHierarchyAggregationBuilder other = (DateHierarchyAggregationBuilder) obj;
         return Objects.equals(interval, other.interval)
                 && Objects.equals(order, other.order)

src/main/java/org/opendatasoft/elasticsearch/search/aggregations/bucket/PathHierarchyAggregationBuilder.java

@@ -320,16 +320,16 @@ protected XContentBuilder doXContentBody(XContentBuilder builder, Params params)
         return builder.endObject();
     }
 
-    /**
-     * Used for caching requests, amongst other things.
-     */
     @Override
     public int hashCode() {
-        return Objects.hash(separator, minDepth, maxDepth, depth, order, minDocCount, bucketCountThresholds);
+        return Objects.hash(super.hashCode(), separator, minDepth, maxDepth, depth, order, minDocCount, bucketCountThresholds);
     }
 
     @Override
     public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (obj == null || getClass() != obj.getClass()) return false;
+        if (!super.equals(obj)) return false;
         PathHierarchyAggregationBuilder other = (PathHierarchyAggregationBuilder) obj;
         return Objects.equals(separator, other.separator)
                 && Objects.equals(minDepth, other.minDepth)

src/yamlRestTest/resources/rest-api-spec/test/PathHierarchy/60_path_hierarchy_multi_buckets.yml

@@ -0,0 +1,72 @@
+setup:
+  - do:
+      indices.create:
+        index: filesystem
+        body:
+          settings:
+            number_of_shards: 1
+            number_of_replicas: 0
+          mappings:
+            properties:
+              path1:
+                type: keyword
+              path2:
+                type: keyword
+
+  - do:
+      cluster.health:
+        wait_for_status: green
+
+---
+"Test with filesystem arborescence":
+  - do:
+      index:
+        index: filesystem
+        id: 1
+        body: { "path1": "/My documents/Spreadsheets/Budget_2013.xls", "path2": "/My documents/Spreadsheets/Budget_2014.xls" }
+
+  - do:
+      index:
+        index: filesystem
+        id: 2
+        body: { "path1": "/My documents/Spreadsheets/Budget_2014.xls", "path2": "/My documents/Spreadsheets/Budget_2013.xls" }
+
+  - do:
+      indices.refresh: {}
+
+
+# basic test
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        body: {
+          "size" : 0,
+          "aggs": {
+            "_path1_agg": {
+              "path_hierarchy": {
+                "field": "path1",
+                "order": {
+                  "_key": "asc"
+                },
+                "shard_size": 100,
+                "size": 20000,
+                "min_doc_count": 0
+              }
+            },
+            "_path2_agg": {
+              "path_hierarchy": {
+                "field": "path2",
+                "order": {
+                  "_key": "asc"
+                },
+                "shard_size": 100,
+                "size": 20000,
+                "min_doc_count": 0
+              }
+            }
+          }
+        }
+
+  - match: { aggregations._path1_agg.buckets.0.key: "My documents" }
+
+  - match: { aggregations._path2_agg.buckets.0.key: "My documents" }