[02/50] [abbrv] ignite git commit: Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5.1-2
Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5.1-2 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/206e5a53 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/206e5a53 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/206e5a53 Branch: refs/heads/ignite-gg-10837 Commit: 206e5a53c3cfa6285d911efe093ede03a3a67892 Parents: 11bee91 057ad5b Author: Alexey GoncharukAuthored: Thu Dec 17 17:03:59 2015 +0300 Committer: Alexey Goncharuk Committed: Thu Dec 17 17:03:59 2015 +0300 -- .../examples/datagrid/CacheQueryExample.java| 11 +- .../streaming/StreamVisitorExample.java | 40 +- .../binary/BinaryReflectiveSerializer.java | 33 ++ .../ignite/binary/BinaryTypeConfiguration.java | 20 +- .../ignite/cache/affinity/AffinityKey.java | 2 +- .../internal/binary/BinaryClassDescriptor.java | 124 ++ .../ignite/internal/binary/BinaryContext.java | 109 - .../internal/binary/BinaryFieldAccessor.java| 3 - .../ignite/internal/binary/BinaryUtils.java | 49 ++- .../ignite/internal/binary/BinaryWriteMode.java | 3 - .../cache/binary/BinaryMetadataKey.java | 2 +- .../binary/CacheObjectBinaryProcessorImpl.java | 2 +- .../datastreamer/DataStreamerUpdateJob.java | 2 +- .../PlatformDotNetConfigurationClosure.java | 4 +- .../processors/query/GridQueryProcessor.java| 204 ++--- .../binary/BinaryFieldsAbstractSelfTest.java| 4 +- .../BinaryFooterOffsetsAbstractSelfTest.java| 3 +- .../binary/BinaryMarshallerSelfTest.java| 34 +- ...GridBinaryMarshallerCtxDisabledSelfTest.java | 3 +- .../binary/GridBinaryWildcardsSelfTest.java | 3 +- .../cache/CacheStopAndDestroySelfTest.java | 2 + .../GridCacheOnCopyFlagAbstractSelfTest.java| 33 +- .../cache/IgniteCacheSerializationSelfTest.java | 112 + .../GridBinaryCacheEntryMemorySizeSelfTest.java | 3 +- .../session/GridSessionCheckpointSelfTest.java | 3 +- .../ignite/testframework/junits/IgniteMock.java | 3 +- .../junits/IgniteTestResources.java | 4 +- .../cache/BinarySerializationQuerySelfTest.java | 416 +++ ...onQueryWithReflectiveSerializerSelfTest.java | 28 ++ ...niteCacheP2pUnmarshallingQueryErrorTest.java | 4 +- .../IgniteBinaryCacheQueryTestSuite.java| 119 +- modules/platforms/dotnet/Apache.Ignite.dxg | 2 +- 32 files changed, 1147 insertions(+), 237 deletions(-) --
[02/50] [abbrv] ignite git commit: Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5.1-2
Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5.1-2 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b534c427 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b534c427 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b534c427 Branch: refs/heads/ignite-2234 Commit: b534c42711d289408bacc9824300d6ec5fcc0fe7 Parents: 524d72e 81458f5 Author: Alexey GoncharukAuthored: Mon Dec 21 18:56:55 2015 +0300 Committer: Alexey Goncharuk Committed: Mon Dec 21 18:56:55 2015 +0300 -- .../internal/binary/BinaryObjectImpl.java | 20 +- .../processors/cache/IgniteCacheProxy.java | 5 +- .../cache/query/GridCacheQueryManager.java | 8 +- .../processors/query/GridQueryProcessor.java| 10 +- .../IgniteCacheBinaryObjectsScanSelfTest.java | 137 + .../cache/IgniteCacheAbstractQuerySelfTest.java | 300 +-- .../IgniteCacheReplicatedQuerySelfTest.java | 10 +- .../local/IgniteCacheLocalQuerySelfTest.java| 2 +- .../IgniteBinaryCacheQueryTestSuite.java| 2 + .../Apache.Ignite.Core/Binary/Package-Info.cs | 2 +- .../Apache.Ignite.Core/Cache/Package-Info.cs| 2 +- .../Cache/Query/Continuous/Package-Info.cs | 2 +- .../Cache/Query/Package-Info.cs | 2 +- .../Cache/Store/Package-Info.cs | 2 +- .../Apache.Ignite.Core/Cluster/Package-Info.cs | 2 +- .../Apache.Ignite.Core/Compute/Package-Info.cs | 2 +- .../Datastream/Package-Info.cs | 2 +- .../Apache.Ignite.Core/Events/Package-Info.cs | 2 +- .../Lifecycle/Package-Info.cs | 2 +- .../Messaging/Package-Info.cs | 2 +- .../dotnet/Apache.Ignite.Core/Package-Info.cs | 2 +- .../Apache.Ignite.Core/Resource/Package-Info.cs | 2 +- .../Apache.Ignite.Core/Services/Package-Info.cs | 2 +- .../Transactions/Package-Info.cs| 2 +- 24 files changed, 394 insertions(+), 130 deletions(-) --
[02/50] [abbrv] ignite git commit: Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5.1-2
Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5.1-2 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/206e5a53 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/206e5a53 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/206e5a53 Branch: refs/heads/ignite-2206 Commit: 206e5a53c3cfa6285d911efe093ede03a3a67892 Parents: 11bee91 057ad5b Author: Alexey GoncharukAuthored: Thu Dec 17 17:03:59 2015 +0300 Committer: Alexey Goncharuk Committed: Thu Dec 17 17:03:59 2015 +0300 -- .../examples/datagrid/CacheQueryExample.java| 11 +- .../streaming/StreamVisitorExample.java | 40 +- .../binary/BinaryReflectiveSerializer.java | 33 ++ .../ignite/binary/BinaryTypeConfiguration.java | 20 +- .../ignite/cache/affinity/AffinityKey.java | 2 +- .../internal/binary/BinaryClassDescriptor.java | 124 ++ .../ignite/internal/binary/BinaryContext.java | 109 - .../internal/binary/BinaryFieldAccessor.java| 3 - .../ignite/internal/binary/BinaryUtils.java | 49 ++- .../ignite/internal/binary/BinaryWriteMode.java | 3 - .../cache/binary/BinaryMetadataKey.java | 2 +- .../binary/CacheObjectBinaryProcessorImpl.java | 2 +- .../datastreamer/DataStreamerUpdateJob.java | 2 +- .../PlatformDotNetConfigurationClosure.java | 4 +- .../processors/query/GridQueryProcessor.java| 204 ++--- .../binary/BinaryFieldsAbstractSelfTest.java| 4 +- .../BinaryFooterOffsetsAbstractSelfTest.java| 3 +- .../binary/BinaryMarshallerSelfTest.java| 34 +- ...GridBinaryMarshallerCtxDisabledSelfTest.java | 3 +- .../binary/GridBinaryWildcardsSelfTest.java | 3 +- .../cache/CacheStopAndDestroySelfTest.java | 2 + .../GridCacheOnCopyFlagAbstractSelfTest.java| 33 +- .../cache/IgniteCacheSerializationSelfTest.java | 112 + .../GridBinaryCacheEntryMemorySizeSelfTest.java | 3 +- .../session/GridSessionCheckpointSelfTest.java | 3 +- .../ignite/testframework/junits/IgniteMock.java | 3 +- .../junits/IgniteTestResources.java | 4 +- .../cache/BinarySerializationQuerySelfTest.java | 416 +++ ...onQueryWithReflectiveSerializerSelfTest.java | 28 ++ ...niteCacheP2pUnmarshallingQueryErrorTest.java | 4 +- .../IgniteBinaryCacheQueryTestSuite.java| 119 +- modules/platforms/dotnet/Apache.Ignite.dxg | 2 +- 32 files changed, 1147 insertions(+), 237 deletions(-) --
[02/50] [abbrv] ignite git commit: Merge branch 'ignite-1.5'
Merge branch 'ignite-1.5' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0db011d4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0db011d4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0db011d4 Branch: refs/heads/ignite-2264 Commit: 0db011d4a8ad9ecaa7bfa2bc1c603077ed4a36d1 Parents: 49a0e6d 1dbf20e Author: ashutakAuthored: Fri Dec 11 12:45:21 2015 +0300 Committer: ashutak Committed: Fri Dec 11 12:45:21 2015 +0300 -- assembly/docfiles/ignite_logo.png | Bin 0 -> 24315 bytes assembly/release-fabric-base.xml| 25 +- bin/ignite.bat |7 +- bin/include/parseargs.bat |4 +- .../java/org/apache/ignite/schema/Demo.java |6 +- ...ComputeClientBinaryTaskExecutionExample.java |4 +- .../CacheClientBinaryPutGetExample.java |2 +- .../datagrid/CacheClientBinaryQueryExample.java |8 +- .../store/auto/CacheBinaryAutoStoreExample.java | 38 +- .../examples/datagrid/CacheQueryExample.java|6 + .../datagrid/CacheTransactionExample.java |4 +- .../store/auto/CacheAutoStoreExample.java | 81 +- .../messaging/MessagingPingPongExample.java |4 - .../ignite/examples/model/Organization.java | 16 +- .../apache/ignite/examples/model/Person.java| 40 +- .../ignite/examples/util/DbH2ServerStartup.java | 31 +- .../examples/MessagingExamplesSelfTest.java |2 - .../ignite/codegen/MessageCodeGenerator.java|6 +- modules/core/pom.xml|4 +- .../java/org/apache/ignite/IgniteBinary.java|2 +- .../java/org/apache/ignite/IgniteCache.java |2 +- .../main/java/org/apache/ignite/Ignition.java | 18 +- .../ignite/binary/BinaryCollectionFactory.java | 33 + .../apache/ignite/binary/BinaryMapFactory.java | 33 + .../apache/ignite/binary/BinaryRawReader.java |8 +- .../org/apache/ignite/binary/BinaryReader.java |9 +- .../store/jdbc/CacheAbstractJdbcStore.java |5 +- .../cache/store/jdbc/CacheJdbcPojoStore.java|2 +- .../configuration/CacheConfiguration.java |5 +- .../configuration/IgniteConfiguration.java |4 +- .../configuration/TransactionConfiguration.java | 47 +- .../apache/ignite/internal/GridComponent.java |3 +- .../ignite/internal/GridKernalContextImpl.java |2 +- .../ignite/internal/GridPluginComponent.java|4 +- .../apache/ignite/internal/IgniteKernal.java| 26 +- .../org/apache/ignite/internal/IgnitionEx.java | 65 +- .../ignite/internal/MarshallerContextImpl.java | 23 +- .../binary/BinaryCachingMetadataHandler.java| 70 + .../ignite/internal/binary/BinaryEnumCache.java | 69 + .../internal/binary/BinaryEnumObjectImpl.java | 311 ++ .../internal/binary/BinaryFieldAccessor.java| 856 .../ignite/internal/binary/BinaryFieldImpl.java | 116 + .../internal/binary/BinaryInternalIdMapper.java | 161 + .../internal/binary/BinaryMarshaller.java | 142 + .../ignite/internal/binary/BinaryMetadata.java | 180 + .../binary/BinaryMetadataCollector.java | 277 ++ .../internal/binary/BinaryMetadataHandler.java | 44 + .../binary/BinaryNoopMetadataHandler.java | 53 + .../ignite/internal/binary/BinaryObjectEx.java | 30 + .../internal/binary/BinaryObjectExImpl.java | 251 ++ .../internal/binary/BinaryObjectImpl.java | 570 +++ .../binary/BinaryObjectOffheapImpl.java | 430 ++ .../internal/binary/BinaryRawReaderEx.java | 33 + .../internal/binary/BinaryRawWriterEx.java | 60 + .../internal/binary/BinaryReaderExImpl.java | 2028 + .../internal/binary/BinaryReaderHandles.java| 108 + .../binary/BinaryReaderHandlesHolder.java | 46 + .../binary/BinaryReaderHandlesHolderImpl.java | 44 + .../binary/BinaryThreadLocalContext.java| 70 + .../ignite/internal/binary/BinaryTypeImpl.java | 93 + .../ignite/internal/binary/BinaryWriteMode.java | 178 + .../internal/binary/BinaryWriterExImpl.java | 1808 .../internal/binary/BinaryWriterHandles.java| 101 + .../binary/BinaryWriterSchemaHolder.java| 149 + .../internal/binary/GridPortableMarshaller.java | 289 ++ .../binary/PortableClassDescriptor.java | 813 .../ignite/internal/binary/PortableContext.java | 1102 + .../binary/PortablePositionReadable.java| 47 + .../internal/binary/PortablePrimitives.java | 382 ++ .../ignite/internal/binary/PortableSchema.java | 466 ++ .../internal/binary/PortableSchemaRegistry.java | 172 + .../ignite/internal/binary/PortableUtils.java | 1909 .../binary/builder/BinaryObjectBuilderImpl.java | 587 +++ .../builder/PortableAbstractLazyValue.java
[02/50] [abbrv] ignite git commit: Merge branch 'ignite-1.5'
Merge branch 'ignite-1.5' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2e7911a2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2e7911a2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2e7911a2 Branch: refs/heads/ignite-2265 Commit: 2e7911a2c11f7760d6b2aa9f8f70f028667a31f4 Parents: b60305f 2de3b19 Author: Valentin KulichenkoAuthored: Fri Nov 20 16:28:38 2015 -0800 Committer: Valentin Kulichenko Committed: Fri Nov 20 16:28:38 2015 -0800 -- .../datastructures/IgniteSemaphoreExample.java | 168 ++ .../ignite/examples/CacheExamplesSelfTest.java | 10 +- .../stream/camel/IgniteCamelStreamerTest.java | 16 +- .../camel/IgniteCamelStreamerTestSuite.java |1 - .../src/main/java/org/apache/ignite/Ignite.java | 17 + .../java/org/apache/ignite/IgniteSemaphore.java | 312 .../apache/ignite/events/DiscoveryEvent.java|6 +- .../apache/ignite/internal/IgniteKernal.java| 21 + .../internal/MarshallerContextAdapter.java |4 +- .../internal/direct/DirectByteBufferStream.java | 1499 - .../internal/direct/DirectMessageReader.java| 144 +- .../internal/direct/DirectMessageWriter.java| 65 +- .../direct/DirectMessageWriterState.java| 123 -- .../direct/state/DirectMessageState.java| 98 ++ .../direct/state/DirectMessageStateItem.java| 28 + .../direct/stream/DirectByteBufferStream.java | 316 .../stream/v1/DirectByteBufferStreamImplV1.java | 1360 +++ .../stream/v2/DirectByteBufferStreamImplV2.java | 1583 ++ .../managers/communication/GridIoManager.java | 64 +- .../GridCachePartitionExchangeManager.java | 34 +- .../processors/cache/GridCacheUtils.java| 39 +- .../CacheDataStructuresManager.java |2 +- .../GridFutureRemapTimeoutObject.java | 72 - .../dht/GridClientPartitionTopology.java| 38 +- .../distributed/dht/GridDhtLockFuture.java |1 - .../dht/GridDhtPartitionTopology.java | 12 +- .../dht/GridDhtPartitionTopologyImpl.java | 45 +- .../distributed/dht/GridDhtTxPrepareFuture.java |1 - .../dht/GridPartitionedGetFuture.java | 30 +- .../colocated/GridDhtColocatedLockFuture.java |1 - .../dht/preloader/GridDhtPartitionFullMap.java | 41 +- .../dht/preloader/GridDhtPartitionMap.java | 148 +- .../dht/preloader/GridDhtPartitionMap2.java | 306 .../GridDhtPartitionsExchangeFuture.java| 24 +- .../GridDhtPartitionsSingleMessage.java |6 +- .../distributed/near/GridNearCacheAdapter.java |1 - .../distributed/near/GridNearGetFuture.java | 30 +- .../distributed/near/GridNearLockFuture.java|2 - ...arOptimisticSerializableTxPrepareFuture.java |3 - .../near/GridNearOptimisticTxPrepareFuture.java |1 - .../near/GridNearTxFinishFuture.java|4 - .../distributed/near/GridNearTxRemote.java |1 - .../processors/cache/local/GridLocalCache.java |1 - .../cache/local/GridLocalLockFuture.java|2 - .../cache/transactions/IgniteInternalTx.java|1 - .../cache/transactions/IgniteTxAdapter.java |1 - .../IgniteTxImplicitSingleStateImpl.java| 29 +- .../transactions/IgniteTxLocalAdapter.java |1 - .../cache/transactions/IgniteTxManager.java |1 - .../IgniteTxRemoteSingleStateImpl.java | 19 +- .../cache/transactions/IgniteTxStateImpl.java |1 - .../datastructures/DataStructuresProcessor.java | 240 ++- .../GridAtomicCacheQueueImpl.java | 126 +- .../GridCacheAtomicReferenceImpl.java | 10 +- .../GridCacheCountDownLatchImpl.java| 15 +- .../datastructures/GridCacheQueueAdapter.java | 32 +- .../datastructures/GridCacheSemaphoreEx.java| 47 + .../datastructures/GridCacheSemaphoreImpl.java | 763 + .../datastructures/GridCacheSemaphoreState.java | 144 ++ .../GridTransactionalCacheQueueImpl.java| 193 +-- .../ignite/internal/util/IgniteUtils.java | 31 + .../internal/util/ipc/IpcToNioAdapter.java | 14 +- .../util/nio/GridCommunicationClient.java |4 +- .../internal/util/nio/GridDirectParser.java | 37 +- .../util/nio/GridNioMessageReaderFactory.java | 37 + .../util/nio/GridNioMessageWriterFactory.java | 35 + .../ignite/internal/util/nio/GridNioServer.java | 47 +- .../util/nio/GridShmemCommunicationClient.java | 12 +- .../ignite/internal/visor/cache/VisorCache.java |6 +- .../communication/MessageFormatter.java | 15 +- .../extensions/communication/MessageReader.java | 26 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java |6 +-
[02/50] [abbrv] ignite git commit: Merge branch ignite-1.5 into ignite-1282
Merge branch ignite-1.5 into ignite-1282 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3d8c4c0f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3d8c4c0f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3d8c4c0f Branch: refs/heads/ignite-1537 Commit: 3d8c4c0f0cf7eda1544969dcc5663a9da0d6f9d2 Parents: ae5fb3e 457ca6f Author: Alexey GoncharukAuthored: Sat Nov 21 12:25:43 2015 +0300 Committer: Alexey Goncharuk Committed: Sat Nov 21 12:25:43 2015 +0300 -- .../datastructures/IgniteSemaphoreExample.java | 168 ++ .../ignite/examples/CacheExamplesSelfTest.java | 10 +- .../stream/camel/IgniteCamelStreamerTest.java | 16 +- .../camel/IgniteCamelStreamerTestSuite.java |1 - .../src/main/java/org/apache/ignite/Ignite.java | 17 + .../java/org/apache/ignite/IgniteSemaphore.java | 312 .../apache/ignite/events/DiscoveryEvent.java|6 +- .../apache/ignite/internal/IgniteKernal.java| 21 + .../internal/MarshallerContextAdapter.java |4 +- .../internal/direct/DirectByteBufferStream.java | 1499 - .../internal/direct/DirectMessageReader.java| 144 +- .../internal/direct/DirectMessageWriter.java| 65 +- .../direct/DirectMessageWriterState.java| 123 -- .../direct/state/DirectMessageState.java| 98 ++ .../direct/state/DirectMessageStateItem.java| 28 + .../direct/stream/DirectByteBufferStream.java | 316 .../stream/v1/DirectByteBufferStreamImplV1.java | 1360 +++ .../stream/v2/DirectByteBufferStreamImplV2.java | 1583 ++ .../managers/communication/GridIoManager.java | 64 +- .../GridCachePartitionExchangeManager.java | 34 +- .../processors/cache/GridCacheUtils.java| 39 +- .../CacheDataStructuresManager.java |2 +- .../GridFutureRemapTimeoutObject.java | 72 - .../dht/GridClientPartitionTopology.java| 38 +- .../distributed/dht/GridDhtLockFuture.java |1 - .../dht/GridDhtPartitionTopology.java | 12 +- .../dht/GridDhtPartitionTopologyImpl.java | 45 +- .../distributed/dht/GridDhtTxPrepareFuture.java |1 - .../dht/GridPartitionedGetFuture.java | 30 +- .../colocated/GridDhtColocatedLockFuture.java |1 - .../dht/preloader/GridDhtPartitionFullMap.java | 41 +- .../dht/preloader/GridDhtPartitionMap.java | 148 +- .../dht/preloader/GridDhtPartitionMap2.java | 306 .../GridDhtPartitionsExchangeFuture.java| 24 +- .../GridDhtPartitionsSingleMessage.java |6 +- .../distributed/near/GridNearCacheAdapter.java |1 - .../distributed/near/GridNearGetFuture.java | 30 +- .../distributed/near/GridNearLockFuture.java|2 - ...arOptimisticSerializableTxPrepareFuture.java |3 - .../near/GridNearOptimisticTxPrepareFuture.java |1 - .../near/GridNearTxFinishFuture.java|4 - .../distributed/near/GridNearTxRemote.java |1 - .../processors/cache/local/GridLocalCache.java |1 - .../cache/local/GridLocalLockFuture.java|2 - .../cache/transactions/IgniteInternalTx.java|1 - .../cache/transactions/IgniteTxAdapter.java |1 - .../IgniteTxImplicitSingleStateImpl.java| 29 +- .../cache/transactions/IgniteTxManager.java |1 - .../IgniteTxRemoteSingleStateImpl.java | 19 +- .../cache/transactions/IgniteTxStateImpl.java |1 - .../datastructures/DataStructuresProcessor.java | 240 ++- .../GridAtomicCacheQueueImpl.java | 126 +- .../GridCacheAtomicReferenceImpl.java | 10 +- .../GridCacheCountDownLatchImpl.java| 15 +- .../datastructures/GridCacheQueueAdapter.java | 32 +- .../datastructures/GridCacheSemaphoreEx.java| 47 + .../datastructures/GridCacheSemaphoreImpl.java | 763 + .../datastructures/GridCacheSemaphoreState.java | 144 ++ .../GridTransactionalCacheQueueImpl.java| 193 +-- .../ignite/internal/util/IgniteUtils.java | 31 + .../internal/util/ipc/IpcToNioAdapter.java | 14 +- .../util/nio/GridCommunicationClient.java |4 +- .../internal/util/nio/GridDirectParser.java | 37 +- .../util/nio/GridNioMessageReaderFactory.java | 37 + .../util/nio/GridNioMessageWriterFactory.java | 35 + .../ignite/internal/util/nio/GridNioServer.java | 47 +- .../util/nio/GridShmemCommunicationClient.java | 12 +- .../ignite/internal/visor/cache/VisorCache.java |6 +- .../communication/MessageFormatter.java | 15 +- .../extensions/communication/MessageReader.java | 26 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java |6 +- .../communication/tcp/TcpCommunicationSpi.java | 80 +-
[02/50] [abbrv] ignite git commit: Merge branch ignite-1.5 into ignite-1282
Merge branch ignite-1.5 into ignite-1282 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3d4ce809 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3d4ce809 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3d4ce809 Branch: refs/heads/master Commit: 3d4ce809fc96d93936a69a6076e7141da41d739c Parents: c505f48 900788b Author: Alexey GoncharukAuthored: Fri Nov 20 14:03:43 2015 +0300 Committer: Alexey Goncharuk Committed: Fri Nov 20 14:03:43 2015 +0300 -- modules/camel/README.txt| 34 + modules/camel/licenses/apache-2.0.txt | 202 ++ modules/camel/pom.xml | 102 + .../ignite/stream/camel/CamelStreamer.java | 237 ++ .../stream/camel/IgniteCamelStreamerTest.java | 420 .../camel/IgniteCamelStreamerTestSuite.java | 48 + .../src/test/resources/camel.test.properties| 18 + .../ignite/codegen/MessageCodeGenerator.java|1 + .../java/org/apache/ignite/IgniteCache.java |3 +- .../java/org/apache/ignite/IgniteCompute.java |3 +- .../org/apache/ignite/compute/ComputeJob.java |2 +- .../internal/GridEventConsumeHandler.java | 22 +- .../internal/GridMessageListenHandler.java | 18 + .../ignite/internal/GridUpdateNotifier.java |2 +- .../apache/ignite/internal/IgniteKernal.java|9 +- .../communication/GridIoMessageFactory.java | 26 +- .../discovery/GridDiscoveryManager.java |2 +- .../processors/cache/GridCacheAdapter.java | 151 +- .../processors/cache/GridCacheAtomicFuture.java |6 + .../cache/GridCacheDeploymentManager.java |2 +- .../processors/cache/GridCacheEntryEx.java | 12 +- .../processors/cache/GridCacheFuture.java | 13 - .../processors/cache/GridCacheGateway.java |1 - .../processors/cache/GridCacheIoManager.java| 50 +- .../processors/cache/GridCacheMapEntry.java | 158 +- .../processors/cache/GridCacheMessage.java | 20 +- .../processors/cache/GridCacheMvcc.java |7 - .../processors/cache/GridCacheMvccFuture.java |7 + .../processors/cache/GridCacheMvccManager.java | 150 +- .../GridCachePartitionExchangeManager.java | 59 +- .../cache/GridCacheSharedContext.java | 38 +- .../cache/GridCacheUpdateAtomicResult.java | 15 +- .../cache/GridCacheUpdateTxResult.java | 24 +- .../processors/cache/IgniteCacheProxy.java |3 + .../distributed/GridCacheTxRecoveryFuture.java | 54 +- .../distributed/GridDistributedBaseMessage.java | 56 - .../distributed/GridDistributedLockRequest.java |6 - .../GridDistributedLockResponse.java| 32 +- .../distributed/GridDistributedTxMapping.java | 78 - .../GridDistributedTxPrepareRequest.java| 67 +- .../GridDistributedTxRemoteAdapter.java | 158 +- .../dht/CacheDistributedGetFutureAdapter.java | 27 +- .../cache/distributed/dht/CacheGetFuture.java | 32 + .../dht/GridClientPartitionTopology.java| 38 +- .../distributed/dht/GridDhtCacheAdapter.java| 141 ++ .../distributed/dht/GridDhtLocalPartition.java | 35 + .../distributed/dht/GridDhtLockFuture.java | 79 +- .../distributed/dht/GridDhtLockRequest.java |2 +- .../dht/GridDhtPartitionTopology.java | 26 +- .../dht/GridDhtPartitionTopologyImpl.java | 112 +- .../dht/GridDhtTransactionalCacheAdapter.java | 14 +- .../distributed/dht/GridDhtTxFinishFuture.java | 38 +- .../distributed/dht/GridDhtTxFinishRequest.java | 112 +- .../cache/distributed/dht/GridDhtTxLocal.java | 28 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 89 +- .../cache/distributed/dht/GridDhtTxMapping.java | 134 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 136 +- .../dht/GridDhtTxPrepareRequest.java| 54 +- .../cache/distributed/dht/GridDhtTxRemote.java | 29 +- .../dht/GridPartitionedGetFuture.java | 69 +- .../dht/GridPartitionedSingleGetFuture.java | 697 ++ .../dht/atomic/GridDhtAtomicCache.java | 206 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 159 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 121 +- .../dht/atomic/GridNearAtomicUpdateFuture.java |5 - .../dht/colocated/GridDhtColocatedCache.java| 162 +- .../colocated/GridDhtColocatedLockFuture.java | 81 +- .../GridDhtPartitionsExchangeFuture.java| 35 +- .../preloader/GridDhtPartitionsFullMessage.java | 64 +- .../GridDhtPartitionsSingleMessage.java | 56 +- .../distributed/near/CacheVersionedValue.java |2 +- .../distributed/near/GridNearAtomicCache.java | 10 +- .../distributed/near/GridNearCacheAdapter.java |4 +-
[02/50] [abbrv] ignite git commit: Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5
Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/37cafb6e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/37cafb6e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/37cafb6e Branch: refs/heads/ignite-530-pull-fixes Commit: 37cafb6ef750e8dd094803cc02f1cc4d36e9dc87 Parents: d70f7ed 9396ccb Author: Denis MagdaAuthored: Tue Nov 10 14:21:07 2015 +0300 Committer: Denis Magda Committed: Tue Nov 10 14:21:07 2015 +0300 -- .../yardstick/config/ignite-store-config.xml| 31 +++- 1 file changed, 17 insertions(+), 14 deletions(-) --