You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/03/13 16:34:57 UTC
[05/50] [abbrv] ignite git commit: ignite-4768
ignite-4768
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/de2697d8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/de2697d8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/de2697d8
Branch: refs/heads/ignite-4768-1
Commit: de2697d81e996b3a5dfe6b80a0638e38cc25cd89
Parents: fa77f2e
Author: sboikov <sb...@gridgain.com>
Authored: Mon Mar 13 12:39:21 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Mar 13 12:39:21 2017 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheMvccFuture.java | 6 +++++-
.../processors/cache/transactions/IgniteTxHandler.java | 2 +-
.../apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java | 5 +----
3 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/de2697d8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFuture.java
index a0acf18..d217562 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccFuture.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.jetbrains.annotations.Nullable;
/**
* Distributed future aware of MVCC locking.
@@ -36,5 +37,8 @@ public interface GridCacheMvccFuture<T> extends GridCacheFuture<T> {
*/
public boolean onOwnerChanged(GridCacheEntryEx entry, GridCacheMvccCandidate owner);
- public IgniteInternalTx tx();
+ /**
+ * @return Transaction related to future if any.
+ */
+ @Nullable public IgniteInternalTx tx();
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/de2697d8/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 b4fe426..754979c 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
@@ -1438,7 +1438,7 @@ public class IgniteTxHandler {
/**
* @param nodeId Node ID.
* @param req Request.
- * @param res Response.
+ * @param res Response or {@code null} if should not reply to primary.
* @return Remote transaction.
* @throws IgniteCheckedException If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/de2697d8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
index 3ad5a9d..15b7cd6 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
@@ -22,12 +22,9 @@ import java.util.concurrent.Callable;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.IgniteTransactions;
-import org.apache.ignite.transactions.TransactionConcurrency;
-import org.apache.ignite.transactions.TransactionIsolation;
import org.apache.ignite.yardstick.IgniteBenchmarkUtils;
import org.apache.ignite.yardstick.cache.model.SampleValue;
import org.yardstickframework.BenchmarkConfiguration;
-import org.yardstickframework.BenchmarkUtils;
/**
* Ignite benchmark that performs transactional put operations.
@@ -61,7 +58,7 @@ public class IgnitePutTxBenchmark extends IgniteCacheAbstractBenchmark<Integer,
/** {@inheritDoc} */
@Override public boolean test(Map<Object, Object> ctx) throws Exception {
- IgniteBenchmarkUtils.doInTransaction(txs, TransactionConcurrency.PESSIMISTIC, TransactionIsolation.REPEATABLE_READ, clo);
+ IgniteBenchmarkUtils.doInTransaction(txs, args.txConcurrency(), args.txIsolation(), clo);
return true;
}