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 2021/09/06 16:18:06 UTC
[ignite-3] branch ignite-15212 updated (df36a81 -> 13021b3)
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a change to branch ignite-15212
in repository https://gitbox.apache.org/repos/asf/ignite-3.git.
from df36a81 WIP. Introduce tx session wrapper.
new 11f7451 Fix duplicated dependency.
add 2fa8a85 IGNITE-15047 Implemented internal configuration roots and extensions. (#290)
add b8db213 IGNITE-15420 Configuration tests moved to a proper module (#305)
add a4b7b88 IGNITE-15417 Creates cursorId on client side. Fixes #307
add 9e814dd IGNITE-15433 Improve network annotation processor error messages (#310)
add 0d12630 IGNITE-15393 Add errorprone plugin (#304)
add b0ff96e IGNITE-15338 Return null in storage methods if a DataRow is not found (#297)
add 9e226df IGNITE-15370 [Ignite 3] Add style check to the build lifecycle (#303)
add 309df75 IGNITE-15449 Renamed missed integration test class names to start with IT prefix. Fixes #317
add ab1b43e Revert "IGNITE-15393 Add errorprone plugin (#304)" (#320)
add 332092c IGNITE-15440 Fix some WARNINGS in Maven build (#312)
new 76c8229 Merge branch 'main' into ignite-15212
new 13021b3 Wip.
The 3 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.
Summary of changes:
DEVNOTES.md | 13 +-
assembly/assembly.xml | 4 +-
check-rules/checkstyle-suppressions.xml | 1 +
.../CheckUnusedDependenciesAndPluginsInParent.sh | 3 +-
.../internal/affinity/AffinityManagerTest.java | 3 +-
.../apache/ignite/query/sql/SqlMultiResultSet.java | 13 +-
.../apache/ignite/query/sql/SqlResultSetMeta.java | 8 +-
.../org/apache/ignite/query/sql/SqlSession.java | 20 +-
.../org/apache/ignite/query/sql/SqlStatement.java | 54 +-
.../AsyncResultSet.java} | 40 +-
.../facebook/presto/bytecode/ClassDefinition.java | 14 +-
modules/calcite/pom.xml | 35 +-
...igCommandTest.java => ITConfigCommandTest.java} | 2 +-
modules/client-common/pom.xml | 8 -
modules/client-handler/pom.xml | 13 -
.../client/handler/ITClientHandlerTest.java} | 10 +-
modules/client/pom.xml | 8 -
.../ignite/internal/client/TcpIgniteClient.java | 6 +
.../apache/ignite/client/AbstractClientTest.java | 3 +-
.../org/apache/ignite/client/fakes/FakeIgnite.java | 6 +
modules/configuration-annotation-processor/pom.xml | 25 -
.../configuration/processor/ITProcessorTest.java | 88 +++-
.../ErrorInternal0ConfigurationSchema.java} | 14 +-
.../ErrorInternal1ConfigurationSchema.java} | 16 +-
.../ErrorInternal2ConfigurationSchema.java} | 23 +-
.../ErrorInternal3ConfigurationSchema.java} | 9 +-
.../ErrorInternal4ConfigurationSchema.java} | 24 +-
.../ErrorInternal5ConfigurationSchema.java} | 16 +-
.../ExtendedSimpleConfigurationSchema.java} | 16 +-
.../ExtendedSimpleRootConfigurationSchema.java} | 16 +-
.../internal/SimpleConfigurationSchema.java} | 16 +-
.../internal/SimpleRootConfigurationSchema.java} | 23 +-
.../configuration/processor/Processor.java | 208 ++++++--
.../org/apache/ignite/configuration/RootKey.java | 15 +
...urationRoot.java => InternalConfiguration.java} | 26 +-
modules/configuration/pom.xml | 34 +-
.../configuration/ConfigurationChanger.java | 4 +-
.../configuration/ConfigurationManager.java | 13 +-
.../internal/configuration/ConfigurationNode.java | 2 +-
.../configuration/ConfigurationRegistry.java | 48 +-
.../configuration/DynamicConfiguration.java | 5 +-
.../internal/configuration/DynamicProperty.java | 6 +-
.../internal/configuration/RootInnerNode.java | 71 +++
.../ignite/internal/configuration/SuperRoot.java | 111 ++--
.../asm/ConfigurationAsmGenerator.java | 585 ++++++++++++++-------
.../configuration/asm/SchemaClassesInfo.java | 64 ++-
.../configuration/hocon/HoconConverter.java | 3 +-
.../hocon/HoconListConfigurationSource.java | 2 +-
.../hocon/HoconObjectConfigurationSource.java | 12 +-
.../configuration/tree/ConstructableTreeNode.java | 3 +-
.../ConverterToMapVisitor.java} | 26 +-
.../internal/configuration/tree/InnerNode.java | 120 +++--
.../internal/configuration/tree/NamedListNode.java | 2 +-
.../configuration/util/ConfigurationFlattener.java | 14 +-
.../util/ConfigurationNotificationsUtil.java | 8 +-
.../configuration/util/ConfigurationUtil.java | 263 ++++++++-
.../util/KeysTrackingConfigurationVisitor.java | 2 +-
.../validation/ValidationContextImpl.java | 2 +-
.../configuration/validation/ValidationUtil.java | 4 +-
.../configuration/ConfigurationChangerTest.java | 23 +-
.../configuration/ConfigurationRegistryTest.java | 86 +++
.../configuration/TestConfigurationChanger.java | 13 +-
.../asm/ConfigurationAsmGeneratorTest.java | 309 +++++++++++
.../configuration/hocon/HoconConverterTest.java | 3 +-
.../notifications/ConfigurationListenerTest.java | 7 +-
.../sample/AutoAdjustConfigurationSchema.java | 0
.../sample/BaselineConfigurationSchema.java | 0
.../sample/CacheConfigurationSchema.java | 0
.../sample/ClusterWideConfigurationSchema.java | 0
.../sample/DiscoveryConfigurationSchema.java | 0
.../sample/LocalConfigurationSchema.java | 0
.../sample/NetworkConfigurationSchema.java | 0
.../sample/NodeConfigurationSchema.java | 0
.../internal/configuration/sample/UsageTest.java | 6 +-
.../configuration/tree/ConfigurationArrayTest.java | 5 +-
.../tree/ConstructableTreeNodeTest.java | 25 +-
.../configuration/tree/NamedListNodeTest.java | 2 +-
.../tree/TraversableTreeNodeTest.java | 24 +-
.../configuration/util/ConfigurationUtilTest.java | 388 +++++++++++++-
.../validation/ValidationUtilTest.java | 2 +-
modules/core/pom.xml | 7 +-
.../ignite/internal/util/CollectionUtils.java | 72 +++
.../ignite/internal/util/CollectionUtilsTest.java | 74 +++
.../client/ITMetaStorageServiceTest.java | 2 +-
.../metastorage/client/MetaStorageServiceImpl.java | 15 +-
.../metastorage/common/command/RangeCommand.java | 22 +-
.../common/command/WatchExactKeysCommand.java | 18 +-
.../common/command/WatchRangeKeysCommand.java | 22 +-
.../server/raft/MetaStorageListener.java | 7 +-
modules/network-annotation-processor/pom.xml | 33 +-
.../ITTransferableObjectProcessorTest.java | 11 +-
.../processor/TransferableObjectProcessor.java | 25 +-
.../network/processor/TestMessageGroup.java | 35 --
modules/network-api/pom.xml | 9 -
modules/network/pom.xml | 29 +-
...nagerTest.java => ITConnectionManagerTest.java} | 2 +-
...shakeTest.java => ITRecoveryHandshakeTest.java} | 22 +-
.../ignite/utils/ClusterServiceTestUtils.java | 4 +-
.../internal/network/processor/EmptyMessage.java | 5 +-
.../network/processor/EmptyMessageTest.java | 1 +
.../network/processor/InheritedMessage.java | 3 +-
.../network/processor/InheritedMessageTest.java | 1 +
.../processor/SerializationOrderMessage.java | 3 +-
.../network/processor/SerializationOrderTest.java | 1 +
.../apache/ignite/network/TestMessageTypes.java | 18 +-
modules/raft-client/pom.xml | 22 +-
.../ignite/raft/client/service/CommandClosure.java | 3 +-
modules/raft/pom.xml | 29 +-
.../raft/server/ITJRaftCounterServerTest.java | 2 +-
modules/rest/pom.xml | 22 +-
.../ConfigurationPresentationTest.java | 3 +-
...onTest.java => ITDynamicTableCreationTest.java} | 2 +-
.../app/{IgnitionTest.java => ITIgnitionTest.java} | 2 +-
...Test.java => ITLiveSchemaChangeKVViewTest.java} | 3 +-
...eTest.java => ITLiveSchemaChangeTableTest.java} | 3 +-
...ViewTest.java => ITSchemaChangeKVViewTest.java} | 2 +-
...wTest.java => ITSchemaChangeTableViewTest.java} | 2 +-
...eCreationTest.java => ITTableCreationTest.java} | 2 +-
.../ITDistributedConfigurationStorageTest.java | 3 +-
.../org/apache/ignite/internal/app/IgniteImpl.java | 6 +-
.../SchemaConfigurationConverterTest.java | 3 +-
modules/sql/src/test/java/SqlTest.java | 111 ++--
.../apache/ignite/internal/storage/DataRow.java | 8 +-
.../ignite/internal/storage/InvokeClosure.java | 7 +-
.../apache/ignite/internal/storage/Storage.java | 4 +-
.../storage/basic/ConcurrentHashMapStorage.java | 60 ++-
.../storage/basic/DeleteExactInvokeClosure.java | 4 +-
.../storage/basic/GetAndRemoveInvokeClosure.java | 15 +-
.../storage/basic/GetAndReplaceInvokeClosure.java | 9 +-
.../storage/basic/InsertInvokeClosure.java | 4 +-
.../storage/basic/ReplaceExactInvokeClosure.java | 5 +-
.../internal/storage/basic/SimpleDataRow.java | 27 +-
.../storage/basic/SimpleReadInvokeClosure.java | 5 +-
.../storage/basic/SimpleRemoveInvokeClosure.java | 3 +-
.../storage/basic/SimpleWriteInvokeClosure.java | 3 +-
.../internal/storage/AbstractStorageTest.java | 77 ++-
.../internal/storage/rocksdb/RocksDbStorage.java | 32 +-
.../ignite/distributed/ITDistributedTableTest.java | 1 -
.../table/distributed/command/CommandUtils.java | 3 +-
.../distributed/command/ReplaceIfExistCommand.java | 2 +-
.../command/response/SingleRowResponse.java | 7 +-
.../table/distributed/raft/PartitionListener.java | 454 ++++++++++------
.../ignite/internal/table/TableManagerTest.java | 6 +-
modules/transactions/pom.xml | 13 -
...> ITPersistencePropertiesVaultServiceTest.java} | 2 +-
...Test.java => ITPersistentVaultServiceTest.java} | 2 +-
parent/pom.xml | 56 +-
pom.xml | 49 ++
148 files changed, 3369 insertions(+), 1246 deletions(-)
copy modules/api/src/main/java/org/apache/ignite/query/sql/{SqlResultSet.java => async/AsyncResultSet.java} (61%)
rename modules/cli/src/integrationTest/java/org/apache/ignite/cli/{ConfigCommandTest.java => ITConfigCommandTest.java} (98%)
rename modules/client-handler/src/{test/java/org/apache/ignite/client/handler/ClientHandlerIntegrationTest.java => integrationTest/java/org/apache/ignite/client/handler/ITClientHandlerTest.java} (97%)
copy modules/configuration-annotation-processor/src/{test/java/org/apache/ignite/internal/configuration/sample/CacheConfigurationSchema.java => integrationTest/resources/org/apache/ignite/internal/configuration/processor/internal/ErrorInternal0ConfigurationSchema.java} (74%)
copy modules/configuration-annotation-processor/src/{test/java/org/apache/ignite/internal/configuration/sample/LocalConfigurationSchema.java => integrationTest/resources/org/apache/ignite/internal/configuration/processor/internal/ErrorInternal1ConfigurationSchema.java} (67%)
copy modules/configuration-annotation-processor/src/integrationTest/resources/org/apache/ignite/internal/configuration/processor/{TestConfigurationSchema.java => internal/ErrorInternal2ConfigurationSchema.java} (70%)
copy modules/{api/src/main/java/org/apache/ignite/query/sql/SqlStatement.java => configuration-annotation-processor/src/integrationTest/resources/org/apache/ignite/internal/configuration/processor/internal/ErrorInternal3ConfigurationSchema.java} (71%)
copy modules/configuration-annotation-processor/src/integrationTest/resources/org/apache/ignite/internal/configuration/processor/{TestConfigurationSchema.java => internal/ErrorInternal4ConfigurationSchema.java} (67%)
copy modules/configuration-annotation-processor/src/{test/java/org/apache/ignite/internal/configuration/sample/CacheConfigurationSchema.java => integrationTest/resources/org/apache/ignite/internal/configuration/processor/internal/ErrorInternal5ConfigurationSchema.java} (69%)
copy modules/configuration-annotation-processor/src/{test/java/org/apache/ignite/internal/configuration/sample/CacheConfigurationSchema.java => integrationTest/resources/org/apache/ignite/internal/configuration/processor/internal/ExtendedSimpleConfigurationSchema.java} (72%)
copy modules/configuration-annotation-processor/src/{test/java/org/apache/ignite/internal/configuration/sample/CacheConfigurationSchema.java => integrationTest/resources/org/apache/ignite/internal/configuration/processor/internal/ExtendedSimpleRootConfigurationSchema.java} (71%)
copy modules/configuration-annotation-processor/src/{test/java/org/apache/ignite/internal/configuration/sample/CacheConfigurationSchema.java => integrationTest/resources/org/apache/ignite/internal/configuration/processor/internal/SimpleConfigurationSchema.java} (79%)
copy modules/configuration-annotation-processor/src/{test/java/org/apache/ignite/internal/configuration/sample/ClusterWideConfigurationSchema.java => integrationTest/resources/org/apache/ignite/internal/configuration/processor/internal/SimpleRootConfigurationSchema.java} (69%)
copy modules/configuration-api/src/main/java/org/apache/ignite/configuration/annotation/{ConfigurationRoot.java => InternalConfiguration.java} (70%)
create mode 100644 modules/configuration/src/main/java/org/apache/ignite/internal/configuration/RootInnerNode.java
rename modules/configuration/src/main/java/org/apache/ignite/internal/configuration/{hocon/HoconConfigurationVisitor.java => tree/ConverterToMapVisitor.java} (84%)
rename modules/{configuration-annotation-processor => configuration}/src/test/java/org/apache/ignite/internal/configuration/ConfigurationChangerTest.java (94%)
create mode 100644 modules/configuration/src/test/java/org/apache/ignite/internal/configuration/ConfigurationRegistryTest.java
rename modules/{configuration-annotation-processor => configuration}/src/test/java/org/apache/ignite/internal/configuration/TestConfigurationChanger.java (79%)
create mode 100644 modules/configuration/src/test/java/org/apache/ignite/internal/configuration/asm/ConfigurationAsmGeneratorTest.java
rename modules/{configuration-annotation-processor => configuration}/src/test/java/org/apache/ignite/internal/configuration/hocon/HoconConverterTest.java (99%)
rename modules/{configuration-annotation-processor => configuration}/src/test/java/org/apache/ignite/internal/configuration/notifications/ConfigurationListenerTest.java (99%)
rename modules/{configuration-annotation-processor => configuration}/src/test/java/org/apache/ignite/internal/configuration/sample/AutoAdjustConfigurationSchema.java (100%)
rename modules/{configuration-annotation-processor => configuration}/src/test/java/org/apache/ignite/internal/configuration/sample/BaselineConfigurationSchema.java (100%)
rename modules/{configuration-annotation-processor => configuration}/src/test/java/org/apache/ignite/internal/configuration/sample/CacheConfigurationSchema.java (100%)
rename modules/{configuration-annotation-processor => configuration}/src/test/java/org/apache/ignite/internal/configuration/sample/ClusterWideConfigurationSchema.java (100%)
rename modules/{configuration-annotation-processor => configuration}/src/test/java/org/apache/ignite/internal/configuration/sample/DiscoveryConfigurationSchema.java (100%)
rename modules/{configuration-annotation-processor => configuration}/src/test/java/org/apache/ignite/internal/configuration/sample/LocalConfigurationSchema.java (100%)
rename modules/{configuration-annotation-processor => configuration}/src/test/java/org/apache/ignite/internal/configuration/sample/NetworkConfigurationSchema.java (100%)
rename modules/{configuration-annotation-processor => configuration}/src/test/java/org/apache/ignite/internal/configuration/sample/NodeConfigurationSchema.java (100%)
rename modules/{configuration-annotation-processor => configuration}/src/test/java/org/apache/ignite/internal/configuration/sample/UsageTest.java (97%)
rename modules/{configuration-annotation-processor => configuration}/src/test/java/org/apache/ignite/internal/configuration/tree/ConfigurationArrayTest.java (99%)
rename modules/{configuration-annotation-processor => configuration}/src/test/java/org/apache/ignite/internal/configuration/tree/ConstructableTreeNodeTest.java (94%)
rename modules/{configuration-annotation-processor => configuration}/src/test/java/org/apache/ignite/internal/configuration/tree/NamedListNodeTest.java (99%)
rename modules/{configuration-annotation-processor => configuration}/src/test/java/org/apache/ignite/internal/configuration/tree/TraversableTreeNodeTest.java (96%)
rename modules/{configuration-annotation-processor => configuration}/src/test/java/org/apache/ignite/internal/configuration/util/ConfigurationUtilTest.java (53%)
rename modules/{configuration-annotation-processor => configuration}/src/test/java/org/apache/ignite/internal/configuration/validation/ValidationUtilTest.java (99%)
create mode 100644 modules/core/src/test/java/org/apache/ignite/internal/util/CollectionUtilsTest.java
delete mode 100644 modules/network-annotation-processor/src/test/java/org/apache/ignite/internal/network/processor/TestMessageGroup.java
rename modules/network/src/integrationTest/java/org/apache/ignite/internal/network/netty/{ConnectionManagerTest.java => ITConnectionManagerTest.java} (99%)
rename modules/network/src/integrationTest/java/org/apache/ignite/internal/network/recovery/{RecoveryHandshakeTest.java => ITRecoveryHandshakeTest.java} (90%)
rename modules/{network-annotation-processor => network}/src/test/java/org/apache/ignite/internal/network/processor/EmptyMessage.java (86%)
rename modules/{network-annotation-processor => network}/src/test/java/org/apache/ignite/internal/network/processor/EmptyMessageTest.java (96%)
rename modules/{network-annotation-processor => network}/src/test/java/org/apache/ignite/internal/network/processor/InheritedMessage.java (92%)
rename modules/{network-annotation-processor => network}/src/test/java/org/apache/ignite/internal/network/processor/InheritedMessageTest.java (98%)
rename modules/{network-annotation-processor => network}/src/test/java/org/apache/ignite/internal/network/processor/SerializationOrderMessage.java (91%)
rename modules/{network-annotation-processor => network}/src/test/java/org/apache/ignite/internal/network/processor/SerializationOrderTest.java (98%)
rename modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/{DynamicTableCreationTest.java => ITDynamicTableCreationTest.java} (99%)
rename modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/{IgnitionTest.java => ITIgnitionTest.java} (99%)
rename modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/{LiveSchemaChangeKVViewTest.java => ITLiveSchemaChangeKVViewTest.java} (99%)
rename modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/{LiveSchemaChangeTableTest.java => ITLiveSchemaChangeTableTest.java} (99%)
rename modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/{SchemaChangeKVViewTest.java => ITSchemaChangeKVViewTest.java} (99%)
rename modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/{SchemaChangeTableViewTest.java => ITSchemaChangeTableViewTest.java} (99%)
rename modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/{TableCreationTest.java => ITTableCreationTest.java} (99%)
rename modules/vault/src/integrationTest/java/org/apache/ignite/internal/vault/persistence/{PersistencePropertiesVaultServiceTest.java => ITPersistencePropertiesVaultServiceTest.java} (98%)
rename modules/vault/src/integrationTest/java/org/apache/ignite/internal/vault/persistence/{PersistentVaultServiceTest.java => ITPersistentVaultServiceTest.java} (96%)
[ignite-3] 03/03: 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-15212
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 13021b3f79115642013e3da9e863e24fe22e2d67
Author: Andrew Mashenkov <an...@gmail.com>
AuthorDate: Mon Sep 6 19:17:58 2021 +0300
Wip.
---
.../apache/ignite/query/sql/SqlMultiResultSet.java | 13 ++-
.../apache/ignite/query/sql/SqlResultSetMeta.java | 8 +-
.../org/apache/ignite/query/sql/SqlSession.java | 20 +++-
.../org/apache/ignite/query/sql/SqlStatement.java | 54 +++++++++-
.../AsyncResultSet.java} | 37 +++++--
.../ignite/internal/client/TcpIgniteClient.java | 6 ++
.../org/apache/ignite/client/fakes/FakeIgnite.java | 6 ++
modules/sql/src/test/java/SqlTest.java | 111 +++++++++++++++------
8 files changed, 193 insertions(+), 62 deletions(-)
diff --git a/modules/api/src/main/java/org/apache/ignite/query/sql/SqlMultiResultSet.java b/modules/api/src/main/java/org/apache/ignite/query/sql/SqlMultiResultSet.java
index 2158966..1df580f 100644
--- a/modules/api/src/main/java/org/apache/ignite/query/sql/SqlMultiResultSet.java
+++ b/modules/api/src/main/java/org/apache/ignite/query/sql/SqlMultiResultSet.java
@@ -21,16 +21,15 @@ import java.util.UUID;
/** */
public interface SqlMultiResultSet extends Iterable<SqlResultSet>, AutoCloseable {
- /** */
- void close();
-
- /** */
- void apply();
-
/**
- * Returns query unique id.
+ * Returns query uid.
*
* @return Query id.
*/
UUID queryId();
+
+ /**
+ * {@inheritDoc}
+ */
+ void close();
}
diff --git a/modules/api/src/main/java/org/apache/ignite/query/sql/SqlResultSetMeta.java b/modules/api/src/main/java/org/apache/ignite/query/sql/SqlResultSetMeta.java
index 38c4a63..29f568d 100644
--- a/modules/api/src/main/java/org/apache/ignite/query/sql/SqlResultSetMeta.java
+++ b/modules/api/src/main/java/org/apache/ignite/query/sql/SqlResultSetMeta.java
@@ -24,14 +24,14 @@ import java.util.List;
*/
public interface SqlResultSetMeta {
/**
- * Returns number of column that every row in a ResulSet contains.
+ * Returns number of column that every row in a result set.
*
* @return Number of columns.
*/
int columnsCount();
/**
- * Returns metadata with description for every column in resultset.
+ * Returns metadata with description for every column in result set.
*
* @return Columns metadata.
*/
@@ -56,8 +56,8 @@ public interface SqlResultSetMeta {
/**
* Returns column id in ResultSet by column name.
*
- * @param columnName Columns name which id is resoliving.
- * @return Column Id for requested column.
+ * @param columnName Columns name which id is resolving.
+ * @return Column Id for the requested column.
*/
int indexOf(String columnName);
}
diff --git a/modules/api/src/main/java/org/apache/ignite/query/sql/SqlSession.java b/modules/api/src/main/java/org/apache/ignite/query/sql/SqlSession.java
index 2e8663a..9df1832 100644
--- a/modules/api/src/main/java/org/apache/ignite/query/sql/SqlSession.java
+++ b/modules/api/src/main/java/org/apache/ignite/query/sql/SqlSession.java
@@ -43,19 +43,29 @@ public interface SqlSession extends AsyncSqlSession, ReactiveSqlSession {
/**
* Sets default query timeout.
- * TODO: add getters.
+ */
+ void defaultTimeout(int timeout);
+
+ /**
+ * Gets default query timeout.
*
- * @return {@code this} for chaining.
+ * @return Default query timeout.
*/
- SqlSession setTimeout(int timeout);
+ long defaultTimeout();
/**
* Sets default query schema.
*
* @param schema Default schema.
- * @return {@code this} for chaining.
*/
- SqlSession setSchema(@NotNull String schema);
+ void defaultSchema(@NotNull String schema);
+
+ /**
+ * Gets default query schema.
+ *
+ * @return Default query schema.
+ */
+ String defaultSchema();
/**
* Executes single SQL query.
diff --git a/modules/api/src/main/java/org/apache/ignite/query/sql/SqlStatement.java b/modules/api/src/main/java/org/apache/ignite/query/sql/SqlStatement.java
index 813e5f1..489f65c 100644
--- a/modules/api/src/main/java/org/apache/ignite/query/sql/SqlStatement.java
+++ b/modules/api/src/main/java/org/apache/ignite/query/sql/SqlStatement.java
@@ -17,10 +17,60 @@
package org.apache.ignite.query.sql;
-import org.apache.ignite.table.Tuple;
-
+import java.sql.SQLException;
/**
+ * SQL statement.
*/
public interface SqlStatement {
+ /**
+ * @return Statement SQL query.
+ */
+ String query();
+
+ /**
+ * @return Query parameters.
+ */
+ Object[] parameters();
+
+ /**
+ * @param parameters Query parameters.
+ * @return {@code this} for chaining.
+ */
+ SqlStatement parameters(Object... parameters);
+
+ /**
+ * @param parameter Query parameter.
+ * @return {@code this} for chaining.
+ */
+ //TODO: method name???
+ SqlStatement set(int parameterIndex, Object parameter);
+
+ /**
+ * Clears query parameters.
+ *
+ * @return {@code this} for chaining.
+ */
+ SqlStatement clearParameters();
+
+ /**
+ * Adds a set of parameters to this <code>Statement</code> object's batch of commands.
+ *
+ * @return {@code this} for chaining.
+ */
+ //TODO: Multi statement?
+ SqlStatement addBatch() throws SQLException;
+
+ /**
+ * @param queryTimeout Query timeout.
+ * @return {@code this} for chaining.
+ */
+ SqlStatement queryTimeout(long queryTimeout);
+
+ /**
+ * @return Query timeout.
+ */
+ long queryTimeout();
+
+ //TODO: Do we need some additional parameters? Query memory quota?
}
diff --git a/modules/api/src/main/java/org/apache/ignite/query/sql/SqlMultiResultSet.java b/modules/api/src/main/java/org/apache/ignite/query/sql/async/AsyncResultSet.java
similarity index 53%
copy from modules/api/src/main/java/org/apache/ignite/query/sql/SqlMultiResultSet.java
copy to modules/api/src/main/java/org/apache/ignite/query/sql/async/AsyncResultSet.java
index 2158966..0a60260 100644
--- a/modules/api/src/main/java/org/apache/ignite/query/sql/SqlMultiResultSet.java
+++ b/modules/api/src/main/java/org/apache/ignite/query/sql/async/AsyncResultSet.java
@@ -15,22 +15,37 @@
* limitations under the License.
*/
-package org.apache.ignite.query.sql;
+package org.apache.ignite.query.sql.async;
-import java.util.UUID;
+import java.util.concurrent.CompletionStage;
+import org.apache.ignite.query.sql.SqlResultSetMeta;
+import org.apache.ignite.query.sql.SqlRow;
-/** */
-public interface SqlMultiResultSet extends Iterable<SqlResultSet>, AutoCloseable {
- /** */
- void close();
+/**
+ * Asynchronous result set.
+ */
+public interface AsyncResultSet {
+ /**
+ * Returns metadata for the results.
+ *
+ * @return ResultSet metadata.
+ */
+ SqlResultSetMeta metadata();
- /** */
- void apply();
+ /**
+ * @return Current page rows.
+ */
+ Iterable<SqlRow> currentPage();
/**
- * Returns query unique id.
+ * Fetch the next page of results asynchronously.
*
- * @return Query id.
+ * @return Operation future.
+ */
+ CompletionStage<AsyncResultSet> fetchNextPage();
+
+ /**
+ * @return Whether there are more pages of results.
*/
- UUID queryId();
+ boolean hasMorePages();
}
diff --git a/modules/client/src/main/java/org/apache/ignite/internal/client/TcpIgniteClient.java b/modules/client/src/main/java/org/apache/ignite/internal/client/TcpIgniteClient.java
index b9e586a..2a2ba69 100644
--- a/modules/client/src/main/java/org/apache/ignite/internal/client/TcpIgniteClient.java
+++ b/modules/client/src/main/java/org/apache/ignite/internal/client/TcpIgniteClient.java
@@ -25,6 +25,7 @@ import org.apache.ignite.client.IgniteClientConfiguration;
import org.apache.ignite.client.IgniteClientException;
import org.apache.ignite.internal.client.io.ClientConnectionMultiplexer;
import org.apache.ignite.internal.client.table.ClientTables;
+import org.apache.ignite.query.sql.IgniteSql;
import org.apache.ignite.table.manager.IgniteTables;
import org.apache.ignite.tx.IgniteTransactions;
@@ -101,6 +102,11 @@ public class TcpIgniteClient implements IgniteClient {
}
/** {@inheritDoc} */
+ @Override public IgniteSql sql() {
+ return null;
+ }
+
+ /** {@inheritDoc} */
@Override public void close() throws Exception {
ch.close();
}
diff --git a/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeIgnite.java b/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeIgnite.java
index 0119afd..75d750b 100644
--- a/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeIgnite.java
+++ b/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeIgnite.java
@@ -18,6 +18,7 @@
package org.apache.ignite.client.fakes;
import org.apache.ignite.app.Ignite;
+import org.apache.ignite.query.sql.IgniteSql;
import org.apache.ignite.table.manager.IgniteTables;
import org.apache.ignite.tx.IgniteTransactions;
@@ -39,6 +40,11 @@ public class FakeIgnite implements Ignite {
}
/** {@inheritDoc} */
+ @Override public IgniteSql sql() {
+ return null;
+ }
+
+ /** {@inheritDoc} */
@Override public void close() throws Exception {
// No-op.
}
diff --git a/modules/sql/src/test/java/SqlTest.java b/modules/sql/src/test/java/SqlTest.java
index 77000ad..02da0d4 100644
--- a/modules/sql/src/test/java/SqlTest.java
+++ b/modules/sql/src/test/java/SqlTest.java
@@ -16,10 +16,16 @@
*/
import java.util.List;
+import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Flow;
import java.util.function.Consumer;
+import org.apache.ignite.internal.schema.Column;
+import org.apache.ignite.internal.schema.NativeTypes;
+import org.apache.ignite.internal.schema.SchemaDescriptor;
+import org.apache.ignite.internal.schema.SchemaRegistry;
+import org.apache.ignite.internal.table.TableImpl;
import org.apache.ignite.internal.util.Constants;
import org.apache.ignite.query.sql.IgniteSql;
import org.apache.ignite.query.sql.SqlResultSet;
@@ -30,12 +36,16 @@ import org.apache.ignite.query.sql.SqlTx;
import org.apache.ignite.query.sql.reactive.ReactiveSqlResultSet;
import org.apache.ignite.schema.ColumnType;
import org.apache.ignite.table.Table;
+import org.apache.ignite.table.Tuple;
import org.apache.ignite.tx.IgniteTransactions;
import org.apache.ignite.tx.Transaction;
+import org.jetbrains.annotations.NotNull;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.AdditionalAnswers;
+import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.junit.jupiter.MockitoExtension;
@@ -68,21 +78,23 @@ public class SqlTest {
igniteTx.runInTransaction(tx -> {
SqlSession sess = queryMgr.session();
- sess.setTimeout(10_000); // Set default timeout.
+ sess.defaultTimeout(10_000); // Set default timeout.
sess.setParameter("memoryQuota", 10 * Constants.MiB); // Set default timeout.
// Execute outside TX.
- SqlResultSet rs = sess.execute("INSERT INTO table VALUES (?, ?)", 10, "str%");
+ SqlResultSet rs = sess.execute("INSERT INTO table VALUES (?, ?)", 10, "str");
- for (SqlRow r : rs) {
- assertTrue(10 > r.longValue("id"));
- assertTrue((r.stringValue("val")).startsWith("str"));
- }
+ assertEquals(1, rs.updateCount());
// Execute in TX.
SqlTx sqlTx = queryMgr.session().withTransaction(tx);
- rs = sqlTx.execute("SELECT id, val FROM table WHERE id < {} AND val LIKE {};", 10, "str%");
+ rs = sqlTx.execute("SELECT id, val FROM table WHERE id < {};", 10);
+
+ for (SqlRow r : rs) {
+ assertTrue(10 > r.longValue("id"));
+ assertTrue((r.stringValue("val")).startsWith("str"));
+ }
sqlTx.commit();
});
@@ -90,24 +102,41 @@ public class SqlTest {
Mockito.verify(tx).commit();
}
- @Disabled
@Test
public void testSynchronousSql2() {
- Table tbl = null;
+ Table tbl = getTable();
// Starts new TX.
SqlTx sqlTx = queryMgr.session().withNewTransaction();
- SqlResultSet rs = sqlTx.execute("SELECT id, val FROM table WHERE id < {} AND val LIKE {};", 10, "str%");
+ SqlResultSet rs = sqlTx.execute("SELECT id, val FROM table WHERE id < {};", 10);
SqlRow row = rs.iterator().next();
tbl.withTransaction(sqlTx.transaction())
- .insertAsync(row.set("val", "NewValue"))
+ .insertAsync(Tuple.create().set("val", "NewValue"))
.thenAccept(r -> sqlTx.transaction().rollback());
+
+ Mockito.verify(tx, Mockito.times(1)).rollback();
+ }
+
+ @NotNull private Table getTable() {
+ SchemaDescriptor schema = new SchemaDescriptor(UUID.randomUUID(), 42,
+ new Column[]{new Column("id", NativeTypes.INT64, false)},
+ new Column[]{new Column("val", NativeTypes.STRING, true)}
+ );
+
+ SchemaRegistry schemaReg = Mockito.mock(SchemaRegistry.class);
+ Mockito.when(schemaReg.schema()).thenReturn(schema);
+
+ Table tbl = Mockito.mock(Table.class);
+ Mockito.when(tbl.insertAsync(Mockito.any())).thenReturn(CompletableFuture.completedFuture(null));
+ Mockito.when(tbl.withTransaction(Mockito.any())).thenAnswer(Answers.RETURNS_SELF);
+
+ return tbl;
}
@Test
- public void testAsyncSql() throws ExecutionException, InterruptedException {
+ public void testSynchronousSql3() throws ExecutionException, InterruptedException {
SqlSession sess = queryMgr.session();
CompletableFuture<SqlResultSet> f = sess.executeMultiAsync(
@@ -138,25 +167,27 @@ public class SqlTest {
return sess.executeAsync("SELECT val FROM table where val LIKE {};", tx, str);
});
- SqlResultSet itRes = f.get();
- // CREATE TABLE - not planned
- // SELECT - not planned
- // DROP - not planned
+ SqlResultSet rs = f.get();
- igniteTx.beginAsync().thenCompose(tx -> {
- SqlSession sess0 = queryMgr.session();
+ rs.iterator().next();
+ }
- return sess0.executeAsync(
+ @Test
+ public void testAsyncSql() {
+ igniteTx.beginAsync().thenCompose(tx0 -> {
+ SqlSession sess = queryMgr.session();
+
+ return sess.executeAsync(
"CREATE TABLE tbl(id INTEGER PRI<ARY KEY, val VARCHAR);" +
"SELECT id, val FROM tbl WHERE id == {};" +
- "DROP TABLE tbl", tx, 10)
+ "DROP TABLE tbl", 10)
.thenCompose(rs -> {
String str = rs.iterator().next().stringValue("val");
- return sess0.executeAsync("SELECT val FROM table where val LIKE {};", tx, str);
+ return sess.executeAsync("SELECT val FROM table where val LIKE {};", str);
})
- .thenApply(ignore -> tx);
+ .thenApply(ignore -> tx0);
}).thenAccept(Transaction::commitAsync);
Mockito.verify(tx).commitAsync();
@@ -175,7 +206,8 @@ public class SqlTest {
.subscribe(subscriber);
return subscriber.exceptionally(th -> {
- return tx.rollbackAsync();
+ tx.rollbackAsync();
+ return null;
}).thenApply(ignore -> tx.commitAsync());
});
@@ -211,15 +243,28 @@ public class SqlTest {
Mockito.when(queryMgr.session()).thenReturn(session);
- Mockito.when(session.execute(Mockito.eq("SELECT id, val FROM table WHERE id < {} AND val LIKE {};"), Mockito.any(), Mockito.any())).
- thenAnswer(ans -> Mockito.when(Mockito.mock(SqlResultSet.class).iterator())
- .thenReturn(List.of(
- new TestRow().set("id", 1L).set("val", "string 1").build(),
- new TestRow().set("id", 2L).set("val", "string 2").build(),
- new TestRow().set("id", 5L).set("val", "string 3").build()
- ).iterator()).getMock());
+ SqlTx sqlTx = Mockito.mock(SqlTx.class);
+
+ Mockito.when(sqlTx.transaction()).thenReturn(tx);
+ Mockito.when(session.withTransaction(Mockito.same(tx))).thenReturn(sqlTx);
+ Mockito.when(session.withNewTransaction()).thenReturn(sqlTx);
+ Mockito.doAnswer(ans -> AdditionalAnswers.delegatesTo(session).answer(ans)).when(sqlTx).execute(Mockito.any(), Mockito.any());
+ Mockito.doAnswer(ans -> AdditionalAnswers.delegatesTo(tx).answer(ans)).when(sqlTx).commit();
+ Mockito.doAnswer(ans -> AdditionalAnswers.delegatesTo(tx).answer(ans)).when(sqlTx).rollback();
+
+ Mockito.when(session.execute(Mockito.eq("SELECT id, val FROM table WHERE id < {};"), Mockito.any()))
+ .thenAnswer(ans -> Mockito.when(Mockito.mock(SqlResultSet.class).iterator())
+ .thenReturn(List.of(
+ new TestRow().set("id", 1L).set("val", "string 1").build(),
+ new TestRow().set("id", 2L).set("val", "string 2").build(),
+ new TestRow().set("id", 5L).set("val", "string 3").build()
+ ).iterator()).getMock());
+
+ Mockito.when(session.execute(Mockito.eq("INSERT INTO table VALUES (?, ?)"), Mockito.any(), Mockito.any()))
+ .thenAnswer(ans -> Mockito.when(Mockito.mock(SqlResultSet.class).updateCount())
+ .thenReturn(1).getMock());
- Mockito.when(session.executeAsync(Mockito.eq("SELECT id, val FROM table WHERE id == {};"), Mockito.any(), Mockito.any()))
+ Mockito.when(session.executeAsync(Mockito.eq("SELECT id, val FROM table WHERE id == {};"), Mockito.any()))
.thenAnswer(ans -> {
Object mock = Mockito.when(Mockito.mock(SqlResultSet.class).iterator())
.thenReturn(List.of(new TestRow().set("id", 1L).set("val", "string 1").build()).iterator())
@@ -228,7 +273,7 @@ public class SqlTest {
return CompletableFuture.completedFuture(mock);
});
- Mockito.when(session.executeAsync(Mockito.eq("SELECT val FROM table where val LIKE {};"), Mockito.any(), Mockito.any()))
+ Mockito.when(session.executeAsync(Mockito.eq("SELECT val FROM table where val LIKE {};"), Mockito.any()))
.thenAnswer(ans -> {
Object mock = Mockito.when(Mockito.mock(SqlResultSet.class).iterator())
.thenReturn(List.of(new TestRow().set("id", 10L).set("val", "string 10").build()).iterator())
@@ -274,7 +319,7 @@ public class SqlTest {
/**
* Dummy subsctiber for test purposes.
*/
- static class SqlRowSubscriber extends CompletableFuture implements Flow.Subscriber<SqlRow> {
+ static class SqlRowSubscriber extends CompletableFuture<Void> implements Flow.Subscriber<SqlRow> {
private Consumer<SqlRow> rowConsumer;
SqlRowSubscriber(Consumer<SqlRow> rowConsumer) {
[ignite-3] 01/03: Fix duplicated dependency.
Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-15212
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 11f745146412ebee6c5fb467075b0c3a942068a9
Author: Andrew Mashenkov <an...@gmail.com>
AuthorDate: Mon Sep 6 17:18:57 2021 +0300
Fix duplicated dependency.
---
parent/pom.xml | 6 ------
1 file changed, 6 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index c518dc5..c3ac635 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -156,12 +156,6 @@
<dependency>
<groupId>org.apache.ignite</groupId>
- <artifactId>ignite-calcite</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.ignite</groupId>
<artifactId>ignite-cli-common</artifactId>
<version>${project.version}</version>
</dependency>
[ignite-3] 02/03: Merge branch 'main' into ignite-15212
Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-15212
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 76c822913af07922b652577b019202c8858b8068
Merge: 11f7451 332092c
Author: Andrew Mashenkov <an...@gmail.com>
AuthorDate: Mon Sep 6 17:24:37 2021 +0300
Merge branch 'main' into ignite-15212
DEVNOTES.md | 13 +-
assembly/assembly.xml | 4 +-
check-rules/checkstyle-suppressions.xml | 1 +
.../CheckUnusedDependenciesAndPluginsInParent.sh | 3 +-
.../internal/affinity/AffinityManagerTest.java | 3 +-
.../facebook/presto/bytecode/ClassDefinition.java | 14 +-
modules/calcite/pom.xml | 35 +-
...igCommandTest.java => ITConfigCommandTest.java} | 2 +-
modules/client-common/pom.xml | 8 -
modules/client-handler/pom.xml | 13 -
.../client/handler/ITClientHandlerTest.java} | 10 +-
modules/client/pom.xml | 8 -
.../apache/ignite/client/AbstractClientTest.java | 3 +-
modules/configuration-annotation-processor/pom.xml | 25 -
.../configuration/processor/ITProcessorTest.java | 88 +++-
.../ErrorInternal0ConfigurationSchema.java} | 14 +-
.../ErrorInternal1ConfigurationSchema.java} | 16 +-
.../ErrorInternal2ConfigurationSchema.java} | 15 +-
.../ErrorInternal3ConfigurationSchema.java} | 13 +-
.../ErrorInternal4ConfigurationSchema.java} | 17 +-
.../ErrorInternal5ConfigurationSchema.java} | 16 +-
.../ExtendedSimpleConfigurationSchema.java} | 16 +-
.../ExtendedSimpleRootConfigurationSchema.java} | 16 +-
.../internal/SimpleConfigurationSchema.java} | 16 +-
.../internal/SimpleRootConfigurationSchema.java} | 23 +-
.../configuration/processor/Processor.java | 208 ++++++--
.../org/apache/ignite/configuration/RootKey.java | 15 +
.../annotation/InternalConfiguration.java} | 34 +-
modules/configuration/pom.xml | 34 +-
.../configuration/ConfigurationChanger.java | 4 +-
.../configuration/ConfigurationManager.java | 13 +-
.../internal/configuration/ConfigurationNode.java | 2 +-
.../configuration/ConfigurationRegistry.java | 48 +-
.../configuration/DynamicConfiguration.java | 5 +-
.../internal/configuration/DynamicProperty.java | 6 +-
.../internal/configuration/RootInnerNode.java | 71 +++
.../ignite/internal/configuration/SuperRoot.java | 111 ++--
.../asm/ConfigurationAsmGenerator.java | 585 ++++++++++++++-------
.../configuration/asm/SchemaClassesInfo.java | 64 ++-
.../configuration/hocon/HoconConverter.java | 3 +-
.../hocon/HoconListConfigurationSource.java | 2 +-
.../hocon/HoconObjectConfigurationSource.java | 12 +-
.../configuration/tree/ConstructableTreeNode.java | 3 +-
.../ConverterToMapVisitor.java} | 26 +-
.../internal/configuration/tree/InnerNode.java | 120 +++--
.../internal/configuration/tree/NamedListNode.java | 2 +-
.../configuration/util/ConfigurationFlattener.java | 14 +-
.../util/ConfigurationNotificationsUtil.java | 8 +-
.../configuration/util/ConfigurationUtil.java | 263 ++++++++-
.../util/KeysTrackingConfigurationVisitor.java | 2 +-
.../validation/ValidationContextImpl.java | 2 +-
.../configuration/validation/ValidationUtil.java | 4 +-
.../configuration/ConfigurationChangerTest.java | 23 +-
.../configuration/ConfigurationRegistryTest.java | 86 +++
.../configuration/TestConfigurationChanger.java | 13 +-
.../asm/ConfigurationAsmGeneratorTest.java | 309 +++++++++++
.../configuration/hocon/HoconConverterTest.java | 3 +-
.../notifications/ConfigurationListenerTest.java | 7 +-
.../sample/AutoAdjustConfigurationSchema.java | 0
.../sample/BaselineConfigurationSchema.java | 0
.../sample/CacheConfigurationSchema.java | 0
.../sample/ClusterWideConfigurationSchema.java | 0
.../sample/DiscoveryConfigurationSchema.java | 0
.../sample/LocalConfigurationSchema.java | 0
.../sample/NetworkConfigurationSchema.java | 0
.../sample/NodeConfigurationSchema.java | 0
.../internal/configuration/sample/UsageTest.java | 6 +-
.../configuration/tree/ConfigurationArrayTest.java | 5 +-
.../tree/ConstructableTreeNodeTest.java | 25 +-
.../configuration/tree/NamedListNodeTest.java | 2 +-
.../tree/TraversableTreeNodeTest.java | 24 +-
.../configuration/util/ConfigurationUtilTest.java | 388 +++++++++++++-
.../validation/ValidationUtilTest.java | 2 +-
modules/core/pom.xml | 7 +-
.../ignite/internal/util/CollectionUtils.java | 72 +++
.../ignite/internal/util/CollectionUtilsTest.java | 74 +++
.../client/ITMetaStorageServiceTest.java | 2 +-
.../metastorage/client/MetaStorageServiceImpl.java | 15 +-
.../metastorage/common/command/RangeCommand.java | 22 +-
.../common/command/WatchExactKeysCommand.java | 18 +-
.../common/command/WatchRangeKeysCommand.java | 22 +-
.../server/raft/MetaStorageListener.java | 7 +-
modules/network-annotation-processor/pom.xml | 33 +-
.../ITTransferableObjectProcessorTest.java | 11 +-
.../processor/TransferableObjectProcessor.java | 25 +-
.../network/processor/TestMessageGroup.java | 35 --
modules/network-api/pom.xml | 9 -
modules/network/pom.xml | 29 +-
...nagerTest.java => ITConnectionManagerTest.java} | 2 +-
...shakeTest.java => ITRecoveryHandshakeTest.java} | 22 +-
.../ignite/utils/ClusterServiceTestUtils.java | 4 +-
.../internal/network/processor/EmptyMessage.java | 5 +-
.../network/processor/EmptyMessageTest.java | 1 +
.../network/processor/InheritedMessage.java | 3 +-
.../network/processor/InheritedMessageTest.java | 1 +
.../processor/SerializationOrderMessage.java | 3 +-
.../network/processor/SerializationOrderTest.java | 1 +
.../apache/ignite/network/TestMessageTypes.java | 18 +-
modules/raft-client/pom.xml | 22 +-
.../ignite/raft/client/service/CommandClosure.java | 3 +-
modules/raft/pom.xml | 29 +-
.../raft/server/ITJRaftCounterServerTest.java | 2 +-
modules/rest/pom.xml | 22 +-
.../ConfigurationPresentationTest.java | 3 +-
...onTest.java => ITDynamicTableCreationTest.java} | 2 +-
.../app/{IgnitionTest.java => ITIgnitionTest.java} | 2 +-
...Test.java => ITLiveSchemaChangeKVViewTest.java} | 3 +-
...eTest.java => ITLiveSchemaChangeTableTest.java} | 3 +-
...ViewTest.java => ITSchemaChangeKVViewTest.java} | 2 +-
...wTest.java => ITSchemaChangeTableViewTest.java} | 2 +-
...eCreationTest.java => ITTableCreationTest.java} | 2 +-
.../ITDistributedConfigurationStorageTest.java | 3 +-
.../org/apache/ignite/internal/app/IgniteImpl.java | 6 +-
.../SchemaConfigurationConverterTest.java | 3 +-
.../apache/ignite/internal/storage/DataRow.java | 8 +-
.../ignite/internal/storage/InvokeClosure.java | 7 +-
.../apache/ignite/internal/storage/Storage.java | 4 +-
.../storage/basic/ConcurrentHashMapStorage.java | 60 ++-
.../storage/basic/DeleteExactInvokeClosure.java | 4 +-
.../storage/basic/GetAndRemoveInvokeClosure.java | 15 +-
.../storage/basic/GetAndReplaceInvokeClosure.java | 9 +-
.../storage/basic/InsertInvokeClosure.java | 4 +-
.../storage/basic/ReplaceExactInvokeClosure.java | 5 +-
.../internal/storage/basic/SimpleDataRow.java | 27 +-
.../storage/basic/SimpleReadInvokeClosure.java | 5 +-
.../storage/basic/SimpleRemoveInvokeClosure.java | 3 +-
.../storage/basic/SimpleWriteInvokeClosure.java | 3 +-
.../internal/storage/AbstractStorageTest.java | 77 ++-
.../internal/storage/rocksdb/RocksDbStorage.java | 32 +-
.../ignite/distributed/ITDistributedTableTest.java | 1 -
.../table/distributed/command/CommandUtils.java | 3 +-
.../distributed/command/ReplaceIfExistCommand.java | 2 +-
.../command/response/SingleRowResponse.java | 7 +-
.../table/distributed/raft/PartitionListener.java | 454 ++++++++++------
.../ignite/internal/table/TableManagerTest.java | 6 +-
modules/transactions/pom.xml | 13 -
...> ITPersistencePropertiesVaultServiceTest.java} | 2 +-
...Test.java => ITPersistentVaultServiceTest.java} | 2 +-
parent/pom.xml | 50 +-
pom.xml | 49 ++
140 files changed, 3193 insertions(+), 1155 deletions(-)