ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [10/50] [abbrv] ignite git commit: Fixing tests.
Date Thu, 03 Sep 2015 01:03:19 GMT
Fixing tests.


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

Branch: refs/heads/ignite-264
Commit: a7b37493808cf76e6ee9e4ff94bc2f3dd92af172
Parents: 905a139
Author: Alexey Goncharuk <agoncharuk@gridgain.com>
Authored: Wed Mar 25 14:08:55 2015 -0700
Committer: Alexey Goncharuk <agoncharuk@gridgain.com>
Committed: Wed Mar 25 14:08:55 2015 -0700

----------------------------------------------------------------------
 .../cache/distributed/dht/GridDhtTxFinishRequest.java    |  7 -------
 .../cache/distributed/dht/GridDhtTxFinishResponse.java   |  4 ++--
 .../cache/distributed/dht/GridDhtTxLocalAdapter.java     |  3 +--
 .../cache/distributed/near/GridNearLockRequest.java      |  8 +-------
 .../cache/distributed/near/GridNearTxFinishFuture.java   | 11 +++++------
 .../processors/cache/transactions/IgniteTxEntry.java     |  9 +--------
 .../processors/cache/transactions/IgniteTxHandler.java   |  4 ++--
 .../processors/cache/transactions/IgniteTxManager.java   |  6 +++---
 8 files changed, 15 insertions(+), 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/a7b37493/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
index 0e9bdff..1a6883b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
@@ -224,13 +224,6 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest
{
         this.checkCommitted = checkCommitted;
     }
 
-    /**
-     * @return Topology version.
-     */
-    @Override public long topologyVersion() {
-        return topVer;
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(GridDhtTxFinishRequest.class, this, super.toString());

http://git-wip-us.apache.org/repos/asf/ignite/blob/a7b37493/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
index 6480413..eb46c2e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
@@ -105,7 +105,7 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse
{
     }
 
     /** {@inheritDoc} */
-    @Override public void prepareMarshal(GridCacheSharedContext<K, V> ctx) throws IgniteCheckedException
{
+    @Override public void prepareMarshal(GridCacheSharedContext ctx) throws IgniteCheckedException
{
         super.prepareMarshal(ctx);
 
         if (checkCommittedErr != null)
@@ -113,7 +113,7 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse
{
     }
 
     /** {@inheritDoc} */
-    @Override public void finishUnmarshal(GridCacheSharedContext<K, V> ctx, ClassLoader
ldr)
+    @Override public void finishUnmarshal(GridCacheSharedContext ctx, ClassLoader ldr)
         throws IgniteCheckedException {
         super.finishUnmarshal(ctx, ldr);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/a7b37493/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
index cc15429..1d8f2b8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java
@@ -635,8 +635,7 @@ public abstract class GridDhtTxLocalAdapter extends IgniteTxLocalAdapter
{
 
                     return ret;
                 }
-            },
-            cctx.kernalContext());
+            });
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/a7b37493/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
index c86e773..1e68d5e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
@@ -341,7 +341,7 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
 
                 writer.incrementState();
 
-            case 24:
+            case 20:
                 if (!writer.writeObjectArray("filter", filter, MessageCollectionItemType.MSG))
                     return false;
 
