ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vkuliche...@apache.org
Subject [02/34] incubator-ignite git commit: Merge branches 'ignite-891' and 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-891
Date Tue, 02 Jun 2015 03:50:56 GMT
Merge branches 'ignite-891' and 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-891

Conflicts:
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java


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

Branch: refs/heads/ignite-sprint-5
Commit: 0c528986a8436f9c904e3049cd1383f81ff75606
Parents: b97441f da5a228
Author: Valentin Kulichenko <vkulichenko@gridgain.com>
Authored: Fri May 15 10:41:40 2015 -0700
Committer: Valentin Kulichenko <vkulichenko@gridgain.com>
Committed: Fri May 15 10:41:40 2015 -0700

----------------------------------------------------------------------
 .../socket/WordsSocketStreamerServer.java       |   2 +-
 .../org/apache/ignite/internal/IgnitionEx.java  | 136 +++++----------
 .../internal/interop/InteropBootstrap.java      |  34 ++++
 .../interop/InteropBootstrapFactory.java        |  39 +++++
 .../internal/interop/InteropIgnition.java       | 103 ++++++++++++
 .../internal/interop/InteropProcessor.java      |  25 +++
 .../processors/cache/GridCacheAdapter.java      |   8 +-
 .../processors/cache/GridCacheMapEntry.java     |  35 +---
 .../distributed/GridDistributedLockRequest.java | 111 +++----------
 .../GridDistributedTxFinishRequest.java         |  70 ++------
 .../GridDistributedTxPrepareRequest.java        | 112 +++----------
 .../GridDistributedTxRemoteAdapter.java         |  20 +--
 .../distributed/dht/GridDhtLockFuture.java      |   2 -
 .../distributed/dht/GridDhtLockRequest.java     |  45 +++--
 .../dht/GridDhtTransactionalCacheAdapter.java   |   6 -
 .../distributed/dht/GridDhtTxFinishFuture.java  |   3 -
 .../distributed/dht/GridDhtTxFinishRequest.java |  43 +++--
 .../cache/distributed/dht/GridDhtTxLocal.java   |   6 -
 .../distributed/dht/GridDhtTxLocalAdapter.java  |  68 +-------
 .../distributed/dht/GridDhtTxPrepareFuture.java |  18 +-
 .../dht/GridDhtTxPrepareRequest.java            |  60 ++++---
 .../cache/distributed/dht/GridDhtTxRemote.java  |   8 +-
 .../colocated/GridDhtColocatedLockFuture.java   |   6 -
 .../distributed/near/GridNearLockFuture.java    |   6 -
 .../distributed/near/GridNearLockRequest.java   |  61 +++----
 .../near/GridNearOptimisticTxPrepareFuture.java |  15 +-
 .../GridNearPessimisticTxPrepareFuture.java     |   2 -
 .../near/GridNearTransactionalCache.java        |   4 -
 .../near/GridNearTxFinishRequest.java           |  28 ++--
 .../cache/distributed/near/GridNearTxLocal.java |  20 +--
 .../near/GridNearTxPrepareRequest.java          |  52 +++---
 .../distributed/near/GridNearTxRemote.java      |  24 +--
 .../cache/transactions/IgniteInternalTx.java    |  10 --
 .../transactions/IgniteTransactionsImpl.java    |   4 +-
 .../cache/transactions/IgniteTxAdapter.java     |  72 +-------
 .../cache/transactions/IgniteTxEntry.java       |  48 +-----
 .../cache/transactions/IgniteTxHandler.java     |   6 -
 .../transactions/IgniteTxLocalAdapter.java      | 165 ++-----------------
 .../cache/transactions/IgniteTxLocalEx.java     |  21 +--
 .../cache/transactions/IgniteTxManager.java     |  62 +------
 .../communication/tcp/TcpCommunicationSpi.java  |   2 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |  26 ---
 .../discovery/tcp/TcpDiscoverySpiAdapter.java   |   8 +-
 .../processors/cache/jta/CacheJtaManager.java   |   4 +-
 pom.xml                                         |   2 +
 45 files changed, 487 insertions(+), 1115 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c528986/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c528986/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
index 40bb36e,609108f..fa64e12
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
@@@ -496,17 -480,10 +480,17 @@@ public abstract class IgniteTxLocalAdap
       */
      @SuppressWarnings({"CatchGenericClass"})
      protected void batchStoreCommit(Iterable<IgniteTxEntry> writeEntries) throws IgniteCheckedException
{
-         if (!storeEnabled() || (internal() && !groupLock()))
 -        CacheStoreManager store = store();
++        if (!storeEnabled() || internal())
 +            return;
  
 -        if (store != null && store.isWriteThrough() && storeEnabled() &&
 -            !internal() && (near() || store.isWriteToStoreFromDht())) {
 +        Collection<CacheStoreManager> stores = stores();
 +
 +        if (stores == null || stores.isEmpty())
 +            return;
 +
 +        boolean isWriteToStoreFromDht = F.first(stores).isWriteToStoreFromDht();
 +
 +        if (near() || isWriteToStoreFromDht) {
              try {
                  if (writeEntries != null) {
                      Map<Object, IgniteBiTuple<Object, GridCacheVersion>> putMap
= null;
@@@ -1008,12 -971,11 +985,12 @@@
              }
          }
          else {
 -            CacheStoreManager store = store();
 +            Collection<CacheStoreManager> stores = stores();
  
-             if (stores != null && !stores.isEmpty() && (!internal() || groupLock()))
{
 -            if (store != null && !internal()) {
++            if (stores != null && !stores.isEmpty() && !internal()) {
                  try {
 -                    store.sessionEnd(this, true);
 +                    for (CacheStoreManager store : stores)
 +                        store.sessionEnd(this, true);
                  }
                  catch (IgniteCheckedException e) {
                      commitError(e);
@@@ -1114,13 -1076,11 +1091,13 @@@
  
                  cctx.tm().rollbackTx(this);
  
 -                CacheStoreManager store = store();
 +                Collection<CacheStoreManager> stores = stores();
  
 -                if (store != null && (near() || store.isWriteToStoreFromDht()))
{
 -                    if (!internal())
 -                        store.sessionEnd(this, false);
 +                if (stores != null && !stores.isEmpty() && (near() || F.first(stores).isWriteToStoreFromDht()))
{
-                     if (!internal() || groupLock()) {
++                    if (!internal()) {
 +                        for (CacheStoreManager store : stores)
 +                            store.sessionEnd(this, false);
 +                    }
                  }
              }
              catch (Error | IgniteCheckedException | RuntimeException e) {


Mime
View raw message