ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sevdoki...@apache.org
Subject incubator-ignite git commit: # ignite-379 rename CacheStore.txEnd() -> CacheStore.sessionEnd().
Date Mon, 02 Mar 2015 12:13:47 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-379 [created] b4779991d


# 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/b4779991
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b4779991
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b4779991

Branch: refs/heads/ignite-379
Commit: b4779991d2c804dbdbdd2224ad43e5ac95376d34
Parents: 0086e9c
Author: sevdokimov <sevdokimov@gridgain.com>
Authored: Mon Mar 2 15:11:39 2015 +0300
Committer: sevdokimov <sevdokimov@gridgain.com>
Committed: Mon Mar 2 15:11:39 2015 +0300

----------------------------------------------------------------------
 .../hibernate/CacheHibernatePersonStore.java    |  2 +-
 .../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 +-
 .../store/jdbc/CacheJdbcPojoStoreTest.java      | 35 ++++++++++----------
 ...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 ++--
 .../IgniteCacheTxStoreSessionTest.java          | 14 ++++----
 .../cache/GridAbstractCacheStoreSelfTest.java   | 34 +++++++++----------
 .../hibernate/CacheHibernateBlobStore.java      |  2 +-
 27 files changed, 70 insertions(+), 71 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4779991/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 9549598..98c6b8a 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
