This is an automated email from the ASF dual-hosted git repository.
rpuch 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 cfdc7e73e48 IGNITE-28295 Support schema-sync related changes not bound
to table version (#7821)
cfdc7e73e48 is described below
commit cfdc7e73e4888e5da6963684b539850ef4f03a42
Author: Roman Puchkovskiy <[email protected]>
AuthorDate: Thu Mar 19 15:33:25 2026 +0400
IGNITE-28295 Support schema-sync related changes not bound to table version
(#7821)
Co-authored-by: Pavel Pereslegin <[email protected]>
---
.../schema/CatalogValidationSchemasSource.java | 80 +++++++++++++++-------
.../replicator/schema/FullTableSchema.java | 64 +++++++++++++----
.../schemacompat/CompatValidationResult.java | 7 ++
.../schemacompat/SchemaCompatibilityValidator.java | 18 ++---
.../schemacompat/TableDefinitionDiffKey.java | 18 ++---
.../replicator/schema/FullTableSchemaTest.java | 17 +++--
.../SchemaCompatibilityValidatorTest.java | 18 ++---
.../replication/PartitionReplicaListenerTest.java | 2 +-
.../ZonePartitionReplicaListenerTest.java | 2 +-
.../table/impl/DummyValidationSchemasSource.java | 2 +-
10 files changed, 155 insertions(+), 73 deletions(-)
diff --git
a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/schema/CatalogValidationSchemasSource.java
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/schema/CatalogValidationSchemasSource.java
index 2dd18c495ea..19b4f218d7b 100644
---
a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/schema/CatalogValidationSchemasSource.java
+++
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/schema/CatalogValidationSchemasSource.java
@@ -19,6 +19,7 @@ package
org.apache.ignite.internal.partition.replicator.schema;
import static java.util.stream.Collectors.toList;
+import java.util.AbstractMap.SimpleEntry;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.CompletableFuture;
@@ -27,6 +28,7 @@ import java.util.concurrent.ConcurrentMap;
import java.util.function.Predicate;
import java.util.stream.IntStream;
import java.util.stream.Stream;
+import org.apache.ignite.internal.catalog.Catalog;
import org.apache.ignite.internal.catalog.CatalogService;
import org.apache.ignite.internal.catalog.descriptors.CatalogTableDescriptor;
import org.apache.ignite.internal.hlc.HybridTimestamp;
@@ -84,37 +86,22 @@ public class CatalogValidationSchemasSource implements
ValidationSchemasSource {
private List<FullTableSchema>
tableSchemaVersionsBetweenCatalogVersions(int tableId, int fromCatalogVersion,
int toCatalogVersion) {
return tableVersionsBetween(tableId, fromCatalogVersion,
toCatalogVersion)
-
.map(CatalogValidationSchemasSource::fullSchemaFromTableDescriptor)
- .collect(toList());
- }
-
- // It's ok to use Stream as the results of the methods that call this are
cached.
- private Stream<CatalogTableDescriptor> tableVersionsBetween(
- int tableId,
- int fromCatalogVersionIncluding,
- int toCatalogVersionIncluding
- ) {
- return IntStream.rangeClosed(fromCatalogVersionIncluding,
toCatalogVersionIncluding)
- .mapToObj(catalogVersion ->
catalogService.catalog(catalogVersion).table(tableId))
- .takeWhile(Objects::nonNull)
+ .map(entry -> fullSchemaFromCatalog(entry.getKey(),
entry.getValue()))
.filter(new Predicate<>() {
- int prevVersion = Integer.MIN_VALUE;
+ FullTableSchema prevSchema = null;
@Override
- public boolean test(CatalogTableDescriptor
tableDescriptor) {
- if (tableDescriptor.latestSchemaVersion() ==
prevVersion) {
+ public boolean test(FullTableSchema tableSchema) {
+ if (prevSchema != null &&
!tableSchema.hasValidatableChangeFrom(prevSchema)) {
return false;
}
- assert prevVersion == Integer.MIN_VALUE ||
tableDescriptor.latestSchemaVersion() == prevVersion + 1
- : String.format("Table version is expected to
be prevVersion+1, but version is %d and prevVersion is %d",
- tableDescriptor.latestSchemaVersion(),
prevVersion);
-
- prevVersion = tableDescriptor.latestSchemaVersion();
+ prevSchema = tableSchema;
return true;
}
- });
+ })
+ .collect(toList());
}
private List<FullTableSchema>
tableSchemaVersionsBetweenCatalogAndTableVersions(
@@ -122,14 +109,57 @@ public class CatalogValidationSchemasSource implements
ValidationSchemasSource {
int fromCatalogVersion,
int toTableVersion
) {
+ Predicate<CatalogTableDescriptor> tableDescriptorFilter = new
Predicate<>() {
+ int prevVersion = Integer.MIN_VALUE;
+
+ @Override
+ public boolean test(CatalogTableDescriptor table) {
+ if (table.latestSchemaVersion() == prevVersion) {
+ return false;
+ }
+
+ assert prevVersion == Integer.MIN_VALUE ||
table.latestSchemaVersion() == prevVersion + 1
+ : String.format("Table version is expected to be
prevVersion+1, but version is %d and prevVersion is %d",
+ table.latestSchemaVersion(), prevVersion);
+
+ prevVersion = table.latestSchemaVersion();
+
+ return true;
+ }
+ };
+
return tableVersionsBetween(tableId, fromCatalogVersion,
catalogService.latestCatalogVersion())
- .takeWhile(tableDescriptor ->
tableDescriptor.latestSchemaVersion() <= toTableVersion)
-
.map(CatalogValidationSchemasSource::fullSchemaFromTableDescriptor)
+ .filter(entry -> tableDescriptorFilter.test(entry.getValue()))
+ .takeWhile(entry -> entry.getValue().latestSchemaVersion() <=
toTableVersion)
+ .map(entry -> fullSchemaFromCatalog(entry.getKey(),
entry.getValue()))
.collect(toList());
}
- private static FullTableSchema
fullSchemaFromTableDescriptor(CatalogTableDescriptor tableDescriptor) {
+ // It's ok to use Stream as the results of the methods that call this are
cached.
+ private Stream<SimpleEntry<Catalog, CatalogTableDescriptor>>
tableVersionsBetween(
+ int tableId,
+ int fromCatalogVersionIncluding,
+ int toCatalogVersionIncluding
+ ) {
+ return IntStream.rangeClosed(fromCatalogVersionIncluding,
toCatalogVersionIncluding)
+ .mapToObj(ver -> {
+ Catalog catalog = catalogService.catalog(ver);
+ CatalogTableDescriptor descriptor = catalog.table(tableId);
+
+ if (descriptor == null) {
+ return null;
+ }
+
+ return new SimpleEntry<>(catalog, descriptor);
+ })
+ .takeWhile(Objects::nonNull);
+ }
+
+ private static FullTableSchema fullSchemaFromCatalog(Catalog catalog,
CatalogTableDescriptor tableDescriptor) {
+ assert tableDescriptor != null;
+
return new FullTableSchema(
+ catalog.version(),
tableDescriptor.latestSchemaVersion(),
tableDescriptor.id(),
tableDescriptor.name(),
diff --git
a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/schema/FullTableSchema.java
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/schema/FullTableSchema.java
index b0255a01838..6fa7ca56e2f 100644
---
a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/schema/FullTableSchema.java
+++
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/schema/FullTableSchema.java
@@ -26,6 +26,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Objects;
import java.util.Set;
import java.util.function.Function;
import
org.apache.ignite.internal.catalog.descriptors.CatalogTableColumnDescriptor;
@@ -36,6 +37,7 @@ import
org.apache.ignite.internal.catalog.descriptors.CatalogTableColumnDescript
* don't affect such compatibility).
*/
public class FullTableSchema {
+ private final int catalogVersion;
private final int schemaVersion;
private final int tableId;
private final String tableName;
@@ -45,13 +47,27 @@ public class FullTableSchema {
/**
* Constructor.
*/
- public FullTableSchema(int schemaVersion, int tableId, String tableName,
List<CatalogTableColumnDescriptor> columns) {
+ public FullTableSchema(
+ int catalogVersion,
+ int schemaVersion,
+ int tableId,
+ String tableName,
+ List<CatalogTableColumnDescriptor> columns
+ ) {
+ this.catalogVersion = catalogVersion;
this.schemaVersion = schemaVersion;
this.tableId = tableId;
this.tableName = tableName;
this.columns = List.copyOf(columns);
}
+ /**
+ * Version of the catalog in which this schema was defined.
+ */
+ public int catalogVersion() {
+ return catalogVersion;
+ }
+
/**
* Returns version of the table definition.
*
@@ -93,20 +109,30 @@ public class FullTableSchema {
* @return Difference between the schemas.
*/
public TableDefinitionDiff diffFrom(FullTableSchema prevSchema) {
- Map<String, CatalogTableColumnDescriptor> prevColumnsByName =
toMapByName(prevSchema.columns, CatalogTableColumnDescriptor::name);
- Map<String, CatalogTableColumnDescriptor> thisColumnsByName =
toMapByName(this.columns, CatalogTableColumnDescriptor::name);
+ List<CatalogTableColumnDescriptor> addedColumns = List.of();
+ List<CatalogTableColumnDescriptor> removedColumns = List.of();
+ List<ColumnDefinitionDiff> changedColumns = List.of();
+
+ if (prevSchema.schemaVersion != schemaVersion) {
+ Map<String, CatalogTableColumnDescriptor> prevColumnsByName
+ = toMapByName(prevSchema.columns,
CatalogTableColumnDescriptor::name);
+
+ Map<String, CatalogTableColumnDescriptor> thisColumnsByName
+ = toMapByName(this.columns,
CatalogTableColumnDescriptor::name);
+
+ addedColumns = subtractKeyed(thisColumnsByName, prevColumnsByName);
+ removedColumns = subtractKeyed(prevColumnsByName,
thisColumnsByName);
+ changedColumns = new ArrayList<>();
- List<CatalogTableColumnDescriptor> addedColumns =
subtractKeyed(thisColumnsByName, prevColumnsByName);
- List<CatalogTableColumnDescriptor> removedColumns =
subtractKeyed(prevColumnsByName, thisColumnsByName);
+ Set<String> intersectionColumnNames =
intersect(thisColumnsByName.keySet(), prevColumnsByName.keySet());
- Set<String> intersectionColumnNames =
intersect(thisColumnsByName.keySet(), prevColumnsByName.keySet());
- List<ColumnDefinitionDiff> changedColumns = new ArrayList<>();
- for (String commonColumnName : intersectionColumnNames) {
- CatalogTableColumnDescriptor prevColumn =
prevColumnsByName.get(commonColumnName);
- CatalogTableColumnDescriptor thisColumn =
thisColumnsByName.get(commonColumnName);
+ for (String commonColumnName : intersectionColumnNames) {
+ CatalogTableColumnDescriptor prevColumn =
prevColumnsByName.get(commonColumnName);
+ CatalogTableColumnDescriptor thisColumn =
thisColumnsByName.get(commonColumnName);
- if (columnChanged(prevColumn, thisColumn)) {
- changedColumns.add(new ColumnDefinitionDiff(prevColumn,
thisColumn));
+ if (columnChanged(prevColumn, thisColumn)) {
+ changedColumns.add(new ColumnDefinitionDiff(prevColumn,
thisColumn));
+ }
}
}
@@ -121,6 +147,20 @@ public class FullTableSchema {
);
}
+ boolean hasValidatableChangeFrom(FullTableSchema prev) {
+ if (this == prev) {
+ return false;
+ }
+
+ // TODO: https://issues.apache.org/jira/browse/IGNITE-19484 Remove the
following condition.
+ if (!Objects.equals(tableName, prev.tableName())) {
+ return true;
+ }
+
+ // Table column related-changes only differ when the schema version is
different
+ return schemaVersion != prev.schemaVersion();
+ }
+
private static <T> Map<String, T> toMapByName(List<T> elements,
Function<T, String> nameExtractor) {
return elements.stream().collect(toMap(nameExtractor, identity()));
}
diff --git
a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/schemacompat/CompatValidationResult.java
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/schemacompat/CompatValidationResult.java
index 2c221eb674e..aad6d1cfcca 100644
---
a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/schemacompat/CompatValidationResult.java
+++
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/schemacompat/CompatValidationResult.java
@@ -20,6 +20,7 @@ package
org.apache.ignite.internal.partition.replicator.schemacompat;
import static org.apache.ignite.internal.lang.IgniteStringFormatter.format;
import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.TestOnly;
/**
* Result of a schema compatibility validation.
@@ -157,6 +158,12 @@ public class CompatValidationResult {
return details;
}
+ @TestOnly
+ @Nullable
+ String optionalDetails() {
+ return details;
+ }
+
/**
* Returns error message corresponding to validation failure. Should only
be called for a failed validation result, otherwise an
* assertion error may be thrown.
diff --git
a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/schemacompat/SchemaCompatibilityValidator.java
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/schemacompat/SchemaCompatibilityValidator.java
index c83e440674b..e72034d5494 100644
---
a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/schemacompat/SchemaCompatibilityValidator.java
+++
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/schemacompat/SchemaCompatibilityValidator.java
@@ -47,7 +47,7 @@ public class SchemaCompatibilityValidator {
private final SchemaSyncService schemaSyncService;
// TODO: Remove entries from cache when compacting schemas in
SchemaManager https://issues.apache.org/jira/browse/IGNITE-20789
- private final ConcurrentMap<TableDefinitionDiffKey, TableDefinitionDiff>
diffCache = new ConcurrentHashMap<>();
+ private final ConcurrentMap<TableDefinitionDiffKey, ValidationResult>
forwardDiffToResultCache = new ConcurrentHashMap<>();
private static final List<ForwardCompatibilityValidator>
FORWARD_COMPATIBILITY_VALIDATORS = List.of(
new RenameTableValidator(),
@@ -142,7 +142,10 @@ public class SchemaCompatibilityValidator {
FullTableSchema oldSchema = tableSchemas.get(i);
FullTableSchema newSchema = tableSchemas.get(i + 1);
- ValidationResult validationResult =
validateForwardSchemaCompatibility(oldSchema, newSchema);
+ ValidationResult validationResult =
forwardDiffToResultCache.computeIfAbsent(
+ new TableDefinitionDiffKey(oldSchema.tableId(),
oldSchema.catalogVersion(), newSchema.catalogVersion()),
+ key -> validateForwardSchemaCompatibility(oldSchema,
newSchema)
+ );
if (validationResult.verdict == ValidatorVerdict.INCOMPATIBLE) {
return CompatValidationResult.incompatibleChange(
@@ -157,11 +160,8 @@ public class SchemaCompatibilityValidator {
return CompatValidationResult.success();
}
- private ValidationResult
validateForwardSchemaCompatibility(FullTableSchema prevSchema, FullTableSchema
nextSchema) {
- TableDefinitionDiff diff = diffCache.computeIfAbsent(
- new TableDefinitionDiffKey(prevSchema.tableId(),
prevSchema.schemaVersion(), nextSchema.schemaVersion()),
- key -> nextSchema.diffFrom(prevSchema)
- );
+ private static ValidationResult
validateForwardSchemaCompatibility(FullTableSchema prevSchema, FullTableSchema
nextSchema) {
+ TableDefinitionDiff diff = nextSchema.diffFrom(prevSchema);
boolean accepted = false;
@@ -178,8 +178,8 @@ public class SchemaCompatibilityValidator {
}
}
- assert accepted : "Table schema changed from " +
prevSchema.schemaVersion()
- + " to " + nextSchema.schemaVersion()
+ assert accepted : "Table schema changed from " +
prevSchema.schemaVersion() + " (catalog version " + prevSchema.catalogVersion()
+ + ") to " + nextSchema.schemaVersion() + " (catalog version "
+ nextSchema.catalogVersion() + ")"
+ ", but no schema change validator voted for any change. Some
schema validator is missing.";
return ValidationResult.COMPATIBLE;
diff --git
a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/schemacompat/TableDefinitionDiffKey.java
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/schemacompat/TableDefinitionDiffKey.java
index c448148c335..6282643575f 100644
---
a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/schemacompat/TableDefinitionDiffKey.java
+++
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/schemacompat/TableDefinitionDiffKey.java
@@ -22,13 +22,13 @@ package
org.apache.ignite.internal.partition.replicator.schemacompat;
*/
class TableDefinitionDiffKey {
private final int tableId;
- private final int fromSchemaVersion;
- private final int toSchemaVersion;
+ private final int fromCatalogVersion;
+ private final int toCatalogVersion;
- TableDefinitionDiffKey(int tableId, int fromSchemaVersion, int
toSchemaVersion) {
+ TableDefinitionDiffKey(int tableId, int fromCatalogVersion, int
toCatalogVersion) {
this.tableId = tableId;
- this.fromSchemaVersion = fromSchemaVersion;
- this.toSchemaVersion = toSchemaVersion;
+ this.fromCatalogVersion = fromCatalogVersion;
+ this.toCatalogVersion = toCatalogVersion;
}
@Override
@@ -45,17 +45,17 @@ class TableDefinitionDiffKey {
if (tableId != that.tableId) {
return false;
}
- if (fromSchemaVersion != that.fromSchemaVersion) {
+ if (fromCatalogVersion != that.fromCatalogVersion) {
return false;
}
- return toSchemaVersion == that.toSchemaVersion;
+ return toCatalogVersion == that.toCatalogVersion;
}
@Override
public int hashCode() {
int result = tableId;
- result = 31 * result + fromSchemaVersion;
- result = 31 * result + toSchemaVersion;
+ result = 31 * result + fromCatalogVersion;
+ result = 31 * result + toCatalogVersion;
return result;
}
}
diff --git
a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/schema/FullTableSchemaTest.java
b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/schema/FullTableSchemaTest.java
index 9878694eeeb..be1b6c985ca 100644
---
a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/schema/FullTableSchemaTest.java
+++
b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/schema/FullTableSchemaTest.java
@@ -42,8 +42,8 @@ class FullTableSchemaTest {
CatalogTableColumnDescriptor column2 = someColumn("b");
CatalogTableColumnDescriptor column3 = someColumn("c");
- var schema1 = new FullTableSchema(1, 1, TABLE_NAME1, List.of(column1,
column2));
- var schema2 = new FullTableSchema(2, 1, TABLE_NAME1, List.of(column2,
column3));
+ var schema1 = tableSchema(1, 1, TABLE_NAME1, List.of(column1,
column2));
+ var schema2 = tableSchema(2, 1, TABLE_NAME1, List.of(column2,
column3));
TableDefinitionDiff diff = schema2.diffFrom(schema1);
@@ -56,8 +56,8 @@ class FullTableSchemaTest {
void changedColumnsAreReflectedInDiff() {
CatalogTableColumnDescriptor column1 = someColumn("a");
- var schema1 = new FullTableSchema(1, 1, TABLE_NAME1, List.of(column1));
- var schema2 = new FullTableSchema(2, 1, TABLE_NAME1,
+ var schema1 = tableSchema(1, 1, TABLE_NAME1, List.of(column1));
+ var schema2 = tableSchema(2, 1, TABLE_NAME1,
List.of(new CatalogTableColumnDescriptor("a",
ColumnType.STRING, true, 0, 0, 10, DefaultValue.constant(null)))
);
@@ -71,11 +71,16 @@ class FullTableSchemaTest {
void changedNameIsReflected() {
CatalogTableColumnDescriptor column = someColumn("a");
- var schema1 = new FullTableSchema(1, 1, TABLE_NAME1, List.of(column));
- var schema2 = new FullTableSchema(1, 1, TABLE_NAME2, List.of(column));
+ var schema1 = tableSchema(1, 1, TABLE_NAME1, List.of(column));
+ var schema2 = tableSchema(1, 1, TABLE_NAME2, List.of(column));
TableDefinitionDiff diff = schema2.diffFrom(schema1);
assertThat(diff.nameDiffers(), is(true));
}
+
+ private static FullTableSchema tableSchema(int schemaVersion, int tableId,
String tableName,
+ List<CatalogTableColumnDescriptor> columns) {
+ return new FullTableSchema(-1, schemaVersion, tableId, tableName,
columns);
+ }
}
diff --git
a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/schemacompat/SchemaCompatibilityValidatorTest.java
b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/schemacompat/SchemaCompatibilityValidatorTest.java
index 92397dcdc33..935bf08b603 100644
---
a/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/schemacompat/SchemaCompatibilityValidatorTest.java
+++
b/modules/partition-replicator/src/test/java/org/apache/ignite/internal/partition/replicator/schemacompat/SchemaCompatibilityValidatorTest.java
@@ -131,7 +131,7 @@ class SchemaCompatibilityValidatorTest extends
BaseIgniteAbstractTest {
CompatValidationResult result = resultFuture.getNow(null);
assertThat(result, is(notNullValue()));
- assertThat("Change is incompatible", result.isSuccessful(), is(true));
+ assertThat("Change is incompatible: " + result.optionalDetails(),
result.isSuccessful(), is(true));
}
@ParameterizedTest
@@ -155,7 +155,7 @@ class SchemaCompatibilityValidatorTest extends
BaseIgniteAbstractTest {
CompatValidationResult result = resultFuture.getNow(null);
assertThat(result, is(notNullValue()));
- assertThat("Change is compatible", result.isSuccessful(), is(false));
+ assertThat("Change should be incompatible", result.isSuccessful(),
is(false));
assertThat(result.isTableDropped(), is(false));
assertThat(result.failedTableName(), is(TABLE_NAME));
@@ -418,12 +418,16 @@ class SchemaCompatibilityValidatorTest extends
BaseIgniteAbstractTest {
);
}
+ private static List<CatalogTableColumnDescriptor> someColumns() {
+ return List.of(intColumn("col1"));
+ }
+
private static FullTableSchema tableSchema(int schemaVersion,
List<CatalogTableColumnDescriptor> columns) {
return tableSchema(schemaVersion, TABLE_NAME, columns);
}
private static FullTableSchema tableSchema(int schemaVersion, String name,
List<CatalogTableColumnDescriptor> columns) {
- return new FullTableSchema(schemaVersion, TABLE_ID, name, columns);
+ return new FullTableSchema(1, schemaVersion, TABLE_ID, name, columns);
}
private interface SchemaChangeSource {
@@ -492,12 +496,8 @@ class SchemaCompatibilityValidatorTest extends
BaseIgniteAbstractTest {
private enum ForwardIncompatibleChange implements SchemaChangeSource {
RENAME_TABLE(
List.of(
- tableSchema(1, TABLE_NAME, List.of(
- intColumn("col1")
- )),
- tableSchema(2, ANOTHER_NAME, List.of(
- intColumn("col1")
- ))
+ tableSchema(1, TABLE_NAME, someColumns()),
+ tableSchema(2, ANOTHER_NAME, someColumns())
),
"Name of the table has been changed"
),
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerTest.java
index 0cb8249f84c..446a53e9ccf 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerTest.java
@@ -1663,7 +1663,7 @@ public class PartitionReplicaListenerTest extends
IgniteAbstractTest {
}
private static FullTableSchema tableSchema(int schemaVersion,
List<CatalogTableColumnDescriptor> columns) {
- return new FullTableSchema(schemaVersion, TABLE_ID, TABLE_NAME,
columns);
+ return new FullTableSchema(-1, schemaVersion, TABLE_ID, TABLE_NAME,
columns);
}
private AtomicReference<Boolean> interceptFinishTxCommand() {
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/ZonePartitionReplicaListenerTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/ZonePartitionReplicaListenerTest.java
index d0755672dcf..1ffffb15ac5 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/ZonePartitionReplicaListenerTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/ZonePartitionReplicaListenerTest.java
@@ -1739,7 +1739,7 @@ public class ZonePartitionReplicaListenerTest extends
IgniteAbstractTest {
}
private static FullTableSchema tableSchema(int schemaVersion,
List<CatalogTableColumnDescriptor> columns) {
- return new FullTableSchema(schemaVersion, TABLE_ID, TABLE_NAME,
columns);
+ return new FullTableSchema(-1, schemaVersion, TABLE_ID, TABLE_NAME,
columns);
}
private CompletableFuture<?> beginAndCommitTx() {
diff --git
a/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/impl/DummyValidationSchemasSource.java
b/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/impl/DummyValidationSchemasSource.java
index 366e387cfcf..b8800afaecc 100644
---
a/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/impl/DummyValidationSchemasSource.java
+++
b/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/impl/DummyValidationSchemasSource.java
@@ -60,7 +60,7 @@ public class DummyValidationSchemasSource implements
ValidationSchemasSource {
.map(DummyValidationSchemasSource::columnDescriptor)
.collect(toList());
- var fullSchema = new FullTableSchema(1, tableId, "test", columns);
+ var fullSchema = new FullTableSchema(-1, 1, tableId, "test", columns);
return List.of(fullSchema);
}
