ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject incubator-ignite git commit: # ignite-42
Date Mon, 19 Jan 2015 18:48:43 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-42 d253a7b13 -> b463cfa65


# ignite-42


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b463cfa6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b463cfa6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b463cfa6

Branch: refs/heads/ignite-42
Commit: b463cfa65ac94e39ddaf64be56d9cb1a39ea2645
Parents: d253a7b
Author: sboikov <semen.boikov@inria.fr>
Authored: Mon Jan 19 21:48:31 2015 +0300
Committer: sboikov <semen.boikov@inria.fr>
Committed: Mon Jan 19 21:48:31 2015 +0300

----------------------------------------------------------------------
 .../datagrid/store/hibernate/CacheHibernatePersonStore.java | 9 +++++++++
 .../examples/datagrid/store/jdbc/CacheJdbcPersonStore.java  | 9 +++++++++
 .../cache/GridCacheGroupLockAbstractSelfTest.java           | 3 ++-
 .../distributed/GridCacheClientModesAbstractSelfTest.java   | 6 ++++++
 4 files changed, 26 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b463cfa6/examples/src/main/java/org/gridgain/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
b/examples/src/main/java/org/gridgain/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
index a6ad96c..8392e45 100644
--- a/examples/src/main/java/org/gridgain/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
+++ b/examples/src/main/java/org/gridgain/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
@@ -267,4 +267,13 @@ public class CacheHibernatePersonStore extends CacheStoreAdapter<Long,
Person> {
 
         return ses;
     }
+
+    /**
+     * @return Current transaction.
+     */
+    @Nullable private IgniteTx transaction() {
+        CacheStoreSession ses = session();
+
+        return ses != null ? ses.transaction() : null;
+    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b463cfa6/examples/src/main/java/org/gridgain/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/gridgain/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
b/examples/src/main/java/org/gridgain/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
index 93b2c3d..bb23e82 100644
--- a/examples/src/main/java/org/gridgain/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
+++ b/examples/src/main/java/org/gridgain/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
@@ -293,4 +293,13 @@ public class CacheJdbcPersonStore extends CacheStoreAdapter<Long,
Person> {
     private Person person(Long id, String firstName, String lastName) {
         return new Person(id, firstName, lastName);
     }
+
+    /**
+     * @return Current transaction.
+     */
+    @Nullable private IgniteTx transaction() {
+        CacheStoreSession ses = session();
+
+        return ses != null ? ses.transaction() : null;
+    }
 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b463cfa6/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java
index 5e0298f..7880b80 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java
@@ -1269,7 +1269,8 @@ public abstract class GridCacheGroupLockAbstractSelfTest extends GridCommonAbstr
 
         /** {@inheritDoc} */
         @Override public void writeAll(Collection<Cache.Entry<? extends Object, ? extends
Object>> entries) {
-            super.writeAll(entries);
+            for (Cache.Entry<? extends Object, ? extends Object> e : entries)
+                storeMap.put(e.getKey(), e.getValue());
 
             putCnt.incrementAndGet();
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b463cfa6/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java
index f2199ae..7ff425c 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheClientModesAbstractSelfTest.java
@@ -19,6 +19,7 @@ package org.gridgain.grid.kernal.processors.cache.distributed;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.store.*;
 import org.gridgain.grid.cache.*;
 import org.gridgain.grid.cache.affinity.consistenthash.*;
 import org.gridgain.grid.kernal.processors.cache.*;
@@ -52,6 +53,11 @@ public abstract class GridCacheClientModesAbstractSelfTest extends GridCacheAbst
     }
 
     /** {@inheritDoc} */
+    @Override protected CacheStore<?, ?> cacheStore() {
+        return null;
+    }
+
+    /** {@inheritDoc} */
     @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception
{
         CacheConfiguration cfg = super.cacheConfiguration(gridName);
 


Mime
View raw message