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 C0590178D3 for ; Wed, 15 Apr 2015 17:01:14 +0000 (UTC) Received: (qmail 72599 invoked by uid 500); 15 Apr 2015 17:01:11 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 72565 invoked by uid 500); 15 Apr 2015 17:01:11 -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 72556 invoked by uid 99); 15 Apr 2015 17:01:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Apr 2015 17:01:11 +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, 15 Apr 2015 17:00:49 +0000 Received: (qmail 68944 invoked by uid 99); 15 Apr 2015 17:00:46 -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, 15 Apr 2015 17:00:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 832B5DF97F; Wed, 15 Apr 2015 17:00:46 +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, 15 Apr 2015 17:00:49 -0000 Message-Id: <7af161c1db60491d893493a8bf8084ed@git.apache.org> In-Reply-To: <8af900c0fa834239b6841c583a849c8d@git.apache.org> References: <8af900c0fa834239b6841c583a849c8d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/5] incubator-ignite git commit: #ignite-758: Remove methods txSynchronize, txUnsynchronize, txSynchronizations from GridCache. X-Virus-Checked: Checked by ClamAV on apache.org #ignite-758: Remove methods txSynchronize, txUnsynchronize, txSynchronizations from GridCache. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/399ddd23 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/399ddd23 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/399ddd23 Branch: refs/heads/ignite-758 Commit: 399ddd23d3cc007c79d1a88c81c27c9b4e2aec20 Parents: 0316790 Author: ivasilinets Authored: Wed Apr 15 18:22:57 2015 +0300 Committer: ivasilinets Committed: Wed Apr 15 18:22:57 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/GridCache.java | 26 -------------- .../processors/cache/GridCacheAdapter.java | 15 -------- .../processors/cache/GridCacheProxyImpl.java | 36 -------------------- .../TransactionSynchronization.java | 3 +- 4 files changed, 1 insertion(+), 79 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/399ddd23/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCache.java index d2cfffb..f17410d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCache.java @@ -66,32 +66,6 @@ public interface GridCache extends CacheProjection { public CacheConfiguration configuration(); /** - * Registers transactions synchronizations for all transactions started by this cache. - * Use it whenever you need to get notifications on transaction lifecycle and possibly change - * its course. It is also particularly useful when integrating cache transactions - * with some other in-house transactions. - * - * @param syncs Transaction synchronizations to register. - */ - public void txSynchronize(@Nullable TransactionSynchronization syncs); - - /** - * Removes transaction synchronizations. - * - * @param syncs Transactions synchronizations to remove. - * @see #txSynchronize(TransactionSynchronization) - */ - public void txUnsynchronize(@Nullable TransactionSynchronization syncs); - - /** - * Gets registered transaction synchronizations. - * - * @return Registered transaction synchronizations. - * @see #txSynchronize(TransactionSynchronization) - */ - public Collection txSynchronizations(); - - /** * Gets affinity service to provide information about data partitioning * and distribution. * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/399ddd23/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 63c42d3..da5fa3c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -3310,21 +3310,6 @@ public abstract class GridCacheAdapter implements GridCache, } /** {@inheritDoc} */ - @Override public void txSynchronize(TransactionSynchronization syncs) { - ctx.tm().addSynchronizations(syncs); - } - - /** {@inheritDoc} */ - @Override public void txUnsynchronize(TransactionSynchronization syncs) { - ctx.tm().removeSynchronizations(syncs); - } - - /** {@inheritDoc} */ - @Override public Collection txSynchronizations() { - return ctx.tm().synchronizations(); - } - - /** {@inheritDoc} */ @Override public void localLoadCache(final IgniteBiPredicate p, Object[] args) throws IgniteCheckedException { final boolean replicate = ctx.isDrEnabled(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/399ddd23/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java index 895f82d..6739bcb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java @@ -158,42 +158,6 @@ public class GridCacheProxyImpl implements GridCacheProxy, Externali } /** {@inheritDoc} */ - @Override public void txSynchronize(@Nullable TransactionSynchronization syncs) { - GridCacheProjectionImpl prev = gate.enter(prj); - - try { - cache.txSynchronize(syncs); - } - finally { - gate.leave(prev); - } - } - - /** {@inheritDoc} */ - @Override public void txUnsynchronize(@Nullable TransactionSynchronization syncs) { - GridCacheProjectionImpl prev = gate.enter(prj); - - try { - cache.txUnsynchronize(syncs); - } - finally { - gate.leave(prev); - } - } - - /** {@inheritDoc} */ - @Override public Collection txSynchronizations() { - GridCacheProjectionImpl prev = gate.enter(prj); - - try { - return cache.txSynchronizations(); - } - finally { - gate.leave(prev); - } - } - - /** {@inheritDoc} */ @Override public CacheMetrics metrics() { GridCacheProjectionImpl prev = gate.enter(prj); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/399ddd23/modules/core/src/main/java/org/apache/ignite/transactions/TransactionSynchronization.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/TransactionSynchronization.java b/modules/core/src/main/java/org/apache/ignite/transactions/TransactionSynchronization.java index 01d24d5..9766bdc 100644 --- a/modules/core/src/main/java/org/apache/ignite/transactions/TransactionSynchronization.java +++ b/modules/core/src/main/java/org/apache/ignite/transactions/TransactionSynchronization.java @@ -21,8 +21,7 @@ import org.jetbrains.annotations.*; /** * Synchronization callback for transaction. You can subscribe to receive transaction - * state change callbacks by registering transaction synchronization via - * {@link org.apache.ignite.internal.processors.cache.GridCache#txSynchronize(TransactionSynchronization)} method. + * state change callbacks by registering transaction synchronization. */ public interface TransactionSynchronization { /**