ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sevdoki...@apache.org
Subject [4/4] incubator-ignite git commit: # Merge IGNITE-379-3 to ignite-45
Date Mon, 23 Mar 2015 10:27:57 GMT
# Merge IGNITE-379-3 to ignite-45


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

Branch: refs/heads/ignite-45
Commit: 37c14baeab0e64e21ffe1865d6c2eb91478be0a7
Parents: 03a6847 567dd9a
Author: sevdokimov <sevdokimov@gridgain.com>
Authored: Mon Mar 23 13:27:34 2015 +0300
Committer: sevdokimov <sevdokimov@gridgain.com>
Committed: Mon Mar 23 13:27:34 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 +-
 .../transactions/TransactionProxyImpl.java      | 17 ----------
 .../apache/ignite/transactions/Transaction.java | 29 -----------------
 .../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    | 21 +++++++++---
 ...acheStoreSessionWriteBehindAbstractTest.java |  2 +-
 .../IgniteCacheTxStoreSessionTest.java          | 14 ++++----
 .../cache/GridAbstractCacheStoreSelfTest.java   | 34 ++++++++++----------
 .../hibernate/CacheHibernateBlobStore.java      |  6 ++--
 30 files changed, 72 insertions(+), 107 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c14bae/examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
----------------------------------------------------------------------
diff --cc examples/src/main/java/org/apache/ignite/examples/datagrid/store/hibernate/CacheHibernatePersonStore.java
index 1951f98,96ef703..577301c
--- 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
@@@ -203,10 -202,12 +203,10 @@@ public class CacheHibernatePersonStore 
      }
  
      /** {@inheritDoc} */
-     @Override public void txEnd(boolean commit) {
+     @Override public void sessionEnd(boolean commit) {
 -        CacheStoreSession storeSes = session();
 +        Transaction tx = ses.transaction();
  
 -        Transaction tx = storeSes.transaction();
 -
 -        Map<String, Session> props = storeSes.properties();
 +        Map<String, Session> props = ses.properties();
  
          Session ses = props.remove(ATTR_SES);
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c14bae/examples/src/main/java/org/apache/ignite/examples/datagrid/store/jdbc/CacheJdbcPersonStore.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c14bae/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheAbstractJdbcStore.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c14bae/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/CacheJdbcBlobStore.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c14bae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStoreBalancingWrapper.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c14bae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLoaderWriterStore.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c14bae/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c14bae/modules/core/src/test/java/org/apache/ignite/cache/store/IgniteCacheExpiryStoreLoadSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c14bae/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c14bae/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationConsistencySelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c14bae/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c14bae/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStorePutxSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c14bae/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c14bae/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c14bae/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionAbstractTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c14bae/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheStoreSessionWriteBehindAbstractTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/37c14bae/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheTxStoreSessionTest.java
----------------------------------------------------------------------


Mime
View raw message