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/02/04 09:18:30 UTC
[1/4] ignite git commit: Fixed GridFactorySelfTest which started
failing due to minor change in exception message.
Repository: ignite
Updated Branches:
refs/heads/ignite-2407 78a42a50a -> 18efa6a8f
Fixed GridFactorySelfTest which started failing due to minor change in exception message.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/74d9d05b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/74d9d05b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/74d9d05b
Branch: refs/heads/ignite-2407
Commit: 74d9d05b7cee071dad4c50a3a053781d78a488a8
Parents: d1e2957
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Feb 4 09:36:52 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Feb 4 09:36:52 2016 +0300
----------------------------------------------------------------------
.../test/java/org/apache/ignite/internal/GridFactorySelfTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/74d9d05b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
index d72b577..cca3e8b 100644
--- a/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/internal/GridFactorySelfTest.java
@@ -469,7 +469,7 @@ public class GridFactorySelfTest extends GridCommonAbstractTest {
String msg = e.getMessage();
if (msg != null &&
- (msg.contains("Default grid instance has already been started.") ||
+ (msg.contains("Default Ignite instance has already been started.") ||
msg.contains("Ignite instance with this name has already been started:")))
info("Caught expected exception: " + msg);
else
[2/4] ignite git commit: IGNITE-2541: Fixed potential NPE in
GridCacheUpdateAtomicResult caused by unsafe [long -> Long -> long]
transitions.
Posted by sb...@apache.org.
IGNITE-2541: Fixed potential NPE in GridCacheUpdateAtomicResult caused by unsafe [long -> Long -> long] transitions.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/10a2b7a1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/10a2b7a1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/10a2b7a1
Branch: refs/heads/ignite-2407
Commit: 10a2b7a18de3d9e0cb3fdf147956c127fa4d4d2b
Parents: 74d9d05
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Feb 4 09:41:26 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Feb 4 09:41:26 2016 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheMapEntry.java | 4 ++--
.../internal/processors/cache/GridCacheUpdateAtomicResult.java | 4 ++--
.../cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/10a2b7a1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 64cfd01..ae40295 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -2135,7 +2135,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
null,
null,
false,
- updateCntr0 == null ? 0 : updateCntr);
+ updateCntr0 == null ? 0 : updateCntr0);
}
}
else
@@ -2431,7 +2431,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
enqueueVer,
conflictCtx,
true,
- updateCntr0);
+ updateCntr0 == null ? 0 : updateCntr0);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/10a2b7a1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUpdateAtomicResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUpdateAtomicResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUpdateAtomicResult.java
index 9df476e..2355b7c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUpdateAtomicResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUpdateAtomicResult.java
@@ -58,7 +58,7 @@ public class GridCacheUpdateAtomicResult {
private final boolean sndToDht;
/** */
- private final Long updateCntr;
+ private final long updateCntr;
/** Value computed by entry processor. */
private IgniteBiTuple<Object, Exception> res;
@@ -137,7 +137,7 @@ public class GridCacheUpdateAtomicResult {
/**
* @return Partition update index.
*/
- public Long updateCounter() {
+ public long updateCounter() {
return updateCntr;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/10a2b7a1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
index e31af19..06c8441 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
@@ -225,7 +225,7 @@ public class GridDhtAtomicUpdateFuture extends GridFutureAdapter<Void>
@Nullable GridCacheVersion conflictVer,
boolean addPrevVal,
@Nullable CacheObject prevVal,
- @Nullable Long updateCntr) {
+ long updateCntr) {
AffinityTopologyVersion topVer = updateReq.topologyVersion();
Collection<ClusterNode> dhtNodes = cctx.dht().topology().nodes(entry.partition(), topVer);
[3/4] ignite git commit: IGNITE-2540: Removed unnecessary ArrayList
from GridNioServer.DirectNioClientWorker write processing methods.
Posted by sb...@apache.org.
IGNITE-2540: Removed unnecessary ArrayList from GridNioServer.DirectNioClientWorker write processing methods.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/afd3bc1e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/afd3bc1e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/afd3bc1e
Branch: refs/heads/ignite-2407
Commit: afd3bc1e3c249ae86071f0d15b41c6eedbdeb050
Parents: 10a2b7a
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Feb 4 11:13:36 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Feb 4 11:13:36 2016 +0300
----------------------------------------------------------------------
.../ignite/internal/util/nio/GridNioServer.java | 28 ++------------------
1 file changed, 2 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/afd3bc1e/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
index 84c8157..c7679c0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
@@ -980,8 +980,6 @@ public class GridNioServer<T> {
NioOperationFuture<?> req = ses.removeMeta(NIO_OPERATION.ordinal());
- List<NioOperationFuture<?>> doneFuts = null;
-
while (true) {
if (req == null) {
req = (NioOperationFuture<?>)ses.pollFuture();
@@ -1012,10 +1010,7 @@ public class GridNioServer<T> {
// Fill up as many messages as possible to write buffer.
while (finished) {
- if (doneFuts == null)
- doneFuts = new ArrayList<>();
-
- doneFuts.add(req);
+ req.onDone();
req = (NioOperationFuture<?>)ses.pollFuture();
@@ -1059,13 +1054,6 @@ public class GridNioServer<T> {
if (!skipWrite) {
int cnt = sockCh.write(buf);
- if (!F.isEmpty(doneFuts)) {
- for (int i = 0; i < doneFuts.size(); i++)
- doneFuts.get(i).onDone();
-
- doneFuts.clear();
- }
-
if (log.isTraceEnabled())
log.trace("Bytes sent [sockCh=" + sockCh + ", cnt=" + cnt + ']');
@@ -1185,13 +1173,8 @@ public class GridNioServer<T> {
}
// Fill up as many messages as possible to write buffer.
- List<NioOperationFuture<?>> doneFuts = null;
-
while (finished) {
- if (doneFuts == null)
- doneFuts = new ArrayList<>();
-
- doneFuts.add(req);
+ req.onDone();
req = (NioOperationFuture<?>)ses.pollFuture();
@@ -1218,13 +1201,6 @@ public class GridNioServer<T> {
if (!skipWrite) {
int cnt = sockCh.write(buf);
- if (!F.isEmpty(doneFuts)) {
- for (int i = 0; i < doneFuts.size(); i++)
- doneFuts.get(i).onDone();
-
- doneFuts.clear();
- }
-
if (log.isTraceEnabled())
log.trace("Bytes sent [sockCh=" + sockCh + ", cnt=" + cnt + ']');
[4/4] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-2407
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into ignite-2407
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/18efa6a8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/18efa6a8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/18efa6a8
Branch: refs/heads/ignite-2407
Commit: 18efa6a8fe6cbb9bb392df0258afb225480e64ac
Parents: 78a42a5 afd3bc1
Author: sboikov <sb...@gridgain.com>
Authored: Thu Feb 4 11:17:19 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Feb 4 11:17:19 2016 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheMapEntry.java | 4 +--
.../cache/GridCacheUpdateAtomicResult.java | 4 +--
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 2 +-
.../ignite/internal/util/nio/GridNioServer.java | 28 ++------------------
.../ignite/internal/GridFactorySelfTest.java | 2 +-
5 files changed, 8 insertions(+), 32 deletions(-)
----------------------------------------------------------------------