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 96f3355cac1d54377b5d54559ff3e48e35a77033
Author: Kirill Tkalenko <tkalkir...@yandex.ru>
AuthorDate: Thu Sep 14 10:12:43 2023 +0300
catalog-feature after merge ai-main
---
.../catalog/commands/AbstractCreateIndexCommand.java | 1 -
.../ignite/internal/catalog/commands/CatalogUtils.java | 2 ++
.../configuration/ConfigurationTreeGenerator.java | 1 -
.../ignite/internal/runner/app/ItTablesApiTest.java | 1 -
.../sql/engine/exec/ExecutableTableRegistryImpl.java | 16 ----------------
.../internal/sql/engine/exec/TableRowConverterImpl.java | 5 +----
.../ignite/internal/table/distributed/TableManager.java | 3 +--
.../distributed/replicator/PartitionReplicaListener.java | 1 -
.../internal/table/impl/DummyInternalTableImpl.java | 2 --
9 files changed, 4 insertions(+), 28 deletions(-)
diff --git
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AbstractCreateIndexCommand.java
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AbstractCreateIndexCommand.java
index bee55a4c18..471c3332e1 100644
---
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AbstractCreateIndexCommand.java
+++
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AbstractCreateIndexCommand.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.catalog.commands;
-import static
org.apache.ignite.internal.catalog.CatalogParamsValidationUtils.ensureNoTableOrIndexExistsWithGivenName;
import static
org.apache.ignite.internal.catalog.CatalogParamsValidationUtils.ensureNoTableIndexOrSysViewExistsWithGivenName;
import static
org.apache.ignite.internal.catalog.CatalogParamsValidationUtils.validateIdentifier;
import static
org.apache.ignite.internal.catalog.commands.CatalogUtils.schemaOrThrow;
diff --git
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CatalogUtils.java
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CatalogUtils.java
index d34b705ed9..eba42a5cc2 100644
---
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CatalogUtils.java
+++
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CatalogUtils.java
@@ -17,11 +17,13 @@
package org.apache.ignite.internal.catalog.commands;
+import static java.util.stream.Collectors.toList;
import static org.apache.ignite.lang.IgniteStringFormatter.format;
import java.util.Collection;
import java.util.EnumMap;
import java.util.EnumSet;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
diff --git
a/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/ConfigurationTreeGenerator.java
b/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/ConfigurationTreeGenerator.java
index 0984d66bb0..13d7761d65 100644
---
a/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/ConfigurationTreeGenerator.java
+++
b/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/ConfigurationTreeGenerator.java
@@ -31,7 +31,6 @@ import static
org.apache.ignite.internal.configuration.util.ConfigurationUtil.sc
import static
org.apache.ignite.internal.configuration.util.ConfigurationUtil.schemaFields;
import static org.apache.ignite.internal.util.CollectionUtils.difference;
import static org.apache.ignite.internal.util.CollectionUtils.first;
-import static org.apache.ignite.internal.util.CollectionUtils.viewReadOnly;
import java.lang.reflect.Field;
import java.util.Collection;
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItTablesApiTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItTablesApiTest.java
index 9947f25bd8..ac1c41e638 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItTablesApiTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItTablesApiTest.java
@@ -39,7 +39,6 @@ import java.util.stream.IntStream;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgnitionManager;
import org.apache.ignite.InitParameters;
-import org.apache.ignite.internal.catalog.IndexExistsValidationException;
import org.apache.ignite.internal.catalog.CatalogValidationException;
import org.apache.ignite.internal.catalog.IndexExistsValidationException;
import org.apache.ignite.internal.catalog.TableExistsValidationException;
diff --git
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ExecutableTableRegistryImpl.java
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ExecutableTableRegistryImpl.java
index ecd7d29ab8..a807a38bbd 100644
---
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ExecutableTableRegistryImpl.java
+++
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ExecutableTableRegistryImpl.java
@@ -78,22 +78,6 @@ public class ExecutableTableRegistryImpl implements
ExecutableTableRegistry, Sch
tableCache.clear();
}
- private CompletableFuture<ExecutableTable> loadTable(String tableName,
TableDescriptor tableDescriptor) {
- return tableManager.tableAsyncInternal(tableName.toUpperCase())
- .thenApply(table -> {
- InternalTable internalTable = table.internalTable();
- SchemaRegistry schemaRegistry =
schemaManager.schemaRegistry(table.tableId());
- SchemaDescriptor schemaDescriptor =
schemaRegistry.schema();
- TableRowConverter rowConverter = new
TableRowConverterImpl(schemaRegistry, schemaDescriptor, tableDescriptor);
- ScannableTable scannableTable = new
ScannableTableImpl(internalTable, rowConverter, tableDescriptor);
-
- UpdatableTableImpl updatableTable = new
UpdatableTableImpl(table.tableId(), tableDescriptor, internalTable.partitions(),
- replicaService, clock, rowConverter,
schemaDescriptor);
-
- return new ExecutableTableImpl(internalTable,
scannableTable, updatableTable);
- });
- }
-
private CompletableFuture<ExecutableTable> loadTable(int tableId,
TableDescriptor tableDescriptor) {
CompletableFuture<Map.Entry<InternalTable, SchemaRegistry>> f =
tableManager.tableAsync(tableId)
.thenApply(table -> {
diff --git
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/TableRowConverterImpl.java
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/TableRowConverterImpl.java
index 8801dc69a0..9af3e25aa9 100644
---
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/TableRowConverterImpl.java
+++
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/TableRowConverterImpl.java
@@ -21,13 +21,10 @@ import java.util.BitSet;
import org.apache.ignite.internal.schema.BinaryRow;
import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.schema.BinaryTupleSchema;
-import org.apache.ignite.internal.schema.Column;
import org.apache.ignite.internal.schema.SchemaDescriptor;
import org.apache.ignite.internal.schema.SchemaRegistry;
import org.apache.ignite.internal.schema.row.InternalTuple;
import org.apache.ignite.internal.sql.engine.schema.ColumnDescriptor;
-import org.apache.ignite.internal.schema.row.Row;
-import org.apache.ignite.internal.sql.engine.schema.ColumnDescriptor;
import org.apache.ignite.internal.sql.engine.schema.TableDescriptor;
import
org.apache.ignite.internal.sql.engine.util.FieldDeserializingProjectedTuple;
import org.apache.ignite.internal.sql.engine.util.FormatAwareProjectedTuple;
@@ -67,7 +64,7 @@ public class TableRowConverterImpl implements
TableRowConverter {
continue;
}
- mapping[currentIdx++] = column.physicalIndex();
+ mapping[currentIdx++] =
schemaDescriptor.column(column.name()).schemaIndex();
}
}
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 c83f5d6666..66af7c86cf 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
@@ -149,7 +149,6 @@ import
org.apache.ignite.internal.table.distributed.raft.snapshot.PartitionSnaps
import
org.apache.ignite.internal.table.distributed.raft.snapshot.outgoing.OutgoingSnapshotsManager;
import
org.apache.ignite.internal.table.distributed.raft.snapshot.outgoing.SnapshotAwarePartitionDataStorage;
import
org.apache.ignite.internal.table.distributed.replicator.DirectCatalogTables;
-import
org.apache.ignite.internal.table.distributed.replicator.CatalogTablesWithIdConversion;
import
org.apache.ignite.internal.table.distributed.replicator.PartitionReplicaListener;
import
org.apache.ignite.internal.table.distributed.replicator.TransactionStateResolver;
import org.apache.ignite.internal.table.distributed.schema.NonHistoricSchemas;
@@ -495,7 +494,7 @@ public class TableManager extends Producer<TableEvent,
TableEventParameters> imp
inBusyLock(busyLock, () -> {
mvGc.start();
- lowWatermark.start();
+ lowWatermark.start();
startTables();
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 a649d0ad6c..fba6bec0e7 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
@@ -281,7 +281,6 @@ public class PartitionReplicaListener implements
ReplicaListener {
* @param indexBuilder Index builder.
* @param catalogService Catalog service.
* @param placementDriver Placement driver.
- * @param placementDriver Placement driver.
*/
public PartitionReplicaListener(
MvPartitionStorage mvDataStorage,
diff --git
a/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/impl/DummyInternalTableImpl.java
b/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/impl/DummyInternalTableImpl.java
index 89ca256b7e..89f2812e0b 100644
---
a/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/impl/DummyInternalTableImpl.java
+++
b/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/impl/DummyInternalTableImpl.java
@@ -112,8 +112,6 @@ public class DummyInternalTableImpl extends
InternalTableImpl {
public static final ClusterNode LOCAL_NODE = new ClusterNodeImpl("id",
"node", ADDR);
- public static final ClusterNode LOCAL_NODE = new ClusterNodeImpl("id",
"node", ADDR);
-
// 2000 was picked to avoid negative time that we get when building read
timestamp
// in TxManagerImpl.currentReadTimestamp.
// We subtract
(ReplicaManager.IDLE_SAFE_TIME_PROPAGATION_PERIOD_MILLISECONDS +
HybridTimestamp.CLOCK_SKEW) = (1000 + 7) = 1007
