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 D187F109CE for ; Wed, 4 Mar 2015 21:15:09 +0000 (UTC) Received: (qmail 58745 invoked by uid 500); 4 Mar 2015 21:14:47 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 58710 invoked by uid 500); 4 Mar 2015 21:14:47 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 58657 invoked by uid 99); 4 Mar 2015 21:14:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Mar 2015 21:14:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 04 Mar 2015 21:14:45 +0000 Received: (qmail 57071 invoked by uid 99); 4 Mar 2015 21:14:24 -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; Wed, 04 Mar 2015 21:14:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 40C0AE104E; Wed, 4 Mar 2015 21:14:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 04 Mar 2015 21:14:40 -0000 Message-Id: <9a9ef93198364fedbf297ec85705de6d@git.apache.org> In-Reply-To: <4439dff1545c452c8e7fa3af2c300dd5@git.apache.org> References: <4439dff1545c452c8e7fa3af2c300dd5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [17/18] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-51' into ignite-51-v2 X-Virus-Checked: Checked by ClamAV on apache.org Merge remote-tracking branch 'remotes/origin/ignite-51' into ignite-51-v2 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/065b81ed Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/065b81ed Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/065b81ed Branch: refs/heads/ignite-51-v2 Commit: 065b81edf5ff57f60eadfb137ca9dc4e2866bcd1 Parents: 6ce2ec6 4f1568d Author: sboikov Authored: Thu Mar 5 00:00:20 2015 +0300 Committer: sboikov Committed: Thu Mar 5 00:00:20 2015 +0300 ---------------------------------------------------------------------- .../misc/lifecycle/LifecycleExample.java | 4 +- .../apache/ignite/internal/IgniteKernal.java | 8 +- .../communication/GridIoMessageFactory.java | 2 +- .../affinity/GridAffinityAssignmentCache.java | 11 +- .../affinity/GridAffinityProcessor.java | 35 +- .../cache/CacheEntryPredicateContainsValue.java | 5 +- .../processors/cache/CacheEvictionEntry.java | 2 +- .../cache/CacheInvokeDirectResult.java | 4 +- .../internal/processors/cache/CacheObject.java | 8 +- .../processors/cache/CacheObjectAdapter.java | 4 +- .../processors/cache/CacheObjectContext.java | 42 +- .../processors/cache/CacheObjectImpl.java | 18 +- .../processors/cache/EvictableEntryImpl.java | 10 +- .../processors/cache/GridCacheAdapter.java | 59 +- .../cache/GridCacheConcurrentMap.java | 2 +- .../processors/cache/GridCacheContext.java | 28 +- .../GridCacheDefaultAffinityKeyMapper.java | 44 +- .../cache/GridCacheDeploymentManager.java | 2 +- .../processors/cache/GridCacheEntryInfo.java | 4 +- .../processors/cache/GridCacheEventManager.java | 6 +- .../cache/GridCacheEvictionRequest.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 58 +- .../processors/cache/GridCacheMessage.java | 10 +- .../processors/cache/GridCacheProcessor.java | 29 +- .../processors/cache/GridCacheStoreManager.java | 20 +- .../processors/cache/GridCacheSwapManager.java | 65 ++- .../processors/cache/GridCacheUtils.java | 7 +- .../processors/cache/KeyCacheObjectImpl.java | 14 +- .../cache/KeyCacheObjectTransferImpl.java | 8 +- .../processors/cache/UserCacheObjectImpl.java | 4 +- .../cache/UserKeyCacheObjectImpl.java | 12 +- .../cache/affinity/GridCacheAffinityImpl.java | 10 +- .../CacheDataStructuresManager.java | 2 +- .../distributed/dht/GridDhtCacheAdapter.java | 2 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 4 +- .../dht/atomic/GridDhtAtomicCache.java | 14 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 4 +- .../atomic/GridNearAtomicUpdateResponse.java | 2 +- .../distributed/near/CacheVersionedValue.java | 157 ++++++ .../distributed/near/GridNearCacheEntry.java | 2 +- .../distributed/near/GridNearGetFuture.java | 4 +- .../cache/distributed/near/GridNearTxLocal.java | 4 +- .../near/GridNearTxPrepareFuture.java | 6 +- .../near/GridNearTxPrepareResponse.java | 18 +- .../near/NearTxPrepareResponseOwnedValue.java | 157 ------ .../local/atomic/GridLocalAtomicCache.java | 18 +- .../cache/query/GridCacheQueryManager.java | 2 +- .../continuous/CacheContinuousQueryEntry.java | 6 +- .../continuous/CacheContinuousQueryEvent.java | 2 +- .../continuous/CacheContinuousQueryManager.java | 6 +- .../cache/transactions/IgniteTxAdapter.java | 2 +- .../cache/transactions/IgniteTxEntry.java | 2 +- .../cache/transactions/IgniteTxKey.java | 2 +- .../transactions/IgniteTxLocalAdapter.java | 28 +- .../cache/transactions/TxEntryValueHolder.java | 2 +- .../dataload/GridDataLoadUpdateJob.java | 4 +- .../dataload/IgniteDataLoaderEntry.java | 4 +- .../dataload/IgniteDataLoaderImpl.java | 11 +- .../datastructures/DataStructuresProcessor.java | 4 +- .../ignite/internal/processors/igfs/IgfsEx.java | 6 + .../IgniteCacheObjectProcessorAdapter.java | 19 +- .../shmem/IpcSharedMemoryServerEndpoint.java | 3 +- .../visor/cache/VisorCacheClearTask.java | 3 +- .../visor/cache/VisorCacheLoadTask.java | 3 +- .../visor/node/VisorIgfsConfiguration.java | 7 +- .../apache/ignite/lifecycle/LifecycleBean.java | 36 +- .../ignite/lifecycle/LifecycleEventType.java | 20 +- .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../internal/GridLifecycleBeanSelfTest.java | 76 +-- .../cache/GridCacheAbstractFullApiSelfTest.java | 3 +- .../cache/GridCacheOffHeapSelfTest.java | 2 +- ...actQueueFailoverDataConsistencySelfTest.java | 2 +- .../dht/GridCacheDhtPreloadBigDataSelfTest.java | 2 +- .../dht/GridCacheDhtPreloadUnloadSelfTest.java | 2 +- ...achePartitionedMultiNodeCounterSelfTest.java | 4 +- ...achePartitionedPreloadLifecycleSelfTest.java | 8 +- ...CacheReplicatedPreloadLifecycleSelfTest.java | 8 +- .../clock/GridTimeSyncProcessorSelfTest.java | 2 +- .../colocation/GridTestLifecycleBean.java | 2 +- .../loadtests/dsi/GridDsiLifecycleBean.java | 8 +- .../hadoop/IgfsHadoopFileSystemWrapper.java | 44 +- .../igfs/hadoop/v1/IgfsHadoopFileSystem.java | 48 +- .../igfs/hadoop/v2/IgfsHadoopFileSystem.java | 54 +- .../hadoop/SecondaryFileSystemProvider.java | 111 ++++ .../GridHadoopExternalCommunication.java | 2 +- ...oopSecondaryFileSystemConfigurationTest.java | 541 +++++++++++++++++++ .../testsuites/IgniteHadoopTestSuite.java | 2 + .../processors/query/h2/IgniteH2Indexing.java | 3 +- .../cache/GridCacheOffHeapAndSwapSelfTest.java | 4 +- .../schema/generator/SnippetGenerator.java | 2 +- .../schema/parser/DatabaseMetadataParser.java | 7 +- .../cache/spring/SpringDynamicCacheManager.java | 2 +- .../ignite/internal/GridFactorySelfTest.java | 10 +- .../scala/org/apache/ignite/visor/Packet.scala | 38 -- .../ignite/visor/commands/VisorConsole.scala | 2 - .../ignite/visor/commands/ack/Packet.scala | 55 -- .../visor/commands/ack/VisorAckCommand.scala | 2 +- .../ignite/visor/commands/alert/Packet.scala | 108 ---- .../ignite/visor/commands/cache/Packet.scala | 127 ----- .../commands/cache/VisorCacheCommand.scala | 12 +- .../ignite/visor/commands/config/Packet.scala | 55 -- .../ignite/visor/commands/deploy/Packet.scala | 76 --- .../ignite/visor/commands/disco/Packet.scala | 72 --- .../ignite/visor/commands/events/Packet.scala | 97 ---- .../ignite/visor/commands/gc/Packet.scala | 61 --- .../ignite/visor/commands/kill/Packet.scala | 78 --- .../visor/commands/kill/VisorKillCommand.scala | 2 +- .../ignite/visor/commands/node/Packet.scala | 60 -- .../ignite/visor/commands/ping/Packet.scala | 50 -- .../visor/commands/ping/VisorPingCommand.scala | 2 +- .../ignite/visor/commands/start/Packet.scala | 90 --- .../ignite/visor/commands/tasks/Packet.scala | 116 ---- .../commands/tasks/VisorTasksCommand.scala | 26 +- .../ignite/visor/commands/top/Packet.scala | 87 --- .../ignite/visor/commands/vvm/Packet.scala | 61 --- 115 files changed, 1365 insertions(+), 1966 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/065b81ed/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ----------------------------------------------------------------------