Change ConsolidationPolicy for ArangoDB v3.12.7

core/src/main/java/com/arangodb/entity/arangosearch/ConsolidationPolicy.java

@@ -34,6 +34,8 @@
     private Long segmentsBytesMax;
     private Long segmentsBytesFloor;
     private Long minScore;
+    private Double maxSkewThreshold;
+    private Double minDeletionRatio;
 
     public static ConsolidationPolicy of(final ConsolidationType type) {
         return new ConsolidationPolicy().type(type);
@@ -69,8 +71,10 @@
      * @param segmentsMin The minimum number of segments that will be evaluated as candidates for consolidation.
      *                    (default: 1)
      * @return this
+     * @deprecated from ArangoDB 3.12.7 onwards.
      */
+    @Deprecated
     public ConsolidationPolicy segmentsMin(final Long segmentsMin) {
         this.segmentsMin = segmentsMin;
         return this;
     }
@@ -83,8 +87,10 @@
      * @param segmentsMax The maximum number of segments that will be evaluated as candidates for consolidation.
      *                    (default: 10)
      * @return this
+     * @deprecated from ArangoDB 3.12.7 onwards.
      */
+    @Deprecated
     public ConsolidationPolicy segmentsMax(final Long segmentsMax) {
         this.segmentsMax = segmentsMax;
         return this;
     }
@@ -110,8 +116,10 @@
      * @param segmentsBytesFloor Defines the value (in bytes) to treat all smaller segments as equal for consolidation
      *                           selection. (default: 2097152)
      * @return this
+     * @deprecated from ArangoDB 3.12.7 onwards.
      */
+    @Deprecated
     public ConsolidationPolicy segmentsBytesFloor(final Long segmentsBytesFloor) {
         this.segmentsBytesFloor = segmentsBytesFloor;
         return this;
     }
@@ -123,23 +131,55 @@
     /**
      * @param minScore Filter out consolidation candidates with a score less than this. (default: 0)
      * @return this
+     * @deprecated from ArangoDB 3.12.7 onwards.
      */
+    @Deprecated
     public ConsolidationPolicy minScore(final Long minScore) {
         this.minScore = minScore;
         return this;
     }
 
+    public Double getMaxSkewThreshold() {
+        return maxSkewThreshold;
+    }
+
+    /**
+     * @param maxSkewThreshold The maximum allowed skew in segment sizes to allow consolidation.
+     *                         (default: 0.4)
+     * @return this
+     * @since ArangoDB 3.12.7
+     */
+    public ConsolidationPolicy maxSkewThreshold(final Double maxSkewThreshold) {
+        this.maxSkewThreshold = maxSkewThreshold;
+        return this;
+    }
+
+    public Double getMinDeletionRatio() {
+        return minDeletionRatio;
+    }
+
+    /**
+     * @param minDeletionRatio The minimum required percentage of total deleted documents in a
+     *                         segment (or a group of segments) to execute cleanup on those segments.
+     *                         (default: 0.5)
+     * @return this
+     * @since ArangoDB 3.12.7
+     */
+    public ConsolidationPolicy minDeletionRatio(final Double minDeletionRatio) {
+        this.minDeletionRatio = minDeletionRatio;
+        return this;
+    }
+
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         ConsolidationPolicy that = (ConsolidationPolicy) o;
-        return type == that.type && Objects.equals(threshold, that.threshold) && Objects.equals(segmentsMin, that.segmentsMin) && Objects.equals(segmentsMax, that.segmentsMax) && Objects.equals(segmentsBytesMax, that.segmentsBytesMax) && Objects.equals(segmentsBytesFloor, that.segmentsBytesFloor) && Objects.equals(minScore, that.minScore);
+        return type == that.type && Objects.equals(threshold, that.threshold) && Objects.equals(segmentsMin, that.segmentsMin) && Objects.equals(segmentsMax, that.segmentsMax) && Objects.equals(segmentsBytesMax, that.segmentsBytesMax) && Objects.equals(segmentsBytesFloor, that.segmentsBytesFloor) && Objects.equals(minScore, that.minScore) && Objects.equals(maxSkewThreshold, that.maxSkewThreshold) && Objects.equals(minDeletionRatio, that.minDeletionRatio);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(type, threshold, segmentsMin, segmentsMax, segmentsBytesMax, segmentsBytesFloor, minScore);
+        return Objects.hash(type, threshold, segmentsMin, segmentsMax, segmentsBytesMax, segmentsBytesFloor, minScore, maxSkewThreshold, minDeletionRatio);
     }
 
     @Override
@@ -152,6 +192,8 @@
                 ", segmentsBytesMax=" + segmentsBytesMax +
                 ", segmentsBytesFloor=" + segmentsBytesFloor +
                 ", minScore=" + minScore +
