# IGNITE-379 Rename CacheStore.txEnd --> CacheStore.sessionEnd
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/43284e63 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/43284e63 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/43284e63 Branch: refs/heads/ignite-443 Commit: 43284e63f54b888d979430d2f9a517c1c05814e6 Parents: 6837e12 Author: sevdokimov <sevdoki...@gridgain.com> Authored: Mon Mar 23 11:28:15 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Mon Mar 23 11:28:15 2015 +0300 ---------------------------------------------------------------------- .../hibernate/CacheHibernatePersonStore.java | 6 ++-- .../store/jdbc/CacheJdbcPersonStore.java | 2 +- .../cache/store/CacheLoadOnlyStoreAdapter.java | 2 +- .../apache/ignite/cache/store/CacheStore.java | 2 +- .../ignite/cache/store/CacheStoreAdapter.java | 2 +- .../ignite/cache/store/CacheStoreSession.java | 2 +- .../store/jdbc/CacheAbstractJdbcStore.java | 2 +- .../cache/store/jdbc/CacheJdbcBlobStore.java | 2 +- .../cache/CacheStoreBalancingWrapper.java | 4 +-- .../cache/GridCacheLoaderWriterStore.java | 2 +- .../processors/cache/GridCacheStoreManager.java | 2 +- .../cache/GridCacheWriteBehindStore.java | 2 +- .../store/GridCacheBalancingStoreSelfTest.java | 2 +- .../cache/store/GridGeneratingTestStore.java | 2 +- .../IgniteCacheExpiryStoreLoadSelfTest.java | 2 +- .../GridCacheAbstractLocalStoreSelfTest.java | 2 +- ...idCacheConfigurationConsistencySelfTest.java | 2 +- .../cache/GridCacheGenericTestStore.java | 2 +- .../cache/GridCacheLifecycleAwareSelfTest.java | 2 +- .../cache/GridCacheStorePutxSelfTest.java | 2 +- .../processors/cache/GridCacheTestStore.java | 2 +- .../IgniteTxStoreExceptionAbstractSelfTest.java | 2 +- .../IgniteCrossCacheTxStoreSelfTest.java | 6 ++-- .../IgniteCacheStoreSessionAbstractTest.java | 6 ++-- ...acheStoreSessionWriteBehindAbstractTest.java | 2 +- .../IgniteCacheTxStoreSessionTest.java | 14 ++++---- .../cache/GridAbstractCacheStoreSelfTest.java | 34 ++++++++++---------- .../hibernate/CacheHibernateBlobStore.java | 6 ++-- 28 files changed, 59 insertions(+), 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43284e63/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java index 05ce68d..96ef703 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java @@ -173,7 +173,7 @@ public class CacheHibernatePersonStore extends CacheStoreAdapter<Long, Person> { */ private void rollback(Session ses, Transaction tx) { // Rollback only if there is no cache transaction, - // otherwise txEnd() will do all required work. + // otherwise sessionEnd() will do all required work. if (tx == null) { org.hibernate.Transaction hTx = ses.getTransaction(); @@ -190,7 +190,7 @@ public class CacheHibernatePersonStore extends CacheStoreAdapter<Long, Person> { */ private void end(Session ses, @Nullable Transaction tx) { // Commit only if there is no cache transaction, - // otherwise txEnd() will do all required work. + // otherwise sessionEnd() will do all required work. if (tx == null) { org.hibernate.Transaction hTx = ses.getTransaction(); @@ -202,7 +202,7 @@ public class CacheHibernatePersonStore extends CacheStoreAdapter<Long, Person> { } /** {@inheritDoc} */ - @Override public void txEnd(boolean commit) { + @Override public void sessionEnd(boolean commit) { CacheStoreSession storeSes = session(); Transaction tx = storeSes.transaction(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43284e63/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java index 252c037..347cf57 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java @@ -70,7 +70,7 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long, Person> { } /** {@inheritDoc} */ - @Override public void txEnd(boolean commit) { + @Override public void sessionEnd(boolean commit) { Map<String, Connection> props = ses.properties(); try (Connection conn = props.remove(ATTR_NAME)) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43284e63/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java index 4acb81c..a0cbe65 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheLoadOnlyStoreAdapter.java @@ -255,7 +255,7 @@ public abstract class CacheLoadOnlyStoreAdapter<K, V, I> implements CacheStore<K } /** {@inheritDoc} */ - @Override public void txEnd(boolean commit) { + @Override public void sessionEnd(boolean commit) { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43284e63/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java index 5def065..d018298 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStore.java @@ -95,5 +95,5 @@ public interface CacheStore<K, V> extends CacheLoader<K, V>, CacheWriter<K, V> { * may bring cache transaction into {@link TransactionState#UNKNOWN} which will * consequently cause all transacted entries to be invalidated. */ - public void txEnd(boolean commit) throws CacheWriterException; + public void sessionEnd(boolean commit) throws CacheWriterException; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43284e63/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java index 58a3f76..f7adf2c 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreAdapter.java @@ -88,7 +88,7 @@ public abstract class CacheStoreAdapter<K, V> implements CacheStore<K, V> { * * @param commit {@inheritDoc} */ - @Override public void txEnd(boolean commit) { + @Override public void sessionEnd(boolean commit) { // No-op. } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43284e63/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java index 38fe95c..640d4a3 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/store/CacheStoreSession.java @@ -26,7 +26,7 @@ import java.util.*; * Session for the cache store operations. The main purpose of cache store session * is to hold context between multiple store invocations whenever in transaction. For example, * if using JDBC, you can store the ongoing database connection in the session {@link #properties()} map. - * You can then commit this connection in the {@link CacheStore#txEnd(boolean)} method. + * You can then commit this connection in the {@link CacheStore#sessionEnd(boolean)} method. * <p> * {@code CacheStoreSession} can be injected into an implementation of {@link CacheStore} with * {@link CacheStoreSessionResource @CacheStoreSessionResource} annotation. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43284e63/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java index 6a43929..974f5e6 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java @@ -303,7 +303,7 @@ public abstract class CacheAbstractJdbcStore<K, V> implements CacheStore<K, V>, } /** {@inheritDoc} */ - @Override public void txEnd(boolean commit) throws CacheWriterException { + @Override public void sessionEnd(boolean commit) throws CacheWriterException { CacheStoreSession ses = session(); Transaction tx = ses.transaction(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43284e63/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java index 08ad789..604e76b 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java @@ -178,7 +178,7 @@ public class CacheJdbcBlobStore<K, V> extends CacheStoreAdapter<K, V> { private boolean initOk; /** {@inheritDoc} */ - @Override public void txEnd(boolean commit) { + @Override public void sessionEnd(boolean commit) { init(); Transaction tx = transaction(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43284e63/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStoreBalancingWrapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStoreBalancingWrapper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStoreBalancingWrapper.java index 8d28ac7..f7cf5cf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStoreBalancingWrapper.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStoreBalancingWrapper.java @@ -212,8 +212,8 @@ public class CacheStoreBalancingWrapper<K, V> implements CacheStore<K, V> { } /** {@inheritDoc} */ - @Override public void txEnd(boolean commit) { - delegate.txEnd(commit); + @Override public void sessionEnd(boolean commit) { + delegate.sessionEnd(commit); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43284e63/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLoaderWriterStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLoaderWriterStore.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLoaderWriterStore.java index 30c84e9..1e364b4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLoaderWriterStore.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLoaderWriterStore.java @@ -133,7 +133,7 @@ class GridCacheLoaderWriterStore<K, V> implements CacheStore<K, V>, LifecycleAwa } /** {@inheritDoc} */ - @Override public void txEnd(boolean commit) { + @Override public void sessionEnd(boolean commit) { // No-op. } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43284e63/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java index c926d32..01c92dd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java @@ -779,7 +779,7 @@ public class GridCacheStoreManager extends GridCacheManagerAdapter { boolean ses = initSession(tx); try { - store.txEnd(commit); + store.sessionEnd(commit); } finally { if (ses) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43284e63/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java index 079940e..5aed410 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java @@ -468,7 +468,7 @@ public class GridCacheWriteBehindStore<K, V> implements CacheStore<K, V>, Lifecy } /** {@inheritDoc} */ - @Override public void txEnd(boolean commit) { + @Override public void sessionEnd(boolean commit) { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43284e63/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheBalancingStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheBalancingStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheBalancingStoreSelfTest.java index d53e275..b14ac5f 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheBalancingStoreSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/store/GridCacheBalancingStoreSelfTest.java @@ -194,7 +194,7 @@ public class GridCacheBalancingStoreSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public void txEnd(boolean commit) { + @Override public void sessionEnd(boolean commit) { // No-op. } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43284e63/modules/core/src/test/java/org/apache/ignite/cache/store/GridGeneratingTestStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/GridGeneratingTestStore.java b/modules/core/src/test/java/org/apache/ignite/cache/store/GridGeneratingTestStore.java index b7e2da7..7e9c82e 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/GridGeneratingTestStore.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/store/GridGeneratingTestStore.java @@ -95,7 +95,7 @@ public class GridGeneratingTestStore implements CacheStore<String, String> { } /** {@inheritDoc} */ - @Override public void txEnd(boolean commit) { + @Override public void sessionEnd(boolean commit) { // No-op. } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43284e63/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java index e32e3d2..3d5b2ef 100644 --- a/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java @@ -197,7 +197,7 @@ public class IgniteCacheExpiryStoreLoadSelfTest extends GridCacheAbstractSelfTes } /** {@inheritDoc} */ - @Override public void txEnd(boolean commit) throws CacheWriterException { + @Override public void sessionEnd(boolean commit) throws CacheWriterException { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43284e63/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java index 3d7ed58..434f40a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java @@ -383,7 +383,7 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst } /** {@inheritDoc} */ - @Override public void txEnd(boolean commit) throws CacheWriterException { + @Override public void sessionEnd(boolean commit) throws CacheWriterException { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43284e63/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java index c24518e..96fd9b3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java @@ -1010,7 +1010,7 @@ public class GridCacheConfigurationConsistencySelfTest extends GridCommonAbstrac } /** {@inheritDoc} */ - @Override public void txEnd(boolean commit) { + @Override public void sessionEnd(boolean commit) { // No-op. } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43284e63/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGenericTestStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGenericTestStore.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGenericTestStore.java index 5b7d130..bc54951 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGenericTestStore.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheGenericTestStore.java @@ -251,7 +251,7 @@ public class GridCacheGenericTestStore<K, V> implements CacheStore<K, V> { } /** {@inheritDoc} */ - @Override public void txEnd(boolean commit) { + @Override public void sessionEnd(boolean commit) { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43284e63/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java index 67ad896..474c98a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java @@ -111,7 +111,7 @@ public class GridCacheLifecycleAwareSelfTest extends GridAbstractLifecycleAwareS } /** {@inheritDoc} */ - @Override public void txEnd(boolean commit) { + @Override public void sessionEnd(boolean commit) { // No-op. } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43284e63/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStorePutxSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStorePutxSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStorePutxSelfTest.java index 093ad0e..001522f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStorePutxSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStorePutxSelfTest.java @@ -151,7 +151,7 @@ public class GridCacheStorePutxSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public void txEnd(boolean commit) { + @Override public void sessionEnd(boolean commit) { // No-op. } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43284e63/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java index 7137aac..1129e5a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestStore.java @@ -299,7 +299,7 @@ public final class GridCacheTestStore implements CacheStore<Integer, String> { } /** {@inheritDoc} */ - @Override public void txEnd(boolean commit) { + @Override public void sessionEnd(boolean commit) { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43284e63/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java index 8a83eae..bcc95a3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java @@ -648,7 +648,7 @@ public abstract class IgniteTxStoreExceptionAbstractSelfTest extends GridCacheAb } /** {@inheritDoc} */ - @Override public void txEnd(boolean commit) { + @Override public void sessionEnd(boolean commit) { if (fail && commit) throw new CacheWriterException("Store exception"); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43284e63/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java index e2c53a4..9db924b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java @@ -150,7 +150,7 @@ public class IgniteCrossCacheTxStoreSelfTest extends GridCommonAbstractTest { "write cacheA", "delete cacheA", "write cacheB", - "txEnd true" + "sessionEnd true" ), evts); } @@ -251,8 +251,8 @@ public class IgniteCrossCacheTxStoreSelfTest extends GridCommonAbstractTest { throws CacheLoaderException { } - @Override public void txEnd(boolean commit) throws CacheWriterException { - evts.offer("txEnd " + commit); + @Override public void sessionEnd(boolean commit) throws CacheWriterException { + evts.offer("sessionEnd " + commit); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43284e63/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java index 749f468..ae00ba4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java @@ -191,7 +191,7 @@ public abstract class IgniteCacheStoreSessionAbstractTest extends IgniteCacheAbs expData.add(new ExpectedData(tx, expMtd, new HashMap<>(), expCacheName)); if (tx) - expData.add(new ExpectedData(true, "txEnd", F.<Object, Object>asMap(0, expMtd), expCacheName)); + expData.add(new ExpectedData(true, "sessionEnd", F.<Object, Object>asMap(0, expMtd), expCacheName)); } /** @@ -244,10 +244,10 @@ public abstract class IgniteCacheStoreSessionAbstractTest extends IgniteCacheAbs } /** {@inheritDoc} */ - @Override public void txEnd(boolean commit) throws CacheWriterException { + @Override public void sessionEnd(boolean commit) throws CacheWriterException { log.info("Tx end [commit=" + commit + ", tx=" + session().transaction() + ']'); - checkSession("txEnd"); + checkSession("sessionEnd"); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43284e63/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java index 408bd93..97d7bcd 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java @@ -162,7 +162,7 @@ public abstract class IgniteCacheStoreSessionWriteBehindAbstractTest extends Ign } /** {@inheritDoc} */ - @Override public void txEnd(boolean commit) throws CacheWriterException { + @Override public void sessionEnd(boolean commit) throws CacheWriterException { fail(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43284e63/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java index 1dcef08..ae2a7a6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java @@ -108,7 +108,7 @@ public class IgniteCacheTxStoreSessionTest extends IgniteCacheStoreSessionAbstra expData.add(new ExpectedData(true, "writeAll", new HashMap<>(), null)); expData.add(new ExpectedData(true, "delete", F.<Object, Object>asMap(0, "writeAll"), null)); - expData.add(new ExpectedData(true, "txEnd", F.<Object, Object>asMap(0, "writeAll", 1, "delete"), null)); + expData.add(new ExpectedData(true, "sessionEnd", F.<Object, Object>asMap(0, "writeAll", 1, "delete"), null)); log.info("Do tx commit."); @@ -143,7 +143,7 @@ public class IgniteCacheTxStoreSessionTest extends IgniteCacheStoreSessionAbstra cache.put(key1, key1); expData.add(new ExpectedData(true, "write", new HashMap<>(), cache.getName())); - expData.add(new ExpectedData(true, "txEnd", F.<Object, Object>asMap(0, "write"), cache.getName())); + expData.add(new ExpectedData(true, "sessionEnd", F.<Object, Object>asMap(0, "write"), cache.getName())); log.info("Do tx commit."); @@ -165,7 +165,7 @@ public class IgniteCacheTxStoreSessionTest extends IgniteCacheStoreSessionAbstra cache.put(key3, key3); expData.add(new ExpectedData(true, "writeAll", new HashMap<>(), cache.getName())); - expData.add(new ExpectedData(true, "txEnd", F.<Object, Object>asMap(0, "writeAll"), cache.getName())); + expData.add(new ExpectedData(true, "sessionEnd", F.<Object, Object>asMap(0, "writeAll"), cache.getName())); log.info("Do tx commit."); @@ -199,7 +199,7 @@ public class IgniteCacheTxStoreSessionTest extends IgniteCacheStoreSessionAbstra cache.remove(key1, key1); expData.add(new ExpectedData(true, "delete", new HashMap<>(), null)); - expData.add(new ExpectedData(true, "txEnd", F.<Object, Object>asMap(0, "delete"), null)); + expData.add(new ExpectedData(true, "sessionEnd", F.<Object, Object>asMap(0, "delete"), null)); log.info("Do tx commit."); @@ -221,7 +221,7 @@ public class IgniteCacheTxStoreSessionTest extends IgniteCacheStoreSessionAbstra cache.remove(key3, key3); expData.add(new ExpectedData(true, "deleteAll", new HashMap<>(), null)); - expData.add(new ExpectedData(true, "txEnd", F.<Object, Object>asMap(0, "deleteAll"), null)); + expData.add(new ExpectedData(true, "sessionEnd", F.<Object, Object>asMap(0, "deleteAll"), null)); log.info("Do tx commit."); @@ -263,7 +263,7 @@ public class IgniteCacheTxStoreSessionTest extends IgniteCacheStoreSessionAbstra expData.add(new ExpectedData(true, "write", new HashMap<>(), null)); expData.add(new ExpectedData(true, "write", F.<Object, Object>asMap(0, "write"), CACHE_NAME1)); - expData.add(new ExpectedData(true, "txEnd", F.<Object, Object>asMap(0, "write", 1, "write"), null)); + expData.add(new ExpectedData(true, "sessionEnd", F.<Object, Object>asMap(0, "write", 1, "write"), null)); tx.commit(); } @@ -277,7 +277,7 @@ public class IgniteCacheTxStoreSessionTest extends IgniteCacheStoreSessionAbstra expData.add(new ExpectedData(true, "write", new HashMap<>(), CACHE_NAME1)); expData.add(new ExpectedData(true, "write", F.<Object, Object>asMap(0, "write"), null)); - expData.add(new ExpectedData(true, "txEnd", F.<Object, Object>asMap(0, "write", 1, "write"), null)); + expData.add(new ExpectedData(true, "sessionEnd", F.<Object, Object>asMap(0, "write", 1, "write"), null)); tx.commit(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43284e63/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java index 372682a..6bbea4d 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/cache/GridAbstractCacheStoreSelfTest.java @@ -68,7 +68,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object store.write(new CacheEntryImpl<>("k1", "v1")); store.write(new CacheEntryImpl<>("k2", "v2")); - store.txEnd(true); + store.sessionEnd(true); ses.newSession(null); @@ -80,7 +80,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object store.delete("k1"); - store.txEnd(true); + store.sessionEnd(true); ses.newSession(null); @@ -100,7 +100,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object // Put. store.write(new CacheEntryImpl<>("k1", "v1")); - store.txEnd(false); // Rollback. + store.sessionEnd(false); // Rollback. tx = new DummyTx(); @@ -117,7 +117,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object store.writeAll(col); - store.txEnd(false); // Rollback. + store.sessionEnd(false); // Rollback. tx = new DummyTx(); @@ -131,7 +131,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object store.writeAll(col); - store.txEnd(true); // Commit. + store.sessionEnd(true); // Commit. tx = new DummyTx(); @@ -141,7 +141,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object store.write(new CacheEntryImpl<>("k4", "v4")); - store.txEnd(false); // Rollback. + store.sessionEnd(false); // Rollback. tx = new DummyTx(); @@ -154,7 +154,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object // Remove. store.delete("k3"); - store.txEnd(false); // Rollback. + store.sessionEnd(false); // Rollback. tx = new DummyTx(); @@ -165,7 +165,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object // Remove all. store.deleteAll(Arrays.asList("k3")); - store.txEnd(false); // Rollback. + store.sessionEnd(false); // Rollback. tx = new DummyTx(); @@ -206,7 +206,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object store.write(new CacheEntryImpl<>("key1", "val1")); if (tx != null && commit) { - store.txEnd(true); + store.sessionEnd(true); tx = new DummyTx(); @@ -224,7 +224,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object store.writeAll(col); if (tx != null && commit) { - store.txEnd(true); + store.sessionEnd(true); tx = new DummyTx(); } @@ -255,7 +255,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object store.deleteAll(Arrays.asList("key2", "key3")); if (tx != null && commit) { - store.txEnd(true); + store.sessionEnd(true); tx = new DummyTx(); @@ -271,7 +271,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object store.delete("key1"); if (tx != null && commit) { - store.txEnd(true); + store.sessionEnd(true); tx = new DummyTx(); @@ -283,7 +283,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object } finally { if (tx != null) { - store.txEnd(false); + store.sessionEnd(false); ses.newSession(null); } @@ -332,7 +332,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object } if (tx != null) - store.txEnd(true); + store.sessionEnd(true); queue.add(key); } @@ -349,7 +349,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object store.deleteAll(Collections.singleton(key)); if (tx != null) - store.txEnd(true); + store.sessionEnd(true); } } else { // Update. @@ -371,7 +371,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object } if (tx != null) - store.txEnd(true); + store.sessionEnd(true); queue.add(key); } @@ -391,7 +391,7 @@ public abstract class GridAbstractCacheStoreSelfTest<T extends CacheStore<Object } if (tx != null) - store.txEnd(true); + store.sessionEnd(true); queue.add(key); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/43284e63/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java b/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java index 9b9f2aa..cf49450 100644 --- a/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java +++ b/modules/hibernate/src/main/java/org/apache/ignite/cache/store/hibernate/CacheHibernateBlobStore.java @@ -298,7 +298,7 @@ public class CacheHibernateBlobStore<K, V> extends CacheStoreAdapter<K, V> { */ private void rollback(SharedSessionContract ses, Transaction tx) { // Rollback only if there is no cache transaction, - // otherwise txEnd() will do all required work. + // otherwise sessionEnd() will do all required work. if (tx == null) { org.hibernate.Transaction hTx = ses.getTransaction(); @@ -315,7 +315,7 @@ public class CacheHibernateBlobStore<K, V> extends CacheStoreAdapter<K, V> { */ private void end(Session ses, Transaction tx) { // Commit only if there is no cache transaction, - // otherwise txEnd() will do all required work. + // otherwise sessionEnd() will do all required work. if (tx == null) { org.hibernate.Transaction hTx = ses.getTransaction(); @@ -327,7 +327,7 @@ public class CacheHibernateBlobStore<K, V> extends CacheStoreAdapter<K, V> { } /** {@inheritDoc} */ - @Override public void txEnd(boolean commit) { + @Override public void sessionEnd(boolean commit) { init(); Transaction tx = transaction();
