You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by yz...@apache.org on 2015/04/01 14:58:14 UTC
[38/50] incubator-ignite git commit: Merge remote-tracking branch
'origin/ignite-sprint-3' into ignite-sprint-3
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d297e066
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d297e066
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d297e066
Branch: refs/heads/sprint-2-ide-settings
Commit: d297e066ea110038168adddbacb31747e673eaac
Parents: 3a8a155 13edeb4
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Wed Apr 1 13:05:04 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Wed Apr 1 13:05:04 2015 +0300
----------------------------------------------------------------------
.../examples/datagrid/CacheQueryExample.java | 12 +-
.../checkpoint/s3/S3CheckpointSpiSelfTest.java | 12 +-
.../client/impl/ClientCacheFlagsCodecTest.java | 18 +-
.../configuration/CacheConfiguration.java | 23 ++
.../ignite/internal/GridCachePluginContext.java | 72 ++++++
.../ignite/internal/GridKernalContextImpl.java | 18 +-
.../apache/ignite/internal/IgniteKernal.java | 7 +
.../org/apache/ignite/internal/IgnitionEx.java | 10 +-
.../internal/MarshallerContextAdapter.java | 6 +-
.../ignite/internal/MarshallerContextImpl.java | 90 ++++++-
.../internal/client/GridClientCacheFlag.java | 13 -
.../impl/connection/GridClientConnection.java | 9 -
.../internal/managers/GridManagerAdapter.java | 4 +
.../internal/processors/cache/CacheFlag.java | 108 ---------
.../processors/cache/CacheFlagException.java | 67 ------
.../processors/cache/CacheProjection.java | 209 +---------------
.../internal/processors/cache/GridCache.java | 3 -
.../processors/cache/GridCacheAdapter.java | 211 ++++------------
.../cache/GridCacheConcurrentMap.java | 44 +---
.../processors/cache/GridCacheContext.java | 239 +++----------------
.../processors/cache/GridCacheEntryEx.java | 3 +-
.../processors/cache/GridCacheMapEntry.java | 27 +--
.../processors/cache/GridCacheProcessor.java | 52 ++--
.../processors/cache/GridCacheProjectionEx.java | 20 --
.../cache/GridCacheProjectionImpl.java | 77 ++----
.../processors/cache/GridCacheProxyImpl.java | 36 +--
.../cache/GridCacheSharedContext.java | 21 --
.../processors/cache/GridCacheUtils.java | 39 +++
.../processors/cache/IgniteCacheProxy.java | 29 +--
.../GridDistributedTxRemoteAdapter.java | 2 +-
.../distributed/dht/GridDhtCacheAdapter.java | 2 +-
.../distributed/dht/GridDhtLocalPartition.java | 2 +-
.../distributed/dht/GridDhtLockFuture.java | 2 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 2 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 2 +-
.../dht/GridPartitionedGetFuture.java | 3 +-
.../dht/atomic/GridDhtAtomicCache.java | 32 ---
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 2 -
.../dht/atomic/GridNearAtomicUpdateFuture.java | 3 -
.../dht/atomic/GridNearAtomicUpdateRequest.java | 78 ++----
.../dht/colocated/GridDhtColocatedCache.java | 2 -
.../colocated/GridDhtDetachedCacheEntry.java | 2 +-
.../distributed/near/GridNearAtomicCache.java | 5 +-
.../distributed/near/GridNearCacheAdapter.java | 9 -
.../distributed/near/GridNearGetFuture.java | 3 +-
.../near/GridNearTransactionalCache.java | 2 -
.../cache/distributed/near/GridNearTxLocal.java | 4 +-
.../local/atomic/GridLocalAtomicCache.java | 74 +-----
.../continuous/CacheContinuousQueryHandler.java | 5 -
.../CacheContinuousQueryListener.java | 3 +
.../continuous/CacheContinuousQueryManager.java | 2 +-
.../transactions/IgniteTransactionsImpl.java | 5 +-
.../transactions/IgniteTxLocalAdapter.java | 19 +-
.../cache/transactions/IgniteTxManager.java | 2 -
.../datastreamer/DataStreamerImpl.java | 2 +-
.../datastructures/DataStructuresProcessor.java | 13 +-
.../datastructures/GridCacheAtomicLongImpl.java | 14 +-
.../GridCacheAtomicReferenceImpl.java | 2 +-
.../GridCacheAtomicReferenceValue.java | 15 +-
.../GridCacheAtomicSequenceImpl.java | 2 +-
.../GridCacheAtomicStampedImpl.java | 2 +-
.../GridCacheAtomicStampedValue.java | 15 +-
.../GridCacheCountDownLatchImpl.java | 2 +-
.../processors/plugin/CachePluginManager.java | 107 +++++++++
.../handlers/cache/GridCacheCommandHandler.java | 66 ++---
.../ignite/internal/util/IgniteUtils.java | 2 +-
.../ignite/marshaller/MarshallerContext.java | 3 +-
.../optimized/OptimizedMarshallerUtils.java | 9 +-
.../ignite/plugin/CachePluginConfiguration.java | 33 +++
.../ignite/plugin/CachePluginContext.java | 54 +++++
.../ignite/plugin/CachePluginProvider.java | 83 +++++++
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 16 +-
.../org/apache/ignite/spi/IgniteSpiContext.java | 5 +
.../communication/tcp/TcpCommunicationSpi.java | 13 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 14 +-
...eJdbcStoreAbstractMultithreadedSelfTest.java | 11 +-
.../managers/GridNoopManagerSelfTest.java | 2 +-
.../communication/GridIoManagerSelfTest.java | 9 +-
.../GridCacheAbstractFailoverSelfTest.java | 2 +-
.../cache/GridCacheAbstractFlagsTest.java | 97 --------
.../cache/GridCacheAbstractFullApiSelfTest.java | 61 ++++-
.../cache/GridCacheMemoryModeSelfTest.java | 12 +-
.../cache/GridCachePutAllFailoverSelfTest.java | 26 +-
.../GridCacheReturnValueTransferSelfTest.java | 36 +--
.../processors/cache/GridCacheTestEntryEx.java | 2 +-
.../cache/IgniteCacheInvokeAbstractTest.java | 11 -
...PartitionedQueueCreateMultiNodeSelfTest.java | 6 +-
.../IgniteCacheSystemTransactionsSelfTest.java | 38 +--
...GridCacheValueConsistencyAtomicSelfTest.java | 101 --------
.../near/GridCachePartitionedFlagsTest.java | 41 ----
.../GridCacheReplicatedFlagsTest.java | 28 ---
...ridCacheContinuousQueryAbstractSelfTest.java | 2 +-
.../cache/GridCacheCommandHandlerSelfTest.java | 2 +-
.../internal/util/IgniteUtilsSelfTest.java | 2 +-
.../loadtests/hashmap/GridCacheTestContext.java | 4 +-
.../OptimizedMarshallerNodeFailoverTest.java | 71 +++++-
.../OptimizedObjectStreamSelfTest.java | 4 -
.../spi/GridSpiLocalHostInjectionTest.java | 2 +-
.../GridPriorityQueueCollisionSpiSelfTest.java | 2 +-
...RobinLoadBalancingSpiNotPerTaskSelfTest.java | 2 +-
.../testframework/GridSpiTestContext.java | 18 +-
.../testframework/junits/GridAbstractTest.java | 28 ++-
.../junits/GridTestKernalContext.java | 2 +-
.../junits/IgniteTestResources.java | 8 +-
.../junits/spi/GridSpiAbstractTest.java | 13 +-
.../IgniteCacheFailoverTestSuite.java | 8 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 1 -
.../processors/cache/jta/CacheJtaManager.java | 1 -
.../ignite/scalar/pimps/ScalarCachePimp.scala | 36 ---
.../commands/disco/VisorDiscoveryCommand.scala | 8 +-
.../commands/events/VisorEventsCommand.scala | 24 +-
.../commands/tasks/VisorTasksCommand.scala | 6 +-
112 files changed, 1118 insertions(+), 1827 deletions(-)
----------------------------------------------------------------------