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 E1308175FC for ; Tue, 22 Sep 2015 14:58:49 +0000 (UTC) Received: (qmail 79216 invoked by uid 500); 22 Sep 2015 14:58:44 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 79096 invoked by uid 500); 22 Sep 2015 14:58:44 -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 78703 invoked by uid 99); 22 Sep 2015 14:58:44 -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; Tue, 22 Sep 2015 14:58:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 69F24E060C; Tue, 22 Sep 2015 14:58:44 +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: Tue, 22 Sep 2015 14:58:50 -0000 Message-Id: <6dd50786be74440da6e4bdba3875273a@git.apache.org> In-Reply-To: <60f08afac2474cc8ac2760ba5902c0b6@git.apache.org> References: <60f08afac2474cc8ac2760ba5902c0b6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/22] ignite git commit: Merge branch 'master' into feature/ignite-535-mqtt Merge branch 'master' into feature/ignite-535-mqtt Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f03f3a3b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f03f3a3b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f03f3a3b Branch: refs/heads/ignite-1282 Commit: f03f3a3b48fa105f318e9493440671188770f4ef Parents: 53683e2 421a523 Author: Raul Kripalani Authored: Mon Sep 21 16:36:53 2015 +0100 Committer: Raul Kripalani Committed: Mon Sep 21 16:36:53 2015 +0100 ---------------------------------------------------------------------- .../org/apache/ignite/IgniteAtomicLong.java | 15 +- .../apache/ignite/IgniteAtomicReference.java | 9 +- .../org/apache/ignite/IgniteAtomicSequence.java | 9 +- .../org/apache/ignite/IgniteAtomicStamped.java | 13 +- .../configuration/NearCacheConfiguration.java | 18 +- .../apache/ignite/internal/IgniteKernal.java | 7 - .../processors/cache/GridCacheContext.java | 6 +- .../cache/GridCacheEvictionManager.java | 6 +- .../cache/GridCacheEvictionResponse.java | 2 +- .../processors/cache/GridCacheIoManager.java | 47 ++-- .../processors/cache/GridCacheMessage.java | 7 + .../processors/cache/GridCacheMvccManager.java | 34 ++- .../GridCachePartitionExchangeManager.java | 41 +++- .../processors/cache/GridCacheProcessor.java | 28 ++- .../GridDistributedLockResponse.java | 6 +- .../GridDistributedTxPrepareResponse.java | 6 +- .../distributed/dht/GridDhtLocalPartition.java | 26 +- .../distributed/dht/GridDhtTopologyFuture.java | 6 +- .../dht/GridDhtTransactionalCacheAdapter.java | 2 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 2 +- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 12 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 16 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 2 + .../atomic/GridNearAtomicUpdateResponse.java | 11 +- .../colocated/GridDhtColocatedLockFuture.java | 44 +++- .../dht/preloader/GridDhtForceKeysFuture.java | 2 +- .../dht/preloader/GridDhtForceKeysResponse.java | 6 +- .../GridDhtPartitionsExchangeFuture.java | 19 +- .../distributed/near/GridNearGetResponse.java | 6 +- .../distributed/near/GridNearLockFuture.java | 26 +- .../near/GridNearOptimisticTxPrepareFuture.java | 20 +- .../near/GridNearTxFinishResponse.java | 6 +- .../query/GridCacheDistributedQueryFuture.java | 27 +- .../cache/query/GridCacheLocalQueryFuture.java | 5 + .../cache/query/GridCacheQueryAdapter.java | 170 ++++++++----- .../query/GridCacheQueryFutureAdapter.java | 11 +- .../cache/query/GridCacheQueryManager.java | 30 ++- .../cache/query/GridCacheQueryResponse.java | 6 +- .../continuous/CacheContinuousQueryHandler.java | 12 +- .../transactions/IgniteTxLocalAdapter.java | 4 +- .../ignite/internal/util/GridSpinBusyLock.java | 10 + .../ignite/spi/discovery/tcp/ServerImpl.java | 12 +- .../IgniteCacheEntryProcessorNodeJoinTest.java | 24 +- .../distributed/CacheAffEarlySelfTest.java | 245 +++++++++++++++++++ .../GridCacheSwapScanQueryAbstractSelfTest.java | 118 ++++----- .../processors/igfs/IgfsAbstractSelfTest.java | 5 +- .../loadtests/hashmap/GridCacheTestContext.java | 4 +- .../ignite/testframework/GridTestUtils.java | 14 +- .../cache/CacheIndexStreamerTest.java | 137 +++++++++++ ...CacheScanPartitionQueryFallbackSelfTest.java | 244 +++++------------- .../IgniteCacheQueryNodeRestartSelfTest2.java | 2 - .../Apache.Ignite.Core/Impl/IgniteManager.cs | 2 - .../ignite/visor/commands/VisorConsole.scala | 37 ++- .../config/benchmark-put-indexed-val.properties | 2 +- modules/yardstick/config/ignite-base-config.xml | 2 +- .../yardstick/IgniteBenchmarkArguments.java | 24 +- .../org/apache/ignite/yardstick/IgniteNode.java | 12 +- 57 files changed, 1084 insertions(+), 535 deletions(-) ----------------------------------------------------------------------