You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by am...@apache.org on 2023/07/19 16:09:05 UTC
[ignite-3] branch ignite-19499 updated: styles
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-19499
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/ignite-19499 by this push:
new faf189ad27 styles
faf189ad27 is described below
commit faf189ad27c1aee6cdb40540b36000d7bbbafd80
Author: amashenkov <an...@gmail.com>
AuthorDate: Wed Jul 19 19:08:58 2023 +0300
styles
---
.../java/org/apache/ignite/internal/index/IndexManager.java | 2 +-
.../org/apache/ignite/internal/schema/SchemaManager.java | 12 ++++++------
.../apache/ignite/internal/sql/engine/SqlQueryProcessor.java | 1 -
.../ignite/internal/table/distributed/TableManager.java | 9 ++++-----
4 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/modules/index/src/main/java/org/apache/ignite/internal/index/IndexManager.java b/modules/index/src/main/java/org/apache/ignite/internal/index/IndexManager.java
index 555e05de18..89fee4b074 100644
--- a/modules/index/src/main/java/org/apache/ignite/internal/index/IndexManager.java
+++ b/modules/index/src/main/java/org/apache/ignite/internal/index/IndexManager.java
@@ -308,7 +308,7 @@ public class IndexManager extends Producer<IndexEvent, IndexEventParameters> imp
}
});
- return createIndexFuture;
+ return createIndexFuture;
}
/**
diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/SchemaManager.java b/modules/schema/src/main/java/org/apache/ignite/internal/schema/SchemaManager.java
index d61c9389cd..92f6090456 100644
--- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/SchemaManager.java
+++ b/modules/schema/src/main/java/org/apache/ignite/internal/schema/SchemaManager.java
@@ -118,7 +118,7 @@ public class SchemaManager extends Producer<SchemaEvent, SchemaEventParameters>
private CompletableFuture<?> onSchemaChange(CreateTableEventParameters evt) {
CatalogTableDescriptor tableDescriptor = evt.tableDescriptor();
- int newSchemaVersion = INITIAL_SCHEMA_VERSION;// evt.catalogVersion();
+ int newSchemaVersion = INITIAL_SCHEMA_VERSION; // evt.catalogVersion();
int tblId = tableDescriptor.id();
SchemaDescriptor newSchema = CatalogDescriptorUtils.convert(newSchemaVersion, tableDescriptor);
@@ -193,8 +193,8 @@ public class SchemaManager extends Producer<SchemaEvent, SchemaEventParameters>
);
}
- return registerSchema(registries, tblId, newSchema);
- }));
+ return registerSchema(registries, tblId, newSchema);
+ }));
} finally {
busyLock.leaveBusy();
}
@@ -354,11 +354,11 @@ public class SchemaManager extends Producer<SchemaEvent, SchemaEventParameters>
* Gets a schema descriptor from the configuration storage.
*
* @param schemaVer Schema version.
- * @param tblId
+ * @param tableId Table id.
* @return Schema descriptor.
*/
- private CompletableFuture<SchemaDescriptor> getSchemaDescriptor(int schemaVer, Integer tblId) {
- CompletableFuture<Entry> ent = metastorageMgr.get(schemaWithVerHistKey(tblId, schemaVer));
+ private CompletableFuture<SchemaDescriptor> getSchemaDescriptor(int schemaVer, int tableId) {
+ CompletableFuture<Entry> ent = metastorageMgr.get(schemaWithVerHistKey(tableId, schemaVer));
return ent.thenApply(e -> SchemaSerializerImpl.INSTANCE.deserialize(e.value()));
}
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/SqlQueryProcessor.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/SqlQueryProcessor.java
index 85f2e61964..96d0a78552 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/SqlQueryProcessor.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/SqlQueryProcessor.java
@@ -43,7 +43,6 @@ import org.apache.calcite.schema.SchemaPlus;
import org.apache.calcite.tools.Frameworks;
import org.apache.calcite.util.Pair;
import org.apache.ignite.internal.catalog.CatalogManager;
-import org.apache.ignite.internal.catalog.descriptors.CatalogSchemaDescriptor;
import org.apache.ignite.internal.distributionzones.DistributionZoneManager;
import org.apache.ignite.internal.hlc.HybridClock;
import org.apache.ignite.internal.index.IndexManager;
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 9308dc8680..82cc8ea5fc 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
@@ -203,7 +203,6 @@ import org.apache.ignite.lang.DistributionZoneNotFoundException;
import org.apache.ignite.lang.IgniteException;
import org.apache.ignite.lang.IgniteExceptionUtils;
import org.apache.ignite.lang.IgniteInternalException;
-import org.apache.ignite.lang.IgniteStringFormatter;
import org.apache.ignite.lang.IgniteSystemProperties;
import org.apache.ignite.lang.NodeStoppingException;
import org.apache.ignite.lang.TableAlreadyExistsException;
@@ -1293,10 +1292,9 @@ public class TableManager extends Producer<TableEvent, TableEventParameters> imp
// We use the event notification future as the result so that dependent components can complete the schema updates.
// TODO: https://issues.apache.org/jira/browse/IGNITE-19913 Possible performance degradation.
- CompletableFuture<?> eventFut = fireEvent(TableEvent.CREATE, new TableEventParameters(causalityToken, tableId));
+ fireEvent(TableEvent.CREATE, new TableEventParameters(causalityToken, tableId));
- // TODO: investigate why createParts and eventFutures hangs.
-// return allOf(createPartsFut, eventFut);
+ // TODO: investigate why createParts hangs.
return completedFuture(false);
}
@@ -2890,7 +2888,8 @@ public class TableManager extends Producer<TableEvent, TableEventParameters> imp
}
if (primaryCols.contains(colName)) {
- throw new SqlException(DROP_IDX_COLUMN_CONSTRAINT_ERR, format("Can`t delete column, belongs to primary key: [name={}]", colName));
+ throw new SqlException(DROP_IDX_COLUMN_CONSTRAINT_ERR,
+ format("Can`t delete column, belongs to primary key: [name={}]", colName));
}
}