You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by tk...@apache.org on 2023/08/14 14:32:15 UTC
[ignite-3] branch catalog-feature updated (dca21e4492 -> 406b856f41)
This is an automated email from the ASF dual-hosted git repository.
tkalkirill pushed a change to branch catalog-feature
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
from dca21e4492 Merge branch 'main' into catalog-feature
add 7b5d0b3a3b IGNITE-20188 Add improvements to the catalog associated with the DistributionZone #2 (#2432)
new 03d063b585 Merge branch 'ai-main' into catalog-feature
new 406b856f41 catalog-feature after merge ai-main
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.
Summary of changes:
modules/catalog/build.gradle | 9 +
.../apache/ignite/internal/catalog/Catalog.java | 4 +-
.../internal/catalog/CatalogManagerImpl.java | 39 ++-
.../ignite/internal/catalog/CatalogService.java | 10 +-
.../internal/catalog/commands/CatalogUtils.java | 17 +-
.../descriptors/CatalogDataStorageDescriptor.java | 4 +-
.../catalog/descriptors/CatalogZoneDescriptor.java | 44 +---
.../internal/catalog/CatalogManagerSelfTest.java | 30 ++-
.../internal/catalog/BaseCatalogManagerTest.java | 2 +-
modules/distribution-zones/build.gradle | 1 +
.../utils/CatalogAlterZoneEventListener.java | 212 ++++++++++++++++
.../utils/CatalogAlterZoneEventListenerTest.java | 267 +++++++++++++++++++++
.../internal/sql/api/ItSqlSynchronousApiTest.java | 1 +
.../exec/ddl/DdlToCatalogCommandConverter.java | 10 +
.../exec/ddl/DdlToCatalogCommandConverterTest.java | 50 ++++
.../internal/table/distributed/TableManager.java | 8 +-
16 files changed, 653 insertions(+), 55 deletions(-)
rename modules/catalog/src/{test => testFixtures}/java/org/apache/ignite/internal/catalog/BaseCatalogManagerTest.java (98%)
create mode 100644 modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/utils/CatalogAlterZoneEventListener.java
create mode 100644 modules/distribution-zones/src/test/java/org/apache/ignite/internal/distributionzones/utils/CatalogAlterZoneEventListenerTest.java
[ignite-3] 01/02: Merge branch 'ai-main' into catalog-feature
Posted by tk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tkalkirill pushed a commit to branch catalog-feature
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 03d063b585afe6f11e0f7505317f65ca5ecbf68c
Merge: dca21e4492 7b5d0b3a3b
Author: Kirill Tkalenko <tk...@yandex.ru>
AuthorDate: Mon Aug 14 17:28:37 2023 +0300
Merge branch 'ai-main' into catalog-feature
modules/catalog/build.gradle | 9 +
.../apache/ignite/internal/catalog/Catalog.java | 4 +-
.../internal/catalog/CatalogManagerImpl.java | 39 ++-
.../ignite/internal/catalog/CatalogService.java | 10 +-
.../internal/catalog/commands/CatalogUtils.java | 17 +-
.../descriptors/CatalogDataStorageDescriptor.java | 4 +-
.../catalog/descriptors/CatalogZoneDescriptor.java | 44 +---
.../internal/catalog/CatalogManagerSelfTest.java | 30 ++-
.../internal/catalog/BaseCatalogManagerTest.java | 2 +-
modules/distribution-zones/build.gradle | 1 +
.../utils/CatalogAlterZoneEventListener.java | 212 ++++++++++++++++
.../utils/CatalogAlterZoneEventListenerTest.java | 267 +++++++++++++++++++++
.../exec/ddl/DdlToCatalogCommandConverter.java | 10 +
.../exec/ddl/DdlToCatalogCommandConverterTest.java | 50 ++++
.../internal/table/distributed/TableManager.java | 8 +-
15 files changed, 652 insertions(+), 55 deletions(-)
diff --cc modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
index 5725c7adad,b25f6444cf..375b725a7d
--- 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
@@@ -1312,15 -1300,15 +1312,15 @@@ public class TableManager extends Produ
* @param zoneDescriptor Catalog distributed zone descriptor.
*/
protected MvTableStorage createTableStorage(CatalogTableDescriptor tableDescriptor, CatalogZoneDescriptor zoneDescriptor) {
- CatalogDataStorageDescriptor dataStorage = zoneDescriptor.getDataStorage();
+ CatalogDataStorageDescriptor dataStorage = zoneDescriptor.dataStorage();
- StorageEngine engine = dataStorageMgr.engine(dataStorage.getEngine());
+ StorageEngine engine = dataStorageMgr.engine(dataStorage.engine());
- assert engine != null : "tableId=" + tableDescriptor.id() + ", engine=" + dataStorage.getEngine();
+ assert engine != null : "tableId=" + tableDescriptor.id() + ", engine=" + dataStorage.engine();
MvTableStorage tableStorage = engine.createMvTable(
- new StorageTableDescriptor(tableDescriptor.id(), zoneDescriptor.partitions(), dataStorage.getDataRegion()),
+ new StorageTableDescriptor(tableDescriptor.id(), zoneDescriptor.partitions(), dataStorage.dataRegion()),
- new StorageIndexDescriptorSupplier(tablesCfg)
+ new StorageIndexDescriptorSupplier(catalogManager)
);
tableStorage.start();
[ignite-3] 02/02: catalog-feature after merge ai-main
Posted by tk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tkalkirill pushed a commit to branch catalog-feature
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 406b856f414c05a27a5d6c9981a4f7e0ec418b77
Author: Kirill Tkalenko <tk...@yandex.ru>
AuthorDate: Mon Aug 14 17:32:06 2023 +0300
catalog-feature after merge ai-main
---
.../java/org/apache/ignite/internal/sql/api/ItSqlSynchronousApiTest.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlSynchronousApiTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlSynchronousApiTest.java
index 1d9f4a6a3f..80e804f437 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlSynchronousApiTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlSynchronousApiTest.java
@@ -61,6 +61,7 @@ import org.apache.ignite.sql.SqlRow;
import org.apache.ignite.table.Table;
import org.apache.ignite.tx.Transaction;
import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInfo;