ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [4/5] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-single-op-get
Date Wed, 18 Nov 2015 20:22:02 GMT
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-single-op-get


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

Branch: refs/heads/ignite-single-op-get
Commit: 6c685b8c9290fab77f8359444285fe04709e428b
Parents: 4e1caa6 c490de3
Author: sboikov <sboikov@gridgain.com>
Authored: Wed Nov 18 23:20:53 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Wed Nov 18 23:20:53 2015 +0300

----------------------------------------------------------------------
 modules/camel/pom.xml                           | 102 +++++
 .../ignite/stream/camel/CamelStreamer.java      | 237 +++++++++++
 .../stream/camel/IgniteCamelStreamerTest.java   | 420 +++++++++++++++++++
 .../camel/IgniteCamelStreamerTestSuite.java     |  48 +++
 .../src/test/resources/camel.test.properties    |  18 +
 .../ignite/codegen/MessageCodeGenerator.java    |  11 +-
 .../communication/GridIoMessageFactory.java     |   8 +-
 .../discovery/GridDiscoveryManager.java         |   2 +-
 .../cache/GridCacheDeploymentManager.java       |   2 +-
 .../processors/cache/GridCacheGateway.java      |   1 -
 .../processors/cache/GridCacheMvcc.java         |   7 -
 .../processors/cache/GridCacheMvccManager.java  |  42 --
 .../GridCachePartitionExchangeManager.java      |  55 ++-
 .../cache/GridCacheSharedContext.java           |   7 +-
 .../distributed/GridCacheTxRecoveryFuture.java  |  41 +-
 .../distributed/GridDistributedBaseMessage.java |  56 ---
 .../distributed/GridDistributedLockRequest.java |   6 -
 .../GridDistributedLockResponse.java            |  32 +-
 .../GridDistributedTxPrepareRequest.java        |  67 ++-
 .../distributed/dht/GridDhtLockFuture.java      |  63 ++-
 .../distributed/dht/GridDhtLockRequest.java     |   2 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |   4 +-
 .../distributed/dht/GridDhtTxLocalAdapter.java  |   9 +
 .../distributed/dht/GridDhtTxPrepareFuture.java |  60 ++-
 .../dht/GridDhtTxPrepareRequest.java            |  54 +--
 .../dht/colocated/GridDhtColocatedCache.java    |   2 +-
 .../colocated/GridDhtColocatedLockFuture.java   |  55 ++-
 .../distributed/near/GridNearLockFuture.java    |  56 ++-
 .../distributed/near/GridNearLockRequest.java   |   4 +-
 ...arOptimisticSerializableTxPrepareFuture.java |  91 ++--
 .../near/GridNearOptimisticTxPrepareFuture.java |  50 ++-
 .../GridNearPessimisticTxPrepareFuture.java     |  39 +-
 .../near/GridNearTransactionalCache.java        |   7 +-
 .../near/GridNearTxFinishFuture.java            |  18 +-
 .../cache/distributed/near/GridNearTxLocal.java |  15 -
 .../near/GridNearTxPrepareFutureAdapter.java    |  14 +-
 .../near/GridNearTxPrepareRequest.java          |  52 +--
 .../cache/transactions/IgniteInternalTx.java    |   1 +
 .../cache/transactions/IgniteTxAdapter.java     |   1 +
 .../cache/transactions/IgniteTxEntry.java       |   9 +-
 .../IgniteTxImplicitSingleStateImpl.java        |   7 +
 .../transactions/IgniteTxLocalAdapter.java      |  12 +-
 .../cache/transactions/IgniteTxManager.java     |   1 +
 .../IgniteTxRemoteStateAdapter.java             |   5 +
 .../cache/transactions/IgniteTxState.java       |   6 +
 .../cache/transactions/IgniteTxStateImpl.java   |  69 ++-
 .../clock/GridClockSyncProcessor.java           |  28 +-
 .../internal/util/UUIDCollectionMessage.java    | 114 +++++
 .../util/future/GridCompoundFuture.java         |  15 +-
 .../ignite/internal/util/lang/GridFunc.java     |   8 +-
 .../ignite/internal/util/nio/GridNioServer.java |  13 +-
 .../org/apache/ignite/stream/StreamAdapter.java |  19 +-
 .../IgniteCacheTxStoreSessionTest.java          |   2 +-
 .../testsuites/IgniteCacheTestSuite3.java       |   2 +
 pom.xml                                         |   1 +
 55 files changed, 1641 insertions(+), 429 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/6c685b8c/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
index e7b61a8,2503eda..3548aac
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
@@@ -693,14 -692,9 +694,19 @@@ public class GridIoMessageFactory imple
                  break;
  
              case 115:
-                 msg = new GridNearSingleGetRequest();
+                 msg = new UUIDCollectionMessage();
  
                  break;
 +
 +            case 116:
++                msg = new GridNearSingleGetRequest();
++
++                break;
++
++            case 117:
 +                msg = new GridNearSingleGetResponse();
 +
 +                break;
  
              // [-3..114] - this
              // [120..123] - DR

http://git-wip-us.apache.org/repos/asf/ignite/blob/6c685b8c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
index f28f9b7,8562f37..9104acb
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java
@@@ -28,9 -29,9 +28,8 @@@ import java.util.Set
  import java.util.UUID;
  import java.util.concurrent.ConcurrentLinkedQueue;
  import java.util.concurrent.ConcurrentMap;
- import java.util.concurrent.ConcurrentSkipListSet;
  import org.apache.ignite.IgniteCheckedException;
  import org.apache.ignite.IgniteLogger;
 -import org.apache.ignite.cluster.ClusterNode;
  import org.apache.ignite.events.DiscoveryEvent;
  import org.apache.ignite.events.Event;
  import org.apache.ignite.internal.IgniteClientDisconnectedCheckedException;
@@@ -953,9 -912,8 +912,8 @@@ public class GridCacheMvccManager exten
          X.println(">>> ");
          X.println(">>> Mvcc manager memory stats [grid=" + cctx.gridName() + ']');
          X.println(">>>   rmvLocksSize: " + rmvLocks.sizex());
-         X.println(">>>   dhtLocCandsSize: " + dhtLocCands.size());
          X.println(">>>   lockedSize: " + locked.size());
 -        X.println(">>>   futsSize: " + futs.size());
 +        X.println(">>>   futsSize: " + (mvccFuts.size() + futs.size()));
          X.println(">>>   near2dhtSize: " + near2dht.size());
          X.println(">>>   finishFutsSize: " + finishFuts.sizex());
      }

http://git-wip-us.apache.org/repos/asf/ignite/blob/6c685b8c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/6c685b8c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/6c685b8c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/6c685b8c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/6c685b8c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/6c685b8c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/6c685b8c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/6c685b8c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/6c685b8c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/6c685b8c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/6c685b8c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/6c685b8c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/6c685b8c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/6c685b8c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/6c685b8c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/6c685b8c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
----------------------------------------------------------------------


Mime
View raw message