+                ", maxSkewThreshold=" + maxSkewThreshold +
+                ", minDeletionRatio=" + minDeletionRatio +
                 '}';
     }
 }

test-functional/src/test/java/com/arangodb/InvertedIndexAsyncTest.java

@@ -81,6 +81,21 @@ private InvertedIndexOptions createOptions(String analyzerName) {
             );
         }
 
+        ConsolidationPolicy consolidationPolicy;
+        if (isAtLeastVersion(3, 12, 7)) {
+            consolidationPolicy = ConsolidationPolicy.of(ConsolidationType.TIER)
+                    .segmentsBytesMax(55555L)
+                    .maxSkewThreshold(0.3)
+                    .minDeletionRatio(0.4);
+        } else {
+            consolidationPolicy = ConsolidationPolicy.of(ConsolidationType.TIER)
+                    .segmentsMin(3L)
+                    .segmentsMax(44L)
+                    .segmentsBytesMax(55555L)
+                    .segmentsBytesFloor(666L)
+                    .minScore(77L);
+        }
+
         return new InvertedIndexOptions()
                 .name(rndName())
                 .inBackground(true)
@@ -104,13 +119,7 @@ private InvertedIndexOptions createOptions(String analyzerName) {
                 .consolidationIntervalMsec(11L)
                 .commitIntervalMsec(22L)
                 .cleanupIntervalStep(33L)
-                .consolidationPolicy(ConsolidationPolicy.of(ConsolidationType.TIER)
-                        .segmentsMin(3L)
-                        .segmentsMax(44L)
-                        .segmentsBytesMax(55555L)
-                        .segmentsBytesFloor(666L)
-                        .minScore(77L)
-                )
+                .consolidationPolicy(consolidationPolicy)
                 .writebufferIdle(44L)
                 .writebufferActive(55L)
                 .writebufferSizeMax(66L)
@@ -148,7 +157,7 @@ private void assertCorrectIndexEntity(InvertedIndexEntity indexResult, InvertedI
         assertThat(indexResult.getPrimaryKeyCache()).isEqualTo(options.getPrimaryKeyCache());
 
         if (isEnterprise() && isAtLeastVersion(3, 12)) {
-             assertThat(indexResult.getOptimizeTopK()).containsExactlyElementsOf(options.getOptimizeTopK());
+            assertThat(indexResult.getOptimizeTopK()).containsExactlyElementsOf(options.getOptimizeTopK());
         }
     }
 

test-functional/src/test/java/com/arangodb/InvertedIndexTest.java

@@ -80,6 +80,21 @@ private InvertedIndexOptions createOptions(String analyzerName) {
             );
         }
 
+        ConsolidationPolicy consolidationPolicy;
+        if (isAtLeastVersion(3, 12, 7)) {
+            consolidationPolicy = ConsolidationPolicy.of(ConsolidationType.TIER)
+                    .segmentsBytesMax(55555L)
+                    .maxSkewThreshold(0.3)
+                    .minDeletionRatio(0.4);
+        } else {
+            consolidationPolicy = ConsolidationPolicy.of(ConsolidationType.TIER)
+                    .segmentsMin(3L)
+                    .segmentsMax(44L)
+                    .segmentsBytesMax(55555L)
+                    .segmentsBytesFloor(666L)
+                    .minScore(77L);
+        }
+
         return new InvertedIndexOptions()
                 .name(rndName())
                 .inBackground(true)
@@ -103,13 +118,7 @@ private InvertedIndexOptions createOptions(String analyzerName) {
                 .consolidationIntervalMsec(11L)
                 .commitIntervalMsec(22L)
                 .cleanupIntervalStep(33L)
-                .consolidationPolicy(ConsolidationPolicy.of(ConsolidationType.TIER)
-                        .segmentsMin(3L)
-                        .segmentsMax(44L)
-                        .segmentsBytesMax(55555L)
-                        .segmentsBytesFloor(666L)
-                        .minScore(77L)
-                )
+                .consolidationPolicy(consolidationPolicy)
                 .writebufferIdle(44L)
                 .writebufferActive(55L)
                 .writebufferSizeMax(66L)
@@ -147,7 +156,7 @@ private void assertCorrectIndexEntity(InvertedIndexEntity indexResult, InvertedI
         assertThat(indexResult.getPrimaryKeyCache()).isEqualTo(options.getPrimaryKeyCache());
 
         if (isEnterprise() && isAtLeastVersion(3, 12)) {
-             assertThat(indexResult.getOptimizeTopK()).containsExactlyElementsOf(options.getOptimizeTopK());
+            assertThat(indexResult.getOptimizeTopK()).containsExactlyElementsOf(options.getOptimizeTopK());
         }
     }