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 8658618CB1 for ; Tue, 7 Jul 2015 13:52:02 +0000 (UTC) Received: (qmail 55304 invoked by uid 500); 7 Jul 2015 13:52:02 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 55274 invoked by uid 500); 7 Jul 2015 13:52:02 -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 55265 invoked by uid 99); 7 Jul 2015 13:52:02 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Jul 2015 13:52:02 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 0562318006E for ; Tue, 7 Jul 2015 13:52:02 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id hjbdkukQ8wQN for ; Tue, 7 Jul 2015 13:52:00 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 40E5D27D6E for ; Tue, 7 Jul 2015 13:51:55 +0000 (UTC) Received: (qmail 55021 invoked by uid 99); 7 Jul 2015 13:51:53 -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, 07 Jul 2015 13:51:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 03F38E10A2; Tue, 7 Jul 2015 13:51:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yzhdanov@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 07 Jul 2015 13:51:54 -0000 Message-Id: <16d5ebf2f6dd4051865b63528de9a87e@git.apache.org> In-Reply-To: <3e20a727ac924b6f8cd4f8b0ac058c65@git.apache.org> References: <3e20a727ac924b6f8cd4f8b0ac058c65@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/45] incubator-ignite git commit: Merge branches 'sprint-1' and 'sprint-1-release' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-1-release Merge branches 'sprint-1' and 'sprint-1-release' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-1-release Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9b3bae79 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9b3bae79 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9b3bae79 Branch: refs/heads/ignite-591 Commit: 9b3bae79d5a51406a9b993a5f4ea4480bf795cb7 Parents: 34d0e44 3ba4f3c Author: Yakov Zhdanov Authored: Mon Feb 16 15:14:20 2015 +0300 Committer: Yakov Zhdanov Committed: Mon Feb 16 15:14:20 2015 +0300 ---------------------------------------------------------------------- .../store/dummy/CacheDummyPersonStore.java | 11 ++ .../hibernate/CacheHibernatePersonStore.java | 12 ++ .../store/jdbc/CacheJdbcPersonStore.java | 11 +- .../cache/store/CacheLoadOnlyStoreAdapter.java | 2 +- .../apache/ignite/cache/store/CacheStore.java | 31 +--- .../ignite/cache/store/CacheStoreAdapter.java | 2 +- .../ignite/cache/store/CacheStoreSession.java | 3 + .../store/jdbc/CacheAbstractJdbcStore.java | 24 ++- .../cache/store/jdbc/CacheJdbcBlobStore.java | 11 ++ .../apache/ignite/cluster/ClusterMetrics.java | 41 +++++ .../org/apache/ignite/compute/ComputeTask.java | 3 +- .../configuration/CacheConfiguration.java | 26 +-- .../ClusterLocalNodeMetricsMXBeanImpl.java | 10 ++ .../ignite/internal/ClusterMetricsSnapshot.java | 52 ++++++ .../discovery/GridDiscoveryManager.java | 2 + .../cache/CacheStoreBalancingWrapper.java | 2 +- .../cache/GridCacheLoaderWriterStore.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 4 +- .../processors/cache/GridCacheProcessor.java | 2 +- .../processors/cache/GridCacheStoreManager.java | 84 +++++---- .../cache/GridCacheWriteBehindStore.java | 2 +- .../dht/atomic/GridDhtAtomicCache.java | 2 +- .../transactions/IgniteTxLocalAdapter.java | 2 +- .../GridTransactionalCacheQueueImpl.java | 4 +- .../processors/query/GridQueryProcessor.java | 6 +- .../processors/resource/GridResourceIoc.java | 48 +++-- .../resource/GridResourceProcessor.java | 21 +++ .../node/VisorNodeEventsCollectorTask.java | 9 +- .../mxbean/ClusterLocalNodeMetricsMXBean.java | 9 + .../resources/CacheStoreSessionResource.java | 41 +++++ .../apache/ignite/resources/package-info.java | 22 +++ .../org/apache/ignite/resources/package.html | 25 --- .../store/GridCacheBalancingStoreSelfTest.java | 2 +- .../cache/store/GridGeneratingTestStore.java | 2 +- .../store/jdbc/CacheJdbcPojoStoreTest.java | 2 +- ...idCacheConfigurationConsistencySelfTest.java | 2 +- .../cache/GridCacheGenericTestStore.java | 2 +- .../cache/GridCacheLifecycleAwareSelfTest.java | 2 +- .../cache/GridCacheStorePutxSelfTest.java | 2 +- .../processors/cache/GridCacheTestStore.java | 15 +- .../IgniteTxStoreExceptionAbstractSelfTest.java | 2 +- .../IgniteCrossCacheTxStoreSelfTest.java | 14 +- .../near/GridCacheNearMetricsSelfTest.java | 4 +- ...idCachePartitionedHitsAndMissesSelfTest.java | 177 +++++++++++++++++++ .../IgniteCacheStoreSessionAbstractTest.java | 20 ++- ...ClusterMetricsSnapshotSerializeSelfTest.java | 6 +- .../cache/GridAbstractCacheStoreSelfTest.java | 2 +- .../IgniteCacheMetricsSelfTestSuite.java | 21 +-- .../hibernate/CacheHibernateBlobStore.java | 11 ++ ...idCachePartitionedHitsAndMissesSelfTest.java | 176 ------------------ .../IgniteH2IndexingSpiTestSuite.java | 2 - .../commands/cache/VisorCacheCommand.scala | 2 +- .../commands/top/VisorTopologyCommand.scala | 3 +- .../scala/org/apache/ignite/visor/visor.scala | 2 +- .../cache/VisorCacheClearCommandSpec.scala | 4 +- .../commands/cache/VisorCacheCommandSpec.scala | 4 +- .../cache/VisorCacheCompactCommandSpec.scala | 4 +- .../cswap/VisorCacheSwapCommandSpec.scala | 4 +- pom.xml | 38 +++- 59 files changed, 696 insertions(+), 355 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b3bae79/pom.xml ----------------------------------------------------------------------