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 2022/09/23 13:18:22 UTC
[ignite-3] branch ignite-17686 created (now 9d454fd5a4)
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a change to branch ignite-17686
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
at 9d454fd5a4 WIP. Code cleanup.
This branch includes the following new commits:
new 2ed0e7d56c WIP.
new 9d454fd5a4 WIP. Code cleanup.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[ignite-3] 02/02: WIP. Code cleanup.
Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-17686
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 9d454fd5a467212502f0afee9c72023a9db994ff
Author: amashenkov <an...@gmail.com>
AuthorDate: Fri Sep 23 16:18:12 2022 +0300
WIP. Code cleanup.
---
.../sql/engine/schema/SqlSchemaManagerImpl.java | 30 ++++++++++------------
1 file changed, 14 insertions(+), 16 deletions(-)
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/SqlSchemaManagerImpl.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/SqlSchemaManagerImpl.java
index 398b545685..cf07ef9ff2 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/SqlSchemaManagerImpl.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/schema/SqlSchemaManagerImpl.java
@@ -223,7 +223,7 @@ public class SqlSchemaManagerImpl implements SqlSchemaManager {
Map<UUID, InternalIgniteTable> resTbls = new HashMap<>(tables);
return igniteTableFuture
- .thenApply(igniteTable -> inBusyLock(busyLock, () -> {
+ .thenApply(igniteTable -> {
InternalIgniteTable oldTable = resTbls.put(igniteTable.id(), igniteTable);
// looks like this is UPDATE operation
@@ -234,17 +234,13 @@ public class SqlSchemaManagerImpl implements SqlSchemaManager {
}
return resTbls;
- }));
+ });
}))
- .thenCombine(
- igniteTableFuture,
- (v, igniteTable) -> inBusyLock(busyLock, () -> {
- schema.addTable(objectSimpleName(schemaName, table.name()), igniteTable);
-
- return null;
- }
- )).thenCompose(v -> inBusyLock(busyLock, () -> completedFuture(res)));
+ .thenCombine(igniteTableFuture, (v, igniteTable) -> {
+ schema.addTable(objectSimpleName(schemaName, table.name()), igniteTable);
+ return res;
+ });
}));
return calciteSchemaVv.get(causalityToken);
@@ -305,7 +301,7 @@ public class SqlSchemaManagerImpl implements SqlSchemaManager {
resTbls.remove(table.id());
return completedFuture(resTbls);
- })).thenCompose(tables -> inBusyLock(busyLock, () -> completedFuture(res)));
+ })).thenCompose(tables -> completedFuture(res));
}
return completedFuture(res);
@@ -432,15 +428,17 @@ public class SqlSchemaManagerImpl implements SqlSchemaManager {
return CompletableFuture.completedFuture(resIdxs);
})
- ).thenRun(() -> inBusyLock(busyLock, () -> {
+ ).thenCompose(ignore -> {
String tblName = tableNameById(schema, index.tableId());
table.addIndex(schemaIndex);
schema.addTable(tblName, table);
schema.addIndex(index.id(), schemaIndex);
- })).thenCompose(ignored -> inBusyLock(busyLock, () -> completedFuture(resTbls)));
+
+ return completedFuture(resTbls);
+ });
})
- ).thenCompose(v -> inBusyLock(busyLock, () -> completedFuture(res)));
+ ).thenCompose(v -> completedFuture(res));
}));
return calciteSchemaVv.get(causalityToken);
@@ -514,9 +512,9 @@ public class SqlSchemaManagerImpl implements SqlSchemaManager {
return completedFuture(resIdxs);
}
- )).thenCompose(v -> inBusyLock(busyLock, () -> completedFuture(resTbls)));
+ )).thenCompose(v -> completedFuture(resTbls));
})
- ).thenCompose(v -> inBusyLock(busyLock, () -> completedFuture(res)));
+ ).thenCompose(v -> completedFuture(res));
}
return completedFuture(res);
[ignite-3] 01/02: WIP.
Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-17686
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 2ed0e7d56c40a2d6c42bfef58c036cf03b180c15
Author: amashenkov <an...@gmail.com>
AuthorDate: Fri Sep 23 15:54:40 2022 +0300
WIP.
---
.../apache/ignite/internal/sql/engine/exec/ddl/DdlCommandHandler.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ddl/DdlCommandHandler.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ddl/DdlCommandHandler.java
index 5ff26fa0ec..89c82a7548 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ddl/DdlCommandHandler.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ddl/DdlCommandHandler.java
@@ -299,6 +299,8 @@ public class DdlCommandHandler {
return tableManager.alterTableAsync(
fullName,
chng -> chng.changeColumns(cols -> {
+ ret.set(true); // Reset state if closure have been restarted.
+
Map<String, String> colNamesToOrders = columnOrdersToNames(chng.columns());
List<ColumnDefinition> colsDef0;
@@ -379,6 +381,8 @@ public class DdlCommandHandler {
return tableManager.alterTableAsync(
fullName,
chng -> chng.changeColumns(cols -> {
+ ret.set(true); // Reset state if closure have been restarted.
+
PrimaryKeyView priKey = chng.primaryKey();
Map<String, String> colNamesToOrders = columnOrdersToNames(chng.columns());