@@ -371,12 +371,6 @@ public class GridNearLockRequest extends GridDistributedLockRequest {
 
                 writer.incrementState();
 
-            case 29:
-                if (!writer.writeBoolean("onePhaseCommit", onePhaseCommit))
-                    return false;
-
-                writer.incrementState();
-
             case 30:
                 if (!writer.writeBoolean("retVal", retVal))
                     return false;

http://git-wip-us.apache.org/repos/asf/ignite/blob/a7b37493/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
index a995d47..5ba1846 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
@@ -211,7 +211,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
      * @param nodeId Sender.
      * @param res Result.
      */
-    public void onResult(UUID nodeId, GridDhtTxFinishResponse<K, V> res) {
+    public void onResult(UUID nodeId, GridDhtTxFinishResponse res) {
         if (!isDone())
             for (IgniteInternalFuture<IgniteInternalTx> fut : futures()) {
                 if (isMini(fut)) {
@@ -363,7 +363,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
 
                 UUID backupId = F.first(backups);
 
-                ClusterNode backup = ctx.discovery().node(backupId);
+                ClusterNode backup = cctx.discovery().node(backupId);
 
                 // Nothing to do if backup has left the grid.
                 if (backup == null)
@@ -373,7 +373,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
 
                 add(mini);
 
-                GridDhtTxFinishRequest<K, V> finishReq = new GridDhtTxFinishRequest<>(
+                GridDhtTxFinishRequest finishReq = new GridDhtTxFinishRequest(
                     cctx.localNodeId(),
                     futureId(),
                     mini.futureId(),
@@ -385,6 +385,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
                     true,
                     false,
                     tx.system(),
+                    tx.ioPolicy(),
                     false,
                     true,
                     true,
@@ -547,8 +548,6 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
          * @param backup Backup to check.
          */
         MiniFuture(ClusterNode backup) {
-            super(cctx.kernalContext());
-
             this.backup = backup;
         }
 
@@ -612,7 +611,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
         /**
          * @param res Response.
          */
-        void onResult(GridDhtTxFinishResponse<K, V> res) {
+        void onResult(GridDhtTxFinishResponse res) {
             assert backup != null;
 
             if (res.checkCommittedError() != null)

http://git-wip-us.apache.org/repos/asf/ignite/blob/a7b37493/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
index c3e734c..6432581 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java
@@ -79,7 +79,7 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
     private Collection<T2<EntryProcessor<Object, Object, Object>, Object[]>>
entryProcessorsCol;
 
     /** Transient field for calculated entry processor value. */
-    private V entryProcessorCalcVal;
+    private CacheObject entryProcessorCalcVal;
 
     /** Transform closure bytes. */
     @GridToStringExclude
@@ -881,13 +881,6 @@ public class IgniteTxEntry implements GridPeerDeployAware, Message {
                 reader.incrementState();
 
             case 6:
-                grpLock = reader.readBoolean("grpLock");
-
-                if (!reader.isLastRead())
-                    return false;
-
-                reader.incrementState();
-
             case 7:
                 key = reader.readMessage("key");
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/a7b37493/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
index 8e0380c..1f175f6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
@@ -1108,7 +1108,7 @@ public class IgniteTxHandler {
                         boolean prepared = f.get();
 
                         sendCheckPrepareTxResponse(nodeId,
-                            new GridCacheOptimisticCheckPreparedTxResponse<K, V>(
+                            new GridCacheOptimisticCheckPreparedTxResponse(
                                 req.version(),
                                 req.futureId(),
                                 req.miniId(),
@@ -1121,7 +1121,7 @@ public class IgniteTxHandler {
                             "(will send rolled back response): " + req.nearXidVersion(),
e);
 
                         sendCheckPrepareTxResponse(nodeId,
-                            new GridCacheOptimisticCheckPreparedTxResponse<K, V>(
+                            new GridCacheOptimisticCheckPreparedTxResponse(
                                 req.version(),
                                 req.futureId(),
                                 req.miniId(),

http://git-wip-us.apache.org/repos/asf/ignite/blob/a7b37493/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
index 14e1db2..5c12912 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
@@ -1711,10 +1711,10 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter
{
      * @return Future.
      */
     public IgniteInternalFuture<Boolean> nearTxCommitted(GridCacheVersion nearVer)
{
-        for (final IgniteInternalTx<K, V> tx : txs()) {
+        for (final IgniteInternalTx tx : txs()) {
             if (tx.near() && tx.xidVersion().equals(nearVer)) {
                 return tx.done() ?
-                    new GridFinishedFutureEx<>(tx.state() == COMMITTED) :
+                    new GridFinishedFuture<>(tx.state() == COMMITTED) :
                     tx.finishFuture().chain(new C1<IgniteInternalFuture<IgniteInternalTx>,
Boolean>() {
                         @Override public Boolean apply(IgniteInternalFuture<IgniteInternalTx>
f) {
                             return tx.state() == COMMITTED;
@@ -1726,7 +1726,7 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter {
         // Transaction was not found. Check committed versions buffer.
         Boolean res = completedVers.get(nearVer);
 
-        return new GridFinishedFutureEx<>(res != null && res);
+        return new GridFinishedFuture<>(res != null && res);
     }
 
     /**


Mime
View raw message