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 2016/12/16 08:49:24 UTC
[1/6] ignite git commit: ignite-2545 Optimization for
GridCompoundFuture's futures iteration
Repository: ignite
Updated Branches:
refs/heads/ignite-2412 0f0e7a42d -> 317af5984
ignite-2545 Optimization for GridCompoundFuture's futures iteration
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5c5d70bc
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5c5d70bc
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5c5d70bc
Branch: refs/heads/ignite-2412
Commit: 5c5d70bcbc9f7bd44cdb3578ddc3bab9b6894956
Parents: e7d0445
Author: sboikov <sb...@gridgain.com>
Authored: Wed Dec 7 12:25:32 2016 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Thu Dec 15 12:47:28 2016 +0300
----------------------------------------------------------------------
.../distributed/GridCacheTxRecoveryFuture.java | 4 +-
.../cache/distributed/dht/GridDhtGetFuture.java | 2 +-
.../distributed/dht/GridDhtLockFuture.java | 4 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 4 +-
.../colocated/GridDhtColocatedLockFuture.java | 4 +-
.../distributed/near/GridNearLockFuture.java | 4 +-
...arOptimisticSerializableTxPrepareFuture.java | 4 +-
.../near/GridNearOptimisticTxPrepareFuture.java | 15 ++++--
.../GridNearPessimisticTxPrepareFuture.java | 4 +-
.../near/GridNearTxFinishFuture.java | 4 +-
.../util/future/GridCompoundFuture.java | 56 +++++++++++++-------
11 files changed, 74 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5c5d70bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java
index c07a817..e27f777 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java
@@ -427,8 +427,10 @@ public class GridCacheTxRecoveryFuture extends GridCompoundIdentityFuture<Boolea
private MiniFuture miniFuture(IgniteUuid miniId) {
// We iterate directly over the futs collection here to avoid copy.
synchronized (sync) {
+ int size = futuresCountNoLock();
+
// Avoid iterator creation.
- for (int i = 0; i < futuresCount(); i++) {
+ for (int i = 0; i < size; i++) {
IgniteInternalFuture<Boolean> fut = future(i);
if (!isMini(fut))
http://git-wip-us.apache.org/repos/asf/ignite/blob/5c5d70bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
index d2a3b3c..d2eab5f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
@@ -275,7 +275,7 @@ public final class GridDhtGetFuture<K, V> extends GridCompoundIdentityFuture<Col
// Optimization to avoid going through compound future,
// if getAsync() has been completed and no other futures added to this
// compound future.
- if (fut.isDone() && futuresCount() == 0) {
+ if (fut.isDone() && !hasFutures()) {
if (fut.error() != null)
onDone(fut.error());
else
http://git-wip-us.apache.org/repos/asf/ignite/blob/5c5d70bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
index dd18d7a..3f35305 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
@@ -526,8 +526,10 @@ public final class GridDhtLockFuture extends GridCompoundIdentityFuture<Boolean>
private MiniFuture miniFuture(IgniteUuid miniId) {
// We iterate directly over the futs collection here to avoid copy.
synchronized (sync) {
+ int size = futuresCountNoLock();
+
// Avoid iterator creation.
- for (int i = 0; i < futuresCount(); i++) {
+ for (int i = 0; i < size; i++) {
MiniFuture mini = (MiniFuture) future(i);
if (mini.futureId().equals(miniId)) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/5c5d70bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index 8aeecf8..ca2b494 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -565,8 +565,10 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter
private MiniFuture miniFuture(IgniteUuid miniId) {
// We iterate directly over the futs collection here to avoid copy.
synchronized (sync) {
+ int size = futuresCountNoLock();
+
// Avoid iterator creation.
- for (int i = 0; i < futuresCount(); i++) {
+ for (int i = 0; i < size; i++) {
IgniteInternalFuture<IgniteInternalTx> fut = future(i);
if (!isMini(fut))
http://git-wip-us.apache.org/repos/asf/ignite/blob/5c5d70bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
index 959ffa3..742f004 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
@@ -482,8 +482,10 @@ public final class GridDhtColocatedLockFuture extends GridCompoundIdentityFuture
private MiniFuture miniFuture(IgniteUuid miniId) {
// We iterate directly over the futs collection here to avoid copy.
synchronized (sync) {
+ int size = futuresCountNoLock();
+
// Avoid iterator creation.
- for (int i = 0; i < futuresCount(); i++) {
+ for (int i = 0; i < size; i++) {
IgniteInternalFuture<Boolean> fut = future(i);
if (!isMini(fut))
http://git-wip-us.apache.org/repos/asf/ignite/blob/5c5d70bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
index f1682b7..96de08b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
@@ -529,8 +529,10 @@ public final class GridNearLockFuture extends GridCompoundIdentityFuture<Boolean
private MiniFuture miniFuture(IgniteUuid miniId) {
// We iterate directly over the futs collection here to avoid copy.
synchronized (sync) {
+ int size = futuresCountNoLock();
+
// Avoid iterator creation.
- for (int i = 0; i < futuresCount(); i++) {
+ for (int i = 0; i < size; i++) {
IgniteInternalFuture<Boolean> fut = future(i);
if (!isMini(fut))
http://git-wip-us.apache.org/repos/asf/ignite/blob/5c5d70bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
index 3676a3c..c464b36 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
@@ -230,8 +230,10 @@ public class GridNearOptimisticSerializableTxPrepareFuture extends GridNearOptim
private MiniFuture miniFuture(IgniteUuid miniId) {
// We iterate directly over the futs collection here to avoid copy.
synchronized (sync) {
+ int size = futuresCountNoLock();
+
// Avoid iterator creation.
- for (int i = 0; i < futuresCount(); i++) {
+ for (int i = 0; i < size; i++) {
IgniteInternalFuture<GridNearTxPrepareResponse> fut = future(i);
if (!isMini(fut))
http://git-wip-us.apache.org/repos/asf/ignite/blob/5c5d70bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
index 87c9e1d..b314b81 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
@@ -202,7 +202,9 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
@SuppressWarnings("ForLoopReplaceableByForEach")
public Set<IgniteTxKey> requestedKeys() {
synchronized (sync) {
- for (int i = 0; i < futuresCount(); i++) {
+ int size = futuresCountNoLock();
+
+ for (int i = 0; i < size; i++) {
IgniteInternalFuture<GridNearTxPrepareResponse> fut = future(i);
if (isMini(fut) && !fut.isDone()) {
@@ -233,8 +235,10 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
private MiniFuture miniFuture(IgniteUuid miniId) {
// We iterate directly over the futs collection here to avoid copy.
synchronized (sync) {
+ int size = futuresCountNoLock();
+
// Avoid iterator creation.
- for (int i = 0; i < futuresCount(); i++) {
+ for (int i = size - 1; i >= 0; i--) {
IgniteInternalFuture<GridNearTxPrepareResponse> fut = future(i);
if (!isMini(fut))
@@ -687,7 +691,9 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
keys = new HashSet<>(keyLockFut.lockKeys);
else {
synchronized (sync) {
- for (int i = 0; i < futuresCount(); i++) {
+ int size = futuresCountNoLock();
+
+ for (int i = 0; i < size; i++) {
IgniteInternalFuture<GridNearTxPrepareResponse> fut = future(i);
if (isMini(fut) && !fut.isDone()) {
@@ -895,7 +901,8 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa
}
else
remap();
- } else {
+ }
+ else {
parent.onPrepareResponse(m, res);
// Proceed prepare before finishing mini future.
http://git-wip-us.apache.org/repos/asf/ignite/blob/5c5d70bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
index 01fb5fd..f9a2f90 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
@@ -133,8 +133,10 @@ public class GridNearPessimisticTxPrepareFuture extends GridNearTxPrepareFutureA
private MiniFuture miniFuture(IgniteUuid miniId) {
// We iterate directly over the futs collection here to avoid copy.
synchronized (sync) {
+ int size = futuresCountNoLock();
+
// Avoid iterator creation.
- for (int i = 0; i < futuresCount(); i++) {
+ for (int i = 0; i < size; i++) {
MiniFuture mini = (MiniFuture) future(i);
if (mini.futureId().equals(miniId)) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/5c5d70bc/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 f14d747..54bd543 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
@@ -201,7 +201,9 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
FinishMiniFuture finishFut = null;
synchronized (sync) {
- for (int i = 0; i < futuresCount(); i++) {
+ int size = futuresCountNoLock();
+
+ for (int i = 0; i < size; i++) {
IgniteInternalFuture<IgniteInternalTx> fut = future(i);
if (fut.getClass() == FinishMiniFuture.class) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/5c5d70bc/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
index 0f7e020..7abd367 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundFuture.java
@@ -88,7 +88,7 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> implements Ig
}
/** {@inheritDoc} */
- @Override public void apply(IgniteInternalFuture<T> fut) {
+ @Override public final void apply(IgniteInternalFuture<T> fut) {
try {
T t = fut.get();
@@ -160,9 +160,9 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> implements Ig
* @return Collection of futures.
*/
@SuppressWarnings("unchecked")
- public Collection<IgniteInternalFuture<T>> futures() {
+ public final Collection<IgniteInternalFuture<T>> futures() {
synchronized (sync) {
- if(futs == null)
+ if (futs == null)
return Collections.emptyList();
if (futs instanceof IgniteInternalFuture)
@@ -190,10 +190,12 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> implements Ig
* @return {@code True} if there are pending futures.
*/
@SuppressWarnings("ForLoopReplaceableByForEach")
- public boolean hasPending() {
+ protected final boolean hasPending() {
synchronized (sync) {
+ int size = futuresCountNoLock();
+
// Avoid iterator creation and collection copy.
- for (int i = 0; i < futuresCount(); i++) {
+ for (int i = 0; i < size; i++) {
IgniteInternalFuture<T> fut = future(i);
if (!fut.isDone())
@@ -210,7 +212,7 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> implements Ig
* @param fut Future to add.
*/
@SuppressWarnings("unchecked")
- public void add(IgniteInternalFuture<T> fut) {
+ public final void add(IgniteInternalFuture<T> fut) {
assert fut != null;
synchronized (sync) {
@@ -243,7 +245,7 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> implements Ig
/**
* Clear futures.
*/
- protected void clear() {
+ protected final void clear() {
synchronized (sync) {
futs = null;
}
@@ -253,14 +255,14 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> implements Ig
* @return {@code True} if this future was initialized. Initialization happens when {@link #markInitialized()}
* method is called on future.
*/
- public boolean initialized() {
+ public final boolean initialized() {
return initFlag == INIT_FLAG;
}
/**
* Mark this future as initialized.
*/
- public void markInitialized() {
+ public final void markInitialized() {
if (FLAGS_UPD.compareAndSet(this, 0, INIT_FLAG))
checkComplete();
}
@@ -295,9 +297,9 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> implements Ig
* @return Future.
*/
@SuppressWarnings("unchecked")
- protected IgniteInternalFuture<T> future(int idx) {
+ protected final IgniteInternalFuture<T> future(int idx) {
assert Thread.holdsLock(sync);
- assert futs != null && idx >= 0 && idx < futuresCount();
+ assert futs != null && idx >= 0 && idx < futuresCountNoLock();
if (futs instanceof IgniteInternalFuture) {
assert idx == 0;
@@ -312,15 +314,33 @@ public class GridCompoundFuture<T, R> extends GridFutureAdapter<R> implements Ig
* @return Futures size.
*/
@SuppressWarnings("unchecked")
- protected int futuresCount() {
- synchronized (sync) {
- if (futs == null)
- return 0;
+ protected final int futuresCountNoLock() {
+ assert Thread.holdsLock(sync);
- if (futs instanceof IgniteInternalFuture)
- return 1;
+ if (futs == null)
+ return 0;
+
+ if (futs instanceof IgniteInternalFuture)
+ return 1;
- return ((Collection<IgniteInternalFuture>)futs).size();
+ return ((Collection<IgniteInternalFuture>)futs).size();
+ }
+
+ /**
+ * @return Futures size.
+ */
+ private int futuresCount() {
+ synchronized (sync) {
+ return futuresCountNoLock();
+ }
+ }
+
+ /**
+ * @return {@code True} if has at least one future.
+ */
+ protected final boolean hasFutures() {
+ synchronized (sync) {
+ return futs != null;
}
}
[5/6] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-2412
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into ignite-2412
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9d076bf3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9d076bf3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9d076bf3
Branch: refs/heads/ignite-2412
Commit: 9d076bf3f19815d0475182d13de23794470c38ab
Parents: 0f0e7a4 b2cc951
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 16 11:34:37 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 16 11:34:37 2016 +0300
----------------------------------------------------------------------
examples/pom-standalone.xml | 6 +++
modules/cassandra/pom.xml | 24 ++++-----
.../distributed/GridCacheTxRecoveryFuture.java | 4 +-
.../cache/distributed/dht/GridDhtGetFuture.java | 2 +-
.../distributed/dht/GridDhtLockFuture.java | 4 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 4 +-
.../colocated/GridDhtColocatedLockFuture.java | 4 +-
.../distributed/near/GridNearLockFuture.java | 4 +-
...arOptimisticSerializableTxPrepareFuture.java | 4 +-
.../near/GridNearOptimisticTxPrepareFuture.java | 15 ++++--
.../GridNearPessimisticTxPrepareFuture.java | 4 +-
.../near/GridNearTxFinishFuture.java | 4 +-
.../util/future/GridCompoundFuture.java | 56 +++++++++++++-------
13 files changed, 91 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
[4/6] ignite git commit: Merge remote-tracking branch 'origin/master'
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b2cc951e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b2cc951e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b2cc951e
Branch: refs/heads/ignite-2412
Commit: b2cc951e3d83e92bce966f7e8aca65fa9f248fee
Parents: 49a0b18 e22b6b6
Author: devozerov <vo...@gridgain.com>
Authored: Thu Dec 15 12:50:49 2016 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Thu Dec 15 12:50:49 2016 +0300
----------------------------------------------------------------------
.../GridCacheAtomicSequenceImpl.java | 12 +-
...achePartitionedAtomicSequenceTxSelfTest.java | 169 +++++++++++++++++++
.../IgniteCacheDataStructuresSelfTestSuite.java | 2 +
3 files changed, 181 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[6/6] ignite git commit: ignite-2412
Posted by sb...@apache.org.
ignite-2412
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/317af598
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/317af598
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/317af598
Branch: refs/heads/ignite-2412
Commit: 317af59849b0af2610604576bc9577a3a0f9be9b
Parents: 9d076bf
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 16 11:49:13 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 16 11:49:13 2016 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheAdapter.java | 8 +++++---
.../cache/distributed/dht/atomic/GridDhtAtomicCache.java | 4 +++-
.../processors/cache/local/atomic/GridLocalAtomicCache.java | 2 +-
3 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/317af598/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 717f65d..5707b49 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -2202,8 +2202,10 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
* @param filter Optional filter.
* @return Put operation future.
*/
- public IgniteInternalFuture<V> getAndPutAsync0(final K key, final V val,
- @Nullable final CacheEntryPredicate filter) {
+ public IgniteInternalFuture<V> getAndPutAsync0(final K key,
+ final V val,
+ @Nullable final CacheEntryPredicate filter)
+ {
return asyncOp(new AsyncOp<V>() {
@Override public IgniteInternalFuture<V> op(IgniteTxLocalAdapter tx, AffinityTopologyVersion readyTopVer) {
return tx.putAsync(ctx, readyTopVer, key, val, true, filter)
@@ -3071,7 +3073,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
/** {@inheritDoc} */
@Override public final IgniteInternalFuture<Boolean> removeAsync(final K key, final V val) {
- A.notNull(key, "key");
+ A.notNull(key, "val");
return removeAsync(key, ctx.equalsVal(val));
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/317af598/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 1e8a26d..07b9dad 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -740,7 +740,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
false,
true,
UPDATE,
- false).chain(RET2NULL).get();
+ false).get();
}
/** {@inheritDoc} */
@@ -1084,6 +1084,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
* @param retval Return value required flag.
* @param rawRetval Return {@code GridCacheReturn} instance.
* @param waitTopFut Whether to wait for topology future.
+ * @param async Async operation flag.
* @return Completion future.
*/
@SuppressWarnings("ConstantConditions")
@@ -1200,6 +1201,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
* @param retval Return value flag.
* @param filter Filter.
* @param waitTopFut Whether to wait for topology future.
+ * @param async Async operation flag.
* @return Future.
*/
private IgniteInternalFuture update0(
http://git-wip-us.apache.org/repos/asf/ignite/blob/317af598/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
index 452efe8..a26d2f3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
@@ -1468,7 +1468,7 @@ public class GridLocalAtomicCache<K, V> extends GridLocalCache<K, V> {
* @return Future.
*/
@SuppressWarnings("unchecked")
- protected IgniteInternalFuture asyncOp(final Callable<?> op) {
+ private IgniteInternalFuture asyncOp(final Callable<?> op) {
IgniteInternalFuture fail = asyncOpAcquire();
if (fail != null)
[2/6] ignite git commit: IGNITE-4238: Added geospatial queries
example (nolgpl examples hotfix)
Posted by sb...@apache.org.
IGNITE-4238: Added geospatial queries example (nolgpl examples hotfix)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c8dbec4e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c8dbec4e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c8dbec4e
Branch: refs/heads/ignite-2412
Commit: c8dbec4eaac417b3943120d0c46a9d493d719def
Parents: 5c5d70b
Author: Anton Vinogradov <av...@apache.org>
Authored: Wed Dec 7 13:15:37 2016 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Thu Dec 15 12:47:44 2016 +0300
----------------------------------------------------------------------
examples/pom-standalone.xml | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c8dbec4e/examples/pom-standalone.xml
----------------------------------------------------------------------
diff --git a/examples/pom-standalone.xml b/examples/pom-standalone.xml
index 6247ced..08c27fe 100644
--- a/examples/pom-standalone.xml
+++ b/examples/pom-standalone.xml
@@ -166,6 +166,12 @@
<artifactId>ignite-schedule</artifactId>
<version>to_be_replaced_by_ignite_version</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-geospatial</artifactId>
+ <version>to_be_replaced_by_ignite_version</version>
+ </dependency>
</dependencies>
</profile>
</profiles>
[3/6] ignite git commit: IGNITE-4353 Parent Cassandra module deployed
on maven repository (hotfix: deploy to custom maven repository)
Posted by sb...@apache.org.
IGNITE-4353 Parent Cassandra module deployed on maven repository (hotfix: deploy to custom maven repository)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/49a0b187
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/49a0b187
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/49a0b187
Branch: refs/heads/ignite-2412
Commit: 49a0b1879fbce3879d37c34727f05a11002ecbc3
Parents: c8dbec4
Author: Anton Vinogradov <av...@apache.org>
Authored: Wed Dec 7 14:25:53 2016 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Thu Dec 15 12:47:58 2016 +0300
----------------------------------------------------------------------
modules/cassandra/pom.xml | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/49a0b187/modules/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/modules/cassandra/pom.xml b/modules/cassandra/pom.xml
index f287684..a4f947a 100644
--- a/modules/cassandra/pom.xml
+++ b/modules/cassandra/pom.xml
@@ -51,18 +51,16 @@
</modules>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.2</version>
- <inherited>false</inherited>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.8.2</version>
+ <inherited>false</inherited>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>