This is an automated email from the ASF dual-hosted git repository.
sanpwc pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new a40f4dd12ba IGNITE-26050 Remove auto adjust related code (#6476)
a40f4dd12ba is described below
commit a40f4dd12bada71e5c4bebd7ced62bd0700d1bad
Author: Mikhail Efremov <[email protected]>
AuthorDate: Mon Sep 1 13:43:30 2025 +0600
IGNITE-26050 Remove auto adjust related code (#6476)
---
docs/_docs/general-tips.adoc | 1 -
.../apache/ignite/catalog/annotations/Zone.java | 7 --
.../ignite/catalog/definitions/ZoneDefinition.java | 34 ---------
.../catalog/ItCatalogApiThreadingTest.java | 1 -
.../ignite/internal/catalog/ItCatalogDslTest.java | 1 -
.../internal/matcher/ZoneDefinitionMatcher.java | 14 ----
.../catalog/sql/CreateFromAnnotationsImpl.java | 4 +-
.../catalog/sql/CreateFromDefinitionImpl.java | 4 +-
.../internal/catalog/sql/CreateZoneImpl.java | 10 ---
.../apache/ignite/internal/catalog/sql/Option.java | 4 -
.../catalog/sql/CreateFromAnnotationsTest.java | 13 +---
.../catalog/sql/CreateFromDefinitionTest.java | 4 +-
.../catalog/sql/InvalidDefinitionTest.java | 2 -
.../catalog/CatalogParamsValidationUtils.java | 16 ----
.../catalog/commands/AlterZoneCommand.java | 33 +-------
.../catalog/commands/AlterZoneCommandBuilder.java | 8 --
.../catalog/commands/CreateZoneCommand.java | 26 +------
.../catalog/commands/CreateZoneCommandBuilder.java | 8 --
.../catalog/commands/RenameZoneCommand.java | 1 -
.../catalog/descriptors/CatalogZoneDescriptor.java | 76 ++++++++++++++++++-
.../CatalogZoneDescriptorSerializers.java | 5 +-
.../internal/catalog/CatalogManagerSelfTest.java | 1 -
.../ignite/internal/catalog/CatalogTableTest.java | 1 -
.../ignite/internal/catalog/CatalogZoneTest.java | 7 +-
.../commands/AbstractCommandValidationTest.java | 1 -
.../commands/AlterZoneCommandValidationTest.java | 85 +--------------------
.../commands/CreateZoneCommandValidationTest.java | 87 +---------------------
.../descriptors/CatalogZoneDescriptorTest.java | 7 --
.../storage/CatalogEntrySerializationTest.java | 1 -
.../catalog/storage/TestZoneDescriptors.java | 3 -
.../ignite/client/handler/FakeCatalogService.java | 1 -
.../distributionzones/DataNodesManager.java | 6 --
.../utils/CatalogAlterZoneEventListener.java | 16 ----
.../rebalance/ZoneMetricSourceTest.java | 1 -
.../ZoneRebalanceUtilUpdateAssignmentsTest.java | 1 -
.../utils/CatalogAlterZoneEventListenerTest.java | 32 --------
.../ignite/internal/sql/engine/ItZoneDdlTest.java | 7 +-
.../prepare/ddl/DdlSqlToCommandConverter.java | 5 --
.../sql/engine/prepare/ddl/ZoneOptionEnum.java | 3 -
.../DistributionZoneSqlToCommandConverterTest.java | 6 --
...ributionZoneObsoleteSyntaxSqlDdlParserTest.java | 8 +-
41 files changed, 95 insertions(+), 456 deletions(-)
diff --git a/docs/_docs/general-tips.adoc b/docs/_docs/general-tips.adoc
index 14b6e4f7585..86cb77f1eeb 100644
--- a/docs/_docs/general-tips.adoc
+++ b/docs/_docs/general-tips.adoc
@@ -29,7 +29,6 @@ NOTE: In Ignite 3, you can create and maintain the
configuration in either JSON
"zone" : {
"defaultDataStorage" : "aipersist",
"defaultDistributionZone" : {
- "dataNodesAutoAdjust" : 2147483647,
"dataNodesAutoAdjustScaleDown" : 2147483647,
"dataNodesAutoAdjustScaleUp" : 0,
"dataStorage" : {
diff --git
a/modules/api/src/main/java/org/apache/ignite/catalog/annotations/Zone.java
b/modules/api/src/main/java/org/apache/ignite/catalog/annotations/Zone.java
index 9e09b63881b..faf8d38dfe9 100644
--- a/modules/api/src/main/java/org/apache/ignite/catalog/annotations/Zone.java
+++ b/modules/api/src/main/java/org/apache/ignite/catalog/annotations/Zone.java
@@ -70,13 +70,6 @@ public @interface Zone {
*/
String distributionAlgorithm() default "";
- /**
- * Timeout in seconds between node added or node left topology event
itself and data nodes switch.
- *
- * @return Timeout.
- */
- int dataNodesAutoAdjust() default -1;
-
/**
* Timeout in seconds between node added topology event itself and data
nodes switch.
*
diff --git
a/modules/api/src/main/java/org/apache/ignite/catalog/definitions/ZoneDefinition.java
b/modules/api/src/main/java/org/apache/ignite/catalog/definitions/ZoneDefinition.java
index f4ddac64815..e6130432762 100644
---
a/modules/api/src/main/java/org/apache/ignite/catalog/definitions/ZoneDefinition.java
+++
b/modules/api/src/main/java/org/apache/ignite/catalog/definitions/ZoneDefinition.java
@@ -35,8 +35,6 @@ public class ZoneDefinition {
private final String distributionAlgorithm;
- private final Integer dataNodesAutoAdjust;
-
private final Integer dataNodesAutoAdjustScaleUp;
private final Integer dataNodesAutoAdjustScaleDown;
@@ -54,7 +52,6 @@ public class ZoneDefinition {
Integer replicas,
Integer quorumSize,
String distributionAlgorithm,
- Integer dataNodesAutoAdjust,
Integer dataNodesAutoAdjustScaleUp,
Integer dataNodesAutoAdjustScaleDown,
String filter,
@@ -67,7 +64,6 @@ public class ZoneDefinition {
this.replicas = replicas;
this.quorumSize = quorumSize;
this.distributionAlgorithm = distributionAlgorithm;
- this.dataNodesAutoAdjust = dataNodesAutoAdjust;
this.dataNodesAutoAdjustScaleUp = dataNodesAutoAdjustScaleUp;
this.dataNodesAutoAdjustScaleDown = dataNodesAutoAdjustScaleDown;
this.filter = filter;
@@ -139,15 +135,6 @@ public class ZoneDefinition {
return distributionAlgorithm;
}
- /**
- * Returns timeout in seconds between node added or node left topology
event itself and data nodes switch.
- *
- * @return Timeout.
- */
- public Integer dataNodesAutoAdjust() {
- return dataNodesAutoAdjust;
- }
-
/**
* Returns timeout in seconds between node added topology event itself and
data nodes switch.
*
@@ -211,7 +198,6 @@ public class ZoneDefinition {
+ ", replicas=" + replicas
+ ", quorumSize=" + quorumSize
+ ", distributionAlgorithm='" + distributionAlgorithm + '\''
- + ", dataNodesAutoAdjust=" + dataNodesAutoAdjust
+ ", dataNodesAutoAdjustScaleUp=" + dataNodesAutoAdjustScaleUp
+ ", dataNodesAutoAdjustScaleDown=" +
dataNodesAutoAdjustScaleDown
+ ", filter='" + filter + '\''
@@ -236,8 +222,6 @@ public class ZoneDefinition {
private String distributionAlgorithm;
- private Integer dataNodesAutoAdjust;
-
private Integer dataNodesAutoAdjustScaleUp;
private Integer dataNodesAutoAdjustScaleDown;
@@ -257,7 +241,6 @@ public class ZoneDefinition {
replicas = definition.replicas;
quorumSize = definition.quorumSize;
distributionAlgorithm = definition.distributionAlgorithm;
- dataNodesAutoAdjust = definition.dataNodesAutoAdjust;
dataNodesAutoAdjustScaleUp = definition.dataNodesAutoAdjustScaleUp;
dataNodesAutoAdjustScaleDown =
definition.dataNodesAutoAdjustScaleDown;
filter = definition.filter;
@@ -346,22 +329,6 @@ public class ZoneDefinition {
return this;
}
- /**
- * Sets timeout in seconds between node added or node left topology
event itself and data nodes switch.
- *
- * @param adjust Timeout.
- * @return This builder instance.
- */
- public Builder dataNodesAutoAdjust(Integer adjust) {
- Objects.requireNonNull(
- adjust,
- "Timeout between node added or node left topology event
itself and data nodes switch must not be null."
- );
-
- this.dataNodesAutoAdjust = adjust;
- return this;
- }
-
/**
* Sets timeout in seconds between node added topology event itself
and data nodes switch.
*
@@ -443,7 +410,6 @@ public class ZoneDefinition {
replicas,
quorumSize,
distributionAlgorithm,
- dataNodesAutoAdjust,
dataNodesAutoAdjustScaleUp,
dataNodesAutoAdjustScaleDown,
filter,
diff --git
a/modules/catalog-dsl/src/integrationTest/java/org/apache/ignite/internal/catalog/ItCatalogApiThreadingTest.java
b/modules/catalog-dsl/src/integrationTest/java/org/apache/ignite/internal/catalog/ItCatalogApiThreadingTest.java
index 72602364c9b..43194360ce8 100644
---
a/modules/catalog-dsl/src/integrationTest/java/org/apache/ignite/internal/catalog/ItCatalogApiThreadingTest.java
+++
b/modules/catalog-dsl/src/integrationTest/java/org/apache/ignite/internal/catalog/ItCatalogApiThreadingTest.java
@@ -118,7 +118,6 @@ class ItCatalogApiThreadingTest extends
ClusterPerClassIntegrationTest {
private static ZoneDefinition testZoneDefinition() {
return ZoneDefinition.builder(ZONE_NAME)
.distributionAlgorithm("rendezvous")
- .dataNodesAutoAdjust(1)
.filter("filter")
.storageProfiles(DEFAULT_AIPERSIST_PROFILE_NAME)
.build();
diff --git
a/modules/catalog-dsl/src/integrationTest/java/org/apache/ignite/internal/catalog/ItCatalogDslTest.java
b/modules/catalog-dsl/src/integrationTest/java/org/apache/ignite/internal/catalog/ItCatalogDslTest.java
index 90a9272855d..96e9ca369d6 100644
---
a/modules/catalog-dsl/src/integrationTest/java/org/apache/ignite/internal/catalog/ItCatalogDslTest.java
+++
b/modules/catalog-dsl/src/integrationTest/java/org/apache/ignite/internal/catalog/ItCatalogDslTest.java
@@ -95,7 +95,6 @@ class ItCatalogDslTest extends ClusterPerClassIntegrationTest
{
// Given zone definition
ZoneDefinition zoneDefinition = ZoneDefinition.builder(ZONE_NAME)
.distributionAlgorithm("rendezvous")
- .dataNodesAutoAdjust(1)
.filter("filter")
.storageProfiles(DEFAULT_AIPERSIST_PROFILE_NAME)
.build();
diff --git
a/modules/catalog-dsl/src/integrationTest/java/org/apache/ignite/internal/matcher/ZoneDefinitionMatcher.java
b/modules/catalog-dsl/src/integrationTest/java/org/apache/ignite/internal/matcher/ZoneDefinitionMatcher.java
index ce62ce8d639..4b3ad7d1268 100644
---
a/modules/catalog-dsl/src/integrationTest/java/org/apache/ignite/internal/matcher/ZoneDefinitionMatcher.java
+++
b/modules/catalog-dsl/src/integrationTest/java/org/apache/ignite/internal/matcher/ZoneDefinitionMatcher.java
@@ -41,8 +41,6 @@ public class ZoneDefinitionMatcher extends
TypeSafeMatcher<ZoneDefinition> {
private Matcher<String> distributionAlgorithmMatcher =
AnythingMatcher.anything();
- private Matcher<Integer> dataNodesAutoAdjustMatcher =
AnythingMatcher.anything();
-
private Matcher<Integer> dataNodesAutoAdjustScaleUpMatcher =
AnythingMatcher.anything();
private Matcher<Integer> dataNodesAutoAdjustScaleDownMatcher =
AnythingMatcher.anything();
@@ -107,15 +105,6 @@ public class ZoneDefinitionMatcher extends
TypeSafeMatcher<ZoneDefinition> {
return
withDistributionAlgorithmMatcher(equalTo(distributionAlgorithm));
}
- public ZoneDefinitionMatcher
withDataNodesAutoAdjustMatcher(Matcher<Integer> dataNodesAutoAdjustMatcher) {
- this.dataNodesAutoAdjustMatcher = dataNodesAutoAdjustMatcher;
- return this;
- }
-
- public ZoneDefinitionMatcher withDataNodesAutoAdjust(int
dataNodesAutoAdjust) {
- return withDataNodesAutoAdjustMatcher(equalTo(dataNodesAutoAdjust));
- }
-
public ZoneDefinitionMatcher withDataNodesAutoAdjustScaleUpMatcher(
Matcher<Integer> dataNodesAutoAdjustScaleUpMatcher) {
this.dataNodesAutoAdjustScaleUpMatcher =
dataNodesAutoAdjustScaleUpMatcher;
@@ -175,7 +164,6 @@ public class ZoneDefinitionMatcher extends
TypeSafeMatcher<ZoneDefinition> {
&& replicasMatcher.matches(zoneDefinition.replicas())
&& quorumSizeMatcher.matches(zoneDefinition.quorumSize())
&&
distributionAlgorithmMatcher.matches(zoneDefinition.distributionAlgorithm())
- &&
dataNodesAutoAdjustMatcher.matches(zoneDefinition.dataNodesAutoAdjust())
&& zoneNameMatcher.matches(zoneDefinition.zoneName())
&&
dataNodesAutoAdjustScaleUpMatcher.matches(zoneDefinition.dataNodesAutoAdjustScaleUp())
&&
dataNodesAutoAdjustScaleDownMatcher.matches(zoneDefinition.dataNodesAutoAdjustScaleDown())
@@ -199,8 +187,6 @@ public class ZoneDefinitionMatcher extends
TypeSafeMatcher<ZoneDefinition> {
.appendText(System.lineSeparator())
.appendText("affinity
").appendDescriptionOf(distributionAlgorithmMatcher)
.appendText(System.lineSeparator())
- .appendText("data nodes auto adjust
").appendDescriptionOf(dataNodesAutoAdjustMatcher)
- .appendText(System.lineSeparator())
.appendText("data nodes auto adjust scale up
").appendDescriptionOf(dataNodesAutoAdjustScaleUpMatcher)
.appendText(System.lineSeparator())
.appendText("data nodes auto adjust scale down
").appendDescriptionOf(dataNodesAutoAdjustScaleDownMatcher)
diff --git
a/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/CreateFromAnnotationsImpl.java
b/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/CreateFromAnnotationsImpl.java
index 4617ea3eb2a..df167cc7b38 100644
---
a/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/CreateFromAnnotationsImpl.java
+++
b/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/CreateFromAnnotationsImpl.java
@@ -137,12 +137,10 @@ class CreateFromAnnotationsImpl extends
AbstractCatalogQuery<TableZoneId> {
createZone.distributionAlgorithm(zone.distributionAlgorithm());
}
- if (zone.dataNodesAutoAdjust() > 0) {
- createZone.dataNodesAutoAdjust(zone.dataNodesAutoAdjust());
- }
if (zone.dataNodesAutoAdjustScaleUp() > 0) {
createZone.dataNodesAutoAdjustScaleUp(zone.dataNodesAutoAdjustScaleUp());
}
+
if (zone.dataNodesAutoAdjustScaleDown() > 0) {
createZone.dataNodesAutoAdjustScaleDown(zone.dataNodesAutoAdjustScaleDown());
}
diff --git
a/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/CreateFromDefinitionImpl.java
b/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/CreateFromDefinitionImpl.java
index eecfa7fcf32..ac81f26ef87 100644
---
a/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/CreateFromDefinitionImpl.java
+++
b/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/CreateFromDefinitionImpl.java
@@ -75,12 +75,10 @@ class CreateFromDefinitionImpl extends
AbstractCatalogQuery<TableZoneId> {
createZone.distributionAlgorithm(def.distributionAlgorithm());
}
- if (isGreaterThanOrEqualToZero(def.dataNodesAutoAdjust())) {
- createZone.dataNodesAutoAdjust(def.dataNodesAutoAdjust());
- }
if (isGreaterThanOrEqualToZero(def.dataNodesAutoAdjustScaleUp())) {
createZone.dataNodesAutoAdjustScaleUp(def.dataNodesAutoAdjustScaleUp());
}
+
if (isGreaterThanOrEqualToZero(def.dataNodesAutoAdjustScaleDown())) {
createZone.dataNodesAutoAdjustScaleDown(def.dataNodesAutoAdjustScaleDown());
}
diff --git
a/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/CreateZoneImpl.java
b/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/CreateZoneImpl.java
index 88f8176dbb2..597127be517 100644
---
a/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/CreateZoneImpl.java
+++
b/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/CreateZoneImpl.java
@@ -85,16 +85,6 @@ class CreateZoneImpl extends AbstractCatalogQuery<Name> {
return this;
}
- CreateZoneImpl dataNodesAutoAdjust(Integer adjust) {
- Objects.requireNonNull(
- adjust,
- "Timeout between node added or node left topology event itself
and data nodes switch must not be null."
- );
-
- withOptions.add(Option.dataNodesAutoAdjust(adjust));
- return this;
- }
-
CreateZoneImpl dataNodesAutoAdjustScaleUp(Integer adjust) {
Objects.requireNonNull(adjust, "Timeout between node added topology
event itself and data nodes switch must not be null.");
diff --git
a/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/Option.java
b/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/Option.java
index 0e4d9c4cac1..14d34be6c43 100644
---
a/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/Option.java
+++
b/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/Option.java
@@ -39,10 +39,6 @@ class Option extends QueryPart {
return new Option("QUORUM_SIZE", quorumSize);
}
- public static Option dataNodesAutoAdjust(Integer adjust) {
- return new Option("DATA_NODES_AUTO_ADJUST", adjust);
- }
-
public static Option dataNodesAutoAdjustScaleUp(Integer adjust) {
return new Option("DATA_NODES_AUTO_ADJUST_SCALE_UP", adjust);
}
diff --git
a/modules/catalog-dsl/src/test/java/org/apache/ignite/internal/catalog/sql/CreateFromAnnotationsTest.java
b/modules/catalog-dsl/src/test/java/org/apache/ignite/internal/catalog/sql/CreateFromAnnotationsTest.java
index 0fef6f87728..5e6a577d9de 100644
---
a/modules/catalog-dsl/src/test/java/org/apache/ignite/internal/catalog/sql/CreateFromAnnotationsTest.java
+++
b/modules/catalog-dsl/src/test/java/org/apache/ignite/internal/catalog/sql/CreateFromAnnotationsTest.java
@@ -71,7 +71,6 @@ class CreateFromAnnotationsTest {
.replicas(5)
.quorumSize(2)
.distributionAlgorithm("partitionDistribution")
- .dataNodesAutoAdjust(1)
.dataNodesAutoAdjustScaleDown(2)
.dataNodesAutoAdjustScaleUp(3)
.filter("filter")
@@ -105,7 +104,7 @@ class CreateFromAnnotationsTest {
query.toString(),
is("CREATE ZONE IF NOT EXISTS ZONE_TEST WITH
STORAGE_PROFILES='default', PARTITIONS=1, REPLICAS=5, QUORUM_SIZE=2,"
+ " DISTRIBUTION_ALGORITHM='partitionDistribution',"
- + " DATA_NODES_AUTO_ADJUST=1,
DATA_NODES_AUTO_ADJUST_SCALE_UP=3, DATA_NODES_AUTO_ADJUST_SCALE_DOWN=2,"
+ + " DATA_NODES_AUTO_ADJUST_SCALE_UP=3,
DATA_NODES_AUTO_ADJUST_SCALE_DOWN=2,"
+ " DATA_NODES_FILTER='filter',
CONSISTENCY_MODE='HIGH_AVAILABILITY';"
+ System.lineSeparator()
+ "CREATE TABLE IF NOT EXISTS PUBLIC.POJO_VALUE_TEST
(ID INT, F_NAME VARCHAR, L_NAME VARCHAR, STR VARCHAR,"
@@ -123,7 +122,7 @@ class CreateFromAnnotationsTest {
query.toString(),
is("CREATE ZONE IF NOT EXISTS ZONE_TEST WITH
STORAGE_PROFILES='default', PARTITIONS=1, REPLICAS=5, QUORUM_SIZE=2,"
+ " DISTRIBUTION_ALGORITHM='partitionDistribution',"
- + " DATA_NODES_AUTO_ADJUST=1,
DATA_NODES_AUTO_ADJUST_SCALE_UP=3, DATA_NODES_AUTO_ADJUST_SCALE_DOWN=2,"
+ + " DATA_NODES_AUTO_ADJUST_SCALE_UP=3,
DATA_NODES_AUTO_ADJUST_SCALE_DOWN=2,"
+ " DATA_NODES_FILTER='filter',
CONSISTENCY_MODE='HIGH_AVAILABILITY';"
+ System.lineSeparator()
+ "CREATE TABLE IF NOT EXISTS PUBLIC.POJO_VALUE_TEST
(ID INT, ID_STR VARCHAR(20), F_NAME VARCHAR, L_NAME VARCHAR,"
@@ -140,7 +139,7 @@ class CreateFromAnnotationsTest {
query.toString(),
is("CREATE ZONE IF NOT EXISTS ZONE_TEST WITH
STORAGE_PROFILES='default', PARTITIONS=1, REPLICAS=5, QUORUM_SIZE=2,"
+ " DISTRIBUTION_ALGORITHM='partitionDistribution',"
- + " DATA_NODES_AUTO_ADJUST=1,
DATA_NODES_AUTO_ADJUST_SCALE_UP=3, DATA_NODES_AUTO_ADJUST_SCALE_DOWN=2,"
+ + " DATA_NODES_AUTO_ADJUST_SCALE_UP=3,
DATA_NODES_AUTO_ADJUST_SCALE_DOWN=2,"
+ " DATA_NODES_FILTER='filter',
CONSISTENCY_MODE='STRONG_CONSISTENCY';"
+ System.lineSeparator()
+ "CREATE TABLE IF NOT EXISTS PUBLIC.POJO_TEST"
@@ -159,7 +158,7 @@ class CreateFromAnnotationsTest {
query.toString(),
is("CREATE ZONE IF NOT EXISTS \"zone test\" WITH
STORAGE_PROFILES='default', PARTITIONS=1, REPLICAS=3,"
+ " DISTRIBUTION_ALGORITHM='partitionDistribution',"
- + " DATA_NODES_AUTO_ADJUST=1,
DATA_NODES_AUTO_ADJUST_SCALE_UP=3, DATA_NODES_AUTO_ADJUST_SCALE_DOWN=2,"
+ + " DATA_NODES_AUTO_ADJUST_SCALE_UP=3,
DATA_NODES_AUTO_ADJUST_SCALE_DOWN=2,"
+ " DATA_NODES_FILTER='filter',
CONSISTENCY_MODE='STRONG_CONSISTENCY';"
+ System.lineSeparator()
+ "CREATE TABLE IF NOT EXISTS \"sche ma\".\"pojo
test\""
@@ -239,7 +238,6 @@ class CreateFromAnnotationsTest {
replicas = 5,
quorumSize = 2,
distributionAlgorithm = "partitionDistribution",
- dataNodesAutoAdjust = 1,
dataNodesAutoAdjustScaleDown = 2,
dataNodesAutoAdjustScaleUp = 3,
filter = "filter",
@@ -271,7 +269,6 @@ class CreateFromAnnotationsTest {
replicas = 5,
quorumSize = 2,
distributionAlgorithm = "partitionDistribution",
- dataNodesAutoAdjust = 1,
dataNodesAutoAdjustScaleDown = 2,
dataNodesAutoAdjustScaleUp = 3,
filter = "filter",
@@ -309,7 +306,6 @@ class CreateFromAnnotationsTest {
partitions = 1,
replicas = 3,
distributionAlgorithm = "partitionDistribution",
- dataNodesAutoAdjust = 1,
dataNodesAutoAdjustScaleDown = 2,
dataNodesAutoAdjustScaleUp = 3,
filter = "filter",
@@ -377,7 +373,6 @@ class CreateFromAnnotationsTest {
partitions = 1,
replicas = 3,
distributionAlgorithm = "partitionDistribution",
- dataNodesAutoAdjust = 1,
dataNodesAutoAdjustScaleDown = 2,
dataNodesAutoAdjustScaleUp = 3,
filter = "filter",
diff --git
a/modules/catalog-dsl/src/test/java/org/apache/ignite/internal/catalog/sql/CreateFromDefinitionTest.java
b/modules/catalog-dsl/src/test/java/org/apache/ignite/internal/catalog/sql/CreateFromDefinitionTest.java
index 258c8524f1b..2a727c2caac 100644
---
a/modules/catalog-dsl/src/test/java/org/apache/ignite/internal/catalog/sql/CreateFromDefinitionTest.java
+++
b/modules/catalog-dsl/src/test/java/org/apache/ignite/internal/catalog/sql/CreateFromDefinitionTest.java
@@ -53,7 +53,6 @@ class CreateFromDefinitionTest {
.replicas(5)
.quorumSize(2)
.distributionAlgorithm("partitionDistribution")
- .dataNodesAutoAdjust(1)
.dataNodesAutoAdjustScaleDown(2)
.dataNodesAutoAdjustScaleUp(3)
.filter("filter")
@@ -65,7 +64,7 @@ class CreateFromDefinitionTest {
createZone(zone),
is("CREATE ZONE IF NOT EXISTS ZONE_TEST WITH
STORAGE_PROFILES='default', PARTITIONS=3, REPLICAS=5, QUORUM_SIZE=2,"
+ " DISTRIBUTION_ALGORITHM='partitionDistribution',"
- + " DATA_NODES_AUTO_ADJUST=1,
DATA_NODES_AUTO_ADJUST_SCALE_UP=3, DATA_NODES_AUTO_ADJUST_SCALE_DOWN=2,"
+ + " DATA_NODES_AUTO_ADJUST_SCALE_UP=3,
DATA_NODES_AUTO_ADJUST_SCALE_DOWN=2,"
+ " DATA_NODES_FILTER='filter',
CONSISTENCY_MODE='HIGH_AVAILABILITY';")
);
}
@@ -77,7 +76,6 @@ class CreateFromDefinitionTest {
.partitions(1)
.replicas(3)
.distributionAlgorithm("partitionDistribution")
- .dataNodesAutoAdjust(1)
.dataNodesAutoAdjustScaleDown(2)
.dataNodesAutoAdjustScaleUp(3)
.filter("filter")
diff --git
a/modules/catalog-dsl/src/test/java/org/apache/ignite/internal/catalog/sql/InvalidDefinitionTest.java
b/modules/catalog-dsl/src/test/java/org/apache/ignite/internal/catalog/sql/InvalidDefinitionTest.java
index e5812ab9119..463c1e8c74c 100644
---
a/modules/catalog-dsl/src/test/java/org/apache/ignite/internal/catalog/sql/InvalidDefinitionTest.java
+++
b/modules/catalog-dsl/src/test/java/org/apache/ignite/internal/catalog/sql/InvalidDefinitionTest.java
@@ -49,8 +49,6 @@ class InvalidDefinitionTest {
assertZoneBuilderNullOrBlank(ZoneDefinition.Builder::distributionAlgorithm,
"a", "Partition distribution algorithm");
- assertZoneBuilderNull(ZoneDefinition.Builder::dataNodesAutoAdjust, 1,
- "Timeout between node added or node left topology event itself
and data nodes switch");
assertZoneBuilderNull(ZoneDefinition.Builder::dataNodesAutoAdjustScaleUp, 1,
"Timeout between node added topology event itself and data
nodes switch");
assertZoneBuilderNull(ZoneDefinition.Builder::dataNodesAutoAdjustScaleDown, 1,
diff --git
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogParamsValidationUtils.java
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogParamsValidationUtils.java
index c1a0cfc1ed7..01a94c68927 100644
---
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogParamsValidationUtils.java
+++
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogParamsValidationUtils.java
@@ -65,22 +65,6 @@ public class CatalogParamsValidationUtils {
}
}
- /**
- * Validates correctness of the auto adjust params.
- */
- public static void validateZoneDataNodesAutoAdjustParametersCompatibility(
- @Nullable Integer autoAdjust,
- @Nullable Integer scaleUp,
- @Nullable Integer scaleDown
- ) {
- if (autoAdjust != null && (scaleUp != null || scaleDown != null)) {
- throw new CatalogValidationException(
- "Not compatible parameters [dataNodesAutoAdjust={},
dataNodesAutoAdjustScaleUp={}, dataNodesAutoAdjustScaleDown={}].",
- autoAdjust, scaleUp, scaleDown
- );
- }
- }
-
/**
* Validates correctness of the filter.
*/
diff --git
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AlterZoneCommand.java
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AlterZoneCommand.java
index 86f3553e6f8..05deedceae9 100644
---
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AlterZoneCommand.java
+++
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AlterZoneCommand.java
@@ -23,9 +23,7 @@ import static java.lang.Math.round;
import static java.util.Objects.requireNonNullElse;
import static
org.apache.ignite.internal.catalog.CatalogParamsValidationUtils.validateField;
import static
org.apache.ignite.internal.catalog.CatalogParamsValidationUtils.validatePartition;
-import static
org.apache.ignite.internal.catalog.CatalogParamsValidationUtils.validateZoneDataNodesAutoAdjustParametersCompatibility;
import static
org.apache.ignite.internal.catalog.CatalogParamsValidationUtils.validateZoneFilter;
-import static
org.apache.ignite.internal.catalog.commands.CatalogUtils.INFINITE_TIMER_VALUE;
import static
org.apache.ignite.internal.catalog.commands.CatalogUtils.fromParams;
import static org.apache.ignite.internal.catalog.commands.CatalogUtils.zone;
@@ -60,8 +58,6 @@ public class AlterZoneCommand extends AbstractZoneCommand {
private final @Nullable Integer quorumSize;
- private final @Nullable Integer dataNodesAutoAdjust;
-
private final @Nullable Integer dataNodesAutoAdjustScaleUp;
private final @Nullable Integer dataNodesAutoAdjustScaleDown;
@@ -78,7 +74,6 @@ public class AlterZoneCommand extends AbstractZoneCommand {
* @param partitions Number of partitions.
* @param replicas Number of replicas.
* @param quorumSize Quorum size.
- * @param dataNodesAutoAdjust Timeout in seconds between node added or
node left topology event itself and data nodes switch.
* @param dataNodesAutoAdjustScaleUp Timeout in seconds between node added
topology event itself and data nodes switch.
* @param dataNodesAutoAdjustScaleDown Timeout in seconds between node
left topology event itself and data nodes switch.
* @param filter Nodes filter.
@@ -91,7 +86,6 @@ public class AlterZoneCommand extends AbstractZoneCommand {
@Nullable Integer partitions,
@Nullable Integer replicas,
@Nullable Integer quorumSize,
- @Nullable Integer dataNodesAutoAdjust,
@Nullable Integer dataNodesAutoAdjustScaleUp,
@Nullable Integer dataNodesAutoAdjustScaleDown,
@Nullable String filter,
@@ -103,7 +97,6 @@ public class AlterZoneCommand extends AbstractZoneCommand {
this.partitions = partitions;
this.replicas = replicas;
this.quorumSize = quorumSize;
- this.dataNodesAutoAdjust = dataNodesAutoAdjust;
this.dataNodesAutoAdjustScaleUp = dataNodesAutoAdjustScaleUp;
this.dataNodesAutoAdjustScaleDown = dataNodesAutoAdjustScaleDown;
this.filter = filter;
@@ -131,16 +124,10 @@ public class AlterZoneCommand extends AbstractZoneCommand
{
}
private CatalogZoneDescriptor
fromParamsAndPreviousValue(CatalogZoneDescriptor previous) {
- @Nullable Integer autoAdjust = null;
@Nullable Integer scaleUp = null;
@Nullable Integer scaleDown = null;
- if (dataNodesAutoAdjust != null) {
- autoAdjust = dataNodesAutoAdjust;
- scaleUp = INFINITE_TIMER_VALUE;
- scaleDown = INFINITE_TIMER_VALUE;
- } else if (dataNodesAutoAdjustScaleUp != null ||
dataNodesAutoAdjustScaleDown != null) {
- autoAdjust = INFINITE_TIMER_VALUE;
+ if (dataNodesAutoAdjustScaleUp != null || dataNodesAutoAdjustScaleDown
!= null) {
scaleUp = dataNodesAutoAdjustScaleUp;
scaleDown = dataNodesAutoAdjustScaleDown;
}
@@ -157,7 +144,6 @@ public class AlterZoneCommand extends AbstractZoneCommand {
requireNonNullElse(partitions, previous.partitions()),
replicas,
quorumSize,
- requireNonNullElse(autoAdjust, previous.dataNodesAutoAdjust()),
requireNonNullElse(scaleUp,
previous.dataNodesAutoAdjustScaleUp()),
requireNonNullElse(scaleDown,
previous.dataNodesAutoAdjustScaleDown()),
requireNonNullElse(filter, previous.filter()),
@@ -205,16 +191,9 @@ public class AlterZoneCommand extends AbstractZoneCommand {
validatePartition(partitions);
validateField(replicas, 1, null, "Invalid number of replicas");
validateField(quorumSize, 1, null, "Invalid quorum size");
- validateField(dataNodesAutoAdjust, 0, null, "Invalid data nodes auto
adjust");
validateField(dataNodesAutoAdjustScaleUp, 0, null, "Invalid data nodes
auto adjust scale up");
validateField(dataNodesAutoAdjustScaleDown, 0, null, "Invalid data
nodes auto adjust scale down");
- validateZoneDataNodesAutoAdjustParametersCompatibility(
- dataNodesAutoAdjust,
- dataNodesAutoAdjustScaleUp,
- dataNodesAutoAdjustScaleDown
- );
-
validateZoneFilter(filter);
}
@@ -232,8 +211,6 @@ public class AlterZoneCommand extends AbstractZoneCommand {
private @Nullable Integer quorumSize;
- private @Nullable Integer dataNodesAutoAdjust;
-
private @Nullable Integer dataNodesAutoAdjustScaleUp;
private @Nullable Integer dataNodesAutoAdjustScaleDown;
@@ -277,13 +254,6 @@ public class AlterZoneCommand extends AbstractZoneCommand {
return this;
}
- @Override
- public AlterZoneCommandBuilder dataNodesAutoAdjust(Integer adjust) {
- dataNodesAutoAdjust = adjust;
-
- return this;
- }
-
@Override
public AlterZoneCommandBuilder dataNodesAutoAdjustScaleUp(Integer
adjust) {
dataNodesAutoAdjustScaleUp = adjust;
@@ -320,7 +290,6 @@ public class AlterZoneCommand extends AbstractZoneCommand {
partitions,
replicas,
quorumSize,
- dataNodesAutoAdjust,
dataNodesAutoAdjustScaleUp,
dataNodesAutoAdjustScaleDown,
filter,
diff --git
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AlterZoneCommandBuilder.java
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AlterZoneCommandBuilder.java
index 6338214bc39..8e57701ca4b 100644
---
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AlterZoneCommandBuilder.java
+++
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AlterZoneCommandBuilder.java
@@ -55,14 +55,6 @@ public interface AlterZoneCommandBuilder extends
AbstractZoneCommandBuilder<Alte
*/
AlterZoneCommandBuilder quorumSize(@Nullable Integer quorumSize);
- /**
- * Sets timeout in seconds between node added or node left topology event
itself and data nodes switch.
- *
- * @param adjust Optional timeout.
- * @return This instance.
- */
- AlterZoneCommandBuilder dataNodesAutoAdjust(@Nullable Integer adjust);
-
/**
* Sets timeout in seconds between node added topology event itself and
data nodes switch.
*
diff --git
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CreateZoneCommand.java
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CreateZoneCommand.java
index c5e4e217e46..d978f0e1471 100644
---
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CreateZoneCommand.java
+++
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CreateZoneCommand.java
@@ -24,7 +24,6 @@ import static java.util.Objects.requireNonNullElse;
import static
org.apache.ignite.internal.catalog.CatalogParamsValidationUtils.validateConsistencyMode;
import static
org.apache.ignite.internal.catalog.CatalogParamsValidationUtils.validateField;
import static
org.apache.ignite.internal.catalog.CatalogParamsValidationUtils.validateStorageProfiles;
-import static
org.apache.ignite.internal.catalog.CatalogParamsValidationUtils.validateZoneDataNodesAutoAdjustParametersCompatibility;
import static
org.apache.ignite.internal.catalog.CatalogParamsValidationUtils.validateZoneFilter;
import static
org.apache.ignite.internal.catalog.commands.CatalogUtils.DEFAULT_FILTER;
import static
org.apache.ignite.internal.catalog.commands.CatalogUtils.DEFAULT_PARTITION_COUNT;
@@ -65,8 +64,6 @@ public class CreateZoneCommand extends AbstractZoneCommand {
private final @Nullable Integer quorumSize;
- private final @Nullable Integer dataNodesAutoAdjust;
-
private final @Nullable Integer dataNodesAutoAdjustScaleUp;
private final @Nullable Integer dataNodesAutoAdjustScaleDown;
@@ -85,7 +82,6 @@ public class CreateZoneCommand extends AbstractZoneCommand {
* @param partitions Number of partitions.
* @param replicas Number of replicas.
* @param quorumSize Quorum size.
- * @param dataNodesAutoAdjust Timeout in seconds between node added or
node left topology event itself and data nodes switch.
* @param dataNodesAutoAdjustScaleUp Timeout in seconds between node added
topology event itself and data nodes switch.
* @param dataNodesAutoAdjustScaleDown Timeout in seconds between node
left topology event itself and data nodes switch.
* @param filter Nodes filter.
@@ -98,7 +94,6 @@ public class CreateZoneCommand extends AbstractZoneCommand {
@Nullable Integer partitions,
@Nullable Integer replicas,
@Nullable Integer quorumSize,
- @Nullable Integer dataNodesAutoAdjust,
@Nullable Integer dataNodesAutoAdjustScaleUp,
@Nullable Integer dataNodesAutoAdjustScaleDown,
@Nullable String filter,
@@ -110,7 +105,6 @@ public class CreateZoneCommand extends AbstractZoneCommand {
this.partitions = partitions;
this.replicas = replicas;
this.quorumSize = quorumSize;
- this.dataNodesAutoAdjust = dataNodesAutoAdjust;
this.dataNodesAutoAdjustScaleUp = dataNodesAutoAdjustScaleUp;
this.dataNodesAutoAdjustScaleDown = dataNodesAutoAdjustScaleDown;
this.filter = filter;
@@ -152,10 +146,9 @@ public class CreateZoneCommand extends AbstractZoneCommand
{
requireNonNullElse(partitions, DEFAULT_PARTITION_COUNT),
replicas,
requireNonNullElse(quorumSize, defaultQuorumSize(replicas)),
- requireNonNullElse(dataNodesAutoAdjust, INFINITE_TIMER_VALUE),
requireNonNullElse(
dataNodesAutoAdjustScaleUp,
- dataNodesAutoAdjust != null ? INFINITE_TIMER_VALUE :
IMMEDIATE_TIMER_VALUE
+ IMMEDIATE_TIMER_VALUE
),
requireNonNullElse(dataNodesAutoAdjustScaleDown,
INFINITE_TIMER_VALUE),
requireNonNullElse(filter, DEFAULT_FILTER),
@@ -173,16 +166,9 @@ public class CreateZoneCommand extends AbstractZoneCommand
{
int quorumSize = requireNonNullElse(this.quorumSize,
defaultQuorumSize(replicas));
validateReplicasAndQuorumCompatibility(replicas, quorumSize);
- validateField(dataNodesAutoAdjust, 0, null, "Invalid data nodes auto
adjust");
validateField(dataNodesAutoAdjustScaleUp, 0, null, "Invalid data nodes
auto adjust scale up");
validateField(dataNodesAutoAdjustScaleDown, 0, null, "Invalid data
nodes auto adjust scale down");
- validateZoneDataNodesAutoAdjustParametersCompatibility(
- dataNodesAutoAdjust,
- dataNodesAutoAdjustScaleUp,
- dataNodesAutoAdjustScaleDown
- );
-
validateZoneFilter(filter);
validateConsistencyMode(consistencyMode);
@@ -239,8 +225,6 @@ public class CreateZoneCommand extends AbstractZoneCommand {
private @Nullable Integer quorumSize;
- private @Nullable Integer dataNodesAutoAdjust;
-
private @Nullable Integer dataNodesAutoAdjustScaleUp;
private @Nullable Integer dataNodesAutoAdjustScaleDown;
@@ -286,13 +270,6 @@ public class CreateZoneCommand extends AbstractZoneCommand
{
return this;
}
- @Override
- public CreateZoneCommandBuilder dataNodesAutoAdjust(Integer adjust) {
- dataNodesAutoAdjust = adjust;
-
- return this;
- }
-
@Override
public CreateZoneCommandBuilder dataNodesAutoAdjustScaleUp(Integer
adjust) {
dataNodesAutoAdjustScaleUp = adjust;
@@ -336,7 +313,6 @@ public class CreateZoneCommand extends AbstractZoneCommand {
partitions,
replicas,
quorumSize,
- dataNodesAutoAdjust,
dataNodesAutoAdjustScaleUp,
dataNodesAutoAdjustScaleDown,
filter,
diff --git
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CreateZoneCommandBuilder.java
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CreateZoneCommandBuilder.java
index 892aef7c7d2..f7bd879d357 100644
---
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CreateZoneCommandBuilder.java
+++
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CreateZoneCommandBuilder.java
@@ -55,14 +55,6 @@ public interface CreateZoneCommandBuilder extends
AbstractZoneCommandBuilder<Cre
*/
CreateZoneCommandBuilder quorumSize(@Nullable Integer quorumSize);
- /**
- * Sets timeout in seconds between node added or node left topology event
itself and data nodes switch.
- *
- * @param adjust Optional timeout.
- * @return This instance.
- */
- CreateZoneCommandBuilder dataNodesAutoAdjust(@Nullable Integer adjust);
-
/**
* Sets timeout in seconds between node added topology event itself and
data nodes switch.
*
diff --git
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/RenameZoneCommand.java
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/RenameZoneCommand.java
index e25ca037222..2ff38121498 100644
---
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/RenameZoneCommand.java
+++
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/RenameZoneCommand.java
@@ -81,7 +81,6 @@ public class RenameZoneCommand extends AbstractZoneCommand {
zone.partitions(),
zone.replicas(),
zone.quorumSize(),
- zone.dataNodesAutoAdjust(),
zone.dataNodesAutoAdjustScaleUp(),
zone.dataNodesAutoAdjustScaleDown(),
zone.filter(),
diff --git
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/descriptors/CatalogZoneDescriptor.java
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/descriptors/CatalogZoneDescriptor.java
index 912dc4f131a..1013c7104ec 100644
---
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/descriptors/CatalogZoneDescriptor.java
+++
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/descriptors/CatalogZoneDescriptor.java
@@ -38,7 +38,10 @@ public class CatalogZoneDescriptor extends
CatalogObjectDescriptor implements Ma
/** Quorum size. */
private final int quorumSize;
- /** Data nodes auto adjust timeout. */
+ /**
+ * Data nodes auto adjust timeout. Deprecated field, do not use it
anymore. Use {@link #dataNodesAutoAdjustScaleUp} and
+ * {@link #dataNodesAutoAdjustScaleDown} instead. The field is left for
backward compatibility.
+ */
private final int dataNodesAutoAdjust;
/** Data nodes auto adjust scale up timeout. */
@@ -89,6 +92,7 @@ public class CatalogZoneDescriptor extends
CatalogObjectDescriptor implements Ma
* @param storageProfiles Storage profiles descriptor.
* @param consistencyMode Consistency mode of the zone.
*/
+ @Deprecated
public CatalogZoneDescriptor(
int id,
String name,
@@ -106,6 +110,36 @@ public class CatalogZoneDescriptor extends
CatalogObjectDescriptor implements Ma
filter, storageProfiles, INITIAL_TIMESTAMP, consistencyMode);
}
+ /**
+ * Constructs a distribution zone descriptor.
+ *
+ * @param id Id of the distribution zone.
+ * @param name Name of the zone.
+ * @param partitions Count of partitions in distributions zone.
+ * @param replicas Count of partition replicas.
+ * @param quorumSize Quorum size.
+ * @param dataNodesAutoAdjustScaleUp Data nodes auto adjust scale up
timeout.
+ * @param dataNodesAutoAdjustScaleDown Data nodes auto adjust scale down
timeout.
+ * @param filter Nodes filter.
+ * @param storageProfiles Storage profiles descriptor.
+ * @param consistencyMode Consistency mode of the zone.
+ */
+ public CatalogZoneDescriptor(
+ int id,
+ String name,
+ int partitions,
+ int replicas,
+ int quorumSize,
+ int dataNodesAutoAdjustScaleUp,
+ int dataNodesAutoAdjustScaleDown,
+ String filter,
+ CatalogStorageProfilesDescriptor storageProfiles,
+ ConsistencyMode consistencyMode
+ ) {
+ this(id, name, partitions, replicas, quorumSize, 0,
dataNodesAutoAdjustScaleUp, dataNodesAutoAdjustScaleDown,
+ filter, storageProfiles, INITIAL_TIMESTAMP, consistencyMode);
+ }
+
/**
* Constructs a distribution zone descriptor.
*
@@ -119,6 +153,7 @@ public class CatalogZoneDescriptor extends
CatalogObjectDescriptor implements Ma
* @param filter Nodes filter.
* @param timestamp Timestamp of the update of the descriptor.
*/
+ @Deprecated
CatalogZoneDescriptor(
int id,
String name,
@@ -146,6 +181,44 @@ public class CatalogZoneDescriptor extends
CatalogObjectDescriptor implements Ma
this.consistencyMode = consistencyMode;
}
+ /**
+ * Constructs a distribution zone descriptor.
+ *
+ * @param id Id of the distribution zone.
+ * @param name Name of the zone.
+ * @param partitions Count of partitions in distributions zone.
+ * @param replicas Count of partition replicas.
+ * @param dataNodesAutoAdjustScaleUp Data nodes auto adjust scale up
timeout.
+ * @param dataNodesAutoAdjustScaleDown Data nodes auto adjust scale down
timeout.
+ * @param filter Nodes filter.
+ * @param timestamp Timestamp of the update of the descriptor.
+ */
+ CatalogZoneDescriptor(
+ int id,
+ String name,
+ int partitions,
+ int replicas,
+ int quorumSize,
+ int dataNodesAutoAdjustScaleUp,
+ int dataNodesAutoAdjustScaleDown,
+ String filter,
+ CatalogStorageProfilesDescriptor storageProfiles,
+ HybridTimestamp timestamp,
+ ConsistencyMode consistencyMode
+ ) {
+ super(id, Type.ZONE, name, timestamp);
+
+ this.partitions = partitions;
+ this.replicas = replicas;
+ this.quorumSize = quorumSize;
+ this.dataNodesAutoAdjust = 0;
+ this.dataNodesAutoAdjustScaleUp = dataNodesAutoAdjustScaleUp;
+ this.dataNodesAutoAdjustScaleDown = dataNodesAutoAdjustScaleDown;
+ this.filter = filter;
+ this.storageProfiles = storageProfiles;
+ this.consistencyMode = consistencyMode;
+ }
+
/**
* Returns count of zone partitions.
*/
@@ -181,6 +254,7 @@ public class CatalogZoneDescriptor extends
CatalogObjectDescriptor implements Ma
*
* @return Data nodes auto adjust timeout.
*/
+ @Deprecated
public int dataNodesAutoAdjust() {
return dataNodesAutoAdjust;
}
diff --git
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/descriptors/CatalogZoneDescriptorSerializers.java
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/descriptors/CatalogZoneDescriptorSerializers.java
index 4babda8a719..6254767a09e 100644
---
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/descriptors/CatalogZoneDescriptorSerializers.java
+++
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/descriptors/CatalogZoneDescriptorSerializers.java
@@ -121,7 +121,7 @@ public class CatalogZoneDescriptorSerializers {
int partitions = input.readVarIntAsInt();
int replicas = input.readVarIntAsInt();
int quorumSize = input.readVarIntAsInt();
- int dataNodesAutoAdjust = input.readVarIntAsInt();
+ input.readVarIntAsInt(); // deprecated field dataNodesAutoAdjust
read, kept for compatibility.
int dataNodesAutoAdjustScaleUp = input.readVarIntAsInt();
int dataNodesAutoAdjustScaleDown = input.readVarIntAsInt();
String filter = input.readUTF();
@@ -133,7 +133,6 @@ public class CatalogZoneDescriptorSerializers {
partitions,
replicas,
quorumSize,
- dataNodesAutoAdjust,
dataNodesAutoAdjustScaleUp,
dataNodesAutoAdjustScaleDown,
filter,
@@ -154,7 +153,7 @@ public class CatalogZoneDescriptorSerializers {
output.writeVarInt(descriptor.partitions());
output.writeVarInt(descriptor.replicas());
output.writeVarInt(descriptor.quorumSize());
- output.writeVarInt(descriptor.dataNodesAutoAdjust());
+ output.writeVarInt(descriptor.dataNodesAutoAdjust()); //
deprecated field, kept for compatibility.
output.writeVarInt(descriptor.dataNodesAutoAdjustScaleUp());
output.writeVarInt(descriptor.dataNodesAutoAdjustScaleDown());
output.writeUTF(descriptor.filter());
diff --git
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogManagerSelfTest.java
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogManagerSelfTest.java
index 9dfe85fe917..2acfd6b68e9 100644
---
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogManagerSelfTest.java
+++
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogManagerSelfTest.java
@@ -133,7 +133,6 @@ public class CatalogManagerSelfTest extends
BaseCatalogManagerTest {
assertEquals(DEFAULT_PARTITION_COUNT, zone.partitions());
assertEquals(DEFAULT_REPLICA_COUNT, zone.replicas());
assertEquals(DEFAULT_FILTER, zone.filter());
- assertEquals(INFINITE_TIMER_VALUE, zone.dataNodesAutoAdjust());
assertEquals(defaultZoneDefaultAutoAdjustScaleUpTimeoutSeconds(colocationEnabled()),
zone.dataNodesAutoAdjustScaleUp());
assertEquals(INFINITE_TIMER_VALUE,
zone.dataNodesAutoAdjustScaleDown());
assertNotNull(zone.storageProfiles());
diff --git
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogTableTest.java
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogTableTest.java
index f7fc0493c0c..2f1e4ed6b91 100644
---
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogTableTest.java
+++
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogTableTest.java
@@ -1145,7 +1145,6 @@ public class CatalogTableTest extends
BaseCatalogManagerTest {
.zoneName(customZoneName)
.partitions(42)
.replicas(15)
- .dataNodesAutoAdjust(73)
.filter("expression")
.storageProfilesParams(List.of(StorageProfileParams.builder().storageProfile("test_profile").build()))
.build();
diff --git
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogZoneTest.java
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogZoneTest.java
index 901603a07e0..ff4519ed59b 100644
---
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogZoneTest.java
+++
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogZoneTest.java
@@ -68,7 +68,6 @@ public class CatalogZoneTest extends BaseCatalogManagerTest {
.zoneName(zoneName)
.partitions(42)
.replicas(15)
- .dataNodesAutoAdjust(73)
.filter("expression")
.storageProfilesParams(List.of(StorageProfileParams.builder().storageProfile("test_profile").build()))
.build();
@@ -89,8 +88,7 @@ public class CatalogZoneTest extends BaseCatalogManagerTest {
assertEquals(zoneName, zone.name());
assertEquals(42, zone.partitions());
assertEquals(15, zone.replicas());
- assertEquals(73, zone.dataNodesAutoAdjust());
- assertEquals(INFINITE_TIMER_VALUE, zone.dataNodesAutoAdjustScaleUp());
+ assertEquals(IMMEDIATE_TIMER_VALUE, zone.dataNodesAutoAdjustScaleUp());
assertEquals(INFINITE_TIMER_VALUE,
zone.dataNodesAutoAdjustScaleDown());
assertEquals("expression", zone.filter());
assertEquals("test_profile",
zone.storageProfiles().profiles().get(0).storageProfile());
@@ -355,7 +353,6 @@ public class CatalogZoneTest extends BaseCatalogManagerTest
{
.zoneName(zoneName)
.partitions(42)
.replicas(15)
- .dataNodesAutoAdjust(73)
.filter("expression")
.storageProfilesParams(List.of(StorageProfileParams.builder().storageProfile(DEFAULT_STORAGE_PROFILE).build()))
.build();
@@ -386,7 +383,6 @@ public class CatalogZoneTest extends BaseCatalogManagerTest
{
assertEquals(42, zone.partitions());
assertEquals(2, zone.replicas());
assertEquals(2, zone.quorumSize());
- assertEquals(INFINITE_TIMER_VALUE, zone.dataNodesAutoAdjust());
assertEquals(3, zone.dataNodesAutoAdjustScaleUp());
assertEquals(4, zone.dataNodesAutoAdjustScaleDown());
assertEquals("newExpression", zone.filter());
@@ -516,7 +512,6 @@ public class CatalogZoneTest extends BaseCatalogManagerTest
{
assertEquals(DEFAULT_PARTITION_COUNT, zone.partitions());
assertEquals(DEFAULT_REPLICA_COUNT, zone.replicas());
- assertEquals(INFINITE_TIMER_VALUE, zone.dataNodesAutoAdjust());
assertEquals(IMMEDIATE_TIMER_VALUE, zone.dataNodesAutoAdjustScaleUp());
assertEquals(INFINITE_TIMER_VALUE,
zone.dataNodesAutoAdjustScaleDown());
assertEquals(DEFAULT_FILTER, zone.filter());
diff --git
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/AbstractCommandValidationTest.java
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/AbstractCommandValidationTest.java
index dd159143e7b..a2a8c1d710b 100644
---
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/AbstractCommandValidationTest.java
+++
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/AbstractCommandValidationTest.java
@@ -73,7 +73,6 @@ abstract class AbstractCommandValidationTest extends
BaseIgniteAbstractTest {
1,
-1,
-1,
- -1,
"",
fromParams(List.of(StorageProfileParams.builder().storageProfile(DEFAULT_STORAGE_PROFILE).build())),
ConsistencyMode.STRONG_CONSISTENCY
diff --git
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/AlterZoneCommandValidationTest.java
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/AlterZoneCommandValidationTest.java
index 38de762fa75..335aca2932d 100644
---
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/AlterZoneCommandValidationTest.java
+++
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/AlterZoneCommandValidationTest.java
@@ -175,20 +175,6 @@ public class AlterZoneCommandValidationTest extends
AbstractCommandValidationTes
}
}
- @Test
- void zoneAutoAdjust() {
- assertThrows(
- CatalogValidationException.class,
- () -> alterZoneBuilder().dataNodesAutoAdjust(-1).build(),
- "Invalid data nodes auto adjust"
- );
-
- // Let's check the success cases.
- alterZoneBuilder().dataNodesAutoAdjust(INFINITE_TIMER_VALUE).build();
- alterZoneBuilder().dataNodesAutoAdjust(IMMEDIATE_TIMER_VALUE).build();
- alterZoneBuilder().dataNodesAutoAdjust(10).build();
- }
-
@Test
void zoneAutoAdjustScaleUp() {
assertThrows(
@@ -217,74 +203,6 @@ public class AlterZoneCommandValidationTest extends
AbstractCommandValidationTes
alterZoneBuilder().dataNodesAutoAdjustScaleDown(10).build();
}
- @Test
- void zoneAutoAdjustCompatibility() {
- // Auto adjust + scale up.
- assertThrows(
- CatalogValidationException.class,
- () -> alterZoneParams(66, IMMEDIATE_TIMER_VALUE, null),
- "Not compatible parameters"
- );
-
- assertThrows(
- CatalogValidationException.class,
- () -> alterZoneParams(66, INFINITE_TIMER_VALUE, null),
- "Not compatible parameters"
- );
-
- assertThrows(
- CatalogValidationException.class,
- () -> alterZoneParams(66, 77, null),
- "Not compatible parameters"
- );
-
- // Auto adjust + scale down.
- assertThrows(
- CatalogValidationException.class,
- () -> alterZoneParams(66, null, IMMEDIATE_TIMER_VALUE),
- "Not compatible parameters"
- );
-
- assertThrows(
- CatalogValidationException.class,
- () -> alterZoneParams(66, null, INFINITE_TIMER_VALUE),
- "Not compatible parameters"
- );
-
- assertThrows(
- CatalogValidationException.class,
- () -> alterZoneParams(66, null, 88),
- "Not compatible parameters"
- );
-
- // Auto adjust + scale up + scale down.
- assertThrows(
- CatalogValidationException.class,
- () -> alterZoneParams(66, IMMEDIATE_TIMER_VALUE,
IMMEDIATE_TIMER_VALUE),
- "Not compatible parameters"
- );
-
- assertThrows(
- CatalogValidationException.class,
- () -> alterZoneParams(66, INFINITE_TIMER_VALUE,
INFINITE_TIMER_VALUE),
- "Not compatible parameters"
- );
-
- assertThrows(
- CatalogValidationException.class,
- () -> alterZoneParams(66, 77, 88),
- "Not compatible parameters"
- );
-
- // Let's check the success cases.
- alterZoneParams(IMMEDIATE_TIMER_VALUE, null, null);
- alterZoneParams(INFINITE_TIMER_VALUE, null, null);
- alterZoneParams(66, null, null);
- alterZoneParams(null, IMMEDIATE_TIMER_VALUE, IMMEDIATE_TIMER_VALUE);
- alterZoneParams(null, INFINITE_TIMER_VALUE, INFINITE_TIMER_VALUE);
- alterZoneParams(null, 77, 88);
- }
-
@Test
void zoneFilter() {
assertThrows(
@@ -305,9 +223,8 @@ public class AlterZoneCommandValidationTest extends
AbstractCommandValidationTes
alterZoneBuilder().filter(DEFAULT_FILTER).build();
}
- private static CatalogCommand alterZoneParams(@Nullable Integer
autoAdjust, @Nullable Integer scaleUp, @Nullable Integer scaleDown) {
+ private static CatalogCommand alterZoneParams(@Nullable Integer scaleUp,
@Nullable Integer scaleDown) {
return alterZoneBuilder()
- .dataNodesAutoAdjust(autoAdjust)
.dataNodesAutoAdjustScaleUp(scaleUp)
.dataNodesAutoAdjustScaleDown(scaleDown)
.build();
diff --git
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/CreateZoneCommandValidationTest.java
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/CreateZoneCommandValidationTest.java
index 545aa17604d..2fcac0ef132 100644
---
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/CreateZoneCommandValidationTest.java
+++
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/CreateZoneCommandValidationTest.java
@@ -177,20 +177,6 @@ public class CreateZoneCommandValidationTest extends
AbstractCommandValidationTe
assertThat(zoneDescriptor.quorumSize(), is(maxQuorumSize - 1));
}
- @Test
- void zoneAutoAdjust() {
- assertThrows(
- CatalogValidationException.class,
- () -> createZoneBuilder().dataNodesAutoAdjust(-1).build(),
- "Invalid data nodes auto adjust"
- );
-
- // Let's check the success cases.
- createZoneBuilder().dataNodesAutoAdjust(INFINITE_TIMER_VALUE).build();
- createZoneBuilder().dataNodesAutoAdjust(IMMEDIATE_TIMER_VALUE).build();
- createZoneBuilder().dataNodesAutoAdjust(10).build();
- }
-
@Test
void zoneAutoAdjustScaleUp() {
assertThrows(
@@ -219,76 +205,6 @@ public class CreateZoneCommandValidationTest extends
AbstractCommandValidationTe
createZoneBuilder().dataNodesAutoAdjustScaleDown(10).build();
}
- @Test
- void zoneAutoAdjustCompatibility() {
- // Auto adjust + scale up.
- assertThrows(
- CatalogValidationException.class,
- () -> createZoneParams(66, IMMEDIATE_TIMER_VALUE, null),
- "Not compatible parameters"
- );
-
- assertThrows(
- CatalogValidationException.class,
- () -> createZoneParams(66, INFINITE_TIMER_VALUE, null),
- "Not compatible parameters"
- );
-
- assertThrows(
- CatalogValidationException.class,
- () -> createZoneParams(66, 77, null),
- "Not compatible parameters"
- );
-
- // Auto adjust + scale down.
- assertThrows(
- CatalogValidationException.class,
- () -> createZoneParams(66, null, IMMEDIATE_TIMER_VALUE),
- "Not compatible parameters"
- );
-
- assertThrows(
- CatalogValidationException.class,
- () -> createZoneParams(66, null, INFINITE_TIMER_VALUE),
- "Not compatible parameters"
- );
-
- assertThrows(
- CatalogValidationException.class,
- () -> createZoneParams(66, null, 88),
- "Not compatible parameters"
- );
-
- // Auto adjust + scale up + scale down.
- assertThrows(
- CatalogValidationException.class,
- () -> createZoneParams(66, IMMEDIATE_TIMER_VALUE,
IMMEDIATE_TIMER_VALUE),
- "Not compatible parameters"
- );
-
- assertThrows(
- CatalogValidationException.class,
- () -> createZoneParams(66, INFINITE_TIMER_VALUE,
INFINITE_TIMER_VALUE),
- "Not compatible parameters"
- );
-
- assertThrows(
- CatalogValidationException.class,
- () -> createZoneParams(66, 77, 88),
- "Not compatible parameters"
- );
-
- // Let's check the success cases.
-
- // Auto adjust only.
- createZoneParams(IMMEDIATE_TIMER_VALUE, null, null);
- createZoneParams(INFINITE_TIMER_VALUE, null, null);
- createZoneParams(66, null, null);
- createZoneParams(null, IMMEDIATE_TIMER_VALUE, IMMEDIATE_TIMER_VALUE);
- createZoneParams(null, INFINITE_TIMER_VALUE, INFINITE_TIMER_VALUE);
- createZoneParams(null, 77, 88);
- }
-
@Test
void zoneFilter() {
assertThrows(
@@ -350,9 +266,8 @@ public class CreateZoneCommandValidationTest extends
AbstractCommandValidationTe
);
}
- private static CatalogCommand createZoneParams(@Nullable Integer
autoAdjust, @Nullable Integer scaleUp, @Nullable Integer scaleDown) {
+ private static CatalogCommand createZoneParams(@Nullable Integer scaleUp,
@Nullable Integer scaleDown) {
return createZoneBuilder()
- .dataNodesAutoAdjust(autoAdjust)
.dataNodesAutoAdjustScaleUp(scaleUp)
.dataNodesAutoAdjustScaleDown(scaleDown)
.build();
diff --git
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/descriptors/CatalogZoneDescriptorTest.java
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/descriptors/CatalogZoneDescriptorTest.java
index 4be98c2f006..ee66d54d82b 100644
---
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/descriptors/CatalogZoneDescriptorTest.java
+++
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/descriptors/CatalogZoneDescriptorTest.java
@@ -49,7 +49,6 @@ class CatalogZoneDescriptorTest {
assertThat(toString, containsString("partitions=2"));
assertThat(toString, containsString("replicas=5"));
assertThat(toString, containsString("quorumSize=3"));
- assertThat(toString, containsString("dataNodesAutoAdjust=5"));
assertThat(toString, containsString("dataNodesAutoAdjustScaleUp=6"));
assertThat(toString, containsString("dataNodesAutoAdjustScaleDown=7"));
assertThat(toString, containsString("filter=the-filter"));
@@ -57,11 +56,6 @@ class CatalogZoneDescriptorTest {
assertThat(toString,
containsString("consistencyMode=STRONG_CONSISTENCY"));
}
- @Test
- void testUpdateRequiresAssignmentsRecalculationAutoAdjust() {
- doTestUpdateRequiresAssignmentsRecalculation(builder ->
builder.dataNodesAutoAdjust(100), false);
- }
-
@Test
void testUpdateRequiresAssignmentsRecalculationAutoAdjustScaleUp() {
doTestUpdateRequiresAssignmentsRecalculation(builder ->
builder.dataNodesAutoAdjustScaleUp(100), false);
@@ -119,7 +113,6 @@ class CatalogZoneDescriptorTest {
2,
5,
3,
- 5,
6,
7,
"the-filter",
diff --git
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/storage/CatalogEntrySerializationTest.java
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/storage/CatalogEntrySerializationTest.java
index ce4cad9b2ad..851e151cc92 100644
---
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/storage/CatalogEntrySerializationTest.java
+++
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/storage/CatalogEntrySerializationTest.java
@@ -515,7 +515,6 @@ public class CatalogEntrySerializationTest extends
BaseIgniteAbstractTest {
partitions,
3,
2, // default
- 1,
2,
3,
DEFAULT_FILTER,
diff --git
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/storage/TestZoneDescriptors.java
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/storage/TestZoneDescriptors.java
index b7c0677c32c..87de0eb318f 100644
---
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/storage/TestZoneDescriptors.java
+++
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/storage/TestZoneDescriptors.java
@@ -119,7 +119,6 @@ final class TestZoneDescriptors {
1,
2,
2,
- 3,
4,
5,
CatalogUtils.DEFAULT_FILTER,
@@ -133,7 +132,6 @@ final class TestZoneDescriptors {
6,
5,
3,
- 3,
2,
1,
"$[?(@.region == \"europe\")]",
@@ -147,7 +145,6 @@ final class TestZoneDescriptors {
6,
10,
5,
- 3,
2,
1,
CatalogUtils.DEFAULT_FILTER,
diff --git
a/modules/client-handler/src/testFixtures/java/org/apache/ignite/client/handler/FakeCatalogService.java
b/modules/client-handler/src/testFixtures/java/org/apache/ignite/client/handler/FakeCatalogService.java
index f3cdffffcce..a5ec9740d2c 100644
---
a/modules/client-handler/src/testFixtures/java/org/apache/ignite/client/handler/FakeCatalogService.java
+++
b/modules/client-handler/src/testFixtures/java/org/apache/ignite/client/handler/FakeCatalogService.java
@@ -90,7 +90,6 @@ public class FakeCatalogService implements CatalogService {
0,
0,
0,
- 0,
"",
fromParams(Collections.emptyList()),
ConsistencyMode.STRONG_CONSISTENCY
diff --git
a/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/DataNodesManager.java
b/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/DataNodesManager.java
index 90ebd2d2fb5..cd3bad009bc 100644
---
a/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/DataNodesManager.java
+++
b/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/DataNodesManager.java
@@ -373,12 +373,6 @@ public class DataNodesManager {
.filter(node -> !scaleDownTimer.nodes().contains(node))
.collect(toSet());
- if ((!addedNodes.isEmpty() || !removedNodes.isEmpty())
- && zoneDescriptor.dataNodesAutoAdjust() !=
INFINITE_TIMER_VALUE) {
- // TODO: IGNITE-18134 Create scheduler with dataNodesAutoAdjust
timer.
- throw new UnsupportedOperationException("Data nodes auto adjust is
not supported.");
- }
-
int partitionResetDelay =
partitionDistributionResetTimeoutSupplier.getAsInt();
if (!removedNodes.isEmpty()
diff --git
a/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/utils/CatalogAlterZoneEventListener.java
b/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/utils/CatalogAlterZoneEventListener.java
index 63eef570809..162ba84fbf3 100644
---
a/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/utils/CatalogAlterZoneEventListener.java
+++
b/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/utils/CatalogAlterZoneEventListener.java
@@ -102,10 +102,6 @@ public class CatalogAlterZoneEventListener implements
EventListener<AlterZoneEve
addFuture(futures, onFilterUpdate(parameters, oldZone.filter()));
}
- if (newZone.dataNodesAutoAdjust() != oldZone.dataNodesAutoAdjust()) {
- addFuture(futures, onAutoAdjustUpdate(parameters,
oldZone.dataNodesAutoAdjust()));
- }
-
if (newZone.dataNodesAutoAdjustScaleUp() !=
oldZone.dataNodesAutoAdjustScaleUp()) {
addFuture(futures, onAutoAdjustScaleUpUpdate(parameters,
oldZone.dataNodesAutoAdjustScaleUp()));
}
@@ -168,18 +164,6 @@ public class CatalogAlterZoneEventListener implements
EventListener<AlterZoneEve
return nullCompletedFuture();
}
- /**
- * Called when the zone changes via {@link
CatalogManager#execute(CatalogCommand)} with a non-null
- * {@link CatalogZoneDescriptor#dataNodesAutoAdjust()}.
- *
- * @param parameters Zone update parameters.
- * @param oldAutoAdjust Old value.
- * @return Future that signifies the end of the callback execution.
- */
- protected CompletableFuture<Void>
onAutoAdjustUpdate(AlterZoneEventParameters parameters, int oldAutoAdjust) {
- return nullCompletedFuture();
- }
-
/**
* Called when a zone change via {@link
CatalogManager#execute(CatalogCommand)} with a non-null
* {@link CatalogZoneDescriptor#dataNodesAutoAdjustScaleUp()}.
diff --git
a/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/rebalance/ZoneMetricSourceTest.java
b/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/rebalance/ZoneMetricSourceTest.java
index 9467acf992d..b52004968b7 100644
---
a/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/rebalance/ZoneMetricSourceTest.java
+++
b/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/rebalance/ZoneMetricSourceTest.java
@@ -91,7 +91,6 @@ public class ZoneMetricSourceTest extends
BaseIgniteAbstractTest {
1,
1,
1,
- 1,
CatalogUtils.DEFAULT_FILTER,
new CatalogStorageProfilesDescriptor(List.of(new
CatalogStorageProfileDescriptor("default"))),
ConsistencyMode.STRONG_CONSISTENCY
diff --git
a/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/rebalance/ZoneRebalanceUtilUpdateAssignmentsTest.java
b/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/rebalance/ZoneRebalanceUtilUpdateAssignmentsTest.java
index cef2f2879d2..40e7242dd46 100644
---
a/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/rebalance/ZoneRebalanceUtilUpdateAssignmentsTest.java
+++
b/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/rebalance/ZoneRebalanceUtilUpdateAssignmentsTest.java
@@ -121,7 +121,6 @@ public class ZoneRebalanceUtilUpdateAssignmentsTest extends
IgniteAbstractTest {
replicas,
1000,
1000,
- 1000,
"",
storageProfilesDescriptor,
ConsistencyMode.STRONG_CONSISTENCY
diff --git
a/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/utils/CatalogAlterZoneEventListenerTest.java
b/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/utils/CatalogAlterZoneEventListenerTest.java
index aa129397252..d018d710236 100644
---
a/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/utils/CatalogAlterZoneEventListenerTest.java
+++
b/modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/utils/CatalogAlterZoneEventListenerTest.java
@@ -152,38 +152,6 @@ public class CatalogAlterZoneEventListenerTest extends
BaseCatalogManagerTest {
assertThat(onFilterUpdateFuture, willCompleteSuccessfully());
}
- @Test
- void testOnUpdateAutoAdjust() {
- CompletableFuture<Void> onZoneUpdateFuture = new CompletableFuture<>();
- CompletableFuture<Void> onAutoAdjustUpdateFuture = new
CompletableFuture<>();
-
- int newAutoAdjust = 303;
-
- listenAlterZone(new CatalogAlterZoneEventListener(manager) {
- @Override
- protected CompletableFuture<Void>
onZoneUpdate(AlterZoneEventParameters parameters, CatalogZoneDescriptor
oldZone) {
- onZoneUpdateFuture.complete(null);
-
- return nullCompletedFuture();
- }
-
- @Override
- protected CompletableFuture<Void>
onAutoAdjustUpdate(AlterZoneEventParameters parameters, int oldAutoAdjust) {
- assertNotEquals(newAutoAdjust, oldAutoAdjust);
-
- onAutoAdjustUpdateFuture.complete(null);
-
- return nullCompletedFuture();
- }
- });
-
- assertThat(manager.execute(createZoneBuilder(ZONE_NAME).build()),
willCompleteSuccessfully());
-
assertThat(manager.execute(alterZoneBuilder(ZONE_NAME).dataNodesAutoAdjust(newAutoAdjust).build()),
willCompleteSuccessfully());
-
- assertThat(onZoneUpdateFuture, willCompleteSuccessfully());
- assertThat(onAutoAdjustUpdateFuture, willCompleteSuccessfully());
- }
-
@Test
void testOnUpdateAutoAdjustScaleUp() {
CompletableFuture<Void> onZoneUpdateFuture = new CompletableFuture<>();
diff --git
a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItZoneDdlTest.java
b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItZoneDdlTest.java
index 8d2aa5ca45f..58e3b83df99 100644
---
a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItZoneDdlTest.java
+++
b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItZoneDdlTest.java
@@ -296,10 +296,13 @@ public class ItZoneDdlTest extends
ClusterPerClassIntegrationTest {
sql(String.format("ALTER ZONE %s RENAME TO %s", failIfNoExists ?
formZoneName : "IF EXISTS " + formZoneName, toZoneName));
}
- private static void tryToAlterZone(String zoneName, int
dataNodesAutoAdjust, boolean failIfNotExists) {
+ private static void tryToAlterZone(String zoneName, int
dataNodesAutoAdjustScaleUp, boolean failIfNotExists) {
sql(String.format(
"ALTER ZONE %s SET (AUTO SCALE UP %s)",
- failIfNotExists ? zoneName : "IF EXISTS " + zoneName,
dataNodesAutoAdjust
+ failIfNotExists
+ ? zoneName
+ : "IF EXISTS " + zoneName,
+ dataNodesAutoAdjustScaleUp
));
}
diff --git
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/ddl/DdlSqlToCommandConverter.java
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/ddl/DdlSqlToCommandConverter.java
index 607e1ac95db..dc1f481940d 100644
---
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/ddl/DdlSqlToCommandConverter.java
+++
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/ddl/DdlSqlToCommandConverter.java
@@ -25,7 +25,6 @@ import static
org.apache.ignite.internal.catalog.commands.CatalogUtils.INFINITE_
import static
org.apache.ignite.internal.catalog.commands.CatalogUtils.defaultLength;
import static org.apache.ignite.internal.lang.IgniteStringFormatter.format;
import static
org.apache.ignite.internal.sql.engine.prepare.ddl.ZoneOptionEnum.CONSISTENCY_MODE;
-import static
org.apache.ignite.internal.sql.engine.prepare.ddl.ZoneOptionEnum.DATA_NODES_AUTO_ADJUST;
import static
org.apache.ignite.internal.sql.engine.prepare.ddl.ZoneOptionEnum.DATA_NODES_AUTO_ADJUST_SCALE_DOWN;
import static
org.apache.ignite.internal.sql.engine.prepare.ddl.ZoneOptionEnum.DATA_NODES_AUTO_ADJUST_SCALE_UP;
import static
org.apache.ignite.internal.sql.engine.prepare.ddl.ZoneOptionEnum.DATA_NODES_FILTER;
@@ -187,8 +186,6 @@ public class DdlSqlToCommandConverter {
// TODO https://issues.apache.org/jira/browse/IGNITE-22162
appropriate setter method should be used.
DISTRIBUTION_ALGORITHM, new DdlOptionInfo<>(String.class,
null, (builder, params) -> {}),
DATA_NODES_FILTER, new DdlOptionInfo<>(String.class, null,
CreateZoneCommandBuilder::filter),
- DATA_NODES_AUTO_ADJUST,
- new DdlOptionInfo<>(Integer.class, this::checkPositiveNumber,
CreateZoneCommandBuilder::dataNodesAutoAdjust),
DATA_NODES_AUTO_ADJUST_SCALE_UP,
new DdlOptionInfo<>(Integer.class, this::checkPositiveNumber,
CreateZoneCommandBuilder::dataNodesAutoAdjustScaleUp),
DATA_NODES_AUTO_ADJUST_SCALE_DOWN,
@@ -205,8 +202,6 @@ public class DdlSqlToCommandConverter {
// We can't properly validate quorum size since it depends on
the replicas number.
QUORUM_SIZE, new DdlOptionInfo<>(Integer.class,
this::checkPositiveNumber, AlterZoneCommandBuilder::quorumSize),
DATA_NODES_FILTER, new DdlOptionInfo<>(String.class, null,
AlterZoneCommandBuilder::filter),
- DATA_NODES_AUTO_ADJUST,
- new DdlOptionInfo<>(Integer.class, this::checkPositiveNumber,
AlterZoneCommandBuilder::dataNodesAutoAdjust),
DATA_NODES_AUTO_ADJUST_SCALE_UP,
new DdlOptionInfo<>(Integer.class, this::checkPositiveNumber,
AlterZoneCommandBuilder::dataNodesAutoAdjustScaleUp),
DATA_NODES_AUTO_ADJUST_SCALE_DOWN,
diff --git
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/ddl/ZoneOptionEnum.java
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/ddl/ZoneOptionEnum.java
index d79de9391ae..5e088e21dc4 100644
---
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/ddl/ZoneOptionEnum.java
+++
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/prepare/ddl/ZoneOptionEnum.java
@@ -37,9 +37,6 @@ public enum ZoneOptionEnum {
/** An expression to filter data nodes. */
DATA_NODES_FILTER("NODES FILTER"),
- /** Data nodes auto adjust timeout. */
- DATA_NODES_AUTO_ADJUST("AUTO ADJUST"),
-
/** Data nodes scale up auto adjust timeout. */
DATA_NODES_AUTO_ADJUST_SCALE_UP("AUTO SCALE UP"),
diff --git
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/prepare/ddl/DistributionZoneSqlToCommandConverterTest.java
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/prepare/ddl/DistributionZoneSqlToCommandConverterTest.java
index f88b632bb1c..2cbc84369f8 100644
---
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/prepare/ddl/DistributionZoneSqlToCommandConverterTest.java
+++
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/prepare/ddl/DistributionZoneSqlToCommandConverterTest.java
@@ -59,7 +59,6 @@ import org.apache.ignite.internal.network.ClusterNodeImpl;
import org.apache.ignite.internal.partitiondistribution.DistributionAlgorithm;
import org.apache.ignite.network.NetworkAddress;
import org.apache.ignite.sql.SqlException;
-import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
@@ -77,7 +76,6 @@ public class DistributionZoneSqlToCommandConverterTest
extends AbstractDdlSqlToC
ZoneOptionEnum.PARTITIONS,
ZoneOptionEnum.REPLICAS,
ZoneOptionEnum.QUORUM_SIZE,
- ZoneOptionEnum.DATA_NODES_AUTO_ADJUST,
ZoneOptionEnum.DATA_NODES_AUTO_ADJUST_SCALE_UP,
ZoneOptionEnum.DATA_NODES_AUTO_ADJUST_SCALE_DOWN
);
@@ -686,8 +684,6 @@ public class DistributionZoneSqlToCommandConverterTest
extends AbstractDdlSqlToC
if (obsolete) {
expectOptionValidationError(format(sql, option.name()),
option.name());
} else {
- Assumptions.assumeFalse(option ==
ZoneOptionEnum.DATA_NODES_AUTO_ADJUST);
-
String sqlName = option.sqlName;
String prefix = "ALTER ZONE test SET (";
assertThrowsWithPos(format(sql, sqlName, "-100"), "-",
prefix.length() + sqlName.length() + 1 /* start pos*/
@@ -717,8 +713,6 @@ public class DistributionZoneSqlToCommandConverterTest
extends AbstractDdlSqlToC
if (withPresent) {
expectInvalidOptionType(format(sql, option, "'bar'"),
option.name());
} else {
- Assumptions.assumeFalse(option ==
ZoneOptionEnum.DATA_NODES_AUTO_ADJUST);
-
String sqlName = option.sqlName;
String prefix = "create zone test_zone (";
int errorPos = prefix.length() + sqlName.length() + 1 /* start
pos*/ + 1 /* first symbol after bracket*/;
diff --git
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/sql/DistributionZoneObsoleteSyntaxSqlDdlParserTest.java
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/sql/DistributionZoneObsoleteSyntaxSqlDdlParserTest.java
index cf51d88ea6a..69b650a4063 100644
---
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/sql/DistributionZoneObsoleteSyntaxSqlDdlParserTest.java
+++
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/sql/DistributionZoneObsoleteSyntaxSqlDdlParserTest.java
@@ -96,7 +96,6 @@ public class DistributionZoneObsoleteSyntaxSqlDdlParserTest
extends AbstractPars
+ "partitions=3, "
+ "data_nodes_filter='(\"US\" || \"EU\") && \"SSD\"', "
+ "distribution_algorithm='test_Distribution', "
- + "data_nodes_auto_adjust=1, "
+ "data_nodes_auto_adjust_scale_up=2, "
+ "data_nodes_auto_adjust_scale_down=3,"
+ "consistency_mode='HIGH_AVAILABILITY'"
@@ -117,12 +116,11 @@ public class
DistributionZoneObsoleteSyntaxSqlDdlParserTest extends AbstractPars
List<SqlNode> optList = createZone.createOptionList().getList();
- assertThat(optList.size(), is(8));
+ assertThat(optList.size(), is(7));
assertThatZoneOptionPresent(optList, ZoneOptionEnum.REPLICAS, 2);
assertThatZoneOptionPresent(optList, ZoneOptionEnum.PARTITIONS, 3);
assertThatZoneOptionPresent(optList,
ZoneOptionEnum.DISTRIBUTION_ALGORITHM, "test_Distribution");
assertThatZoneOptionPresent(optList, ZoneOptionEnum.DATA_NODES_FILTER,
"(\"US\" || \"EU\") && \"SSD\"");
- assertThatZoneOptionPresent(optList,
ZoneOptionEnum.DATA_NODES_AUTO_ADJUST, 1);
assertThatZoneOptionPresent(optList,
ZoneOptionEnum.DATA_NODES_AUTO_ADJUST_SCALE_UP, 2);
assertThatZoneOptionPresent(optList,
ZoneOptionEnum.DATA_NODES_AUTO_ADJUST_SCALE_DOWN, 3);
assertThatZoneOptionPresent(optList, ZoneOptionEnum.CONSISTENCY_MODE,
"HIGH_AVAILABILITY");
@@ -132,7 +130,6 @@ public class DistributionZoneObsoleteSyntaxSqlDdlParserTest
extends AbstractPars
+ "PARTITIONS 3, "
+ "NODES FILTER '(\"US\" || \"EU\") && \"SSD\"', "
+ "DISTRIBUTION ALGORITHM 'test_Distribution', "
- + "AUTO ADJUST 1, "
+ "AUTO SCALE UP 2, "
+ "AUTO SCALE DOWN 3, "
+ "CONSISTENCY MODE 'HIGH_AVAILABILITY') "
@@ -201,7 +198,6 @@ public class DistributionZoneObsoleteSyntaxSqlDdlParserTest
extends AbstractPars
"alter zone a.test_zone set "
+ "replicas=2, "
+ "data_nodes_filter='(\"US\" || \"EU\") && \"SSD\"', "
- + "data_nodes_auto_adjust=1, "
+ "data_nodes_auto_adjust_scale_up=2, "
+ "data_nodes_auto_adjust_scale_down=3"
);
@@ -214,12 +210,10 @@ public class
DistributionZoneObsoleteSyntaxSqlDdlParserTest extends AbstractPars
assertThatZoneOptionPresent(optList, ZoneOptionEnum.REPLICAS, 2);
assertThatZoneOptionPresent(optList, ZoneOptionEnum.DATA_NODES_FILTER,
"(\"US\" || \"EU\") && \"SSD\"");
- assertThatZoneOptionPresent(optList,
ZoneOptionEnum.DATA_NODES_AUTO_ADJUST, 1);
String expectedStmt = "ALTER ZONE \"A\".\"TEST_ZONE\" SET ("
+ "REPLICAS 2, "
+ "NODES FILTER '(\"US\" || \"EU\") && \"SSD\"', "
- + "AUTO ADJUST 1, "
+ "AUTO SCALE UP 2, "
+ "AUTO SCALE DOWN 3)";
expectUnparsed(alterZoneSet, expectedStmt);
