tkalkirill commented on code in PR #2403:
URL: https://github.com/apache/ignite-3/pull/2403#discussion_r1283153642


##########
modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogManagerValidationTest.java:
##########
@@ -0,0 +1,539 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.catalog;
+
+import static 
org.apache.ignite.internal.catalog.commands.CatalogUtils.DEFAULT_FILTER;
+import static 
org.apache.ignite.internal.catalog.commands.CatalogUtils.DEFAULT_PARTITION_COUNT;
+import static 
org.apache.ignite.internal.catalog.commands.CatalogUtils.DEFAULT_REPLICA_COUNT;
+import static 
org.apache.ignite.internal.catalog.commands.CatalogUtils.IMMEDIATE_TIMER_VALUE;
+import static 
org.apache.ignite.internal.catalog.commands.CatalogUtils.INFINITE_TIMER_VALUE;
+import static 
org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willThrowFast;
+import static 
org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willBe;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.nullValue;
+
+import org.apache.ignite.internal.catalog.commands.AlterZoneParams;
+import org.apache.ignite.internal.catalog.commands.CreateZoneParams;
+import org.apache.ignite.internal.catalog.commands.DropZoneParams;
+import org.apache.ignite.internal.catalog.commands.RenameZoneParams;
+import org.apache.ignite.lang.IgniteInternalException;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Catalog manager validation test.
+ */
+public class CatalogManagerValidationTest extends BaseCatalogManagerTest {
+    private static final String ZONE_NAME = "test_zone";
+
+    @Test
+    void testValidateZoneNameOnCreateZone() {
+        assertThat(
+                manager.createZone(CreateZoneParams.builder().build()),
+                willThrowFast(IgniteInternalException.class, "Missing zone 
name")
+        );
+
+        assertThat(manager.createZone(createZoneBuilder(ZONE_NAME).build()), 
willBe(nullValue()));
+    }
+
+    @Test
+    void testValidateZoneNameOnAlterZone() {
+        assertThat(manager.createZone(createZoneBuilder(ZONE_NAME).build()), 
willBe(nullValue()));
+
+        assertThat(
+                manager.alterZone(AlterZoneParams.builder().build()),
+                willThrowFast(IgniteInternalException.class, "Missing zone 
name")
+        );
+
+        assertThat(manager.alterZone(alterZoneBuilder(ZONE_NAME).build()), 
willBe(nullValue()));
+    }
+
+    @Test
+    void testValidateZonePartitionsOnCreateZone() {
+        assertThat(
+                
manager.createZone(createZoneBuilder(ZONE_NAME).partitions(-1).build()),
+                willThrowFast(IgniteInternalException.class, "Invalid number 
of partitions")
+        );
+
+        assertThat(
+                
manager.createZone(createZoneBuilder(ZONE_NAME).partitions(0).build()),
+                willThrowFast(IgniteInternalException.class, "Invalid number 
of partitions")
+        );
+
+        assertThat(
+                
manager.createZone(createZoneBuilder(ZONE_NAME).partitions(65_001).build()),
+                willThrowFast(IgniteInternalException.class, "Invalid number 
of partitions")
+        );
+
+        // Let's check the success cases.
+        assertThat(manager.createZone(createZoneBuilder(ZONE_NAME + 
0).partitions(1).build()), willBe(nullValue()));
+        assertThat(manager.createZone(createZoneBuilder(ZONE_NAME + 
1).partitions(65_000).build()), willBe(nullValue()));
+        assertThat(manager.createZone(createZoneBuilder(ZONE_NAME + 
2).partitions(10).build()), willBe(nullValue()));
+        assertThat(manager.createZone(createZoneBuilder(ZONE_NAME + 
3).partitions(DEFAULT_PARTITION_COUNT).build()), willBe(nullValue()));
+    }
+
+    @Test
+    void testValidateZonePartitionsOnAlterZone() {
+        assertThat(manager.createZone(createZoneBuilder(ZONE_NAME).build()), 
willBe(nullValue()));
+
+        assertThat(
+                
manager.alterZone(alterZoneBuilder(ZONE_NAME).partitions(-1).build()),
+                willThrowFast(IgniteInternalException.class, "Invalid number 
of partitions")
+        );
+
+        assertThat(
+                
manager.alterZone(alterZoneBuilder(ZONE_NAME).partitions(0).build()),
+                willThrowFast(IgniteInternalException.class, "Invalid number 
of partitions")
+        );
+
+        assertThat(
+                
manager.alterZone(alterZoneBuilder(ZONE_NAME).partitions(65_001).build()),
+                willThrowFast(IgniteInternalException.class, "Invalid number 
of partitions")
+        );
+
+        // Let's check the success cases.
+        
assertThat(manager.alterZone(alterZoneBuilder(ZONE_NAME).partitions(1).build()),
 willBe(nullValue()));
+        
assertThat(manager.alterZone(alterZoneBuilder(ZONE_NAME).partitions(65_000).build()),
 willBe(nullValue()));
+        
assertThat(manager.alterZone(alterZoneBuilder(ZONE_NAME).partitions(10).build()),
 willBe(nullValue()));
+        
assertThat(manager.alterZone(alterZoneBuilder(ZONE_NAME).partitions(DEFAULT_PARTITION_COUNT).build()),
 willBe(nullValue()));
+    }
+
+    @Test
+    void testValidateZoneReplicasOnCreateZone() {
+        assertThat(
+                
manager.createZone(createZoneBuilder(ZONE_NAME).replicas(-1).build()),
+                willThrowFast(IgniteInternalException.class, "Invalid number 
of replicas")
+        );
+
+        assertThat(
+                
manager.createZone(createZoneBuilder(ZONE_NAME).replicas(0).build()),
+                willThrowFast(IgniteInternalException.class, "Invalid number 
of replicas")
+        );
+
+        // Let's check the success cases.
+        assertThat(manager.createZone(createZoneBuilder(ZONE_NAME + 
0).replicas(1).build()), willBe(nullValue()));
+        assertThat(manager.createZone(createZoneBuilder(ZONE_NAME + 
1).replicas(Integer.MAX_VALUE).build()), willBe(nullValue()));
+        assertThat(manager.createZone(createZoneBuilder(ZONE_NAME + 
2).replicas(DEFAULT_REPLICA_COUNT).build()), willBe(nullValue()));
+    }
+
+    @Test
+    void testValidateZoneReplicasOnAlterZone() {
+        assertThat(manager.createZone(createZoneBuilder(ZONE_NAME).build()), 
willBe(nullValue()));
+
+        assertThat(
+                
manager.alterZone(alterZoneBuilder(ZONE_NAME).replicas(-1).build()),
+                willThrowFast(IgniteInternalException.class, "Invalid number 
of replicas")
+        );
+
+        assertThat(
+                
manager.alterZone(alterZoneBuilder(ZONE_NAME).replicas(0).build()),
+                willThrowFast(IgniteInternalException.class, "Invalid number 
of replicas")
+        );
+
+        // Let's check the success cases.
+        
assertThat(manager.alterZone(alterZoneBuilder(ZONE_NAME).replicas(1).build()), 
willBe(nullValue()));
+        
assertThat(manager.alterZone(alterZoneBuilder(ZONE_NAME).replicas(Integer.MAX_VALUE).build()),
 willBe(nullValue()));
+        
assertThat(manager.alterZone(alterZoneBuilder(ZONE_NAME).replicas(DEFAULT_REPLICA_COUNT).build()),
 willBe(nullValue()));
+    }
+
+    @Test
+    void testValidateDataNodesAutoAdjustOnCreateZone() {
+        assertThat(
+                
manager.createZone(createZoneBuilder(ZONE_NAME).dataNodesAutoAdjust(-1).build()),
+                willThrowFast(IgniteInternalException.class, "Invalid data 
nodes auto adjust")
+        );
+
+        // Let's check the success cases.
+        assertThat(
+                manager.createZone(createZoneBuilder(ZONE_NAME + 
0).dataNodesAutoAdjust(0).build()),
+                willBe(nullValue())
+        );
+
+        assertThat(
+                manager.createZone(createZoneBuilder(ZONE_NAME + 
1).dataNodesAutoAdjust(Integer.MAX_VALUE).build()),
+                willBe(nullValue())
+        );
+
+        assertThat(
+                manager.createZone(createZoneBuilder(ZONE_NAME + 
2).dataNodesAutoAdjust(IMMEDIATE_TIMER_VALUE).build()),
+                willBe(nullValue())
+        );
+
+        assertThat(
+                manager.createZone(createZoneBuilder(ZONE_NAME + 
3).dataNodesAutoAdjust(INFINITE_TIMER_VALUE).build()),
+                willBe(nullValue())
+        );
+    }
+
+    @Test
+    void testValidateDataNodesAutoAdjustOnAlterZone() {
+        assertThat(manager.createZone(createZoneBuilder(ZONE_NAME).build()), 
willBe(nullValue()));
+
+        assertThat(
+                
manager.alterZone(alterZoneBuilder(ZONE_NAME).dataNodesAutoAdjust(-1).build()),
+                willThrowFast(IgniteInternalException.class, "Invalid data 
nodes auto adjust")
+        );
+
+        // Let's check the success cases.
+        
assertThat(manager.alterZone(alterZoneBuilder(ZONE_NAME).dataNodesAutoAdjust(0).build()),
 willBe(nullValue()));
+        
assertThat(manager.alterZone(alterZoneBuilder(ZONE_NAME).dataNodesAutoAdjust(Integer.MAX_VALUE).build()),
 willBe(nullValue()));
+        
assertThat(manager.alterZone(alterZoneBuilder(ZONE_NAME).dataNodesAutoAdjust(INFINITE_TIMER_VALUE).build()),
 willBe(nullValue()));
+        
assertThat(manager.alterZone(alterZoneBuilder(ZONE_NAME).dataNodesAutoAdjust(IMMEDIATE_TIMER_VALUE).build()),
 willBe(nullValue()));
+    }
+
+    @Test
+    void testValidateDataNodesAutoAdjustScaleUpOnCreateZone() {
+        assertThat(
+                
manager.createZone(createZoneBuilder(ZONE_NAME).dataNodesAutoAdjustScaleUp(-1).build()),
+                willThrowFast(IgniteInternalException.class, "Invalid data 
nodes auto adjust scale up")
+        );
+
+        // Let's check the success cases.
+        assertThat(
+                manager.createZone(createZoneBuilder(ZONE_NAME + 
0).dataNodesAutoAdjustScaleUp(0).build()),
+                willBe(nullValue())
+        );
+
+        assertThat(
+                manager.createZone(createZoneBuilder(ZONE_NAME + 
1).dataNodesAutoAdjustScaleUp(Integer.MAX_VALUE).build()),
+                willBe(nullValue())
+        );
+
+        assertThat(
+                manager.createZone(createZoneBuilder(ZONE_NAME + 
2).dataNodesAutoAdjustScaleUp(IMMEDIATE_TIMER_VALUE).build()),
+                willBe(nullValue())
+        );
+
+        assertThat(
+                manager.createZone(createZoneBuilder(ZONE_NAME + 
3).dataNodesAutoAdjustScaleUp(INFINITE_TIMER_VALUE).build()),
+                willBe(nullValue())
+        );
+    }
+
+    @Test
+    void testValidateDataNodesAutoAdjustScaleUpOnAlterZone() {
+        assertThat(manager.createZone(createZoneBuilder(ZONE_NAME).build()), 
willBe(nullValue()));
+
+        assertThat(
+                
manager.alterZone(alterZoneBuilder(ZONE_NAME).dataNodesAutoAdjustScaleUp(-1).build()),
+                willThrowFast(IgniteInternalException.class, "Invalid data 
nodes auto adjust scale up")
+        );
+
+        // Let's check the success cases.
+        assertThat(
+                
manager.alterZone(alterZoneBuilder(ZONE_NAME).dataNodesAutoAdjustScaleUp(0).build()),
+                willBe(nullValue())
+        );
+
+        assertThat(
+                
manager.alterZone(alterZoneBuilder(ZONE_NAME).dataNodesAutoAdjustScaleUp(Integer.MAX_VALUE).build()),
+                willBe(nullValue())
+        );
+
+        assertThat(
+                
manager.alterZone(alterZoneBuilder(ZONE_NAME).dataNodesAutoAdjustScaleUp(INFINITE_TIMER_VALUE).build()),
+                willBe(nullValue())
+        );
+
+        assertThat(
+                
manager.alterZone(alterZoneBuilder(ZONE_NAME).dataNodesAutoAdjustScaleUp(IMMEDIATE_TIMER_VALUE).build()),
+                willBe(nullValue())
+        );
+    }
+
+    @Test
+    void testValidateDataNodesAutoAdjustScaleDownOnCreateZone() {
+        assertThat(
+                
manager.createZone(createZoneBuilder(ZONE_NAME).dataNodesAutoAdjustScaleDown(-1).build()),
+                willThrowFast(IgniteInternalException.class, "Invalid data 
nodes auto adjust scale down")
+        );
+
+        // Let's check the success cases.
+        assertThat(
+                manager.createZone(createZoneBuilder(ZONE_NAME + 
0).dataNodesAutoAdjustScaleDown(0).build()),
+                willBe(nullValue())
+        );
+
+        assertThat(
+                manager.createZone(createZoneBuilder(ZONE_NAME + 
1).dataNodesAutoAdjustScaleDown(Integer.MAX_VALUE).build()),
+                willBe(nullValue())
+        );
+
+        assertThat(
+                manager.createZone(createZoneBuilder(ZONE_NAME + 
2).dataNodesAutoAdjustScaleDown(IMMEDIATE_TIMER_VALUE).build()),
+                willBe(nullValue())
+        );
+
+        assertThat(
+                manager.createZone(createZoneBuilder(ZONE_NAME + 
3).dataNodesAutoAdjustScaleDown(INFINITE_TIMER_VALUE).build()),
+                willBe(nullValue())
+        );
+    }
+
+    @Test
+    void testValidateDataNodesAutoAdjustScaleDownOnAlterZone() {
+        assertThat(manager.createZone(createZoneBuilder(ZONE_NAME).build()), 
willBe(nullValue()));
+
+        assertThat(
+                
manager.alterZone(alterZoneBuilder(ZONE_NAME).dataNodesAutoAdjustScaleDown(-1).build()),
+                willThrowFast(IgniteInternalException.class, "Invalid data 
nodes auto adjust scale down")
+        );
+
+        // Let's check the success cases.
+        assertThat(
+                
manager.alterZone(alterZoneBuilder(ZONE_NAME).dataNodesAutoAdjustScaleDown(0).build()),
+                willBe(nullValue())
+        );
+
+        assertThat(
+                
manager.alterZone(alterZoneBuilder(ZONE_NAME).dataNodesAutoAdjustScaleDown(Integer.MAX_VALUE).build()),
+                willBe(nullValue())
+        );
+
+        assertThat(
+                
manager.alterZone(alterZoneBuilder(ZONE_NAME).dataNodesAutoAdjustScaleDown(INFINITE_TIMER_VALUE).build()),
+                willBe(nullValue())
+        );
+
+        assertThat(
+                
manager.alterZone(alterZoneBuilder(ZONE_NAME).dataNodesAutoAdjustScaleDown(IMMEDIATE_TIMER_VALUE).build()),
+                willBe(nullValue())
+        );
+    }
+
+    @Test
+    void testValidateDataNodesAutoAdjustCompatibilityParametersOnCreateZone() {
+        assertThat(
+                
manager.createZone(createZoneBuilder(ZONE_NAME).dataNodesAutoAdjust(666).dataNodesAutoAdjustScaleUp(666).build()),
+                willThrowFast(IgniteInternalException.class, "Not compatible 
parameters")
+        );
+
+        assertThat(
+                
manager.createZone(createZoneBuilder(ZONE_NAME).dataNodesAutoAdjust(666).dataNodesAutoAdjustScaleDown(666).build()),
+                willThrowFast(IgniteInternalException.class, "Not compatible 
parameters")
+        );
+
+        assertThat(
+                manager.createZone(
+                        createZoneBuilder(ZONE_NAME)
+                                .dataNodesAutoAdjust(666)
+                                .dataNodesAutoAdjustScaleUp(666)
+                                .dataNodesAutoAdjustScaleDown(666)
+                                .build()
+                ),
+                willThrowFast(IgniteInternalException.class, "Not compatible 
parameters")
+        );
+
+        // Let's check the success cases.
+        assertThat(
+                manager.createZone(
+                        createZoneBuilder(ZONE_NAME + 0)
+                                .dataNodesAutoAdjust(666)
+                                
.dataNodesAutoAdjustScaleUp(INFINITE_TIMER_VALUE)
+                                .build()
+                ),
+                willBe(nullValue())
+        );
+
+        assertThat(
+                manager.createZone(
+                        createZoneBuilder(ZONE_NAME + 1)
+                                .dataNodesAutoAdjust(666)
+                                
.dataNodesAutoAdjustScaleDown(INFINITE_TIMER_VALUE)
+                                .build()
+                ),
+                willBe(nullValue())
+        );
+
+        assertThat(
+                manager.createZone(
+                        createZoneBuilder(ZONE_NAME + 2)
+                                .dataNodesAutoAdjust(666)
+                                
.dataNodesAutoAdjustScaleUp(INFINITE_TIMER_VALUE)
+                                
.dataNodesAutoAdjustScaleDown(INFINITE_TIMER_VALUE)
+                                .build()
+                ),
+                willBe(nullValue())
+        );
+    }
+
+    @Test
+    void testValidateDataNodesAutoAdjustCompatibilityParametersOnAlterZone() {
+        assertThat(manager.createZone(createZoneBuilder(ZONE_NAME).build()), 
willBe(nullValue()));
+
+        assertThat(
+                
manager.alterZone(alterZoneBuilder(ZONE_NAME).dataNodesAutoAdjust(666).dataNodesAutoAdjustScaleUp(666).build()),
+                willThrowFast(IgniteInternalException.class, "Not compatible 
parameters")
+        );
+
+        assertThat(
+                
manager.alterZone(alterZoneBuilder(ZONE_NAME).dataNodesAutoAdjust(666).dataNodesAutoAdjustScaleDown(666).build()),
+                willThrowFast(IgniteInternalException.class, "Not compatible 
parameters")
+        );
+
+        assertThat(
+                manager.alterZone(
+                        alterZoneBuilder(ZONE_NAME)
+                                .dataNodesAutoAdjust(666)
+                                .dataNodesAutoAdjustScaleUp(666)
+                                .dataNodesAutoAdjustScaleDown(666)
+                                .build()
+                ),
+                willThrowFast(IgniteInternalException.class, "Not compatible 
parameters")
+        );
+
+        // Let's check the success cases.
+        assertThat(
+                manager.alterZone(
+                        alterZoneBuilder(ZONE_NAME)
+                                .dataNodesAutoAdjust(666)
+                                
.dataNodesAutoAdjustScaleUp(INFINITE_TIMER_VALUE)
+                                .build()
+                ),
+                willBe(nullValue())
+        );
+
+        assertThat(
+                manager.alterZone(
+                        alterZoneBuilder(ZONE_NAME)
+                                .dataNodesAutoAdjust(666)
+                                
.dataNodesAutoAdjustScaleDown(INFINITE_TIMER_VALUE)
+                                .build()
+                ),
+                willBe(nullValue())
+        );
+
+        assertThat(
+                manager.alterZone(
+                        alterZoneBuilder(ZONE_NAME)
+                                .dataNodesAutoAdjust(666)
+                                
.dataNodesAutoAdjustScaleUp(INFINITE_TIMER_VALUE)
+                                
.dataNodesAutoAdjustScaleDown(INFINITE_TIMER_VALUE)
+                                .build()
+                ),
+                willBe(nullValue())
+        );
+
+        // Let's check the compatibility of the parameters and what is already 
stored in the catalog.
+        assertThat(
+                
manager.alterZone(alterZoneBuilder(ZONE_NAME).dataNodesAutoAdjustScaleUp(666).build()),
+                willThrowFast(IgniteInternalException.class, "Not compatible 
parameters")
+        );
+
+        assertThat(
+                
manager.alterZone(alterZoneBuilder(ZONE_NAME).dataNodesAutoAdjustScaleDown(666).build()),
+                willThrowFast(IgniteInternalException.class, "Not compatible 
parameters")
+        );
+
+        assertThat(
+                
manager.alterZone(alterZoneBuilder(ZONE_NAME).dataNodesAutoAdjustScaleUp(666).dataNodesAutoAdjustScaleDown(666).build()),
+                willThrowFast(IgniteInternalException.class, "Not compatible 
parameters")
+        );
+    }
+
+    @Test
+    void testValidateFilterOnCreateZone() {
+        assertThat(
+                manager.createZone(createZoneBuilder(ZONE_NAME).filter("some 
text").build()),

Review Comment:
   fix it



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to