Merge pull request #496 from Eistern/feature/add-max-active-partitions

Add max_active_partitions support to topic operations

Author: alex268

topic/src/main/java/tech/ydb/topic/impl/TopicClientImpl.java

@@ -160,6 +160,10 @@ public CompletableFuture<Status> alterTopic(String path, AlterTopicSettings sett
             if (minActivePartitions != null) {
                 builder.setSetMinActivePartitions(minActivePartitions);
             }
+            Long maxActivePartitions = partitioningSettings.getMaxActivePartitions();
+            if (maxActivePartitions != null) {
+                builder.setSetMaxActivePartitions(maxActivePartitions);
+            }
             Long partitionCountLimit = partitioningSettings.getPartitionCountLimit();
             if (partitionCountLimit != null) {
                 builder.setSetPartitionCountLimit(partitionCountLimit);
@@ -321,6 +325,7 @@ private TopicDescription mapDescribeTopic(YdbTopic.DescribeTopicResult result) {
 
         PartitioningSettings.Builder partitioningDescription = PartitioningSettings.newBuilder()
                 .setMinActivePartitions(partitioningSettings.getMinActivePartitions())
+                .setMaxActivePartitions(partitioningSettings.getMaxActivePartitions())
                 .setPartitionCountLimit(partitioningSettings.getPartitionCountLimit())
                 .setAutoPartitioningStrategy(fromProto(autoPartitioningStrategy));
 

topic/src/main/java/tech/ydb/topic/settings/AlterPartitioningSettings.java

@@ -9,6 +9,8 @@ public class AlterPartitioningSettings {
     @Nullable
     private final Long minActivePartitions;
     @Nullable
+    private final Long maxActivePartitions;
+    @Nullable
     private final Long partitionCountLimit;
     @Nullable
     private final AutoPartitioningStrategy autoPartitioningStrategy;
@@ -17,6 +19,7 @@ public class AlterPartitioningSettings {
 
     private AlterPartitioningSettings(Builder builder) {
         this.minActivePartitions = builder.minActivePartitions;
+        this.maxActivePartitions = builder.maxActivePartitions;
         this.partitionCountLimit = builder.partitionCountLimit;
         this.autoPartitioningStrategy = builder.autoPartitioningStrategy;
         this.writeStrategySettings = builder.writeStrategySettings;
@@ -31,6 +34,11 @@ public Long getMinActivePartitions() {
         return minActivePartitions;
     }
 
+    @Nullable
+    public Long getMaxActivePartitions() {
+        return maxActivePartitions;
+    }
+
     @Nullable
     public Long getPartitionCountLimit() {
         return partitionCountLimit;
@@ -51,6 +59,7 @@ public AlterAutoPartitioningWriteStrategySettings getWriteStrategySettings() {
      */
     public static class Builder {
         private Long minActivePartitions = null;
+        private Long maxActivePartitions = null;
         private Long partitionCountLimit = null;
         private AutoPartitioningStrategy autoPartitioningStrategy = null;
         private AlterAutoPartitioningWriteStrategySettings writeStrategySettings = null;
@@ -65,11 +74,22 @@ public Builder setMinActivePartitions(long minActivePartitions) {
             return this;
         }
 
+        /**
+         * @param maxActivePartitions  maximum partition count auto merge would stop working at.
+         *                             Zero value means default - 1.
+         * @return settings builder
+         */
+        public Builder setMaxActivePartitions(long maxActivePartitions) {
+            this.maxActivePartitions = maxActivePartitions;
+            return this;
+        }
+
         /**
          * @param partitionCountLimit  Limit for total partition count, including active (open for write) and
          *                             read-only partitions.
          *                             Zero value means default - 100.
          * @return settings builder
+         * @deprecated Use {@link #setMaxActivePartitions(long)} instead
          */
         public Builder setPartitionCountLimit(long partitionCountLimit) {
             this.partitionCountLimit = partitionCountLimit;

topic/src/main/java/tech/ydb/topic/settings/PartitioningSettings.java

@@ -7,12 +7,14 @@
  */
 public class PartitioningSettings {
     private final long minActivePartitions;
+    private final long maxActivePartitions;
     private final long partitionCountLimit;
     private final AutoPartitioningStrategy autoPartitioningStrategy;
     private final AutoPartitioningWriteStrategySettings writeStrategySettings;
 
     private PartitioningSettings(Builder builder) {
         this.minActivePartitions = builder.minActivePartitions;
+        this.maxActivePartitions = builder.maxActivePartitions;
         this.partitionCountLimit = builder.partitionCountLimit;
         this.autoPartitioningStrategy = builder.autoPartitioningStrategy;
         this.writeStrategySettings = builder.writeStrategySettings;
@@ -26,10 +28,19 @@ public long getMinActivePartitions() {
         return minActivePartitions;
     }
 
+    /**
+     * @return  maximum partition count auto merge would stop working at.
+     *                             Zero value means default - 1.
+     */
+    public long getMaxActivePartitions() {
+        return maxActivePartitions;
+    }
+
     /**
      * @return  Limit for total partition count, including active (open for write) and
      *                             read-only partitions.
      *                             Zero value means default - 100.
+     * @deprecated Use {@link #getMaxActivePartitions()} instead
      */
     public long getPartitionCountLimit() {
         return partitionCountLimit;
@@ -58,6 +69,7 @@ public static Builder newBuilder() {
      */
     public static class Builder {
         private long minActivePartitions = 0;
+        private long maxActivePartitions = 0;
         private long partitionCountLimit = 0;
         private AutoPartitioningStrategy autoPartitioningStrategy = AutoPartitioningStrategy.DISABLED;
         private AutoPartitioningWriteStrategySettings writeStrategySettings = null;
@@ -72,12 +84,24 @@ public Builder setMinActivePartitions(long minActivePartitions) {
             return this;
         }
 
+        /**
+         * @param maxActivePartitions  maximum partition count auto merge would stop working at.
+         *                             Zero value means default - 1.
+         * @return settings builder
+         */
+        public Builder setMaxActivePartitions(long maxActivePartitions) {
+            this.maxActivePartitions = maxActivePartitions;
+            return this;
+        }
+
         /**
          * @param partitionCountLimit  Limit for total partition count, including active (open for write) and
          *                             read-only partitions.
          *                             Zero value means default - 100.
          * @return settings builder
+         * @deprecated Use {@link #setMaxActivePartitions(long)} instead.
          */
+        @Deprecated
         public Builder setPartitionCountLimit(long partitionCountLimit) {
             this.partitionCountLimit = partitionCountLimit;
             return this;
@@ -120,13 +144,20 @@ public boolean equals(Object o) {
         }
         PartitioningSettings that = (PartitioningSettings) o;
         return minActivePartitions == that.minActivePartitions &&
+                maxActivePartitions == that.maxActivePartitions &&
                 partitionCountLimit == that.partitionCountLimit &&
                 autoPartitioningStrategy == that.autoPartitioningStrategy &&
                 Objects.equals(writeStrategySettings, that.writeStrategySettings);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(minActivePartitions, partitionCountLimit, autoPartitioningStrategy, writeStrategySettings);
+        return Objects.hash(
+                minActivePartitions,
+                maxActivePartitions,
+                partitionCountLimit,
+                autoPartitioningStrategy,
+                writeStrategySettings
+        );
     }
 }

topic/src/test/java/tech/ydb/topic/impl/YdbTopicsIntegrationTest.java

@@ -268,7 +268,7 @@ public void step07_alterTopicWithAutoPartitioning() {
                         .setDownUtilizationPercent(20)
                         .build())
                 .setMinActivePartitions(1)
-                .setPartitionCountLimit(0)
+                .setMaxActivePartitions(1)
                 .build();
 
         Assert.assertEquals(expectedPartitioningSettings, actualPartitioningSettings);