Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8B19B18B64 for ; Thu, 28 Jan 2016 07:37:18 +0000 (UTC) Received: (qmail 50502 invoked by uid 500); 28 Jan 2016 07:37:02 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 50291 invoked by uid 500); 28 Jan 2016 07:37:02 -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 49453 invoked by uid 99); 28 Jan 2016 07:37:02 -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; Thu, 28 Jan 2016 07:37:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 32D4BE0BB6; Thu, 28 Jan 2016 07:37:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Thu, 28 Jan 2016 07:37:50 -0000 Message-Id: <831e5db790404417abd1504b7b260b6c@git.apache.org> In-Reply-To: <3db10955b08343e38993d286e8de72c1@git.apache.org> References: <3db10955b08343e38993d286e8de72c1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [50/50] ignite git commit: Merge branch 'master' into ignite-2324 Merge branch 'master' into ignite-2324 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/06610d35 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/06610d35 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/06610d35 Branch: refs/heads/ignite-2324 Commit: 06610d35672d16b9bb8c8977c46def61d7d5710c Parents: 8ec03ff f9868d4 Author: vozerov-gridgain Authored: Thu Jan 28 10:35:23 2016 +0300 Committer: vozerov-gridgain Committed: Thu Jan 28 10:35:23 2016 +0300 ---------------------------------------------------------------------- examples/pom.xml | 2 +- examples/schema-import/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/benchmarks/pom.xml | 170 ++++++++ .../benchmarks/jmh/cache/PutBenchmark.java | 170 ++++++++ .../internal/benchmarks/model/IntValue.java | 91 ++++ modules/camel/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../ignite/binary/BinaryObjectBuilder.java | 8 +- .../configuration/CacheConfiguration.java | 2 +- .../internal/GridEventConsumeHandler.java | 3 +- .../internal/GridMessageListenHandler.java | 6 +- .../internal/binary/BinaryClassDescriptor.java | 32 +- .../internal/binary/BinaryEnumObjectImpl.java | 3 +- .../internal/direct/DirectMessageWriter.java | 5 + .../stream/v1/DirectByteBufferStreamImplV1.java | 2 + .../stream/v2/DirectByteBufferStreamImplV2.java | 2 + .../ignite/internal/jdbc/JdbcConnection.java | 14 +- .../managers/discovery/CustomEventListener.java | 4 +- .../discovery/GridDiscoveryManager.java | 28 +- .../processors/cache/CacheMetricsSnapshot.java | 4 +- .../processors/cache/GridCacheAdapter.java | 108 ++--- .../processors/cache/GridCacheContext.java | 33 ++ .../processors/cache/GridCacheMvccManager.java | 43 +- .../processors/cache/GridCacheProcessor.java | 18 + .../processors/cache/GridCacheUtils.java | 36 +- .../distributed/GridCacheTxRecoveryFuture.java | 2 +- .../dht/CacheDistributedGetFutureAdapter.java | 30 +- .../dht/GridClientPartitionTopology.java | 2 + .../cache/distributed/dht/GridDhtGetFuture.java | 2 +- .../distributed/dht/GridDhtLockFuture.java | 2 +- .../dht/GridDhtPartitionTopologyImpl.java | 27 +- .../distributed/dht/GridDhtTxFinishFuture.java | 2 +- .../dht/GridPartitionedGetFuture.java | 241 ++++++----- .../dht/GridPartitionedSingleGetFuture.java | 229 ++++++---- .../dht/atomic/GridDhtAtomicCache.java | 37 +- .../colocated/GridDhtColocatedLockFuture.java | 6 +- .../distributed/near/GridNearGetFuture.java | 267 +++++++----- .../distributed/near/GridNearLockFuture.java | 2 +- ...arOptimisticSerializableTxPrepareFuture.java | 47 +- .../GridNearPessimisticTxPrepareFuture.java | 6 +- .../near/GridNearTxFinishFuture.java | 29 +- .../continuous/CacheContinuousQueryEntry.java | 70 +-- .../continuous/CacheContinuousQueryHandler.java | 36 +- .../cache/transactions/IgniteTxManager.java | 18 +- .../processors/cluster/ClusterProcessor.java | 37 +- .../continuous/AbstractContinuousMessage.java | 5 +- .../continuous/GridContinuousHandler.java | 4 +- .../continuous/GridContinuousProcessor.java | 15 +- .../internal/processors/igfs/IgfsProcessor.java | 3 - .../platform/PlatformNoopProcessor.java | 5 + .../processors/platform/PlatformProcessor.java | 8 + .../platform/PlatformProcessorImpl.java | 5 + .../processors/query/GridQueryProcessor.java | 7 +- .../processors/rest/GridRestProcessor.java | 3 + .../handlers/log/GridLogCommandHandler.java | 171 ++++++++ .../rest/request/GridRestLogRequest.java | 10 +- .../service/GridServiceProcessor.java | 17 +- .../processors/service/ServiceContextImpl.java | 4 +- .../ignite/internal/util/IgniteUtils.java | 3 + .../util/future/GridCompoundFuture.java | 314 ++++---------- .../util/future/GridCompoundIdentityFuture.java | 6 +- .../internal/util/future/GridFutureAdapter.java | 2 + .../ignite/internal/util/nio/GridNioServer.java | 12 + .../ignite/internal/visor/cache/VisorCache.java | 75 ++-- .../visor/cache/VisorCacheConfiguration.java | 31 +- .../cache/VisorCacheQueryConfiguration.java | 31 +- .../cache/VisorCacheQueryConfigurationV2.java | 47 ++ .../cache/VisorCacheStoreConfiguration.java | 39 +- .../cache/VisorCacheStoreConfigurationV2.java | 48 +++ .../internal/visor/cache/VisorCacheV2.java | 73 ++++ .../visor/node/VisorIgfsConfiguration.java | 32 +- .../visor/node/VisorNodeDataCollectorJob.java | 21 +- .../visor/node/VisorNodeDataCollectorTask.java | 2 +- .../ignite/lang/IgniteProductVersion.java | 18 + .../extensions/communication/MessageWriter.java | 9 +- .../plugin/security/SecurityCredentials.java | 4 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 5 +- .../ipfinder/jdbc/TcpDiscoveryJdbcIpFinder.java | 48 ++- .../resources/META-INF/classnames.properties | 15 +- .../core/src/main/resources/ignite.properties | 2 +- .../internal/TestRecordingCommunicationSpi.java | 157 +++++++ ...idCacheConfigurationConsistencySelfTest.java | 58 +-- .../cache/GridCacheUtilsSelfTest.java | 136 +----- .../cache/IgniteCacheNearLockValueSelfTest.java | 62 +-- .../cache/IgniteCacheStoreCollectionTest.java | 12 + ...eDynamicCacheStartNoExchangeTimeoutTest.java | 7 + ...ridCachePartitionNotLoadedEventSelfTest.java | 7 +- .../IgniteCacheAtomicNodeRestartTest.java | 2 + ...niteCacheClientNodeChangingTopologyTest.java | 4 +- .../distributed/IgniteCacheGetRestartTest.java | 280 ++++++++++++ .../distributed/IgniteCachePrimarySyncTest.java | 129 ++++++ .../IgniteCacheReadFromBackupTest.java | 427 +++++++++++++++++++ .../IgniteCacheSingleGetMessageTest.java | 88 +--- .../IgniteCrossCacheTxStoreSelfTest.java | 1 + .../GridCacheDhtPreloadMessageCountTest.java | 62 +-- .../near/GridCacheGetStoreErrorSelfTest.java | 9 +- .../GridCachePartitionedNodeRestartTest.java | 4 +- ...ePartitionedOptimisticTxNodeRestartTest.java | 4 +- .../RandomEvictionPolicyCacheSizeSelfTest.java | 79 ---- .../random/RandomEvictionPolicySelfTest.java | 363 ---------------- ...ContinuousQueryFailoverAbstractSelfTest.java | 80 ++++ .../CacheContinuousQueryLostPartitionTest.java | 256 +++++++++++ .../IgniteCacheWriteBehindNoUpdateSelfTest.java | 178 ++++++++ .../handlers/log/GridLogCommandHandlerTest.java | 190 +++++++++ .../GridServicePackagePrivateSelfTest.java | 46 ++ .../processors/service/inner/MyService.java | 30 ++ .../service/inner/MyServiceFactory.java | 30 ++ .../processors/service/inner/MyServiceImpl.java | 45 ++ .../ignite/testframework/GridTestUtils.java | 7 +- .../IgniteCacheEvictionSelfTestSuite.java | 4 - .../IgniteCacheRestartTestSuite2.java | 3 + .../testsuites/IgniteCacheTestSuite4.java | 2 + .../testsuites/IgniteCacheTestSuite5.java | 2 + .../testsuites/IgniteKernalSelfTestSuite.java | 4 +- .../testsuites/IgniteRestHandlerTestSuite.java | 4 +- modules/extdata/p2p/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/flume/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- .../processors/hadoop/v2/HadoopV2Context.java | 2 + .../processors/hadoop/v2/HadoopV2MapTask.java | 23 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- ...niteCacheP2pUnmarshallingQueryErrorTest.java | 20 +- .../IgniteBinaryCacheQueryTestSuite.java | 2 + modules/jcl/pom.xml | 2 +- modules/jms11/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/mqtt/pom.xml | 2 +- modules/osgi-karaf/pom.xml | 2 +- modules/osgi-paxlogging/pom.xml | 2 +- modules/osgi/pom.xml | 2 +- modules/platforms/cpp/common/configure.ac | 2 +- .../cpp/common/include/ignite/common/exports.h | 1 + .../cpp/common/include/ignite/common/java.h | 3 + .../platforms/cpp/common/project/vs/module.def | 3 +- modules/platforms/cpp/common/src/exports.cpp | 4 + modules/platforms/cpp/common/src/java.cpp | 20 + modules/platforms/cpp/core-test/configure.ac | 2 +- modules/platforms/cpp/core/configure.ac | 2 +- modules/platforms/cpp/examples/configure.ac | 2 +- modules/platforms/cpp/ignite/configure.ac | 2 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Binary/BinaryBuilderSelfTest.cs | 8 +- .../Cache/CacheAbstractTest.cs | 91 +++- .../Properties/AssemblyInfo.cs | 6 +- .../Apache.Ignite.Core/Binary/IBinaryObject.cs | 8 + .../dotnet/Apache.Ignite.Core/IIgnite.cs | 7 + .../Apache.Ignite.Core/Impl/Binary/Binary.cs | 3 + .../Impl/Binary/BinaryEnum.cs | 6 + .../Impl/Binary/BinaryObject.cs | 6 + .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 6 + .../Apache.Ignite.Core/Impl/IgniteProxy.cs | 6 + .../Impl/Unmanaged/IgniteJniNativeMethods.cs | 3 + .../Impl/Unmanaged/UnmanagedUtils.cs | 14 + .../Properties/AssemblyInfo.cs | 6 +- .../Apache.Ignite/Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/storm/pom.xml | 6 +- modules/tools/pom.xml | 2 +- modules/twitter/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- .../commands/cache/VisorCacheCommand.scala | 10 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- modules/yarn/pom.xml | 2 +- modules/zookeeper/pom.xml | 2 +- .../tcp/ipfinder/zk/ZookeeperIpFinderTest.java | 15 +- pom.xml | 3 +- 197 files changed, 4230 insertions(+), 1932 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/06610d35/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/Binary.cs ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/06610d35/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryObject.cs ----------------------------------------------------------------------