@@ -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/b4779991/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 55ba1a7..0c920f4 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/b4779991/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 b4bcd6c..056e88c 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/b4779991/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 eefcfb3..95c5ff3 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
@@ -146,5 +146,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/b4779991/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/b4779991/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/b4779991/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 7c6f060..fd409fa 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
@@ -301,7 +301,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/b4779991/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 90d62b7..3116309 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/b4779991/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 394bcfb..e628503 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/b4779991/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/b4779991/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 9262a8f..e8e3bd0 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
@@ -773,7 +773,7 @@ public class GridCacheStoreManager<K, V> extends GridCacheManagerAdapter<K,
V> {
         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/b4779991/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 eb6120a..11145d9 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
@@ -458,7 +458,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/b4779991/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/b4779991/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/b4779991/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/b4779991/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
index e870fd6..c112de5 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
@@ -19,7 +19,6 @@ package org.apache.ignite.cache.store.jdbc;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.store.*;
 import org.apache.ignite.cache.store.jdbc.dialect.*;
 import org.apache.ignite.cache.store.jdbc.model.*;
 import org.apache.ignite.internal.processors.cache.*;
@@ -351,7 +350,7 @@ public class CacheJdbcPojoStoreTest extends GridCommonAbstractTest {
         store.write(new CacheEntryImpl<>(k1, v1));
         store.write(new CacheEntryImpl<>(k2, v2));
 
-        store.txEnd(true);
+        store.sessionEnd(true);
 
         ses.newSession(null);
 
@@ -366,7 +365,7 @@ public class CacheJdbcPojoStoreTest extends GridCommonAbstractTest {
 
         store.delete(k1);
 
-        store.txEnd(true);
+        store.sessionEnd(true);
 
         assertNull(store.load(k1));
         assertEquals(v2, store.load(k2));
@@ -399,7 +398,7 @@ public class CacheJdbcPojoStoreTest extends GridCommonAbstractTest {
         // Put.
         store.write(new CacheEntryImpl<>(k1, v1));
 
-        store.txEnd(false); // Rollback.
+        store.sessionEnd(false); // Rollback.
 
         tx = new DummyTx();
 
@@ -419,7 +418,7 @@ public class CacheJdbcPojoStoreTest extends GridCommonAbstractTest {
 
         store.writeAll(col);
 
-        store.txEnd(false); // Rollback.
+        store.sessionEnd(false); // Rollback.
 
         tx = new DummyTx();
 
@@ -436,7 +435,7 @@ public class CacheJdbcPojoStoreTest extends GridCommonAbstractTest {
 
         store.writeAll(col);
 
-        store.txEnd(true); // Commit.
+        store.sessionEnd(true); // Commit.
 
         tx = new DummyTx();
 
@@ -449,7 +448,7 @@ public class CacheJdbcPojoStoreTest extends GridCommonAbstractTest {
 
         store.write(new CacheEntryImpl<>(k4, v4));
 
-        store.txEnd(false); // Rollback.
+        store.sessionEnd(false); // Rollback.
 
         tx = new DummyTx();
 
@@ -462,7 +461,7 @@ public class CacheJdbcPojoStoreTest extends GridCommonAbstractTest {
         // Remove.
         store.delete(k3);
 
-        store.txEnd(false); // Rollback.
+        store.sessionEnd(false); // Rollback.
 
         tx = new DummyTx();
 
@@ -475,7 +474,7 @@ public class CacheJdbcPojoStoreTest extends GridCommonAbstractTest {
         // Remove all.
         store.deleteAll(Arrays.asList(k3));
 
-        store.txEnd(false); // Rollback.
+        store.sessionEnd(false); // Rollback.
 
         tx = new DummyTx();
 
@@ -516,7 +515,7 @@ public class CacheJdbcPojoStoreTest extends GridCommonAbstractTest {
             store.write(new CacheEntryImpl<>(k1, v1));
 
             if (tx != null && commit) {
-                store.txEnd(true);
+                store.sessionEnd(true);
 
                 tx = new DummyTx();
 
@@ -540,7 +539,7 @@ public class CacheJdbcPojoStoreTest extends GridCommonAbstractTest {
             store.writeAll(col);
 
             if (tx != null && commit) {
-                store.txEnd(true);
+                store.sessionEnd(true);
 
                 tx = new DummyTx();
 
@@ -579,7 +578,7 @@ public class CacheJdbcPojoStoreTest extends GridCommonAbstractTest {
             store.deleteAll(Arrays.asList(k2, k3));
 
             if (tx != null && commit) {
-                store.txEnd(true);
+                store.sessionEnd(true);
 
                 tx = new DummyTx();
 
@@ -595,7 +594,7 @@ public class CacheJdbcPojoStoreTest extends GridCommonAbstractTest {
             store.delete(k1);
 
             if (tx != null && commit) {
-                store.txEnd(true);
+                store.sessionEnd(true);
 
                 tx = new DummyTx();
 
@@ -607,7 +606,7 @@ public class CacheJdbcPojoStoreTest extends GridCommonAbstractTest {
         }
         finally {
             if (tx != null)
-                store.txEnd(false);
+                store.sessionEnd(false);
         }
     }
 
@@ -652,7 +651,7 @@ public class CacheJdbcPojoStoreTest extends GridCommonAbstractTest {
                             }
 
                             if (tx != null)
-                                store.txEnd(true);
+                                store.sessionEnd(true);
 
                             queue.add(key);
                         }
@@ -669,7 +668,7 @@ public class CacheJdbcPojoStoreTest extends GridCommonAbstractTest {
                                 store.deleteAll(Collections.singleton(key));
 
                             if (tx != null)
-                                store.txEnd(true);
+                                store.sessionEnd(true);
                         }
                     }
                     else { // Update.
@@ -694,7 +693,7 @@ public class CacheJdbcPojoStoreTest extends GridCommonAbstractTest {
                             }
 
                             if (tx != null)
-                                store.txEnd(true);
+                                store.sessionEnd(true);
 
                             queue.add(key);
                         }
@@ -717,7 +716,7 @@ public class CacheJdbcPojoStoreTest extends GridCommonAbstractTest {
                         }
 
                         if (tx != null)
-                            store.txEnd(true);
+                            store.sessionEnd(true);
 
                         queue.add(key);
                     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b4779991/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 3bd42dc..673e079 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
@@ -1053,7 +1053,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/b4779991/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/b4779991/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 9f4b8f2..d8c1428 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/b4779991/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/b4779991/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/b4779991/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 b378b97..2b9adc1 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/b4779991/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 89ac933..ca6d840 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
@@ -156,7 +156,7 @@ public class IgniteCrossCacheTxStoreSelfTest extends GridCommonAbstractTest
{
                 "write cacheA",
                 "delete cacheA",
                 "write cacheB",
-                "txEnd true"
+                "sessionEnd true"
             ),
             evts);
     }
@@ -257,8 +257,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/b4779991/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/b4779991/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/b4779991/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/b4779991/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 b6a4155..faba711 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
@@ -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();


Mime
View raw message