You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by nt...@apache.org on 2016/02/01 15:21:57 UTC
[49/49] ignite git commit: Merge branch 'master' into ignite-2435
Merge branch 'master' into ignite-2435
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/47bc381b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/47bc381b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/47bc381b
Branch: refs/heads/ignite-2435
Commit: 47bc381b9e3178f1c8b578d706b05fd7af76587b
Parents: acae0a5 58dce88
Author: Tikhonov Nikolay <ti...@gmail.com>
Authored: Mon Feb 1 17:19:27 2016 +0300
Committer: Tikhonov Nikolay <ti...@gmail.com>
Committed: Mon Feb 1 17:19:27 2016 +0300
----------------------------------------------------------------------
examples/pom.xml | 2 +-
examples/schema-import/pom.xml | 2 +-
.../examples/datagrid/CacheAffinityExample.java | 8 +-
.../java8/datagrid/CacheAffinityExample.java | 6 +-
modules/aop/pom.xml | 2 +-
modules/apache-license-gen/pom.xml | 2 +-
modules/aws/pom.xml | 2 +-
modules/benchmarks/pom.xml | 140 +++++++
.../benchmarks/jmh/JmhAbstractBenchmark.java | 150 +++++++
.../jmh/cache/JmhCacheAbstractBenchmark.java | 181 +++++++++
.../jmh/cache/JmhCachePutBenchmark.java | 124 ++++++
.../jmh/runner/JmhIdeBenchmarkRunner.java | 232 +++++++++++
.../internal/benchmarks/model/IntValue.java | 91 +++++
modules/camel/pom.xml | 2 +-
modules/clients/pom.xml | 2 +-
.../internal/client/ClientGetAffinityTask.java | 4 +-
modules/cloud/pom.xml | 2 +-
modules/codegen/pom.xml | 2 +-
modules/core/pom.xml | 5 +-
.../java/org/apache/ignite/IgniteCluster.java | 7 +-
.../apache/ignite/cache/affinity/Affinity.java | 24 +-
.../org/apache/ignite/internal/IgnitionEx.java | 4 +-
.../internal/binary/GridBinaryMarshaller.java | 5 +-
.../ignite/internal/jdbc/JdbcConnection.java | 14 +-
.../affinity/GridAffinityProcessor.java | 60 ++-
.../processors/cache/CacheMetricsSnapshot.java | 4 +-
.../processors/cache/CacheOperationContext.java | 43 ++-
.../processors/cache/GridCacheAdapter.java | 86 +----
.../cache/GridCacheAffinityManager.java | 47 ++-
.../processors/cache/GridCacheMapEntry.java | 6 +-
.../processors/cache/GridCacheProxyImpl.java | 11 +-
.../processors/cache/GridCacheUtils.java | 36 +-
.../processors/cache/IgniteCacheProxy.java | 43 ++-
.../cache/affinity/GridCacheAffinityImpl.java | 48 ++-
.../dht/atomic/GridDhtAtomicCache.java | 108 ++++--
.../dht/atomic/GridNearAtomicUpdateFuture.java | 10 +-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 22 +-
.../dht/preloader/GridDhtPartitionDemander.java | 4 +-
.../near/GridNearTxFinishFuture.java | 96 ++---
.../processors/cache/dr/GridCacheDrInfo.java | 49 ++-
.../transactions/IgniteTxLocalAdapter.java | 81 ++--
.../cache/transactions/IgniteTxManager.java | 2 +-
.../cache/version/GridCacheVersionManager.java | 23 +-
.../handlers/log/GridLogCommandHandler.java | 16 +-
.../processors/service/ServiceContextImpl.java | 4 +-
.../processors/task/GridTaskProcessor.java | 2 +-
.../OptimizedObjectStreamRegistry.java | 4 +-
.../core/src/main/resources/ignite.properties | 2 +-
.../ignite/internal/GridAffinityMappedTest.java | 8 +-
.../internal/GridAffinityNoCacheSelfTest.java | 290 ++++++++++++++
.../internal/GridAffinityP2PSelfTest.java | 8 +-
.../ignite/internal/GridAffinitySelfTest.java | 8 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 4 +-
.../cache/GridCacheAffinityRoutingSelfTest.java | 10 +-
.../GridCacheConcurrentTxMultiNodeTest.java | 4 +-
.../GridCacheDaemonNodeAbstractSelfTest.java | 17 +-
.../GridCacheDeploymentOffHeapSelfTest.java | 4 +-
...ridCacheDeploymentOffHeapValuesSelfTest.java | 41 ++
.../cache/GridCacheDeploymentSelfTest.java | 8 +-
.../cache/GridCacheEntryMemorySizeSelfTest.java | 6 +-
...hePartitionedProjectionAffinitySelfTest.java | 8 +-
.../cache/GridCachePutAllFailoverSelfTest.java | 4 +-
.../cache/GridCacheUtilsSelfTest.java | 136 +------
.../dht/GridCacheDhtMultiBackupTest.java | 4 +-
.../near/GridCacheNearOnlyTopologySelfTest.java | 4 +-
.../near/GridCacheNearTxMultiNodeSelfTest.java | 4 +-
...titionedExplicitLockNodeFailureSelfTest.java | 6 +-
.../GridCacheRebalancingSyncSelfTest.java | 8 +
.../RandomEvictionPolicyCacheSizeSelfTest.java | 79 ----
.../random/RandomEvictionPolicySelfTest.java | 363 -----------------
...ridCacheContinuousQueryAbstractSelfTest.java | 10 +-
.../processors/igfs/IgfsStreamsSelfTest.java | 4 +-
.../handlers/log/GridLogCommandHandlerTest.java | 58 ++-
.../GridServicePackagePrivateSelfTest.java | 51 +++
.../processors/service/inner/MyService.java | 30 ++
.../service/inner/MyServiceFactory.java | 30 ++
.../processors/service/inner/MyServiceImpl.java | 45 +++
.../ignite/loadtests/dsi/GridDsiClient.java | 4 +-
.../tcp/GridCacheDhtLockBackupSelfTest.java | 4 +-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 3 +-
.../testframework/junits/GridAbstractTest.java | 3 +
.../IgniteCacheEvictionSelfTestSuite.java | 4 -
.../testsuites/IgniteCacheTestSuite3.java | 2 +
.../testsuites/IgniteComputeGridTestSuite.java | 4 +-
.../testsuites/IgniteKernalSelfTestSuite.java | 4 +-
modules/docker/1.5.0.final/Dockerfile | 40 ++
modules/docker/1.5.0.final/run.sh | 50 +++
modules/docker/Dockerfile | 6 +-
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 +-
modules/hibernate/pom.xml | 2 +-
modules/indexing/pom.xml | 2 +-
.../query/h2/opt/GridH2IndexBase.java | 5 +-
.../query/h2/opt/GridH2TreeIndex.java | 2 +-
modules/jcl/pom.xml | 2 +-
modules/jms11/pom.xml | 2 +-
modules/jta/pom.xml | 2 +-
modules/kafka/README.txt | 111 +++++-
modules/kafka/pom.xml | 71 ++--
.../ignite/stream/kafka/KafkaStreamer.java | 2 +-
.../kafka/connect/IgniteSinkConnector.java | 91 +++++
.../kafka/connect/IgniteSinkConstants.java | 38 ++
.../stream/kafka/connect/IgniteSinkTask.java | 165 ++++++++
.../kafka/IgniteKafkaStreamerSelfTestSuite.java | 9 +-
.../stream/kafka/KafkaEmbeddedBroker.java | 387 -------------------
.../kafka/KafkaIgniteStreamerSelfTest.java | 13 +-
.../ignite/stream/kafka/SimplePartitioner.java | 53 ---
.../ignite/stream/kafka/TestKafkaBroker.java | 237 ++++++++++++
.../kafka/connect/IgniteSinkConnectorTest.java | 250 ++++++++++++
.../kafka/src/test/resources/example-ignite.xml | 71 ++++
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/project/vs/common.vcxproj | 2 +-
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 +-
.../Apache.Ignite.Benchmarks.csproj | 4 +-
.../Properties/AssemblyInfo.cs | 6 +-
.../Apache.Ignite.Core.Tests.TestDll.csproj | 4 +-
.../Properties/AssemblyInfo.cs | 6 +-
.../Apache.Ignite.Core.Tests.csproj | 2 +-
.../Properties/AssemblyInfo.cs | 6 +-
.../Apache.Ignite.Core.csproj | 8 +-
.../Apache.Ignite.Core.ruleset | 26 ++
.../Binary/BinaryConfiguration.cs | 3 +
.../Binary/BinaryTypeConfiguration.cs | 5 +
.../Binary/BinaryTypeNames.cs | 64 +--
.../Cache/CachePartialUpdateException.cs | 3 +
.../Apache.Ignite.Core/Cache/CacheResult.cs | 41 +-
.../Cache/Event/ICacheEntryEventFilter.cs | 1 +
.../Cache/Event/ICacheEntryEventListener.cs | 1 +
.../Cache/Query/Continuous/ContinuousQuery.cs | 2 +-
.../Apache.Ignite.Core/Cache/Query/QueryBase.cs | 2 +-
.../Cache/Query/SqlFieldsQuery.cs | 2 +-
.../Apache.Ignite.Core/Cache/Query/SqlQuery.cs | 6 +-
.../Apache.Ignite.Core/Cache/Query/TextQuery.cs | 7 +-
.../Cache/Store/CacheStoreAdapter.cs | 4 +
.../Compute/ComputeJobAdapter.cs | 2 +-
.../Compute/ComputeJobResultPolicy.cs | 2 -
.../Compute/ComputeTaskAdapter.cs | 3 +
.../Compute/ComputeTaskSplitAdapter.cs | 18 +-
.../Datastream/StreamTransformer.cs | 2 +
.../Datastream/StreamVisitor.cs | 2 +
.../Apache.Ignite.Core/Events/CacheEvent.cs | 8 +-
.../Events/CacheQueryExecutedEvent.cs | 4 +-
.../Events/CacheQueryReadEvent.cs | 6 +-
.../Events/CacheRebalancingEvent.cs | 4 +-
.../Events/CheckpointEvent.cs | 4 +-
.../Apache.Ignite.Core/Events/DiscoveryEvent.cs | 4 +-
.../Apache.Ignite.Core/Events/EventBase.cs | 70 +++-
.../dotnet/Apache.Ignite.Core/Ignition.cs | 3 +-
.../Apache.Ignite.Core/Impl/Binary/Binary.cs | 47 +--
.../Impl/Binary/BinaryFullTypeDescriptor.cs | 2 +-
.../Impl/Binary/BinaryObject.cs | 44 ++-
.../Impl/Binary/BinaryObjectBuilder.cs | 75 ++--
.../Impl/Binary/BinaryReader.cs | 1 +
.../Impl/Binary/BinaryReflectiveSerializer.cs | 2 +-
.../Impl/Binary/BinarySystemHandlers.cs | 9 +-
.../Impl/Binary/BinaryUtils.cs | 7 +-
.../Impl/Binary/BinaryWriter.cs | 3 +
.../Impl/Binary/Io/BinaryHeapStream.cs | 9 +
.../Impl/Binary/Marshaller.cs | 19 +-
.../Impl/Binary/Metadata/BinaryType.cs | 2 +
.../Impl/Binary/SerializableObjectHolder.cs | 13 +-
.../Impl/Binary/Structure/BinaryStructure.cs | 3 +-
.../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 42 +-
.../Impl/Cache/Query/AbstractQueryCursor.cs | 4 +-
.../Continuous/ContinuousQueryFilterHolder.cs | 2 +-
.../Continuous/ContinuousQueryHandleImpl.cs | 4 +-
.../Impl/Cache/Query/FieldsQueryCursor.cs | 2 +
.../Impl/Cache/Query/QueryCursor.cs | 2 +
.../Impl/Common/CancelledTask.cs | 3 +
.../Common/CopyOnWriteConcurrentDictionary.cs | 1 +
.../Impl/Common/DelegateConverter.cs | 11 +-
.../Apache.Ignite.Core/Impl/Common/Future.cs | 2 +
.../Impl/Common/LoadedAssembliesResolver.cs | 1 +
.../Closure/ComputeAbstractClosureTask.cs | 3 +
.../Compute/Closure/ComputeMultiClosureTask.cs | 2 +
.../Closure/ComputeReducingClosureTask.cs | 2 +
.../Compute/Closure/ComputeSingleClosureTask.cs | 2 +
.../Impl/Datastream/DataStreamerBatch.cs | 1 +
.../Impl/Datastream/DataStreamerImpl.cs | 5 +-
.../Apache.Ignite.Core/Impl/ExceptionUtils.cs | 56 +--
.../Impl/Handle/HandleRegistry.cs | 1 +
.../Apache.Ignite.Core/Impl/IgniteUtils.cs | 11 +-
.../Impl/InteropExceptionHolder.cs | 11 +-
.../Memory/PlatformBigEndianMemoryStream.cs | 8 +
.../Impl/Memory/PlatformMemory.cs | 2 +
.../Impl/Memory/PlatformMemoryManager.cs | 2 +
.../Impl/Memory/PlatformMemoryStream.cs | 2 +
.../Impl/Memory/PlatformRawMemory.cs | 2 +
.../Apache.Ignite.Core/Impl/PlatformTarget.cs | 3 +-
.../Impl/Resource/ResourceProcessor.cs | 2 +-
.../Impl/Resource/ResourceTypeDescriptor.cs | 2 +-
.../Impl/Services/ServiceProxy.cs | 2 +
.../Impl/Services/ServiceProxyInvoker.cs | 1 +
.../Impl/Transactions/TransactionsImpl.cs | 2 +
.../Impl/Unmanaged/UnmanagedCallbacks.cs | 5 +-
.../Properties/AssemblyInfo.cs | 6 +-
.../Services/ServiceInvocationException.cs | 2 +
modules/platforms/dotnet/Apache.Ignite.FxCop | 354 +++--------------
modules/platforms/dotnet/Apache.Ignite.sln | 4 +-
.../Apache.Ignite.sln.TeamCity.DotSettings | 30 ++
.../dotnet/Apache.Ignite/Apache.Ignite.csproj | 5 +-
.../Apache.Ignite/Properties/AssemblyInfo.cs | 6 +-
.../Apache.Ignite.Examples.csproj | 4 +-
.../Properties/AssemblyInfo.cs | 6 +-
.../Apache.Ignite.ExamplesDll.csproj | 4 +-
.../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 +-
.../visor/commands/node/VisorNodeCommand.scala | 1 +
.../commands/top/VisorTopologyCommand.scala | 5 +-
.../scala/org/apache/ignite/visor/visor.scala | 3 +-
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
modules/yardstick/pom.xml | 2 +-
modules/yarn/pom.xml | 2 +-
.../apache/ignite/yarn/ApplicationMaster.java | 12 +-
.../apache/ignite/yarn/ClusterProperties.java | 144 ++++---
.../yarn/IgniteApplicationMasterSelfTest.java | 52 +++
modules/zookeeper/pom.xml | 2 +-
parent/pom.xml | 123 +++---
pom.xml | 19 +-
250 files changed, 4086 insertions(+), 2269 deletions(-)
----------------------------------------------------------------------