Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id EC733200B48 for ; Mon, 4 Jul 2016 05:46:45 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id EB269160A73; Mon, 4 Jul 2016 03:46:45 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id E6529160A71 for ; Mon, 4 Jul 2016 05:46:44 +0200 (CEST) Received: (qmail 58004 invoked by uid 500); 4 Jul 2016 03:46:41 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 57782 invoked by uid 99); 4 Jul 2016 03:46:40 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Jul 2016 03:46:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 12C54DFDA9; Mon, 4 Jul 2016 03:46:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.apache.org Date: Mon, 04 Jul 2016 03:46:43 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [04/14] ignite git commit: Merge remote-tracking branch 'upstream/master' into IGNITE-3227 archived-at: Mon, 04 Jul 2016 03:46:46 -0000 Merge remote-tracking branch 'upstream/master' into IGNITE-3227 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c7cee69f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c7cee69f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c7cee69f Branch: refs/heads/ignite-3227 Commit: c7cee69fc7bf72efdafc52d02af224efcb2d1cb2 Parents: 5d2f32a 351dfae Author: samaitra Authored: Sat Jun 18 14:05:08 2016 +0530 Committer: samaitra Committed: Sat Jun 18 14:05:08 2016 +0530 ---------------------------------------------------------------------- .gitignore | 1 + .../affinity/fair/FairAffinityFunction.java | 2 + .../rendezvous/RendezvousAffinityFunction.java | 2 + .../configuration/CacheConfiguration.java | 3 + .../configuration/FileSystemConfiguration.java | 18 +- .../ignite/internal/IgniteServicesImpl.java | 2 +- .../ignite/internal/MarshallerContextImpl.java | 80 +- .../ignite/internal/binary/BinaryContext.java | 43 +- .../GridClientConnectionManagerAdapter.java | 25 +- .../connection/GridClientNioTcpConnection.java | 3 + .../GridClientOptimizedMarshaller.java | 4 +- .../GridClientZipOptimizedMarshaller.java | 167 +++++ .../impl/GridTcpRouterNioListenerAdapter.java | 11 +- .../discovery/GridDiscoveryManager.java | 23 +- .../processors/cache/GridCacheAdapter.java | 46 +- .../processors/cache/GridCacheEntryEx.java | 9 +- .../processors/cache/GridCacheMapEntry.java | 149 ++-- .../processors/cache/GridCacheProcessor.java | 28 +- .../processors/cache/GridCacheUtils.java | 3 + .../binary/CacheObjectBinaryProcessorImpl.java | 29 +- .../dht/GridCachePartitionedConcurrentMap.java | 142 +++- .../distributed/dht/GridDhtCacheAdapter.java | 10 +- .../distributed/dht/GridDhtLockFuture.java | 18 +- .../dht/GridDhtPartitionTopology.java | 2 +- .../dht/GridDhtPartitionTopologyImpl.java | 176 +++-- .../dht/GridDhtTransactionalCacheAdapter.java | 2 - .../distributed/dht/GridDhtTxPrepareFuture.java | 19 +- .../dht/GridPartitionedGetFuture.java | 2 - .../dht/GridPartitionedSingleGetFuture.java | 2 - .../dht/atomic/GridDhtAtomicCache.java | 8 - .../dht/colocated/GridDhtColocatedCache.java | 4 +- .../dht/preloader/GridDhtForceKeysFuture.java | 3 +- .../dht/preloader/GridDhtPartitionDemander.java | 3 +- .../dht/preloader/GridDhtPartitionMap2.java | 7 +- .../distributed/near/GridNearGetFuture.java | 4 - .../cache/distributed/near/GridNearTxLocal.java | 7 +- .../local/atomic/GridLocalAtomicCache.java | 8 - .../continuous/CacheContinuousQueryEntry.java | 16 + .../continuous/CacheContinuousQueryHandler.java | 2 +- .../continuous/CacheContinuousQueryManager.java | 135 ++++ .../cache/transactions/IgniteTxAdapter.java | 17 +- .../cache/transactions/IgniteTxEntry.java | 24 +- .../cache/transactions/IgniteTxHandler.java | 46 ++ .../transactions/IgniteTxLocalAdapter.java | 34 +- .../GridCacheLazyPlainVersionedEntry.java | 107 +++ .../version/GridCachePlainVersionedEntry.java | 7 +- .../cacheobject/IgniteCacheObjectProcessor.java | 7 + .../IgniteCacheObjectProcessorImpl.java | 5 + .../continuous/GridContinuousProcessor.java | 216 ++++-- .../datastreamer/DataStreamerImpl.java | 3 +- .../GridCacheCountDownLatchImpl.java | 54 +- .../processors/igfs/IgfsCreateResult.java | 66 ++ .../processors/igfs/IgfsDataManager.java | 166 +---- .../processors/igfs/IgfsDeleteResult.java | 62 ++ .../internal/processors/igfs/IgfsImpl.java | 83 +-- .../processors/igfs/IgfsMetaManager.java | 733 +++++++++---------- .../internal/processors/igfs/IgfsPathIds.java | 10 + .../IgfsSecondaryFileSystemCreateContext.java | 111 +++ .../IgfsSecondaryOutputStreamDescriptor.java | 59 -- .../igfs/data/IgfsDataPutProcessor.java | 99 +++ .../meta/IgfsMetaDirectoryCreateProcessor.java | 40 +- ...IgfsMetaDirectoryListingRenameProcessor.java | 133 ++++ .../igfs/meta/IgfsMetaFileCreateProcessor.java | 46 +- .../platform/cluster/PlatformClusterGroup.java | 7 + .../utils/PlatformConfigurationUtils.java | 61 ++ .../message/GridClientHandshakeRequest.java | 4 +- .../protocols/tcp/GridTcpRestNioListener.java | 19 +- .../rest/protocols/tcp/GridTcpRestProtocol.java | 12 +- .../service/GridServiceProcessor.java | 307 ++++---- .../processors/task/GridTaskWorker.java | 44 +- .../ignite/internal/util/IgniteUtils.java | 8 +- .../internal/util/PartitionedReadOnlySet.java | 71 -- .../ignite/internal/util/nio/GridNioServer.java | 10 +- .../ignite/internal/visor/cache/VisorCache.java | 56 +- .../visor/cache/VisorCachePartition.java | 89 +++ .../visor/cache/VisorCachePartitions.java | 88 +++ .../visor/cache/VisorCachePartitionsTask.java | 152 ++++ .../internal/visor/cache/VisorCacheV3.java | 68 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 4 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 7 +- .../ipfinder/jdbc/BasicJdbcIpFinderDialect.java | 28 + .../tcp/ipfinder/jdbc/JdbcIpFinderDialect.java | 28 + .../jdbc/OracleJdbcIpFinderDialect.java | 28 + .../ipfinder/jdbc/TcpDiscoveryJdbcIpFinder.java | 72 +- .../sharedfs/TcpDiscoverySharedFsIpFinder.java | 60 +- .../internal/ClusterNodeMetricsSelfTest.java | 101 ++- ...eClientReconnectContinuousProcessorTest.java | 60 +- .../ignite/internal/binary/AffinityKey.java | 69 ++ .../binary/GridBinaryAffinityKeySelfTest.java | 15 + ...aultBinaryMappersBinaryMetaDataSelfTest.java | 17 + .../cache/CacheAffinityCallSelfTest.java | 42 +- .../processors/cache/GridCacheTestEntryEx.java | 5 +- .../cache/IgniteCacheAbstractTest.java | 2 +- ...gniteCacheInvokeReadThroughAbstractTest.java | 382 ++++++++++ ...iteCacheInvokeReadThroughSingleNodeTest.java | 106 +++ .../cache/IgniteCacheInvokeReadThroughTest.java | 182 +++-- .../IgniteCacheReadThroughStoreCallTest.java | 288 ++++++++ .../IgniteCountDownLatchAbstractSelfTest.java | 156 +++- .../IgniteCacheSyncRebalanceModeSelfTest.java | 116 +++ .../IgniteCacheLoaderWriterAbstractTest.java | 10 + ...yRemoteFilterMissingInClassPathSelfTest.java | 237 ++++++ ...ridCacheContinuousQueryAbstractSelfTest.java | 2 +- ...niteCacheContinuousQueryBackupQueueTest.java | 135 ++++ .../IgniteNoCustomEventsOnNodeStart.java | 85 +++ .../processors/igfs/IgfsAbstractSelfTest.java | 14 +- .../igfs/IgfsMetaManagerSelfTest.java | 24 +- .../service/GridServiceClientNodeTest.java | 102 ++- .../internal/util/IgniteUtilsSelfTest.java | 15 + .../ignite/platform/PlatformStringTestTask.java | 67 ++ .../TcpDiscoverySharedFsIpFinderSelfTest.java | 25 + .../testsuites/IgniteCacheTestSuite2.java | 3 + .../testsuites/IgniteCacheTestSuite4.java | 4 + .../testsuites/IgniteCacheTestSuite5.java | 2 + .../processors/query/h2/sql/GridSqlConst.java | 5 + .../processors/query/h2/sql/GridSqlJoin.java | 17 +- .../processors/query/h2/sql/GridSqlType.java | 5 + .../query/IgniteSqlSplitterSelfTest.java | 75 ++ .../IgniteCacheQuerySelfTestSuite3.java | 4 + .../cpp/jni/include/ignite/jni/exports.h | 1 + .../platforms/cpp/jni/include/ignite/jni/java.h | 2 + modules/platforms/cpp/jni/project/vs/module.def | 2 + modules/platforms/cpp/jni/src/exports.cpp | 4 + modules/platforms/cpp/jni/src/java.cpp | 12 + .../Apache.Ignite.AspNet.csproj | 72 ++ .../Apache.Ignite.AspNet.nuspec | 57 ++ .../Apache.Ignite.AspNet.ruleset | 9 + .../Apache.Ignite.AspNet.snk | Bin 0 -> 596 bytes .../IgniteOutputCacheProvider.cs | 220 ++++++ .../Apache.Ignite.AspNet/IgniteWebUtils.cs | 44 ++ .../Properties/AssemblyInfo.cs | 39 + .../Apache.Ignite.Core.Tests.NuGet.csproj | 14 + .../AspNetTest.cs | 73 ++ .../SchemaTest.cs | 62 ++ .../install-package.ps1 | 21 +- .../packages.config | 2 + .../Apache.Ignite.Core.Tests.csproj | 7 + .../AspNet/IgniteOutputCacheProviderTest.cs | 172 +++++ .../Binary/BinarySelfTest.cs | 26 +- .../Binary/BinaryStringTest.cs | 120 +++ .../Cache/CacheConfigurationTest.cs | 133 +++- .../Continuous/ContinuousQueryAbstractTest.cs | 18 +- .../Compute/AbstractTaskTest.cs | 9 + .../Compute/BinarizableTaskTest.cs | 13 +- .../Compute/ComputeApiTest.cs | 70 +- .../Compute/FailoverTaskSelfTest.cs | 2 +- .../Compute/IgniteExceptionTaskSelfTest.cs | 18 +- .../Compute/ResourceTaskTest.cs | 8 +- .../Compute/TaskAdapterTest.cs | 16 +- .../Compute/TaskResultTest.cs | 10 +- .../Config/cache-query-continuous.xml | 1 + .../Apache.Ignite.Core.Tests/EventsTest.cs | 4 +- .../IgniteConfigurationSerializerTest.cs | 13 + .../IgniteConfigurationTest.cs | 12 +- .../Services/ServicesTest.cs | 24 +- .../Apache.Ignite.Core.Tests/TestRunner.cs | 24 +- .../Apache.Ignite.Core.Tests/TestUtils.cs | 9 +- .../dotnet/Apache.Ignite.Core.Tests/app.config | 2 +- .../Apache.Ignite.Core.Schema.nuspec | 53 ++ .../Apache.Ignite.Core.csproj | 11 +- .../Binary/BinaryReflectiveSerializer.cs | 193 +---- .../Binary/UserSerializerProxy.cs | 68 ++ .../Cache/Affinity/AffinityFunctionBase.cs | 116 +++ .../Cache/Affinity/Fair/FairAffinityFunction.cs | 28 + .../Cache/Affinity/IAffinityFunction.cs | 35 + .../Rendezvous/RendezvousAffinityFunction.cs | 27 + .../Cache/Configuration/CacheConfiguration.cs | 8 + .../Apache.Ignite.Core/Cluster/IClusterGroup.cs | 6 + .../Configuration/AtomicConfiguration.cs | 9 + .../Apache.Ignite.Core/IgniteConfiguration.cs | 2 + .../IgniteConfigurationSection.xsd | 7 + .../Impl/Binary/BinarizableSerializer.cs | 22 +- .../Impl/Binary/BinaryFullTypeDescriptor.cs | 8 +- .../Impl/Binary/BinaryReader.cs | 38 +- .../BinaryReflectiveSerializerInternal.cs | 169 +++++ .../Binary/BinarySurrogateTypeDescriptor.cs | 4 +- .../Impl/Binary/BinarySystemTypeSerializer.cs | 20 +- .../Impl/Binary/BinaryUtils.cs | 177 ++++- .../Impl/Binary/BinaryWriter.cs | 2 +- .../Impl/Binary/DateTimeSerializer.cs | 48 ++ .../Impl/Binary/IBinarySerializerInternal.cs | 42 ++ .../Impl/Binary/IBinarySystemTypeSerializer.cs | 34 - .../Impl/Binary/IBinaryTypeDescriptor.cs | 2 +- .../Impl/Binary/Io/BinaryHeapStream.cs | 2 +- .../Impl/Binary/Io/BinaryStreamBase.cs | 14 - .../Impl/Binary/Marshaller.cs | 77 +- .../Impl/Binary/SerializableSerializer.cs | 48 ++ .../Impl/Cluster/ClusterGroupImpl.cs | 6 + .../Impl/Common/DelegateConverter.cs | 44 ++ .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 10 +- .../Apache.Ignite.Core/Impl/IgniteProxy.cs | 6 + .../Apache.Ignite.Core/Impl/IgniteUtils.cs | 22 +- .../Impl/Memory/PlatformMemoryStream.cs | 3 +- .../Apache.Ignite.Core/Impl/NativeMethods.cs | 6 + .../Impl/Services/ServiceProxyInvoker.cs | 14 +- .../Impl/Unmanaged/IgniteJniNativeMethods.cs | 3 + .../Impl/Unmanaged/UnmanagedUtils.cs | 7 + .../Properties/AssemblyInfo.cs | 2 +- .../Transactions/TransactionConfiguration.cs | 12 + .../Apache.Ignite.Linq.nuspec | 4 +- modules/platforms/dotnet/Apache.Ignite.sln | 14 + .../org/apache/ignite/spark/IgniteContext.scala | 4 +- .../org/apache/ignite/spark/IgniteRDD.scala | 25 +- .../apache/ignite/spark/JavaIgniteContext.scala | 4 +- .../org/apache/ignite/spark/JavaIgniteRDD.scala | 2 + .../ignite/spark/impl/IgniteAbstractRDD.scala | 15 +- .../apache/ignite/spark/impl/IgniteSqlRDD.scala | 5 +- .../spark/impl/JavaIgniteAbstractRDD.scala | 34 - .../org/apache/ignite/spark/IgniteRDDSpec.scala | 25 +- .../cache/websession/WebSessionFilter.java | 39 +- .../internal/websession/WebSessionSelfTest.java | 330 ++++++++- .../config/ignite-base-load-config.xml | 4 +- .../IgniteCacheRandomOperationBenchmark.java | 561 +++++++------- .../yardstick/cache/load/model/ModelUtil.java | 38 +- .../cache/load/model/key/Identifier.java | 6 + .../yardstick/cache/load/model/key/Mark.java | 7 + .../yardstick/cache/load/model/value/Car.java | 6 + .../yardstick/cache/load/model/value/Truck.java | 12 +- .../ignite/yardstick/cache/model/Account.java | 6 + .../ignite/yardstick/cache/model/Person1.java | 2 +- .../ignite/yardstick/cache/model/Person2.java | 2 +- .../ignite/yardstick/cache/model/SampleKey.java | 2 +- .../yardstick/cache/model/SampleValue.java | 2 +- .../zk/TcpDiscoveryZookeeperIpFinder.java | 84 ++- .../tcp/ipfinder/zk/ZookeeperIpFinderTest.java | 16 +- 224 files changed, 8491 insertions(+), 2449 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c7cee69f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ----------------------------------------------------------------------