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/06/29 19:35:05 UTC
[ignite-3] branch ignite-19499 created (now fee94bfc3d)
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a change to branch ignite-19499
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
at fee94bfc3d Fix modules dependencies.
This branch includes the following new commits:
new 2739ce632f Add catalog manager to table manager.
new fee94bfc3d Fix modules dependencies.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[ignite-3] 02/02: Fix modules dependencies.
Posted by am...@apache.org.
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 fee94bfc3dc2d6f9e7314ba566e835d5dddcfa94
Author: amashenkov <an...@gmail.com>
AuthorDate: Thu Jun 29 22:34:57 2023 +0300
Fix modules dependencies.
---
modules/catalog/build.gradle | 3 --
modules/distribution-zones/build.gradle | 1 +
.../apache/ignite/internal/index/IndexManager.java | 4 +-
.../sql/engine/ClusterPerClassIntegrationTest.java | 4 +-
modules/schema/build.gradle | 1 +
.../internal/schema}/CatalogDescriptorUtils.java | 50 ++++------------------
.../schema/TestDataStorageConfigurationSchema.java | 28 ------------
.../storage/index/StorageHashIndexDescriptor.java | 2 +-
.../index/StorageIndexDescriptorSupplier.java | 4 +-
.../index/StorageSortedIndexDescriptor.java | 2 +-
.../storage/AbstractMvTableStorageTest.java | 6 +--
.../index/AbstractHashIndexStorageTest.java | 4 +-
.../index/AbstractSortedIndexStorageTest.java | 4 +-
.../internal/table/distributed/TableManager.java | 45 ++++++++++++++++++-
.../replicator/PartitionReplicaListener.java | 4 +-
15 files changed, 70 insertions(+), 92 deletions(-)
diff --git a/modules/catalog/build.gradle b/modules/catalog/build.gradle
index 4329f68c70..5fb5e02c74 100644
--- a/modules/catalog/build.gradle
+++ b/modules/catalog/build.gradle
@@ -28,9 +28,6 @@ dependencies {
implementation project(':ignite-configuration')
implementation project(':ignite-metastorage-api')
implementation project(':ignite-vault')
- // TODO: IGNITE-19499 Get rig of ignite-schema/gnite-distribution-zones
- implementation project(':ignite-schema')
- implementation project(':ignite-distribution-zones')
implementation libs.jetbrains.annotations
implementation libs.auto.service.annotations
diff --git a/modules/distribution-zones/build.gradle b/modules/distribution-zones/build.gradle
index c0d38eff4f..137e84bb3e 100644
--- a/modules/distribution-zones/build.gradle
+++ b/modules/distribution-zones/build.gradle
@@ -26,6 +26,7 @@ dependencies {
annotationProcessor project(":ignite-configuration-annotation-processor")
annotationProcessor libs.auto.service
+ implementation project(':ignite-catalog')
implementation project(':ignite-core')
implementation project(':ignite-configuration-api')
implementation project(':ignite-api')
diff --git a/modules/index/src/main/java/org/apache/ignite/internal/index/IndexManager.java b/modules/index/src/main/java/org/apache/ignite/internal/index/IndexManager.java
index 8cbe2eca88..a9bbdf6c45 100644
--- a/modules/index/src/main/java/org/apache/ignite/internal/index/IndexManager.java
+++ b/modules/index/src/main/java/org/apache/ignite/internal/index/IndexManager.java
@@ -20,8 +20,8 @@ package org.apache.ignite.internal.index;
import static java.util.concurrent.CompletableFuture.allOf;
import static java.util.concurrent.CompletableFuture.completedFuture;
import static java.util.concurrent.CompletableFuture.failedFuture;
-import static org.apache.ignite.internal.catalog.descriptors.CatalogDescriptorUtils.toIndexDescriptor;
-import static org.apache.ignite.internal.catalog.descriptors.CatalogDescriptorUtils.toTableDescriptor;
+import static org.apache.ignite.internal.schema.CatalogDescriptorUtils.toIndexDescriptor;
+import static org.apache.ignite.internal.schema.CatalogDescriptorUtils.toTableDescriptor;
import static org.apache.ignite.internal.schema.configuration.SchemaConfigurationUtils.findTableView;
import static org.apache.ignite.internal.util.ArrayUtils.STRING_EMPTY_ARRAY;
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ClusterPerClassIntegrationTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ClusterPerClassIntegrationTest.java
index 4347405dee..f982876480 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ClusterPerClassIntegrationTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ClusterPerClassIntegrationTest.java
@@ -18,8 +18,8 @@
package org.apache.ignite.internal.sql.engine;
import static java.util.stream.Collectors.toList;
-import static org.apache.ignite.internal.catalog.descriptors.CatalogDescriptorUtils.toIndexDescriptor;
-import static org.apache.ignite.internal.catalog.descriptors.CatalogDescriptorUtils.toTableDescriptor;
+import static org.apache.ignite.internal.schema.CatalogDescriptorUtils.toIndexDescriptor;
+import static org.apache.ignite.internal.schema.CatalogDescriptorUtils.toTableDescriptor;
import static org.apache.ignite.internal.sql.engine.util.CursorUtils.getAllFromCursor;
import static org.apache.ignite.internal.testframework.IgniteTestUtils.await;
import static org.apache.ignite.internal.testframework.IgniteTestUtils.testNodeName;
diff --git a/modules/schema/build.gradle b/modules/schema/build.gradle
index 124e4561ed..483350dc7d 100644
--- a/modules/schema/build.gradle
+++ b/modules/schema/build.gradle
@@ -29,6 +29,7 @@ dependencies {
api project(':ignite-binary-tuple')
implementation project(':ignite-api')
implementation project(':ignite-bytecode')
+ implementation project(':ignite-catalog')
implementation project(':ignite-core')
implementation project(':ignite-configuration-api')
implementation project(':ignite-metastorage-api')
diff --git a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/descriptors/CatalogDescriptorUtils.java b/modules/schema/src/main/java/org/apache/ignite/internal/schema/CatalogDescriptorUtils.java
similarity index 83%
rename from modules/catalog/src/main/java/org/apache/ignite/internal/catalog/descriptors/CatalogDescriptorUtils.java
rename to modules/schema/src/main/java/org/apache/ignite/internal/schema/CatalogDescriptorUtils.java
index 9cc96f4250..e3c2e509a1 100644
--- a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/descriptors/CatalogDescriptorUtils.java
+++ b/modules/schema/src/main/java/org/apache/ignite/internal/schema/CatalogDescriptorUtils.java
@@ -15,18 +15,21 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.catalog.descriptors;
+package org.apache.ignite.internal.schema;
import static java.util.stream.Collectors.toList;
import static org.apache.ignite.internal.catalog.descriptors.CatalogColumnCollation.ASC_NULLS_LAST;
import static org.apache.ignite.internal.catalog.descriptors.CatalogColumnCollation.DESC_NULLS_FIRST;
-import java.lang.reflect.Method;
import java.util.List;
import org.apache.ignite.internal.catalog.commands.DefaultValue;
-import org.apache.ignite.internal.distributionzones.configuration.DistributionZoneView;
-import org.apache.ignite.internal.schema.NativeType;
-import org.apache.ignite.internal.schema.NativeTypes;
+import org.apache.ignite.internal.catalog.descriptors.CatalogColumnCollation;
+import org.apache.ignite.internal.catalog.descriptors.CatalogHashIndexDescriptor;
+import org.apache.ignite.internal.catalog.descriptors.CatalogIndexColumnDescriptor;
+import org.apache.ignite.internal.catalog.descriptors.CatalogIndexDescriptor;
+import org.apache.ignite.internal.catalog.descriptors.CatalogSortedIndexDescriptor;
+import org.apache.ignite.internal.catalog.descriptors.CatalogTableColumnDescriptor;
+import org.apache.ignite.internal.catalog.descriptors.CatalogTableDescriptor;
import org.apache.ignite.internal.schema.configuration.ColumnTypeView;
import org.apache.ignite.internal.schema.configuration.ColumnView;
import org.apache.ignite.internal.schema.configuration.ConfigurationToSchemaDescriptorConverter;
@@ -42,7 +45,6 @@ import org.apache.ignite.internal.schema.configuration.index.IndexColumnView;
import org.apache.ignite.internal.schema.configuration.index.SortedIndexView;
import org.apache.ignite.internal.schema.configuration.index.TableIndexConfigurationSchema;
import org.apache.ignite.internal.schema.configuration.index.TableIndexView;
-import org.apache.ignite.internal.schema.configuration.storage.DataStorageView;
/**
* Helper class for working with catalog descriptors.
@@ -152,25 +154,6 @@ public class CatalogDescriptorUtils {
}
}
- /**
- * Converts a distribution zone configuration to a Distribution zone descriptor.
- *
- * @param config Distribution zone configuration.
- */
- 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())
- );
- }
-
private static CatalogTableColumnDescriptor toTableColumnDescriptor(ColumnView config) {
ColumnTypeView typeConfig = config.type();
@@ -211,21 +194,4 @@ public class CatalogDescriptorUtils {
return new CatalogIndexColumnDescriptor(config.name(), collation);
}
-
- // TODO: IGNITE-19719 Fix it
- private static CatalogDataStorageDescriptor toDataStorageDescriptor(DataStorageView config) {
- String dataRegion;
-
- try {
- Method dataRegionMethod = config.getClass().getMethod("dataRegion");
-
- dataRegionMethod.setAccessible(true);
-
- dataRegion = (String) dataRegionMethod.invoke(config);
- } catch (ReflectiveOperationException e) {
- dataRegion = e.getMessage();
- }
-
- return new CatalogDataStorageDescriptor(config.name(), dataRegion);
- }
}
diff --git a/modules/schema/src/test/java/org/apache/ignite/internal/schema/configuration/schema/TestDataStorageConfigurationSchema.java b/modules/schema/src/test/java/org/apache/ignite/internal/schema/configuration/schema/TestDataStorageConfigurationSchema.java
deleted file mode 100644
index af13211a8a..0000000000
--- a/modules/schema/src/test/java/org/apache/ignite/internal/schema/configuration/schema/TestDataStorageConfigurationSchema.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.schema.configuration.schema;
-
-import org.apache.ignite.configuration.annotation.PolymorphicConfigInstance;
-import org.apache.ignite.internal.schema.configuration.storage.DataStorageConfigurationSchema;
-
-/**
- * Test data storage configuration schema for tables.
- */
-@PolymorphicConfigInstance("test_data_storage")
-public class TestDataStorageConfigurationSchema extends DataStorageConfigurationSchema {
-}
diff --git a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/StorageHashIndexDescriptor.java b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/StorageHashIndexDescriptor.java
index a5c66d787e..3d556de653 100644
--- a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/StorageHashIndexDescriptor.java
+++ b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/StorageHashIndexDescriptor.java
@@ -18,7 +18,7 @@
package org.apache.ignite.internal.storage.index;
import static java.util.stream.Collectors.toList;
-import static org.apache.ignite.internal.catalog.descriptors.CatalogDescriptorUtils.getNativeType;
+import static org.apache.ignite.internal.schema.CatalogDescriptorUtils.getNativeType;
import java.util.List;
import org.apache.ignite.internal.catalog.descriptors.CatalogHashIndexDescriptor;
diff --git a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/StorageIndexDescriptorSupplier.java b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/StorageIndexDescriptorSupplier.java
index 417f21fe55..4034d69210 100644
--- a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/StorageIndexDescriptorSupplier.java
+++ b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/StorageIndexDescriptorSupplier.java
@@ -17,8 +17,8 @@
package org.apache.ignite.internal.storage.index;
-import static org.apache.ignite.internal.catalog.descriptors.CatalogDescriptorUtils.toIndexDescriptor;
-import static org.apache.ignite.internal.catalog.descriptors.CatalogDescriptorUtils.toTableDescriptor;
+import static org.apache.ignite.internal.schema.CatalogDescriptorUtils.toIndexDescriptor;
+import static org.apache.ignite.internal.schema.CatalogDescriptorUtils.toTableDescriptor;
import static org.apache.ignite.internal.schema.configuration.SchemaConfigurationUtils.findIndexView;
import static org.apache.ignite.internal.schema.configuration.SchemaConfigurationUtils.findTableView;
diff --git a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/StorageSortedIndexDescriptor.java b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/StorageSortedIndexDescriptor.java
index d5ec4cddcb..7738935820 100644
--- a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/StorageSortedIndexDescriptor.java
+++ b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/StorageSortedIndexDescriptor.java
@@ -18,7 +18,7 @@
package org.apache.ignite.internal.storage.index;
import static java.util.stream.Collectors.toList;
-import static org.apache.ignite.internal.catalog.descriptors.CatalogDescriptorUtils.getNativeType;
+import static org.apache.ignite.internal.schema.CatalogDescriptorUtils.getNativeType;
import java.util.List;
import org.apache.ignite.internal.catalog.descriptors.CatalogColumnCollation;
diff --git a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/AbstractMvTableStorageTest.java b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/AbstractMvTableStorageTest.java
index a60f81db8f..d55e2496c7 100644
--- a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/AbstractMvTableStorageTest.java
+++ b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/AbstractMvTableStorageTest.java
@@ -19,9 +19,9 @@ package org.apache.ignite.internal.storage;
import static java.util.concurrent.TimeUnit.SECONDS;
import static java.util.stream.Collectors.toList;
-import static org.apache.ignite.internal.catalog.descriptors.CatalogDescriptorUtils.toHashIndexDescriptor;
-import static org.apache.ignite.internal.catalog.descriptors.CatalogDescriptorUtils.toSortedIndexDescriptor;
-import static org.apache.ignite.internal.catalog.descriptors.CatalogDescriptorUtils.toTableDescriptor;
+import static org.apache.ignite.internal.schema.CatalogDescriptorUtils.toHashIndexDescriptor;
+import static org.apache.ignite.internal.schema.CatalogDescriptorUtils.toSortedIndexDescriptor;
+import static org.apache.ignite.internal.schema.CatalogDescriptorUtils.toTableDescriptor;
import static org.apache.ignite.internal.schema.configuration.SchemaConfigurationUtils.findTableView;
import static org.apache.ignite.internal.storage.MvPartitionStorage.REBALANCE_IN_PROGRESS;
import static org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willThrowFast;
diff --git a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/AbstractHashIndexStorageTest.java b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/AbstractHashIndexStorageTest.java
index 39f779b5d9..e33da7f16a 100644
--- a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/AbstractHashIndexStorageTest.java
+++ b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/AbstractHashIndexStorageTest.java
@@ -17,8 +17,8 @@
package org.apache.ignite.internal.storage.index;
-import static org.apache.ignite.internal.catalog.descriptors.CatalogDescriptorUtils.toHashIndexDescriptor;
-import static org.apache.ignite.internal.catalog.descriptors.CatalogDescriptorUtils.toTableDescriptor;
+import static org.apache.ignite.internal.schema.CatalogDescriptorUtils.toHashIndexDescriptor;
+import static org.apache.ignite.internal.schema.CatalogDescriptorUtils.toTableDescriptor;
import static org.apache.ignite.internal.schema.configuration.SchemaConfigurationUtils.findTableView;
import static org.apache.ignite.internal.schema.testutils.SchemaConfigurationConverter.addIndex;
import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully;
diff --git a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/AbstractSortedIndexStorageTest.java b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/AbstractSortedIndexStorageTest.java
index 99647eeb19..ecbba5d9f8 100644
--- a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/AbstractSortedIndexStorageTest.java
+++ b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/AbstractSortedIndexStorageTest.java
@@ -20,8 +20,8 @@ package org.apache.ignite.internal.storage.index;
import static java.util.function.Function.identity;
import static java.util.stream.Collectors.toList;
import static java.util.stream.Collectors.toUnmodifiableList;
-import static org.apache.ignite.internal.catalog.descriptors.CatalogDescriptorUtils.toSortedIndexDescriptor;
-import static org.apache.ignite.internal.catalog.descriptors.CatalogDescriptorUtils.toTableDescriptor;
+import static org.apache.ignite.internal.schema.CatalogDescriptorUtils.toSortedIndexDescriptor;
+import static org.apache.ignite.internal.schema.CatalogDescriptorUtils.toTableDescriptor;
import static org.apache.ignite.internal.schema.configuration.SchemaConfigurationUtils.findTableView;
import static org.apache.ignite.internal.schema.testutils.SchemaConfigurationConverter.addIndex;
import static org.apache.ignite.internal.storage.index.SortedIndexStorage.GREATER;
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 341ff0b185..950e37b893 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
@@ -25,13 +25,12 @@ import static java.util.concurrent.CompletableFuture.failedFuture;
import static java.util.concurrent.CompletableFuture.runAsync;
import static java.util.concurrent.CompletableFuture.supplyAsync;
import static java.util.stream.Collectors.toList;
-import static org.apache.ignite.internal.catalog.descriptors.CatalogDescriptorUtils.toTableDescriptor;
-import static org.apache.ignite.internal.catalog.descriptors.CatalogDescriptorUtils.toZoneDescriptor;
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.IgniteUtils.inBusyLock;
@@ -46,6 +45,7 @@ import static org.apache.ignite.internal.utils.RebalanceUtil.stablePartAssignmen
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import java.io.IOException;
+import java.lang.reflect.Method;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -88,6 +88,7 @@ import org.apache.ignite.configuration.notifications.ConfigurationNotificationEv
import org.apache.ignite.internal.affinity.AffinityUtils;
import org.apache.ignite.internal.affinity.Assignment;
import org.apache.ignite.internal.baseline.BaselineManager;
+import org.apache.ignite.internal.catalog.CatalogManager;
import org.apache.ignite.internal.catalog.descriptors.CatalogDataStorageDescriptor;
import org.apache.ignite.internal.catalog.descriptors.CatalogTableDescriptor;
import org.apache.ignite.internal.catalog.descriptors.CatalogZoneDescriptor;
@@ -95,6 +96,7 @@ 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;
@@ -134,6 +136,7 @@ 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;
+import org.apache.ignite.internal.schema.configuration.storage.DataStorageView;
import org.apache.ignite.internal.schema.event.SchemaEvent;
import org.apache.ignite.internal.schema.event.SchemaEventParameters;
import org.apache.ignite.internal.storage.DataStorageManager;
@@ -2632,4 +2635,42 @@ public class TableManager extends Producer<TableEvent, TableEventParameters> imp
private CatalogZoneDescriptor getZoneDescriptor(int id) {
return toZoneDescriptor(getZoneById(zonesConfig, id).value());
}
+
+ // TODO: IGNITE-19719 Fix it
+ private static CatalogDataStorageDescriptor toDataStorageDescriptor(DataStorageView config) {
+ String dataRegion;
+
+ try {
+ Method dataRegionMethod = config.getClass().getMethod("dataRegion");
+
+ dataRegionMethod.setAccessible(true);
+
+ dataRegion = (String) dataRegionMethod.invoke(config);
+ } catch (ReflectiveOperationException e) {
+ dataRegion = e.getMessage();
+ }
+
+ return new CatalogDataStorageDescriptor(config.name(), dataRegion);
+ }
+
+ /**
+ * Converts a distribution zone configuration to a Distribution zone descriptor.
+ *
+ * @param config Distribution zone configuration.
+ */
+ //TODO drop
+ @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())
+ );
+ }
}
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java
index 367b9aded2..b9d9c88c3c 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java
@@ -22,8 +22,8 @@ import static java.util.concurrent.CompletableFuture.allOf;
import static java.util.concurrent.CompletableFuture.completedFuture;
import static java.util.concurrent.CompletableFuture.failedFuture;
import static java.util.stream.Collectors.toList;
-import static org.apache.ignite.internal.catalog.descriptors.CatalogDescriptorUtils.toIndexDescriptor;
-import static org.apache.ignite.internal.catalog.descriptors.CatalogDescriptorUtils.toTableDescriptor;
+import static org.apache.ignite.internal.schema.CatalogDescriptorUtils.toIndexDescriptor;
+import static org.apache.ignite.internal.schema.CatalogDescriptorUtils.toTableDescriptor;
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.filter;
[ignite-3] 01/02: Add catalog manager to table manager.
Posted by am...@apache.org.
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 2739ce632f97fa9c6376fe28a36e08aad597a522
Author: amashenkov <an...@gmail.com>
AuthorDate: Thu Jun 29 17:52:30 2023 +0300
Add catalog manager to table manager.
---
.../internal/configuration/storage/ItRebalanceDistributedTest.java | 1 +
.../apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java | 1 +
.../src/main/java/org/apache/ignite/internal/app/IgniteImpl.java | 1 +
.../apache/ignite/internal/sql/engine/exec/MockedStructuresTest.java | 1 +
.../org/apache/ignite/internal/table/distributed/TableManager.java | 4 ++++
.../apache/ignite/internal/table/distributed/TableManagerTest.java | 1 +
6 files changed, 9 insertions(+)
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 ac1e021304..34ad63956a 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
@@ -805,6 +805,7 @@ public class ItRebalanceDistributedTest {
dataStorageMgr,
storagePath,
metaStorageManager,
+ catalogManager,
schemaManager,
view -> new LocalLogStorageFactory(),
new HybridClockImpl(),
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 f57fae0c9e..fcbf02cb0e 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
@@ -363,6 +363,7 @@ public class ItIgniteNodeRestartTest extends BaseIgniteRestartTest {
dataStorageManager,
storagePath,
metaStorageMgr,
+ catalogManager,
schemaManager,
view -> new LocalLogStorageFactory(),
hybridClock,
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 1811fd2310..f7c75eca45 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
@@ -518,6 +518,7 @@ public class IgniteImpl implements Ignite {
dataStorageMgr,
storagePath,
metaStorageMgr,
+ catalogManager,
schemaManager,
volatileLogStorageFactoryCreator,
clock,
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 ab52605ca2..5dd40893a6 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
@@ -585,6 +585,7 @@ public class MockedStructuresTest extends IgniteAbstractTest {
dataStorageManager,
workDir,
msm,
+ catalogManager,
schemaManager,
null,
clock,
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 2c1e14280c..341ff0b185 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
@@ -312,6 +312,7 @@ public class TableManager extends Producer<TableEvent, TableEventParameters> imp
/** Schema manager. */
private final SchemaManager schemaManager;
+ private final CatalogManager catalogManager;
private final LogStorageFactoryCreator volatileLogStorageFactoryCreator;
@@ -388,6 +389,7 @@ public class TableManager extends Producer<TableEvent, TableEventParameters> imp
* @param baselineMgr Baseline manager.
* @param txManager Transaction manager.
* @param dataStorageMgr Data storage manager.
+ * @param catalogManager Catalog manager.
* @param schemaManager Schema manager.
* @param volatileLogStorageFactoryCreator Creator for {@link org.apache.ignite.internal.raft.storage.LogStorageFactory} for
* volatile tables.
@@ -411,6 +413,7 @@ public class TableManager extends Producer<TableEvent, TableEventParameters> imp
DataStorageManager dataStorageMgr,
Path storagePath,
MetaStorageManager metaStorageMgr,
+ CatalogManager catalogManager,
SchemaManager schemaManager,
LogStorageFactoryCreator volatileLogStorageFactoryCreator,
HybridClock clock,
@@ -434,6 +437,7 @@ public class TableManager extends Producer<TableEvent, TableEventParameters> imp
this.storagePath = storagePath;
this.metaStorageMgr = metaStorageMgr;
this.vaultManager = vaultManager;
+ this.catalogManager = catalogManager;
this.schemaManager = schemaManager;
this.volatileLogStorageFactoryCreator = volatileLogStorageFactoryCreator;
this.clock = clock;
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 898358beeb..b6e2fbe81d 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
@@ -874,6 +874,7 @@ public class TableManagerTest extends IgniteAbstractTest {
dsm = createDataStorageManager(configRegistry, workDir, storageEngineConfig),
workDir,
msm,
+ null,
sm = new SchemaManager(revisionUpdater, tblsCfg, msm),
budgetView -> new LocalLogStorageFactory(),
new HybridClockImpl(),