Merge branches 'ignite-3443' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-3443
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aef905ad Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aef905ad Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aef905ad Branch: refs/heads/ignite-3443 Commit: aef905ade7a3857c58b22281bfb80cec72705467 Parents: 7de38e7 d98cd30 Author: Alexey Kuznetsov <[email protected]> Authored: Tue Aug 30 17:54:52 2016 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Tue Aug 30 17:54:52 2016 +0700 ---------------------------------------------------------------------- .../local/LocalIgfsSecondaryFileSystem.java | 38 +- .../processors/cache/GridCacheMapEntry.java | 19 +- .../GridCachePartitionExchangeManager.java | 7 + .../GridDistributedTxPrepareRequest.java | 4 +- .../distributed/dht/GridDhtLockFuture.java | 53 +- .../distributed/dht/GridDhtTxFinishFuture.java | 4 +- .../cache/distributed/dht/GridDhtTxLocal.java | 26 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 101 +- .../dht/GridDhtTxPrepareRequest.java | 4 +- .../GridNearAtomicAbstractUpdateFuture.java | 69 ++ .../GridNearAtomicSingleUpdateFuture.java | 70 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 68 +- .../colocated/GridDhtColocatedLockFuture.java | 37 +- .../distributed/near/GridNearLockFuture.java | 90 +- ...arOptimisticSerializableTxPrepareFuture.java | 13 +- .../near/GridNearOptimisticTxPrepareFuture.java | 263 +++-- ...ridNearOptimisticTxPrepareFutureAdapter.java | 5 +- .../GridNearPessimisticTxPrepareFuture.java | 8 +- .../near/GridNearTxFinishFuture.java | 5 +- .../cache/distributed/near/GridNearTxLocal.java | 16 +- .../near/GridNearTxPrepareRequest.java | 4 +- .../cache/transactions/IgniteInternalTx.java | 3 +- .../cache/transactions/IgniteTxAdapter.java | 37 +- .../cache/transactions/IgniteTxHandler.java | 11 +- .../transactions/IgniteTxLocalAdapter.java | 19 +- .../cache/transactions/IgniteTxManager.java | 86 +- .../cache/transactions/IgniteTxStateImpl.java | 11 +- .../cache/transactions/TxDeadlockDetection.java | 51 +- .../processors/odbc/OdbcNioListener.java | 2 +- .../processors/odbc/OdbcRequestHandler.java | 36 +- .../odbc/escape/OdbcEscapeParseResult.java | 73 ++ .../processors/odbc/escape/OdbcEscapeToken.java | 61 + .../processors/odbc/escape/OdbcEscapeType.java | 105 ++ .../processors/odbc/escape/OdbcEscapeUtils.java | 361 ++++++ .../service/GridServiceProcessor.java | 18 +- .../util/future/GridCompoundFuture.java | 10 + .../ignite/spi/discovery/tcp/ClientImpl.java | 7 +- .../cache/IgniteTxConfigCacheSelfTest.java | 91 +- .../IgniteTxTimeoutAbstractTest.java | 8 +- ...tionedMultiNodeLongTxTimeoutFullApiTest.java | 34 + ...nabledMultiNodeLongTxTimeoutFullApiTest.java | 41 + .../local/GridCacheLocalTxTimeoutSelfTest.java | 5 +- .../transactions/DepthFirstSearchTest.java | 100 +- .../TxDeadlockDetectionNoHangsTest.java | 246 ++++ .../transactions/TxDeadlockDetectionTest.java | 13 +- ...timisticDeadlockDetectionCrossCacheTest.java | 257 +++++ .../TxOptimisticDeadlockDetectionTest.java | 574 ++++++++++ ...simisticDeadlockDetectionCrossCacheTest.java | 165 ++- .../TxPessimisticDeadlockDetectionTest.java | 50 +- .../igfs/IgfsAbstractBaseSelfTest.java | 1067 ++++++++++++++++++ .../processors/igfs/IgfsAbstractSelfTest.java | 1012 +---------------- ...SecondaryFileSystemDualAbstractSelfTest.java | 143 +++ .../odbc/OdbcEscapeSequenceSelfTest.java | 420 +++++++ .../ignite/testsuites/IgniteBasicTestSuite.java | 2 + .../IgniteCacheFullApiSelfTestSuite.java | 4 + .../TxDeadlockDetectionTestSuite.java | 6 + .../cpp/common/include/ignite/common/utils.h | 7 + .../cpp/common/os/win/src/common/utils.cpp | 20 + .../cpp/common/src/common/big_integer.cpp | 1 - .../cpp/core/include/ignite/ignition.h | 2 +- modules/platforms/cpp/core/src/ignition.cpp | 8 +- modules/platforms/cpp/odbc-test/Makefile.am | 9 + .../platforms/cpp/odbc-test/include/Makefile.am | 4 +- .../odbc-test/include/sql_test_suite_fixture.h | 191 ++++ .../cpp/odbc-test/include/test_utils.h | 45 + .../cpp/odbc-test/project/vs/odbc-test.vcxproj | 11 + .../project/vs/odbc-test.vcxproj.filters | 33 + .../cpp/odbc-test/src/configuration_test.cpp | 6 +- .../cpp/odbc-test/src/queries_test.cpp | 78 +- .../src/sql_aggregate_functions_test.cpp | 249 ++++ .../src/sql_numeric_functions_test.cpp | 309 +++++ .../cpp/odbc-test/src/sql_operators_test.cpp | 214 ++++ .../odbc-test/src/sql_string_functions_test.cpp | 291 +++++ .../odbc-test/src/sql_system_functions_test.cpp | 47 + .../odbc-test/src/sql_test_suite_fixture.cpp | 271 +++++ .../cpp/odbc-test/src/sql_types_test.cpp | 60 + .../src/sql_value_expressions_test.cpp | 94 ++ .../platforms/cpp/odbc-test/src/test_utils.cpp | 36 + modules/platforms/cpp/odbc/Makefile.am | 1 + modules/platforms/cpp/odbc/include/Makefile.am | 1 + .../platforms/cpp/odbc/include/ignite/odbc.h | 1 - .../include/ignite/odbc/config/configuration.h | 93 +- .../ignite/odbc/diagnostic/diagnostic_record.h | 2 +- .../cpp/odbc/include/ignite/odbc/dsn_config.h | 61 + .../odbc/include/ignite/odbc/protocol_version.h | 20 +- .../include/ignite/odbc/system/odbc_constants.h | 4 - .../odbc/system/ui/dsn_configuration_window.h | 152 +++ .../ignite/odbc/system/ui/custom_window.h | 189 ++++ .../win/include/ignite/odbc/system/ui/window.h | 201 ++++ .../odbc/os/win/src/system/ui/custom_window.cpp | 184 +++ .../src/system/ui/dsn_configuration_window.cpp | 305 +++++ .../cpp/odbc/os/win/src/system/ui/window.cpp | 192 ++++ .../cpp/odbc/os/win/src/system_dsn.cpp | 218 ++++ .../platforms/cpp/odbc/project/vs/odbc.vcxproj | 25 +- .../cpp/odbc/project/vs/odbc.vcxproj.filters | 30 + .../cpp/odbc/src/config/configuration.cpp | 17 +- .../cpp/odbc/src/config/connection_info.cpp | 57 +- modules/platforms/cpp/odbc/src/connection.cpp | 2 +- .../odbc/src/diagnostic/diagnostic_record.cpp | 2 +- .../diagnostic/diagnostic_record_storage.cpp | 2 +- modules/platforms/cpp/odbc/src/dsn_config.cpp | 115 ++ modules/platforms/cpp/odbc/src/entry_points.cpp | 8 - modules/platforms/cpp/odbc/src/odbc.cpp | 88 +- .../platforms/cpp/odbc/src/protocol_version.cpp | 23 +- .../platforms/cpp/odbc/src/query/data_query.cpp | 6 +- modules/platforms/cpp/odbc/src/utility.cpp | 14 +- .../Apache.Ignite.Core.Tests.TestDll.csproj | 5 - .../Cache/Affinity/AffinityFunctionContext.cs | 4 +- .../Apache.Ignite.Core/Events/DiscoveryEvent.cs | 4 +- .../Apache.Ignite.Core/Events/EventReader.cs | 6 +- .../Impl/Binary/DateTimeHolder.cs | 4 +- .../Impl/Binary/Marshaller.cs | 36 +- .../Impl/Binary/SerializableObjectHolder.cs | 6 +- .../Affinity/AffinityFunctionSerializer.cs | 2 +- .../Impl/Cache/CacheEntryFilterHolder.cs | 10 +- .../Impl/Cache/CacheEntryProcessorHolder.cs | 8 +- .../Continuous/ContinuousQueryFilterHolder.cs | 8 +- .../Impl/Compute/Closure/ComputeActionJob.cs | 6 +- .../Impl/Compute/Closure/ComputeFuncJob.cs | 8 +- .../Impl/Compute/Closure/ComputeOutFuncJob.cs | 9 +- .../Impl/Compute/ComputeFunc.cs | 9 +- .../Impl/Compute/ComputeJob.cs | 10 +- .../Impl/Compute/ComputeJobHolder.cs | 8 +- .../Impl/Compute/ComputeOutFunc.cs | 8 +- .../Impl/Datastream/StreamReceiverHolder.cs | 2 +- .../Apache.Ignite.Core/Impl/IgniteUtils.cs | 5 +- .../Impl/Messaging/MessageListenerHolder.cs | 8 +- .../Apache.Ignite.Linq.csproj | 5 - .../Apache.Ignite.NLog.csproj | 5 - .../dotnet/Apache.Ignite/Apache.Ignite.csproj | 5 - .../commands/cache/VisorCacheStopCommand.scala | 5 +- 131 files changed, 8400 insertions(+), 1818 deletions(-) ----------------------------------------------------------------------
