Merge branch 'master' of https://github.com/apache/ignite
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6b29143a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6b29143a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6b29143a Branch: refs/heads/master Commit: 6b29143a3ca29382c0ef8883b37413ad0e6903ea Parents: 485191f 25d5297 Author: Igor Rudyak <[email protected]> Authored: Sun Jun 18 20:57:48 2017 -0700 Committer: Igor Rudyak <[email protected]> Committed: Sun Jun 18 20:57:48 2017 -0700 ---------------------------------------------------------------------- config/ignite-log4j.xml | 6 +- config/ignite-log4j2.xml | 6 +- examples/redis/redis-example.php | 4 +- examples/redis/redis-example.py | 3 +- .../client/suite/IgniteClientTestSuite.java | 8 +- .../tcp/redis/RedisCommonAbstractTest.java | 133 ++++ .../tcp/redis/RedisProtocolConnectSelfTest.java | 73 +++ .../tcp/redis/RedisProtocolSelfTest.java | 568 ----------------- .../tcp/redis/RedisProtocolStringSelfTest.java | 445 ++++++++++++++ modules/clients/src/test/resources/log4j.xml | 2 +- .../apache/ignite/IgniteSystemProperties.java | 18 + .../configuration/ExecutorConfiguration.java | 4 +- .../configuration/IgniteConfiguration.java | 6 + .../org/apache/ignite/internal/GridTopic.java | 6 +- .../ignite/internal/IgniteComputeImpl.java | 2 +- .../ignite/internal/IgniteDiagnosticAware.java | 28 + .../ignite/internal/IgniteDiagnosticInfo.java | 45 ++ .../internal/IgniteDiagnosticMessage.java | 467 ++++++++++++++ .../IgniteDiagnosticPrepareContext.java | 279 +++++++++ .../apache/ignite/internal/IgniteKernal.java | 11 +- .../managers/communication/GridIoManager.java | 2 +- .../communication/GridIoMessageFactory.java | 8 +- .../internal/managers/discovery/DiscoCache.java | 17 - .../discovery/GridDiscoveryManager.java | 88 ++- .../processors/GridProcessorAdapter.java | 10 + .../affinity/GridAffinityProcessor.java | 28 +- .../cache/CacheAffinitySharedManager.java | 615 +++++++++++++++---- .../processors/cache/CacheGroupContext.java | 3 + .../ClientCacheChangeDiscoveryMessage.java | 176 ++++++ .../ClientCacheChangeDummyDiscoveryMessage.java | 104 ++++ .../cache/ClientCacheUpdateTimeout.java | 44 ++ .../processors/cache/ClusterCachesInfo.java | 124 ++-- .../cache/DynamicCacheChangeRequest.java | 30 - .../processors/cache/ExchangeActions.java | 110 +--- .../processors/cache/GridCacheAttributes.java | 17 +- .../processors/cache/GridCacheContext.java | 9 +- .../processors/cache/GridCacheIoManager.java | 248 ++++++-- .../GridCachePartitionExchangeManager.java | 156 +++-- .../processors/cache/GridCacheProcessor.java | 364 +++++++---- .../cache/GridCacheSharedManagerAdapter.java | 9 + .../cache/IgniteFinishedCacheFutureImpl.java | 32 + .../distributed/GridDistributedLockRequest.java | 20 + .../GridDistributedTxPrepareRequest.java | 34 +- .../GridDistributedTxPrepareResponse.java | 2 +- .../dht/ClientCacheDhtTopologyFuture.java | 78 +++ .../dht/GridClientPartitionTopology.java | 41 +- .../dht/GridDhtAffinityAssignmentRequest.java | 40 +- .../dht/GridDhtAffinityAssignmentResponse.java | 66 +- .../dht/GridDhtAssignmentFetchFuture.java | 22 +- .../distributed/dht/GridDhtCacheAdapter.java | 21 +- .../distributed/dht/GridDhtCacheEntry.java | 40 +- .../cache/distributed/dht/GridDhtGetFuture.java | 16 +- .../distributed/dht/GridDhtGetSingleFuture.java | 10 +- .../distributed/dht/GridDhtLockFuture.java | 1 + .../distributed/dht/GridDhtLockRequest.java | 4 + .../dht/GridDhtPartitionTopology.java | 14 +- .../dht/GridDhtPartitionTopologyImpl.java | 49 +- .../dht/GridDhtTopologyFutureAdapter.java | 195 ++++++ .../dht/GridDhtTransactionalCacheAdapter.java | 6 +- .../cache/distributed/dht/GridDhtTxLocal.java | 2 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 8 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 44 +- .../dht/GridDhtTxPrepareRequest.java | 48 +- .../dht/GridDhtTxPrepareResponse.java | 6 +- .../cache/distributed/dht/GridDhtTxRemote.java | 24 +- .../dht/GridPartitionedGetFuture.java | 2 + .../dht/GridPartitionedSingleGetFuture.java | 42 +- .../GridDhtAtomicAbstractUpdateFuture.java | 76 ++- .../GridDhtAtomicAbstractUpdateRequest.java | 22 +- .../dht/atomic/GridDhtAtomicCache.java | 59 +- .../atomic/GridDhtAtomicSingleUpdateFuture.java | 6 +- .../GridDhtAtomicSingleUpdateRequest.java | 14 + .../dht/atomic/GridDhtAtomicUpdateFuture.java | 4 +- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 11 +- ...idNearAtomicAbstractSingleUpdateRequest.java | 19 +- .../GridNearAtomicAbstractUpdateFuture.java | 200 ++++-- .../GridNearAtomicAbstractUpdateRequest.java | 86 ++- .../atomic/GridNearAtomicFullUpdateRequest.java | 24 +- ...GridNearAtomicSingleUpdateFilterRequest.java | 23 +- .../GridNearAtomicSingleUpdateFuture.java | 42 +- ...GridNearAtomicSingleUpdateInvokeRequest.java | 23 +- .../GridNearAtomicSingleUpdateRequest.java | 20 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 46 +- .../atomic/GridNearAtomicUpdateResponse.java | 24 +- .../colocated/GridDhtColocatedLockFuture.java | 88 ++- .../GridDhtPartitionsExchangeFuture.java | 242 +++----- .../distributed/near/GridNearGetFuture.java | 4 +- .../distributed/near/GridNearGetRequest.java | 145 ++--- .../distributed/near/GridNearLockFuture.java | 1 + .../distributed/near/GridNearLockRequest.java | 13 +- .../near/GridNearTxFinishFuture.java | 11 +- .../cache/distributed/near/GridNearTxLocal.java | 15 +- .../near/GridNearTxPrepareFutureAdapter.java | 5 +- .../near/GridNearTxPrepareResponse.java | 14 + .../local/atomic/GridLocalAtomicCache.java | 13 +- .../cache/query/GridCacheQueryAdapter.java | 9 +- .../cache/transactions/IgniteTxEntry.java | 29 +- .../cache/transactions/IgniteTxHandler.java | 18 +- .../IgniteTxImplicitSingleStateImpl.java | 11 - .../transactions/IgniteTxLocalAdapter.java | 6 +- .../cache/transactions/IgniteTxLocalState.java | 10 - .../cache/transactions/IgniteTxManager.java | 27 + .../IgniteTxRemoteStateAdapter.java | 7 - .../cache/transactions/IgniteTxState.java | 6 - .../cache/transactions/IgniteTxStateImpl.java | 32 - .../processors/cluster/ClusterProcessor.java | 305 ++++++++- .../datastreamer/DataStreamerImpl.java | 18 +- .../CacheDataStructuresCacheKey.java | 64 -- .../CacheDataStructuresConfigurationKey.java | 64 -- .../datastructures/DataStructureInfoKey.java | 58 ++ .../datastructures/DataStructuresCacheKey.java | 44 ++ .../datastructures/DataStructuresProcessor.java | 373 ++--------- .../processors/odbc/odbc/OdbcMessageParser.java | 55 +- .../odbc/odbc/OdbcQueryExecuteBatchRequest.java | 95 +++ .../odbc/odbc/OdbcQueryExecuteBatchResult.java | 75 +++ .../odbc/odbc/OdbcQueryExecuteRequest.java | 6 +- .../odbc/odbc/OdbcQueryExecuteResult.java | 2 +- .../processors/odbc/odbc/OdbcRequest.java | 4 +- .../odbc/odbc/OdbcRequestHandler.java | 108 +++- .../internal/processors/query/QueryUtils.java | 3 + .../handlers/redis/GridRedisCommandHandler.java | 4 +- .../GridRedisConnectionCommandHandler.java | 47 +- .../redis/GridRedisRestCommandHandler.java | 7 +- .../redis/key/GridRedisDelCommandHandler.java | 2 +- .../key/GridRedisExistsCommandHandler.java | 2 +- .../server/GridRedisDbSizeCommandHandler.java | 2 +- .../string/GridRedisAppendCommandHandler.java | 6 +- .../string/GridRedisGetCommandHandler.java | 2 +- .../string/GridRedisGetRangeCommandHandler.java | 2 +- .../string/GridRedisGetSetCommandHandler.java | 2 +- .../string/GridRedisIncrDecrCommandHandler.java | 4 +- .../string/GridRedisMGetCommandHandler.java | 2 +- .../string/GridRedisMSetCommandHandler.java | 2 +- .../string/GridRedisSetCommandHandler.java | 2 +- .../string/GridRedisSetRangeCommandHandler.java | 4 +- .../string/GridRedisStrlenCommandHandler.java | 2 +- .../protocols/tcp/redis/GridRedisCommand.java | 2 + .../protocols/tcp/redis/GridRedisMessage.java | 8 + .../tcp/redis/GridRedisNioListener.java | 26 +- .../ignite/internal/util/IgniteUtils.java | 219 +------ .../ignite/internal/util/nio/GridNioServer.java | 212 +++++-- .../visor/cache/VisorCacheConfiguration.java | 13 + .../compute/VisorComputeCancelSessionsTask.java | 6 +- .../VisorComputeCancelSessionsTaskArg.java | 10 +- .../visor/query/VisorQueryIndexField.java | 32 +- .../communication/tcp/TcpCommunicationSpi.java | 185 ++++-- modules/core/src/test/config/log4j-test.xml | 6 +- modules/core/src/test/config/log4j2-test.xml | 6 +- .../src/test/config/log4j2-verbose-test.xml | 4 +- .../GridProjectionForCachesSelfTest.java | 24 +- .../IgniteClientReconnectCacheTest.java | 29 +- .../IgniteClientReconnectStreamerTest.java | 2 +- .../managers/IgniteDiagnosticMessagesTest.java | 255 ++++++++ .../cache/CacheStopAndDestroySelfTest.java | 38 +- .../cache/GridCacheAbstractMetricsSelfTest.java | 2 +- .../cache/GridCacheClearSelfTest.java | 15 +- .../processors/cache/IgniteCacheGroupsTest.java | 98 +-- ...IgniteClientCacheInitializationFailTest.java | 6 +- .../IgniteClientCacheStartFailoverTest.java | 585 ++++++++++++++++++ .../IgniteDynamicClientCacheStartSelfTest.java | 248 +++++++- .../cache/IgniteNearClientCacheCloseTest.java | 262 ++++++++ .../IgniteOnePhaseCommitNearReadersTest.java | 270 ++++++++ ...gniteTopologyValidatorAbstractCacheTest.java | 178 ++++-- ...ologyValidatorAbstractTxCacheGroupsTest.java | 12 +- ...iteTopologyValidatorAbstractTxCacheTest.java | 28 +- .../CacheLateAffinityAssignmentTest.java | 16 +- ...teCacheClientNodePartitionsExchangeTest.java | 23 +- .../IgniteTxCachePrimarySyncTest.java | 34 +- .../IgniteCachePutRetryAbstractSelfTest.java | 37 +- .../dht/TxRecoveryStoreEnabledTest.java | 231 +++++++ .../atomic/IgniteCacheAtomicProtocolTest.java | 128 ++++ ...LocalAtomicMetricsNoReadThroughSelfTest.java | 48 ++ .../loadtest/GridSingleExecutionTest.java | 4 +- .../cache/GridCacheAbstractLoadTest.java | 4 +- .../platform/PlatformComputeEchoTask.java | 4 +- .../testframework/junits/GridAbstractTest.java | 6 +- .../junits/logger/GridTestLog4jLogger.java | 4 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 6 +- .../IgniteCacheMetricsSelfTestSuite.java | 4 +- .../testsuites/IgniteCacheTestSuite2.java | 7 + .../testsuites/IgniteCacheTestSuite3.java | 4 +- .../IgniteCacheTxRecoverySelfTestSuite.java | 2 + .../processors/query/h2/IgniteH2Indexing.java | 4 +- .../query/h2/sql/GridSqlQuerySplitter.java | 145 ++++- .../h2/twostep/msg/GridH2IndexRangeRequest.java | 2 + .../cache/CacheIteratorScanQueryTest.java | 110 ++++ .../cache/IgniteCacheNoClassQuerySelfTest.java | 6 +- .../cache/index/H2DynamicTableSelfTest.java | 3 +- .../query/IgniteSqlSplitterSelfTest.java | 74 ++- .../IgniteCacheQuerySelfTestSuite.java | 2 + .../apache/ignite/logger/log4j/Log4JLogger.java | 4 +- .../log4j/GridLog4jCorrectFileNameTest.java | 2 +- .../ignite/logger/log4j2/Log4J2Logger.java | 2 +- .../impls/matrix/SparseDistributedMatrix.java | 9 - .../matrix/SparseDistributedMatrixTest.java | 9 - .../platforms/cpp/core-test/src/test_utils.cpp | 1 + .../examples/odbc-example/src/odbc_example.cpp | 2 +- .../src/application_data_buffer_test.cpp | 176 ++---- .../platforms/cpp/odbc-test/src/column_test.cpp | 21 +- .../cpp/odbc-test/src/queries_test.cpp | 435 ++++++++++++- .../platforms/cpp/odbc-test/src/row_test.cpp | 9 +- .../platforms/cpp/odbc-test/src/test_utils.cpp | 1 + modules/platforms/cpp/odbc/Makefile.am | 3 + modules/platforms/cpp/odbc/include/Makefile.am | 2 + .../ignite/odbc/app/application_data_buffer.h | 38 +- .../odbc/include/ignite/odbc/app/parameter.h | 20 +- .../include/ignite/odbc/app/parameter_set.h | 268 ++++++++ .../ignite/odbc/diagnostic/diagnosable.h | 4 +- .../cpp/odbc/include/ignite/odbc/message.h | 411 +++++-------- .../include/ignite/odbc/query/batch_query.h | 160 +++++ .../odbc/include/ignite/odbc/query/data_query.h | 12 +- .../cpp/odbc/include/ignite/odbc/query/query.h | 3 + .../include/ignite/odbc/query/type_info_query.h | 2 +- .../cpp/odbc/include/ignite/odbc/statement.h | 63 +- .../platforms/cpp/odbc/project/vs/odbc.vcxproj | 5 + .../cpp/odbc/project/vs/odbc.vcxproj.filters | 15 + .../odbc/src/app/application_data_buffer.cpp | 90 ++- .../platforms/cpp/odbc/src/app/parameter.cpp | 11 +- .../cpp/odbc/src/app/parameter_set.cpp | 242 ++++++++ modules/platforms/cpp/odbc/src/column.cpp | 1 - .../cpp/odbc/src/config/connection_info.cpp | 36 ++ modules/platforms/cpp/odbc/src/message.cpp | 373 +++++++++++ modules/platforms/cpp/odbc/src/odbc.cpp | 7 +- .../cpp/odbc/src/query/batch_query.cpp | 198 ++++++ .../platforms/cpp/odbc/src/query/data_query.cpp | 13 +- modules/platforms/cpp/odbc/src/statement.cpp | 279 +++++---- .../Binary/BinaryCompactFooterInteropTest.cs | 8 +- .../Binary/BinaryDynamicRegistrationTest.cs | 7 +- .../Cache/Query/CacheDmlQueriesTest.cs | 197 +++++- .../Cache/Query/CacheLinqTest.cs | 162 ++++- .../Compute/ComputeApiTest.cs | 25 +- .../Config/Log/dotnet-log4j.xml | 2 +- .../Examples/ExamplesTest.cs | 13 +- .../ProjectFilesTest.cs | 7 +- .../Impl/Binary/BinaryArrayEqualityComparer.cs | 6 +- .../Impl/Binary/BinaryObjectHeader.cs | 8 + .../Impl/Binary/BinaryReader.cs | 2 +- .../Impl/Binary/BinaryWriter.cs | 4 +- .../Impl/Binary/Marshaller.cs | 33 +- .../NuGet/LINQPad/BinaryModeExample.linq | 1 + .../NuGet/LINQPad/ComputeExample.linq | 17 +- .../NuGet/LINQPad/PutGetExample.linq | 1 + .../NuGet/LINQPad/QueryExample.linq | 1 + .../Apache.Ignite.Linq.csproj | 2 + .../dotnet/Apache.Ignite.Linq/CompiledQuery.cs | 31 +- .../Apache.Ignite.Linq/Impl/AliasDictionary.cs | 65 +- .../Impl/CacheQueryExpressionVisitor.cs | 71 +-- .../Impl/CacheQueryModelVisitor.cs | 96 ++- .../Apache.Ignite.Linq/Impl/EnumerableHelper.cs | 59 ++ .../Apache.Ignite.Linq/Impl/ExpressionWalker.cs | 86 ++- ...SequenceParameterNotNullExpressionVisitor.cs | 72 +++ .../NuGet/LINQPad/QueryExample.linq | 1 + .../Apache.Ignite.Examples.csproj | 1 + .../examples/Apache.Ignite.Examples/App.config | 3 +- .../Compute/PeerAssemblyLoadingExample.cs | 96 +++ .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../rocketmq/RocketMQStreamerTestSuite.java | 2 +- .../commands/cache/VisorCacheCommand.scala | 1 + .../src/main/java/log4j.properties | 2 +- modules/web-console/backend/app/mongo.js | 1 + .../frontend/app/helpers/jade/mixins.pug | 1 + .../generator/ConfigurationGenerator.js | 8 +- .../states/configuration/caches/general.pug | 4 + .../states/configuration/clusters/thread.pug | 2 +- .../frontend/app/primitives/index.js | 1 + .../frontend/app/primitives/switch/index.pug | 34 + .../frontend/app/primitives/switch/index.scss | 87 +++ .../frontend/controllers/domains-controller.js | 169 ++--- .../views/configuration/domains-import.tpl.pug | 4 +- .../apache/ignite/console/agent/AgentUtils.java | 24 +- .../ignite/console/agent/db/DbColumn.java | 17 +- .../ignite/console/agent/db/DbSchema.java | 60 ++ .../apache/ignite/console/agent/db/DbTable.java | 21 +- .../db/dialect/DatabaseMetadataDialect.java | 27 +- .../agent/db/dialect/JdbcMetadataDialect.java | 42 +- .../agent/db/dialect/OracleMetadataDialect.java | 116 +++- .../console/agent/handlers/ClusterListener.java | 28 +- .../agent/handlers/DatabaseListener.java | 18 +- .../ignite/console/demo/AgentClusterDemo.java | 3 + .../demo/service/DemoComputeLoadService.java | 79 +++ .../console/demo/task/DemoCancellableTask.java | 92 +++ .../console/demo/task/DemoComputeTask.java | 105 ++++ .../src/main/resources/log4j.properties | 6 +- parent/pom.xml | 2 +- 285 files changed, 12511 insertions(+), 4060 deletions(-) ----------------------------------------------------------------------
