This is an automated email from the ASF dual-hosted git repository.
vpyatkov 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 03eb9b9938 IGNITE-23313 Avoid useing fulfilled hybrid time in
SchemaVersions#schemaVersionAtNow (#4790)
03eb9b9938 is described below
commit 03eb9b993854e14979fed5d6f19d18b14b257b56
Author: Vladislav Pyatkov <[email protected]>
AuthorDate: Tue Nov 26 16:32:46 2024 +0300
IGNITE-23313 Avoid useing fulfilled hybrid time in
SchemaVersions#schemaVersionAtNow (#4790)
---
.../client/handler/requests/table/ClientSchemasGetRequest.java | 2 +-
.../test/java/org/apache/ignite/client/fakes/FakeIgniteTables.java | 2 +-
.../java/org/apache/ignite/internal/table/AbstractTableView.java | 2 +-
.../ignite/internal/table/distributed/schema/SchemaVersions.java | 5 +++--
.../ignite/internal/table/distributed/schema/SchemaVersionsImpl.java | 4 ++--
.../internal/table/distributed/schema/ConstantSchemaVersions.java | 2 +-
6 files changed, 9 insertions(+), 8 deletions(-)
diff --git
a/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/table/ClientSchemasGetRequest.java
b/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/table/ClientSchemasGetRequest.java
index 19f2c69f9e..c492afdb21 100644
---
a/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/table/ClientSchemasGetRequest.java
+++
b/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/table/ClientSchemasGetRequest.java
@@ -53,7 +53,7 @@ public class ClientSchemasGetRequest {
// Return the latest schema.
out.packInt(1);
- return schemaVersions.schemaVersionAtNow(table.tableId())
+ return
schemaVersions.schemaVersionAtCurrentTime(table.tableId())
.thenAccept(version -> {
SchemaDescriptor schema =
table.schemaView().schema(version);
diff --git
a/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeIgniteTables.java
b/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeIgniteTables.java
index c3c062bcc2..8e9201b522 100644
---
a/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeIgniteTables.java
+++
b/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeIgniteTables.java
@@ -236,7 +236,7 @@ public class FakeIgniteTables implements
IgniteTablesInternal {
}
@Override
- public CompletableFuture<Integer> schemaVersionAtNow(int
tableId) {
+ public CompletableFuture<Integer>
schemaVersionAtCurrentTime(int tableId) {
return
completedFuture(schemaReg.lastKnownSchemaVersion());
}
},
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/AbstractTableView.java
b/modules/table/src/main/java/org/apache/ignite/internal/table/AbstractTableView.java
index 2778dbf84b..81ab9a88a4 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/AbstractTableView.java
+++
b/modules/table/src/main/java/org/apache/ignite/internal/table/AbstractTableView.java
@@ -135,7 +135,7 @@ abstract class AbstractTableView<R> implements
CriteriaQuerySource<R> {
private <T> CompletableFuture<T> withSchemaSync(@Nullable Transaction tx,
@Nullable Integer previousSchemaVersion, KvAction<T> action) {
CompletableFuture<Integer> schemaVersionFuture = tx == null
- ? schemaVersions.schemaVersionAtNow(tbl.tableId())
+ ? schemaVersions.schemaVersionAtCurrentTime(tbl.tableId())
: schemaVersions.schemaVersionAt(((InternalTransaction)
tx).startTimestamp(), tbl.tableId());
return schemaVersionFuture
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/schema/SchemaVersions.java
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/schema/SchemaVersions.java
index 9bf5c97dea..1a3f6027dd 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/schema/SchemaVersions.java
+++
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/schema/SchemaVersions.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.table.distributed.schema;
import java.util.concurrent.CompletableFuture;
+import org.apache.ignite.internal.hlc.HybridClock;
import org.apache.ignite.internal.hlc.HybridTimestamp;
/**
@@ -34,10 +35,10 @@ public interface SchemaVersions {
CompletableFuture<Integer> schemaVersionAt(HybridTimestamp timestamp, int
tableId);
/**
- * Obtains a schema version at 'now' in obedience to rules of Schema
Synchronization.
+ * Obtains a schema version at {@link HybridClock#current()} in obedience
to rules of Schema Synchronization.
*
* @param tableId ID of the table which schema to return.
* @return Future that will complete with the version.
*/
- CompletableFuture<Integer> schemaVersionAtNow(int tableId);
+ CompletableFuture<Integer> schemaVersionAtCurrentTime(int tableId);
}
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/schema/SchemaVersionsImpl.java
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/schema/SchemaVersionsImpl.java
index 17a41b3beb..b3eb0ba3b2 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/schema/SchemaVersionsImpl.java
+++
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/schema/SchemaVersionsImpl.java
@@ -82,7 +82,7 @@ public class SchemaVersionsImpl implements SchemaVersions {
}
@Override
- public CompletableFuture<Integer> schemaVersionAtNow(int tableId) {
- return schemaVersionAt(clockService.now(), tableId);
+ public CompletableFuture<Integer> schemaVersionAtCurrentTime(int tableId) {
+ return schemaVersionAt(clockService.current(), tableId);
}
}
diff --git
a/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/distributed/schema/ConstantSchemaVersions.java
b/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/distributed/schema/ConstantSchemaVersions.java
index bc97169830..83e71bb44f 100644
---
a/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/distributed/schema/ConstantSchemaVersions.java
+++
b/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/distributed/schema/ConstantSchemaVersions.java
@@ -38,7 +38,7 @@ public class ConstantSchemaVersions implements SchemaVersions
{
}
@Override
- public CompletableFuture<Integer> schemaVersionAtNow(int tableId) {
+ public CompletableFuture<Integer> schemaVersionAtCurrentTime(int tableId) {
return completedFuture(schemaVersion);
}
}
