This is an automated email from the ASF dual-hosted git repository.
tkalkirill pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new b5575f5bde IGNITE-22720 Get rid of
CatalogIndexDescriptor#txWaitCatalogVersion (#4080)
b5575f5bde is described below
commit b5575f5bde3c3742a518301ce3879a14cbcfb99c
Author: Kirill Tkalenko <[email protected]>
AuthorDate: Mon Jul 15 10:09:11 2024 +0300
IGNITE-22720 Get rid of CatalogIndexDescriptor#txWaitCatalogVersion (#4080)
---
.../commands/AbstractCreateIndexCommand.java | 4 +-
.../catalog/commands/CreateHashIndexCommand.java | 4 +-
.../catalog/commands/CreateSortedIndexCommand.java | 4 +-
.../catalog/commands/CreateTableCommand.java | 7 +--
.../descriptors/CatalogHashIndexDescriptor.java | 20 ++-----
.../descriptors/CatalogIndexDescriptor.java | 25 +++-----
.../descriptors/CatalogSortedIndexDescriptor.java | 19 ++----
.../storage/AbstractChangeIndexStatusEntry.java | 17 ++----
.../internal/catalog/storage/RenameIndexEntry.java | 2 -
.../ignite/internal/catalog/CatalogIndexTest.java | 68 ----------------------
.../catalog/CatalogManagerRecoveryTest.java | 24 --------
.../ignite/internal/catalog/CatalogTableTest.java | 1 -
...ractChangeIndexStatusCommandValidationTest.java | 1 -
.../catalog/commands/CatalogUtilsTest.java | 1 -
.../CatalogHashIndexDescriptorTest.java | 2 +-
.../CatalogSortedIndexDescriptorTest.java | 2 +-
.../storage/CatalogEntrySerializationTest.java | 4 +-
.../storage/index/StorageIndexDescriptorTest.java | 2 -
.../storage/AbstractMvTableStorageTest.java | 7 ---
.../index/AbstractHashIndexStorageTest.java | 1 -
.../index/AbstractSortedIndexStorageTest.java | 1 -
21 files changed, 34 insertions(+), 182 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 12bf302010..3a7336c3db 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
@@ -67,7 +67,7 @@ public abstract class AbstractCreateIndexCommand extends
AbstractIndexCommand {
return ifNotExists;
}
- protected abstract CatalogIndexDescriptor createDescriptor(int indexId,
int tableId, int creationCatalogVersion);
+ protected abstract CatalogIndexDescriptor createDescriptor(int indexId,
int tableId);
@Override
public List<UpdateEntry> get(Catalog catalog) {
@@ -91,7 +91,7 @@ public abstract class AbstractCreateIndexCommand extends
AbstractIndexCommand {
}
return List.of(
- new NewIndexEntry(createDescriptor(catalog.objectIdGenState(),
table.id(), catalog.version() + 1)),
+ new NewIndexEntry(createDescriptor(catalog.objectIdGenState(),
table.id())),
new ObjectIdGenUpdateEntry(1)
);
}
diff --git
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CreateHashIndexCommand.java
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CreateHashIndexCommand.java
index ece78e00db..2ea72d8498 100644
---
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CreateHashIndexCommand.java
+++
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CreateHashIndexCommand.java
@@ -49,9 +49,9 @@ public class CreateHashIndexCommand extends
AbstractCreateIndexCommand {
}
@Override
- protected CatalogIndexDescriptor createDescriptor(int indexId, int
tableId, int creationCatalogVersion) {
+ protected CatalogIndexDescriptor createDescriptor(int indexId, int
tableId) {
return new CatalogHashIndexDescriptor(
- indexId, indexName, tableId, unique, creationCatalogVersion,
columns
+ indexId, indexName, tableId, unique, columns
);
}
diff --git
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CreateSortedIndexCommand.java
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CreateSortedIndexCommand.java
index 5bb0d3ee69..d21661dc98 100644
---
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CreateSortedIndexCommand.java
+++
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CreateSortedIndexCommand.java
@@ -62,7 +62,7 @@ public class CreateSortedIndexCommand extends
AbstractCreateIndexCommand {
}
@Override
- protected CatalogIndexDescriptor createDescriptor(int indexId, int
tableId, int creationCatalogVersion) {
+ protected CatalogIndexDescriptor createDescriptor(int indexId, int
tableId) {
var indexColumnDescriptors = new
ArrayList<CatalogIndexColumnDescriptor>(columns.size());
for (int i = 0; i < columns.size(); i++) {
@@ -72,7 +72,7 @@ public class CreateSortedIndexCommand extends
AbstractCreateIndexCommand {
}
return new CatalogSortedIndexDescriptor(
- indexId, indexName, tableId, unique, creationCatalogVersion,
indexColumnDescriptors
+ indexId, indexName, tableId, unique, indexColumnDescriptors
);
}
diff --git
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CreateTableCommand.java
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CreateTableCommand.java
index 2322ef5cdd..79fa986daa 100644
---
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CreateTableCommand.java
+++
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CreateTableCommand.java
@@ -146,9 +146,8 @@ public class CreateTableCommand extends
AbstractTableCommand {
String indexName = pkIndexName(tableName);
ensureNoTableIndexOrSysViewExistsWithGivenName(schema, indexName);
- int txWaitCatalogVersion = catalog.version() + 1;
- CatalogIndexDescriptor pkIndex =
createIndexDescriptor(txWaitCatalogVersion, indexName, pkIndexId, tableId);
+ CatalogIndexDescriptor pkIndex = createIndexDescriptor(indexName,
pkIndexId, tableId);
return List.of(
new NewTableEntry(table),
@@ -204,7 +203,7 @@ public class CreateTableCommand extends
AbstractTableCommand {
}
}
- private CatalogIndexDescriptor createIndexDescriptor(int
txWaitCatalogVersion, String indexName, int pkIndexId, int tableId) {
+ private CatalogIndexDescriptor createIndexDescriptor(String indexName, int
pkIndexId, int tableId) {
CatalogIndexDescriptor pkIndex;
if (primaryKey instanceof TableSortedPrimaryKey) {
@@ -224,7 +223,6 @@ public class CreateTableCommand extends
AbstractTableCommand {
tableId,
true,
AVAILABLE,
- txWaitCatalogVersion,
indexColumns
);
} else if (primaryKey instanceof TableHashPrimaryKey) {
@@ -235,7 +233,6 @@ public class CreateTableCommand extends
AbstractTableCommand {
tableId,
true,
AVAILABLE,
- txWaitCatalogVersion,
hashPrimaryKey.columns()
);
} else {
diff --git
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/descriptors/CatalogHashIndexDescriptor.java
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/descriptors/CatalogHashIndexDescriptor.java
index e251a6016f..b77d49430d 100644
---
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/descriptors/CatalogHashIndexDescriptor.java
+++
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/descriptors/CatalogHashIndexDescriptor.java
@@ -43,13 +43,11 @@ public class CatalogHashIndexDescriptor extends
CatalogIndexDescriptor {
* @param name Name of the index.
* @param tableId Id of the table index belongs to.
* @param unique Unique flag.
- * @param txWaitCatalogVersion Catalog version used in special index
status updates to wait for RW transactions, started before
- * this version, to finish.
* @param columns A list of indexed columns. Must not contains duplicates.
* @throws IllegalArgumentException If columns list contains duplicates.
*/
- public CatalogHashIndexDescriptor(int id, String name, int tableId,
boolean unique, int txWaitCatalogVersion, List<String> columns) {
- this(id, name, tableId, unique, CatalogIndexStatus.REGISTERED,
txWaitCatalogVersion, columns, INITIAL_CAUSALITY_TOKEN);
+ public CatalogHashIndexDescriptor(int id, String name, int tableId,
boolean unique, List<String> columns) {
+ this(id, name, tableId, unique, CatalogIndexStatus.REGISTERED,
columns, INITIAL_CAUSALITY_TOKEN);
}
/**
@@ -60,8 +58,6 @@ public class CatalogHashIndexDescriptor extends
CatalogIndexDescriptor {
* @param tableId Id of the table index belongs to.
* @param unique Unique flag.
* @param status Index status.
- * @param txWaitCatalogVersion Catalog version used in special index
status updates to wait for RW transactions, started before
- * this version, to finish.
* @param columns A list of indexed columns. Must not contains duplicates.
* @throws IllegalArgumentException If columns list contains duplicates.
*/
@@ -71,10 +67,9 @@ public class CatalogHashIndexDescriptor extends
CatalogIndexDescriptor {
int tableId,
boolean unique,
CatalogIndexStatus status,
- int txWaitCatalogVersion,
List<String> columns
) {
- this(id, name, tableId, unique, status, txWaitCatalogVersion, columns,
INITIAL_CAUSALITY_TOKEN);
+ this(id, name, tableId, unique, status, columns,
INITIAL_CAUSALITY_TOKEN);
}
/**
@@ -85,8 +80,6 @@ public class CatalogHashIndexDescriptor extends
CatalogIndexDescriptor {
* @param tableId Id of the table index belongs to.
* @param unique Unique flag.
* @param status Index status.
- * @param txWaitCatalogVersion Catalog version used in special index
status updates to wait for RW transactions, started before
- * this version, to finish.
* @param columns A list of indexed columns. Must not contains duplicates.
* @param causalityToken Token of the update of the descriptor.
* @throws IllegalArgumentException If columns list contains duplicates.
@@ -97,11 +90,10 @@ public class CatalogHashIndexDescriptor extends
CatalogIndexDescriptor {
int tableId,
boolean unique,
CatalogIndexStatus status,
- int txWaitCatalogVersion,
List<String> columns,
long causalityToken
) {
- super(CatalogIndexDescriptorType.HASH, id, name, tableId, unique,
status, txWaitCatalogVersion, causalityToken);
+ super(CatalogIndexDescriptorType.HASH, id, name, tableId, unique,
status, causalityToken);
this.columns = List.copyOf(Objects.requireNonNull(columns, "columns"));
}
@@ -125,10 +117,9 @@ public class CatalogHashIndexDescriptor extends
CatalogIndexDescriptor {
int tableId = input.readInt();
boolean unique = input.readBoolean();
CatalogIndexStatus status =
CatalogIndexStatus.forId(input.readByte());
- int txWaitCatalogVersion = input.readInt();
List<String> columns = readStringCollection(input, ArrayList::new);
- return new CatalogHashIndexDescriptor(id, name, tableId, unique,
status, txWaitCatalogVersion, columns, updateToken);
+ return new CatalogHashIndexDescriptor(id, name, tableId, unique,
status, columns, updateToken);
}
@Override
@@ -139,7 +130,6 @@ public class CatalogHashIndexDescriptor extends
CatalogIndexDescriptor {
output.writeInt(descriptor.tableId());
output.writeBoolean(descriptor.unique());
output.writeByte(descriptor.status().id());
- output.writeInt(descriptor.txWaitCatalogVersion());
writeStringCollection(descriptor.columns(), output);
}
}
diff --git
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/descriptors/CatalogIndexDescriptor.java
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/descriptors/CatalogIndexDescriptor.java
index a14c84685f..38c6aaa6b2 100644
---
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/descriptors/CatalogIndexDescriptor.java
+++
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/descriptors/CatalogIndexDescriptor.java
@@ -31,22 +31,23 @@ public abstract class CatalogIndexDescriptor extends
CatalogObjectDescriptor {
/** Index status. */
private final CatalogIndexStatus status;
- /**
- * Catalog version used in special index status updates to wait for RW
transactions, started before this version, to finish.
- */
- private final int txWaitCatalogVersion;
-
/** Index descriptor type. */
private final CatalogIndexDescriptorType indexType;
- CatalogIndexDescriptor(CatalogIndexDescriptorType indexType, int id,
String name, int tableId, boolean unique,
- CatalogIndexStatus status, int txWaitCatalogVersion, long
causalityToken) {
+ CatalogIndexDescriptor(
+ CatalogIndexDescriptorType indexType,
+ int id,
+ String name,
+ int tableId,
+ boolean unique,
+ CatalogIndexStatus status,
+ long causalityToken
+ ) {
super(id, Type.INDEX, name, causalityToken);
this.indexType = indexType;
this.tableId = tableId;
this.unique = unique;
this.status = Objects.requireNonNull(status, "status");
- this.txWaitCatalogVersion = txWaitCatalogVersion;
}
/** Gets table ID. */
@@ -64,14 +65,6 @@ public abstract class CatalogIndexDescriptor extends
CatalogObjectDescriptor {
return status;
}
- /**
- * Returns the Catalog version used in special index status updates to
wait for RW transactions, started before
- * this version, to finish.
- */
- public int txWaitCatalogVersion() {
- return txWaitCatalogVersion;
- }
-
/** Returns catalog index descriptor type. */
public CatalogIndexDescriptorType indexType() {
return indexType;
diff --git
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/descriptors/CatalogSortedIndexDescriptor.java
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/descriptors/CatalogSortedIndexDescriptor.java
index 6697c16259..d535ac9679 100644
---
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/descriptors/CatalogSortedIndexDescriptor.java
+++
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/descriptors/CatalogSortedIndexDescriptor.java
@@ -44,8 +44,6 @@ public class CatalogSortedIndexDescriptor extends
CatalogIndexDescriptor {
* @param name Name of the index.
* @param tableId Id of the table index belongs to.
* @param unique Unique flag.
- * @param txWaitCatalogVersion Catalog version used in special index
status updates to wait for RW transactions, started before
- * this version, to finish.
* @param columns A list of columns descriptors.
* @throws IllegalArgumentException If columns list contains duplicates or
columns size doesn't match the collations size.
*/
@@ -54,10 +52,9 @@ public class CatalogSortedIndexDescriptor extends
CatalogIndexDescriptor {
String name,
int tableId,
boolean unique,
- int txWaitCatalogVersion,
List<CatalogIndexColumnDescriptor> columns
) {
- this(id, name, tableId, unique, REGISTERED, txWaitCatalogVersion,
columns);
+ this(id, name, tableId, unique, REGISTERED, columns);
}
/**
@@ -68,8 +65,6 @@ public class CatalogSortedIndexDescriptor extends
CatalogIndexDescriptor {
* @param tableId Id of the table index belongs to.
* @param unique Unique flag.
* @param status Index status.
- * @param txWaitCatalogVersion Catalog version used in special index
status updates to wait for RW transactions, started before
- * this version, to finish.
* @param columns A list of columns descriptors.
* @throws IllegalArgumentException If columns list contains duplicates or
columns size doesn't match the collations size.
*/
@@ -79,10 +74,9 @@ public class CatalogSortedIndexDescriptor extends
CatalogIndexDescriptor {
int tableId,
boolean unique,
CatalogIndexStatus status,
- int txWaitCatalogVersion,
List<CatalogIndexColumnDescriptor> columns
) {
- this(id, name, tableId, unique, status, txWaitCatalogVersion, columns,
INITIAL_CAUSALITY_TOKEN);
+ this(id, name, tableId, unique, status, columns,
INITIAL_CAUSALITY_TOKEN);
}
/**
@@ -93,8 +87,6 @@ public class CatalogSortedIndexDescriptor extends
CatalogIndexDescriptor {
* @param tableId Id of the table index belongs to.
* @param unique Unique flag.
* @param status Index status.
- * @param txWaitCatalogVersion Catalog version used in special index
status updates to wait for RW transactions, started before
- * this version, to finish.
* @param columns A list of columns descriptors.
* @param causalityToken Token of the update of the descriptor.
* @throws IllegalArgumentException If columns list contains duplicates or
columns size doesn't match the collations size.
@@ -105,11 +97,10 @@ public class CatalogSortedIndexDescriptor extends
CatalogIndexDescriptor {
int tableId,
boolean unique,
CatalogIndexStatus status,
- int txWaitCatalogVersion,
List<CatalogIndexColumnDescriptor> columns,
long causalityToken
) {
- super(CatalogIndexDescriptorType.SORTED, id, name, tableId, unique,
status, txWaitCatalogVersion, causalityToken);
+ super(CatalogIndexDescriptorType.SORTED, id, name, tableId, unique,
status, causalityToken);
this.columns = Objects.requireNonNull(columns, "columns");
}
@@ -133,10 +124,9 @@ public class CatalogSortedIndexDescriptor extends
CatalogIndexDescriptor {
int tableId = input.readInt();
boolean unique = input.readBoolean();
CatalogIndexStatus status =
CatalogIndexStatus.forId(input.readByte());
- int txWaitCatalogVersion = input.readInt();
List<CatalogIndexColumnDescriptor> columns =
readList(CatalogIndexColumnDescriptor.SERIALIZER, input);
- return new CatalogSortedIndexDescriptor(id, name, tableId, unique,
status, txWaitCatalogVersion, columns, updateToken);
+ return new CatalogSortedIndexDescriptor(id, name, tableId, unique,
status, columns, updateToken);
}
@Override
@@ -147,7 +137,6 @@ public class CatalogSortedIndexDescriptor extends
CatalogIndexDescriptor {
output.writeInt(descriptor.tableId());
output.writeBoolean(descriptor.unique());
output.writeByte(descriptor.status().id());
- output.writeInt(descriptor.txWaitCatalogVersion());
writeList(descriptor.columns(),
CatalogIndexColumnDescriptor.SERIALIZER, output);
}
}
diff --git
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/storage/AbstractChangeIndexStatusEntry.java
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/storage/AbstractChangeIndexStatusEntry.java
index e86cf154b4..01aaf56234 100644
---
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/storage/AbstractChangeIndexStatusEntry.java
+++
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/storage/AbstractChangeIndexStatusEntry.java
@@ -75,15 +75,12 @@ abstract class AbstractChangeIndexStatusEntry implements
UpdateEntry {
) {
CatalogIndexDescriptor source = indexOrThrow(catalog, indexId);
- // We only care about the transitions to REGISTERED and STOPPING.
REGISTERED status has already been handled on index creation.
- int txWaitCatalogVersion = newStatus == CatalogIndexStatus.STOPPING ?
catalog.version() + 1 : source.txWaitCatalogVersion();
-
CatalogIndexDescriptor updateIndexDescriptor;
if (source instanceof CatalogHashIndexDescriptor) {
- updateIndexDescriptor =
updateHashIndexStatus((CatalogHashIndexDescriptor) source, newStatus,
txWaitCatalogVersion);
+ updateIndexDescriptor =
updateHashIndexStatus((CatalogHashIndexDescriptor) source, newStatus);
} else if (source instanceof CatalogSortedIndexDescriptor) {
- updateIndexDescriptor =
updateSortedIndexStatus((CatalogSortedIndexDescriptor) source, newStatus,
txWaitCatalogVersion);
+ updateIndexDescriptor =
updateSortedIndexStatus((CatalogSortedIndexDescriptor) source, newStatus);
} else {
throw new CatalogValidationException(format("Unsupported index
type '{}' {}", source.id(), source));
}
@@ -93,30 +90,24 @@ abstract class AbstractChangeIndexStatusEntry implements
UpdateEntry {
return updateIndexDescriptor;
}
- private static CatalogIndexDescriptor updateHashIndexStatus(
- CatalogHashIndexDescriptor index, CatalogIndexStatus newStatus,
int txWaitCatalogVersion
- ) {
+ private static CatalogIndexDescriptor
updateHashIndexStatus(CatalogHashIndexDescriptor index, CatalogIndexStatus
newStatus) {
return new CatalogHashIndexDescriptor(
index.id(),
index.name(),
index.tableId(),
index.unique(),
newStatus,
- txWaitCatalogVersion,
index.columns()
);
}
- private static CatalogIndexDescriptor updateSortedIndexStatus(
- CatalogSortedIndexDescriptor index, CatalogIndexStatus newStatus,
int txWaitCatalogVersion
- ) {
+ private static CatalogIndexDescriptor
updateSortedIndexStatus(CatalogSortedIndexDescriptor index, CatalogIndexStatus
newStatus) {
return new CatalogSortedIndexDescriptor(
index.id(),
index.name(),
index.tableId(),
index.unique(),
newStatus,
- txWaitCatalogVersion,
index.columns()
);
}
diff --git
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/storage/RenameIndexEntry.java
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/storage/RenameIndexEntry.java
index 1b2278f21d..c1e36aa70f 100644
---
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/storage/RenameIndexEntry.java
+++
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/storage/RenameIndexEntry.java
@@ -100,7 +100,6 @@ public class RenameIndexEntry implements UpdateEntry {
index.tableId(),
index.unique(),
index.status(),
- index.txWaitCatalogVersion(),
index.columns()
);
}
@@ -112,7 +111,6 @@ public class RenameIndexEntry implements UpdateEntry {
index.tableId(),
index.unique(),
index.status(),
- index.txWaitCatalogVersion(),
index.columns()
);
}
diff --git
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogIndexTest.java
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogIndexTest.java
index 12a6cde2d4..2194262b91 100644
---
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogIndexTest.java
+++
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogIndexTest.java
@@ -33,7 +33,6 @@ import static
org.apache.ignite.internal.util.CompletableFutures.falseCompletedF
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.hasItems;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
@@ -57,7 +56,6 @@ import static org.mockito.Mockito.when;
import java.util.List;
import java.util.concurrent.CompletableFuture;
-import java.util.stream.Stream;
import org.apache.ignite.internal.catalog.commands.DropIndexCommand;
import org.apache.ignite.internal.catalog.commands.MakeIndexAvailableCommand;
import org.apache.ignite.internal.catalog.commands.RemoveIndexCommand;
@@ -82,11 +80,8 @@ import org.apache.ignite.internal.sql.SqlCommon;
import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.EnumSource;
import org.junit.jupiter.params.provider.EnumSource.Mode;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.junit.jupiter.params.provider.ValueSource;
import org.mockito.ArgumentCaptor;
/** Tests for index related commands. */
@@ -122,7 +117,6 @@ public class CatalogIndexTest extends
BaseCatalogManagerTest {
assertEquals(List.of("VAL", "ID"), index.columns());
assertFalse(index.unique());
assertEquals(REGISTERED, index.status());
- assertEquals(manager.latestCatalogVersion(),
index.txWaitCatalogVersion());
}
@Test
@@ -164,7 +158,6 @@ public class CatalogIndexTest extends
BaseCatalogManagerTest {
assertEquals(ASC_NULLS_LAST, index.columns().get(1).collation());
assertTrue(index.unique());
assertEquals(REGISTERED, index.status());
- assertEquals(manager.latestCatalogVersion(),
index.txWaitCatalogVersion());
}
@Test
@@ -466,58 +459,6 @@ public class CatalogIndexTest extends
BaseCatalogManagerTest {
assertThat(fireEventFuture, willCompleteSuccessfully());
}
- @ParameterizedTest
- @ValueSource(booleans = {true, false})
- public void testIndexCreationCatalogVersionAfterUpdateIndex(boolean
hashIndex) {
- createSomeTable(TABLE_NAME);
-
- if (hashIndex) {
- createSomeIndex(TABLE_NAME, INDEX_NAME);
- } else {
- createSomeSortedIndex(TABLE_NAME, INDEX_NAME);
- }
-
- int expCreationVersion = manager.latestCatalogVersion();
-
- int indexId = indexId(INDEX_NAME);
-
- assertThat(manager.execute(startBuildingIndexCommand(indexId)),
willCompleteSuccessfully());
-
- Catalog latestCatalog =
manager.catalog(manager.activeCatalogVersion(clock.nowLong()));
-
- assertThat(latestCatalog.version(), greaterThan(expCreationVersion));
-
- assertEquals(expCreationVersion,
latestCatalog.index(indexId).txWaitCatalogVersion());
- }
-
- @ParameterizedTest(name = "hashIndex={0}, updateIndex={1}")
- @MethodSource("argumentsForCheckIndexCreationCatalogVersion")
- public void testIndexCreationCatalogVersionAfterUpdateCatalog(boolean
hashIndex, boolean updateIndex) {
- createSomeTable(TABLE_NAME);
-
- if (hashIndex) {
- createSomeIndex(TABLE_NAME, INDEX_NAME);
- } else {
- createSomeSortedIndex(TABLE_NAME, INDEX_NAME);
- }
-
- int expCreationVersion = manager.latestCatalogVersion();
-
- int indexId = indexId(INDEX_NAME);
-
- if (updateIndex) {
- assertThat(manager.execute(startBuildingIndexCommand(indexId)),
willCompleteSuccessfully());
- } else {
- createSomeTable(TABLE_NAME + 1);
- }
-
- Catalog latestCatalog =
manager.catalog(manager.activeCatalogVersion(clock.nowLong()));
-
- assertThat(latestCatalog.version(), greaterThan(expCreationVersion));
-
- assertEquals(expCreationVersion,
latestCatalog.index(indexId).txWaitCatalogVersion());
- }
-
@Test
public void testIndexEvents() {
CatalogCommand createIndexCmd = createHashIndexCommand(INDEX_NAME,
List.of("ID"));
@@ -860,13 +801,4 @@ public class CatalogIndexTest extends
BaseCatalogManagerTest {
willCompleteSuccessfully()
);
}
-
- private static Stream<Arguments>
argumentsForCheckIndexCreationCatalogVersion() {
- return Stream.of(
- Arguments.of(true, true), // Create hash index and update
index status..
- Arguments.of(true, false), // Create hash index and update
catalog (create table).
- Arguments.of(false, true), // Create sorted index and update
index status..
- Arguments.of(false, false) // Create sorted index and update
catalog (create table).
- );
- }
}
diff --git
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogManagerRecoveryTest.java
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogManagerRecoveryTest.java
index d35fc27934..efb5574a85 100644
---
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogManagerRecoveryTest.java
+++
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogManagerRecoveryTest.java
@@ -26,7 +26,6 @@ import static
org.apache.ignite.internal.catalog.BaseCatalogManagerTest.dropInde
import static
org.apache.ignite.internal.catalog.BaseCatalogManagerTest.dropTableCommand;
import static
org.apache.ignite.internal.catalog.BaseCatalogManagerTest.simpleIndex;
import static
org.apache.ignite.internal.catalog.BaseCatalogManagerTest.simpleTable;
-import static
org.apache.ignite.internal.catalog.BaseCatalogManagerTest.startBuildingIndexCommand;
import static
org.apache.ignite.internal.testframework.IgniteTestUtils.waitForCondition;
import static
org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willBe;
import static
org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully;
@@ -35,7 +34,6 @@ import static
org.apache.ignite.internal.util.IgniteUtils.stopAsync;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThan;
-import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
@@ -187,28 +185,6 @@ public class CatalogManagerRecoveryTest extends
BaseIgniteAbstractTest {
assertThat(catalogManager.activeCatalogVersion(latestVersionActivationTime),
equalTo(latestVersion));
}
- @Test
- void testRecoveryIndexCreationCatalogVersion() throws InterruptedException
{
- createAndStartComponents();
- awaitDefaultZoneCreation();
-
- assertThat(catalogManager.execute(simpleTable(TABLE_NAME)),
willCompleteSuccessfully());
- assertThat(catalogManager.execute(simpleIndex(TABLE_NAME,
INDEX_NAME)), willCompleteSuccessfully());
-
- int expCreationCatalogVersion = catalogManager.latestCatalogVersion();
-
- int indexId = catalogManager.aliveIndex(INDEX_NAME,
clock.nowLong()).id();
-
- assertThat(catalogManager.execute(startBuildingIndexCommand(indexId)),
willCompleteSuccessfully());
- assertThat(catalogManager.execute(simpleTable(TABLE_NAME + 1)),
willCompleteSuccessfully());
-
- stopComponents();
-
- createAndStartComponents();
-
- assertEquals(expCreationCatalogVersion,
catalogManager.aliveIndex(INDEX_NAME, clock.nowLong()).txWaitCatalogVersion());
- }
-
private void createAndStartComponents() {
createComponents();
diff --git
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogTableTest.java
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogTableTest.java
index 403811b7e0..9974e6280f 100644
---
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogTableTest.java
+++
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogTableTest.java
@@ -166,7 +166,6 @@ public class CatalogTableTest extends
BaseCatalogManagerTest {
assertEquals(table.primaryKeyColumns(), pkIndex.columns());
assertTrue(pkIndex.unique());
assertEquals(AVAILABLE, pkIndex.status());
- assertEquals(manager.latestCatalogVersion(),
pkIndex.txWaitCatalogVersion());
CatalogTableColumnDescriptor desc = table.columnDescriptor("key1");
assertNotNull(desc);
diff --git
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/AbstractChangeIndexStatusCommandValidationTest.java
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/AbstractChangeIndexStatusCommandValidationTest.java
index c40cf4d540..f52a73dddf 100644
---
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/AbstractChangeIndexStatusCommandValidationTest.java
+++
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/AbstractChangeIndexStatusCommandValidationTest.java
@@ -87,7 +87,6 @@ public abstract class
AbstractChangeIndexStatusCommandValidationTest extends Abs
tableId,
false,
invalidPreviousIndexStatus,
- version,
List.of(columnName)
)
},
diff --git
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/CatalogUtilsTest.java
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/CatalogUtilsTest.java
index 6801406998..8feb82909c 100644
---
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/CatalogUtilsTest.java
+++
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/CatalogUtilsTest.java
@@ -141,7 +141,6 @@ public class CatalogUtilsTest extends
BaseIgniteAbstractTest {
fooIndex.tableId(),
fooIndex.unique(),
fooIndex.status(),
- fooIndex.txWaitCatalogVersion(),
fooIndex.columns()
);
diff --git
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/descriptors/CatalogHashIndexDescriptorTest.java
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/descriptors/CatalogHashIndexDescriptorTest.java
index d6153169ec..4304e6193d 100644
---
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/descriptors/CatalogHashIndexDescriptorTest.java
+++
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/descriptors/CatalogHashIndexDescriptorTest.java
@@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test;
class CatalogHashIndexDescriptorTest {
@Test
void toStringContainsTypeAndFields() {
- var descriptor = new CatalogHashIndexDescriptor(1, "index1", 2, false,
3, List.of("col"));
+ var descriptor = new CatalogHashIndexDescriptor(1, "index1", 2, false,
List.of("col"));
String toString = descriptor.toString();
diff --git
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/descriptors/CatalogSortedIndexDescriptorTest.java
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/descriptors/CatalogSortedIndexDescriptorTest.java
index 979ff659ed..740e77aa4e 100644
---
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/descriptors/CatalogSortedIndexDescriptorTest.java
+++
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/descriptors/CatalogSortedIndexDescriptorTest.java
@@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test;
class CatalogSortedIndexDescriptorTest {
@Test
void toStringContainsTypeAndFields() {
- var descriptor = new CatalogSortedIndexDescriptor(1, "index1", 2,
false, 3, List.of());
+ var descriptor = new CatalogSortedIndexDescriptor(1, "index1", 2,
false, List.of());
String toString = descriptor.toString();
diff --git
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/storage/CatalogEntrySerializationTest.java
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/storage/CatalogEntrySerializationTest.java
index 44804040eb..bc796bcf5a 100644
---
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/storage/CatalogEntrySerializationTest.java
+++
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/storage/CatalogEntrySerializationTest.java
@@ -457,12 +457,12 @@ public class CatalogEntrySerializationTest extends
BaseIgniteAbstractTest {
CatalogIndexColumnDescriptor idxCol4 = new
CatalogIndexColumnDescriptor("C4", CatalogColumnCollation.ASC_NULLS_LAST);
return new CatalogSortedIndexDescriptor(
- 1, name, 12, false, CatalogIndexStatus.AVAILABLE, 1,
List.of(idxCol1, idxCol2, idxCol3, idxCol4));
+ 1, name, 12, false, CatalogIndexStatus.AVAILABLE,
List.of(idxCol1, idxCol2, idxCol3, idxCol4));
}
private static CatalogHashIndexDescriptor newHashIndexDescriptor(String
name) {
return new CatalogHashIndexDescriptor(
- 1, name, 12, true, CatalogIndexStatus.REGISTERED, 1,
List.of("C1", "C2"));
+ 1, name, 12, true, CatalogIndexStatus.REGISTERED,
List.of("C1", "C2"));
}
private static CatalogTableDescriptor newTableDescriptor(String name,
List<CatalogTableColumnDescriptor> columns) {
diff --git
a/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/index/StorageIndexDescriptorTest.java
b/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/index/StorageIndexDescriptorTest.java
index ca2913f8fa..48a4a228fb 100644
---
a/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/index/StorageIndexDescriptorTest.java
+++
b/modules/storage-api/src/test/java/org/apache/ignite/internal/storage/index/StorageIndexDescriptorTest.java
@@ -75,7 +75,6 @@ public class StorageIndexDescriptorTest {
tableId,
false,
AVAILABLE,
- 1,
List.of(COLUMN_NAME)
);
}
@@ -87,7 +86,6 @@ public class StorageIndexDescriptorTest {
tableId,
false,
AVAILABLE,
- 1,
List.of(new CatalogIndexColumnDescriptor(COLUMN_NAME,
ASC_NULLS_FIRST))
);
}
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 11a6a05f93..1db331c084 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
@@ -366,7 +366,6 @@ public abstract class AbstractMvTableStorageTest extends
BaseMvStoragesTest {
catalogTableDescriptor.id(),
false,
AVAILABLE,
- catalogService.latestCatalogVersion(),
List.of(new CatalogIndexColumnDescriptor("STRKEY",
ASC_NULLS_LAST))
);
@@ -376,7 +375,6 @@ public abstract class AbstractMvTableStorageTest extends
BaseMvStoragesTest {
catalogTableDescriptor.id(),
false,
AVAILABLE,
- catalogService.latestCatalogVersion(),
List.of(new CatalogIndexColumnDescriptor("STRKEY",
ASC_NULLS_LAST))
);
@@ -419,7 +417,6 @@ public abstract class AbstractMvTableStorageTest extends
BaseMvStoragesTest {
catalogTableDescriptor.id(),
true,
AVAILABLE,
- catalogService.latestCatalogVersion(),
List.of("STRKEY")
);
@@ -429,7 +426,6 @@ public abstract class AbstractMvTableStorageTest extends
BaseMvStoragesTest {
catalogTableDescriptor.id(),
true,
AVAILABLE,
- catalogService.latestCatalogVersion(),
List.of("STRKEY")
);
@@ -1054,7 +1050,6 @@ public abstract class AbstractMvTableStorageTest extends
BaseMvStoragesTest {
tableId,
false,
AVAILABLE,
- catalogService.latestCatalogVersion(),
List.of(new CatalogIndexColumnDescriptor("STRKEY",
ASC_NULLS_LAST))
);
@@ -1064,7 +1059,6 @@ public abstract class AbstractMvTableStorageTest extends
BaseMvStoragesTest {
tableId,
true,
AVAILABLE,
- catalogService.latestCatalogVersion(),
List.of("STRKEY")
);
@@ -1074,7 +1068,6 @@ public abstract class AbstractMvTableStorageTest extends
BaseMvStoragesTest {
tableId,
true,
AVAILABLE,
- catalogService.latestCatalogVersion(),
List.of(pkColumnName)
);
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 7a0b604629..9a996cb11f 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
@@ -73,7 +73,6 @@ public abstract class AbstractHashIndexStorageTest extends
AbstractIndexStorageT
tableId,
false,
AVAILABLE,
- catalogService.latestCatalogVersion(),
Stream.of(columnTypes).map(AbstractIndexStorageTest::columnName).collect(toList())
);
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 99b9fe0705..ac871f28f9 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
@@ -187,7 +187,6 @@ public abstract class AbstractSortedIndexStorageTest
extends AbstractIndexStorag
tableId,
false,
AVAILABLE,
- catalogService.latestCatalogVersion(),
List.of(columns)
);
