denis-chudov commented on code in PR #1296:
URL: https://github.com/apache/ignite-3/pull/1296#discussion_r1015158048
##########
modules/schema/src/main/java/org/apache/ignite/internal/schema/SchemaManager.java:
##########
@@ -300,27 +274,19 @@ private CompletableFuture<SchemaDescriptor>
tableSchema(UUID tblId, String table
CompletableFuture<SchemaDescriptor> fut = new CompletableFuture<>();
- if (checkSchemaVersion(tblId, schemaVer)) {
- SchemaDescriptor desc = searchSchemaByVersion(tblId, schemaVer);
+ SchemaRegistry registry = registriesVv.latest().get(tblId);
- if (desc == null) {
- return getSchemaDescriptor(schemaVer, tblCfg);
- } else {
- fut.complete(desc);
- return fut;
- }
+ // TODO: We can remove it after: restore all schemes on recovery
https://issues.apache.org/jira/browse/IGNITE-18066
+ // Probably all near stuff must be improved too.
+ if (registry.lastSchemaVersion() > schemaVer) {
+ return getSchemaDescriptor(schemaVer, tblCfg);
}
IgniteTriConsumer<Long, Map<UUID, SchemaRegistryImpl>, Throwable>
schemaListener = (token, regs, e) -> {
if (schemaVer <= regs.get(tblId).lastSchemaVersion()) {
- getSchemaDescriptor(schemaVer, tblCfg)
- .whenComplete((desc, th) -> {
- if (th != null) {
- fut.completeExceptionally(th);
- } else {
- fut.complete(desc);
- }
- });
+ SchemaRegistry registry0 = registriesVv.latest().get(tblId);
+
+ fut.complete(registry0.schemaCached(schemaVer));
Review Comment:
could you pls add an assertion that `registry0.schemaCached(schemaVer)`
didn't return `null`?
##########
modules/schema/src/main/java/org/apache/ignite/internal/schema/SchemaManager.java:
##########
@@ -331,7 +297,9 @@ private CompletableFuture<SchemaDescriptor>
tableSchema(UUID tblId, String table
if (checkSchemaVersion(tblId, schemaVer)) {
registriesVv.removeWhenComplete(schemaListener);
- return getSchemaDescriptor(schemaVer, tblCfg);
+ registry = registriesVv.latest().get(tblId);
+
+ fut.complete(registry.schemaCached(schemaVer));
Review Comment:
and also here
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
