You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by am...@apache.org on 2023/07/25 10:00:29 UTC
[ignite-3] 09/11: Get rid of ZonesConfig from TableManager.
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-19499
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 7a7174a5c7c55133b03b9ae2909c47bb3e376067
Author: amashenkov <an...@gmail.com>
AuthorDate: Fri Jul 21 16:09:18 2023 +0300
Get rid of ZonesConfig from TableManager.
---
.../storage/ItRebalanceDistributedTest.java | 1 -
.../runner/app/ItIgniteNodeRestartTest.java | 1 -
.../org/apache/ignite/internal/app/IgniteImpl.java | 1 -
.../sql/engine/exec/MockedStructuresTest.java | 5 --
.../internal/table/distributed/TableManager.java | 59 +++++-----------------
.../table/distributed/TableManagerTest.java | 3 --
6 files changed, 13 insertions(+), 57 deletions(-)
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/storage/ItRebalanceDistributedTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/storage/ItRebalanceDistributedTest.java
index 0db166eb30..002fea35f8 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/storage/ItRebalanceDistributedTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/configuration/storage/ItRebalanceDistributedTest.java
@@ -800,7 +800,6 @@ public class ItRebalanceDistributedTest {
name,
registry,
tablesCfg,
- zonesCfg,
gcConfig,
clusterService,
raftManager,
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java
index 1e3141f6c5..93751c5ee3 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java
@@ -361,7 +361,6 @@ public class ItIgniteNodeRestartTest extends BaseIgniteRestartTest {
name,
registry,
tablesConfig,
- zonesConfig,
gcConfig,
clusterSvc,
raftMgr,
diff --git a/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java b/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
index 931dffd433..fdc0cfd697 100644
--- a/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
+++ b/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
@@ -525,7 +525,6 @@ public class IgniteImpl implements Ignite {
name,
registry,
tablesConfig,
- zonesConfig,
gcConfig,
clusterSvc,
raftMgr,
diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/MockedStructuresTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/MockedStructuresTest.java
index 6bce878f4f..aea8087ad1 100644
--- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/MockedStructuresTest.java
+++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/MockedStructuresTest.java
@@ -30,7 +30,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
@@ -72,9 +71,7 @@ import org.apache.ignite.internal.raft.client.TopologyAwareRaftGroupServiceFacto
import org.apache.ignite.internal.raft.service.RaftGroupService;
import org.apache.ignite.internal.replicator.ReplicaManager;
import org.apache.ignite.internal.replicator.ReplicaService;
-import org.apache.ignite.internal.schema.SchemaDescriptor;
import org.apache.ignite.internal.schema.SchemaManager;
-import org.apache.ignite.internal.schema.SchemaUtils;
import org.apache.ignite.internal.schema.configuration.GcConfiguration;
import org.apache.ignite.internal.schema.configuration.TableView;
import org.apache.ignite.internal.schema.configuration.TablesConfiguration;
@@ -117,7 +114,6 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.MockedStatic;
import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;
@@ -583,7 +579,6 @@ public class MockedStructuresTest extends IgniteAbstractTest {
"",
revisionUpdater,
tblsCfg,
- dstZnsCfg,
gcConfig,
cs,
rm,
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
index 96ef743d6c..62c20db8dd 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
@@ -27,13 +27,10 @@ import static java.util.concurrent.CompletableFuture.supplyAsync;
import static java.util.stream.Collectors.toList;
import static org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
import static org.apache.ignite.internal.causality.IncrementalVersionedValue.dependingOn;
-import static org.apache.ignite.internal.distributionzones.DistributionZonesUtil.getZoneById;
import static org.apache.ignite.internal.distributionzones.rebalance.RebalanceUtil.partitionAssignments;
import static org.apache.ignite.internal.distributionzones.rebalance.RebalanceUtil.tableAssignments;
import static org.apache.ignite.internal.metastorage.dsl.Operations.put;
-import static org.apache.ignite.internal.schema.CatalogDescriptorUtils.toTableDescriptor;
import static org.apache.ignite.internal.schema.SchemaManager.INITIAL_SCHEMA_VERSION;
-import static org.apache.ignite.internal.schema.configuration.SchemaConfigurationUtils.findTableView;
import static org.apache.ignite.internal.util.CollectionUtils.nullOrEmpty;
import static org.apache.ignite.internal.util.IgniteUtils.inBusyLock;
import static org.apache.ignite.internal.util.IgniteUtils.shutdownAndAwaitTermination;
@@ -107,8 +104,6 @@ import org.apache.ignite.internal.causality.CompletionListener;
import org.apache.ignite.internal.causality.IncrementalVersionedValue;
import org.apache.ignite.internal.cluster.management.ClusterManagementGroupManager;
import org.apache.ignite.internal.distributionzones.DistributionZoneManager;
-import org.apache.ignite.internal.distributionzones.configuration.DistributionZoneView;
-import org.apache.ignite.internal.distributionzones.configuration.DistributionZonesConfiguration;
import org.apache.ignite.internal.hlc.HybridClock;
import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.logger.IgniteLogger;
@@ -145,7 +140,6 @@ import org.apache.ignite.internal.schema.configuration.GcConfiguration;
import org.apache.ignite.internal.schema.configuration.PrimaryKeyView;
import org.apache.ignite.internal.schema.configuration.TableChange;
import org.apache.ignite.internal.schema.configuration.TableConfiguration;
-import org.apache.ignite.internal.schema.configuration.TableView;
import org.apache.ignite.internal.schema.configuration.TablesChange;
import org.apache.ignite.internal.schema.configuration.TablesConfiguration;
import org.apache.ignite.internal.schema.configuration.index.TableIndexView;
@@ -245,9 +239,6 @@ public class TableManager extends Producer<TableEvent, TableEventParameters> imp
/** Tables configuration. */
private final TablesConfiguration tablesCfg;
- /** Distribution zones configuration. */
- private final DistributionZonesConfiguration zonesConfig;
-
/** Garbage collector configuration. */
private final GcConfiguration gcConfig;
@@ -397,7 +388,6 @@ public class TableManager extends Producer<TableEvent, TableEventParameters> imp
* @param nodeName Node name.
* @param registry Registry for versioned values.
* @param tablesCfg Tables configuration.
- * @param zonesConfig Distribution zones configuration.
* @param gcConfig Garbage collector configuration.
* @param raftMgr Raft manager.
* @param replicaMgr Replica manager.
@@ -417,7 +407,6 @@ public class TableManager extends Producer<TableEvent, TableEventParameters> imp
String nodeName,
Consumer<LongFunction<CompletableFuture<?>>> registry,
TablesConfiguration tablesCfg,
- DistributionZonesConfiguration zonesConfig,
GcConfiguration gcConfig,
ClusterService clusterService,
RaftManager raftMgr,
@@ -441,7 +430,6 @@ public class TableManager extends Producer<TableEvent, TableEventParameters> imp
DistributionZoneManager distributionZoneManager
) {
this.tablesCfg = tablesCfg;
- this.zonesConfig = zonesConfig;
this.gcConfig = gcConfig;
this.clusterService = clusterService;
this.raftMgr = raftMgr;
@@ -1464,15 +1452,13 @@ public class TableManager extends Producer<TableEvent, TableEventParameters> imp
}
private Set<Assignment> calculateAssignments(TablePartitionId tablePartitionId) {
- CatalogTableDescriptor tableDescriptor = getTableDescriptor(tablePartitionId.tableId());
-
- assert tableDescriptor != null : tablePartitionId;
+ int replicas = tableReplicas(tablePartitionId.tableId());
return AffinityUtils.calculateAssignmentForPartition(
// TODO: https://issues.apache.org/jira/browse/IGNITE-19425 we must use distribution zone keys here
baselineMgr.nodes().stream().map(ClusterNode::name).collect(toList()),
tablePartitionId.partitionId(),
- getZoneDescriptor(tableDescriptor.zoneId()).replicas()
+ replicas
);
}
@@ -2494,14 +2480,12 @@ public class TableManager extends Producer<TableEvent, TableEventParameters> imp
}
try {
- CatalogTableDescriptor tableDescriptor = getTableDescriptor(tableId);
-
- assert tableDescriptor != null : replicaGrpId;
+ int replicas = tableReplicas(tableId);
return RebalanceUtil.handleReduceChanged(
metaStorageMgr,
baselineMgr.nodes().stream().map(ClusterNode::name).collect(toList()),
- getZoneDescriptor(tableDescriptor.zoneId()).replicas(),
+ replicas,
replicaGrpId,
evt
);
@@ -2772,35 +2756,18 @@ public class TableManager extends Producer<TableEvent, TableEventParameters> imp
return startedTables.get(tableId);
}
- private @Nullable CatalogTableDescriptor getTableDescriptor(int id) {
- TableView tableView = findTableView(tablesCfg.value(), id);
+ private int tableReplicas(int tableId) {
+ int version = catalogManager.activeCatalogVersion(Long.MAX_VALUE);
- return tableView == null ? null : toTableDescriptor(tableView);
- }
+ CatalogTableDescriptor table = catalogManager.table(tableId, version);
- private CatalogZoneDescriptor getZoneDescriptor(int id) {
- return toZoneDescriptor(getZoneById(zonesConfig, id).value());
- }
+ assert table != null;
- // TODO: IGNITE-19719 Fix it
- /**
- * Converts a distribution zone configuration to a Distribution zone descriptor.
- *
- * @param config Distribution zone configuration.
- */
- @Deprecated(forRemoval = true)
- public static CatalogZoneDescriptor toZoneDescriptor(DistributionZoneView config) {
- return new CatalogZoneDescriptor(
- config.zoneId(),
- config.name(),
- config.partitions(),
- config.replicas(),
- config.dataNodesAutoAdjust(),
- config.dataNodesAutoAdjustScaleUp(),
- config.dataNodesAutoAdjustScaleDown(),
- config.filter(),
- toDataStorageDescriptor(config.dataStorage())
- );
+ CatalogZoneDescriptor zone = catalogManager.zone(table.zoneId(), version);
+
+ assert zone != null;
+
+ return zone.replicas();
}
@Deprecated(forRemoval = true)
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerTest.java
index a223eddbf1..c5057c465b 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerTest.java
@@ -92,9 +92,7 @@ import org.apache.ignite.internal.raft.client.TopologyAwareRaftGroupServiceFacto
import org.apache.ignite.internal.raft.service.RaftGroupService;
import org.apache.ignite.internal.raft.storage.impl.LocalLogStorageFactory;
import org.apache.ignite.internal.replicator.ReplicaManager;
-import org.apache.ignite.internal.schema.SchemaDescriptor;
import org.apache.ignite.internal.schema.SchemaManager;
-import org.apache.ignite.internal.schema.SchemaUtils;
import org.apache.ignite.internal.schema.configuration.ExtendedTableChange;
import org.apache.ignite.internal.schema.configuration.GcConfiguration;
import org.apache.ignite.internal.schema.configuration.TableView;
@@ -865,7 +863,6 @@ public class TableManagerTest extends IgniteAbstractTest {
"test",
revisionUpdater,
tblsCfg,
- distributionZonesConfiguration,
gcConfig,
clusterService,
rm,