Merge remote-tracking branch 'remotes/upstream/ignite-1.7.4' into ignite-4242
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6bc587dc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6bc587dc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6bc587dc Branch: refs/heads/ignite-4242 Commit: 6bc587dc42fe7b14bae85b65c34798c51d2e053f Parents: 38df717 b038730 Author: Anton Vinogradov <[email protected]> Authored: Thu Nov 24 16:17:18 2016 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Thu Nov 24 16:17:18 2016 +0300 ---------------------------------------------------------------------- bin/ignite.bat | 5 + .../org/apache/ignite/IgniteDataStreamer.java | 2 +- .../apache/ignite/IgniteSystemProperties.java | 13 + .../internal/ComputeTaskInternalFuture.java | 11 + .../internal/binary/BinaryClassDescriptor.java | 43 +- .../ignite/internal/binary/BinaryContext.java | 17 +- .../internal/binary/BinaryObjectExImpl.java | 57 +- .../internal/binary/BinaryObjectImpl.java | 23 + .../binary/BinaryObjectOffheapImpl.java | 24 +- .../ignite/internal/binary/BinaryUtils.java | 4 + .../binary/builder/BinaryObjectBuilderImpl.java | 6 +- .../communication/GridIoMessageFactory.java | 10 +- .../processors/affinity/AffinityAssignment.java | 88 +++ .../affinity/GridAffinityAssignment.java | 8 +- .../affinity/GridAffinityAssignmentCache.java | 35 +- .../affinity/GridAffinityProcessor.java | 89 ++- .../processors/affinity/GridAffinityUtils.java | 8 +- .../affinity/HistoryAffinityAssignment.java | 169 +++++ .../cache/CacheAffinitySharedManager.java | 57 +- .../cache/DynamicCacheChangeBatch.java | 7 + .../processors/cache/GridCacheAdapter.java | 11 +- .../cache/GridCacheAffinityManager.java | 6 +- .../processors/cache/GridCacheContext.java | 8 + .../processors/cache/GridCacheIoManager.java | 25 +- .../processors/cache/GridCacheMapEntry.java | 5 +- .../processors/cache/GridCacheMvccManager.java | 77 +++ .../GridCachePartitionExchangeManager.java | 299 ++++++-- .../processors/cache/GridCacheProcessor.java | 5 +- .../cache/GridCacheSharedContext.java | 1 + .../processors/cache/GridCacheUtils.java | 67 -- .../dht/GridClientPartitionTopology.java | 33 +- .../dht/GridDhtPartitionTopology.java | 3 +- .../dht/GridDhtPartitionTopologyImpl.java | 31 +- .../GridDhtAtomicAbstractUpdateFuture.java | 68 +- .../GridDhtAtomicAbstractUpdateRequest.java | 287 ++++++++ .../dht/atomic/GridDhtAtomicCache.java | 19 +- .../atomic/GridDhtAtomicSingleUpdateFuture.java | 69 ++ .../GridDhtAtomicSingleUpdateRequest.java | 678 +++++++++++++++++++ .../dht/atomic/GridDhtAtomicUpdateFuture.java | 30 + .../dht/atomic/GridDhtAtomicUpdateRequest.java | 312 +++------ .../atomic/GridNearAtomicFullUpdateRequest.java | 103 +-- .../GridNearAtomicSingleUpdateRequest.java | 6 +- .../dht/preloader/GridDhtPartitionFullMap.java | 18 + .../dht/preloader/GridDhtPartitionMap2.java | 53 +- .../GridDhtPartitionsAbstractMessage.java | 40 +- .../GridDhtPartitionsExchangeFuture.java | 84 +-- .../preloader/GridDhtPartitionsFullMessage.java | 150 +++- .../GridDhtPartitionsSingleMessage.java | 132 +++- .../GridDhtPartitionsSingleRequest.java | 4 +- .../dht/preloader/GridDhtPreloader.java | 22 +- .../distributed/near/GridNearAtomicCache.java | 8 +- .../query/GridCacheQueryMetricsAdapter.java | 2 +- .../continuous/GridContinuousProcessor.java | 4 +- .../datastreamer/DataStreamProcessor.java | 104 ++- .../datastreamer/DataStreamerImpl.java | 607 ++++++++++++----- .../internal/processors/igfs/IgfsProcessor.java | 15 + .../processors/odbc/OdbcRequestHandler.java | 32 +- .../ignite/internal/util/GridLogThrottle.java | 45 +- .../ignite/internal/util/IgniteUtils.java | 111 ++- .../internal/util/future/GridFutureAdapter.java | 12 +- .../util/offheap/unsafe/GridUnsafeMemory.java | 33 +- .../visor/misc/VisorResolveHostNameTask.java | 4 +- .../security/SecurityBasicPermissionSet.java | 107 +++ .../security/SecurityPermissionSetBuilder.java | 222 ++++++ .../ignite/spi/discovery/tcp/ClientImpl.java | 38 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 510 +++++++++++--- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 59 +- .../messages/TcpDiscoveryAbstractMessage.java | 7 + .../messages/TcpDiscoveryClientAckResponse.java | 5 + .../TcpDiscoveryClientHeartbeatMessage.java | 7 +- .../TcpDiscoveryConnectionCheckMessage.java | 5 + .../messages/TcpDiscoveryHeartbeatMessage.java | 5 + .../TcpDiscoveryNodeAddFinishedMessage.java | 11 + .../messages/TcpDiscoveryNodeAddedMessage.java | 33 +- .../binary/BinaryMarshallerSelfTest.java | 343 +++++++++- ...CacheExchangeMessageDuplicatedStateTest.java | 393 +++++++++++ .../GridCacheAtomicMessageCountSelfTest.java | 6 +- .../cache/IgniteCacheDynamicStopSelfTest.java | 48 +- .../cache/IgniteCachePeekModesAbstractTest.java | 2 +- ...CacheLoadingConcurrentGridStartSelfTest.java | 255 ++++++- ...ncurrentGridStartSelfTestAllowOverwrite.java | 30 + .../distributed/IgniteCacheGetRestartTest.java | 3 + ...eAtomicInvalidPartitionHandlingSelfTest.java | 2 +- ...cingDelayedPartitionMapExchangeSelfTest.java | 8 +- .../GridCacheRebalancingSyncSelfTest.java | 18 +- .../GridCacheSyncReplicatedPreloadSelfTest.java | 3 - .../IgniteCacheSyncRebalanceModeSelfTest.java | 2 +- ...ContinuousQueryFailoverAbstractSelfTest.java | 2 +- ...ComputeJobExecutionErrorToLogManualTest.java | 88 +++ .../compute/PublicThreadpoolStarvationTest.java | 123 ++++ .../IgniteNoCustomEventsOnNodeStart.java | 7 + .../DataStreamProcessorSelfTest.java | 4 +- .../datastreamer/DataStreamerImplSelfTest.java | 170 +++-- .../DataStreamerMultiThreadedSelfTest.java | 2 - .../datastreamer/DataStreamerTimeoutTest.java | 92 ++- .../igfs/IgfsProcessorValidationSelfTest.java | 30 + ...IpcEndpointRegistrationAbstractSelfTest.java | 76 ++- ...dpointRegistrationOnLinuxAndMacSelfTest.java | 11 +- .../SecurityPermissionSetBuilderTest.java | 110 +++ .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 134 +++- .../junits/common/GridCommonAbstractTest.java | 25 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 3 + .../testsuites/IgniteCacheTestSuite2.java | 5 + .../testsuites/IgniteComputeGridTestSuite.java | 2 + .../h2/GridBinaryH2IndexingGeoSelfTest.java | 35 + .../query/h2/GridH2IndexingGeoSelfTest.java | 2 +- .../testsuites/GeoSpatialIndexingTestSuite.java | 2 + ...opClientProtocolMultipleServersSelfTest.java | 126 ++-- .../query/h2/GridH2ResultSetIterator.java | 62 +- .../processors/query/h2/IgniteH2Indexing.java | 4 +- .../query/h2/opt/GridH2ValueCacheObject.java | 10 +- .../query/h2/twostep/GridMapQueryExecutor.java | 34 +- .../query/h2/twostep/GridMergeIndex.java | 49 +- .../h2/twostep/GridReduceQueryExecutor.java | 2 +- .../cache/CacheSqlQueryValueCopySelfTest.java | 226 +++++++ .../cache/IgniteCacheOffheapEvictQueryTest.java | 7 + .../IgniteCacheQueryMultiThreadedSelfTest.java | 59 ++ ...lientQueryReplicatedNodeRestartSelfTest.java | 7 + ...butedQueryStopOnCancelOrTimeoutSelfTest.java | 7 + .../query/IgniteSqlSplitterSelfTest.java | 2 + .../query/h2/sql/GridQueryParsingTest.java | 11 +- .../IgniteCacheQuerySelfTestSuite2.java | 2 + modules/platforms/cpp/DEVNOTES.txt | 23 +- modules/platforms/cpp/README.txt | 10 +- modules/platforms/cpp/binary/Makefile.am | 4 +- .../cpp/binary/project/vs/binary.vcxproj | 2 - .../src/impl/binary/binary_reader_impl.cpp | 3 +- .../cpp/common/project/vs/common.vcxproj | 1 - modules/platforms/cpp/core/Makefile.am | 4 +- .../platforms/cpp/core/project/vs/core.vcxproj | 2 - modules/platforms/cpp/examples/README.txt | 9 +- .../cpp/examples/odbc-example/Makefile.am | 4 +- .../cpp/examples/putget-example/Makefile.am | 4 +- .../cpp/examples/query-example/Makefile.am | 4 +- modules/platforms/cpp/ignite/Makefile.am | 4 +- .../cpp/ignite/project/vs/ignite.vcxproj | 4 +- modules/platforms/cpp/jni/Makefile.am | 4 +- .../platforms/cpp/jni/project/vs/jni.vcxproj | 1 - .../platforms/cpp/odbc-test/include/test_type.h | 42 +- .../cpp/odbc-test/src/api_robustness_test.cpp | 108 +++ .../cpp/odbc-test/src/queries_test.cpp | 153 ++++- .../cpp/odbc-test/src/sql_outer_join_test.cpp | 2 +- modules/platforms/cpp/odbc/Makefile.am | 4 +- modules/platforms/cpp/odbc/README.txt | 23 +- .../platforms/cpp/odbc/include/ignite/odbc.h | 12 +- .../ignite/odbc/diagnostic/diagnosable.h | 7 + .../odbc/diagnostic/diagnosable_adapter.h | 10 + .../ignite/odbc/diagnostic/diagnostic_record.h | 19 + .../odbc/diagnostic/diagnostic_record_storage.h | 16 + .../cpp/odbc/include/ignite/odbc/statement.h | 42 ++ .../cpp/odbc/install/ignite-odbc-amd64.wxs | 114 ++++ .../cpp/odbc/install/ignite-odbc-x86.wxs | 114 ++++ .../odbc/os/win/src/system/socket_client.cpp | 4 +- .../platforms/cpp/odbc/project/vs/odbc.vcxproj | 4 +- .../odbc/src/app/application_data_buffer.cpp | 34 +- modules/platforms/cpp/odbc/src/connection.cpp | 21 +- .../odbc/src/diagnostic/diagnostic_record.cpp | 16 +- .../diagnostic/diagnostic_record_storage.cpp | 18 + modules/platforms/cpp/odbc/src/entry_points.cpp | 26 +- modules/platforms/cpp/odbc/src/odbc.cpp | 175 ++--- modules/platforms/cpp/odbc/src/statement.cpp | 151 +++++ .../Dataload/DataStreamerTestTopologyChange.cs | 27 +- .../Apache.Ignite.Core/Impl/PlatformTarget.cs | 2 +- .../src/test/config/incorrect-store-cache.xml | 2 + .../src/test/config/jdbc-pojo-store-builtin.xml | 3 + .../src/test/config/jdbc-pojo-store-obj.xml | 3 + modules/spring/src/test/config/node.xml | 2 + modules/spring/src/test/config/node1.xml | 2 + .../test/config/pojo-incorrect-store-cache.xml | 2 + modules/spring/src/test/config/store-cache.xml | 2 + modules/spring/src/test/config/store-cache1.xml | 2 + .../IgniteStartFromStreamConfigurationTest.java | 18 +- pom.xml | 8 + 173 files changed, 7756 insertions(+), 1467 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6bc587dc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java index 15ea3f9,503b334..6369ee9 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java @@@ -80,7 -85,9 +85,8 @@@ import org.apache.ignite.internal.util. import org.apache.ignite.internal.util.typedef.CI1; import org.apache.ignite.internal.util.typedef.CI2; import org.apache.ignite.internal.util.typedef.F; + import org.apache.ignite.internal.util.typedef.T2; import org.apache.ignite.internal.util.typedef.internal.CU; -import org.apache.ignite.internal.util.typedef.internal.GPC; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.internal.util.worker.GridWorker; http://git-wip-us.apache.org/repos/asf/ignite/blob/6bc587dc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6bc587dc/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java ----------------------------------------------------------------------
