You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/12/14 13:21:26 UTC
[1/6] ignite git commit: ignite-1.5 More info in
GridPartitionedSingleGetFuture.toString.
Repository: ignite
Updated Branches:
refs/heads/ignite-2100 74e478d40 -> e92fb51c7
ignite-1.5 More info in GridPartitionedSingleGetFuture.toString.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6bf716af
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6bf716af
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6bf716af
Branch: refs/heads/ignite-2100
Commit: 6bf716afc490a3bec987e788d795fd979edbdd23
Parents: 345fc27
Author: sboikov <sb...@gridgain.com>
Authored: Mon Dec 14 12:42:41 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Dec 14 12:42:41 2015 +0300
----------------------------------------------------------------------
.../cache/distributed/dht/GridPartitionedSingleGetFuture.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bf716af/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
index f955bb6..23e7c9a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
@@ -46,6 +46,7 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridNearSing
import org.apache.ignite.internal.processors.cache.distributed.near.GridNearSingleGetResponse;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import org.apache.ignite.internal.util.future.GridFutureAdapter;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.CI1;
import org.apache.ignite.internal.util.typedef.CIX1;
import org.apache.ignite.internal.util.typedef.F;
@@ -120,6 +121,7 @@ public class GridPartitionedSingleGetFuture extends GridFutureAdapter<Object> im
private final boolean keepCacheObjects;
/** */
+ @GridToStringInclude
private ClusterNode node;
/**
[5/6] ignite git commit: ignite-2065: portable -> binary renaming
(Fix platforms)
Posted by vo...@apache.org.
ignite-2065: portable -> binary renaming (Fix platforms)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d6b46115
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d6b46115
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d6b46115
Branch: refs/heads/ignite-2100
Commit: d6b46115147704f13c36aa59f307f77baf954e3f
Parents: 3d9be34
Author: ashutak <as...@gridgain.com>
Authored: Mon Dec 14 14:17:37 2015 +0300
Committer: ashutak <as...@gridgain.com>
Committed: Mon Dec 14 14:17:37 2015 +0300
----------------------------------------------------------------------
modules/platforms/cpp/common/src/java.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d6b46115/modules/platforms/cpp/common/src/java.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/common/src/java.cpp b/modules/platforms/cpp/common/src/java.cpp
index 002eb44..7bc18f1 100644
--- a/modules/platforms/cpp/common/src/java.cpp
+++ b/modules/platforms/cpp/common/src/java.cpp
@@ -234,7 +234,7 @@ namespace ignite
JniMethod M_PLATFORM_CACHE_WITH_NO_RETRIES = JniMethod("withNoRetries", "()Lorg/apache/ignite/internal/processors/platform/cache/PlatformCache;", false);
JniMethod M_PLATFORM_CACHE_WITH_EXPIRY_PLC = JniMethod("withExpiryPolicy", "(JJJ)Lorg/apache/ignite/internal/processors/platform/cache/PlatformCache;", false);
JniMethod M_PLATFORM_CACHE_WITH_ASYNC = JniMethod("withAsync", "()Lorg/apache/ignite/internal/processors/platform/cache/PlatformCache;", false);
- JniMethod M_PLATFORM_CACHE_WITH_KEEP_PORTABLE = JniMethod("withKeepPortable", "()Lorg/apache/ignite/internal/processors/platform/cache/PlatformCache;", false);
+ JniMethod M_PLATFORM_CACHE_WITH_KEEP_PORTABLE = JniMethod("withKeepBinary", "()Lorg/apache/ignite/internal/processors/platform/cache/PlatformCache;", false);
JniMethod M_PLATFORM_CACHE_CLEAR = JniMethod("clear", "()V", false);
JniMethod M_PLATFORM_CACHE_REMOVE_ALL = JniMethod("removeAll", "()V", false);
JniMethod M_PLATFORM_CACHE_ITERATOR = JniMethod("iterator", "()Lorg/apache/ignite/internal/processors/platform/cache/PlatformCacheIterator;", false);
@@ -372,7 +372,7 @@ namespace ignite
const char* C_PLATFORM_SERVICES = "org/apache/ignite/internal/processors/platform/services/PlatformServices";
JniMethod M_PLATFORM_SERVICES_WITH_ASYNC = JniMethod("withAsync", "()Lorg/apache/ignite/internal/processors/platform/services/PlatformServices;", false);
- JniMethod M_PLATFORM_SERVICES_WITH_SERVER_KEEP_PORTABLE = JniMethod("withServerKeepPortable", "()Lorg/apache/ignite/internal/processors/platform/services/PlatformServices;", false);
+ JniMethod M_PLATFORM_SERVICES_WITH_SERVER_KEEP_PORTABLE = JniMethod("withServerKeepBinary", "()Lorg/apache/ignite/internal/processors/platform/services/PlatformServices;", false);
JniMethod M_PLATFORM_SERVICES_CANCEL = JniMethod("cancel", "(Ljava/lang/String;)V", false);
JniMethod M_PLATFORM_SERVICES_CANCEL_ALL = JniMethod("cancelAll", "()V", false);
JniMethod M_PLATFORM_SERVICES_SERVICE_PROXY = JniMethod("dotNetServiceProxy", "(Ljava/lang/String;Z)Ljava/lang/Object;", false);
@@ -867,7 +867,7 @@ namespace ignite
try {
if (!JVM.GetJvm()) {
- // 1. Create JVM itself.
+ // 1. Create JVM itself.
CreateJvm(opts, optsLen, &jvm, &env);
// 2. Populate members;
@@ -2413,4 +2413,4 @@ namespace ignite
}
}
}
-}
\ No newline at end of file
+}
[4/6] ignite git commit: ignite-1.5 Less unnecessary logging in test.
Posted by vo...@apache.org.
ignite-1.5 Less unnecessary logging in test.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3d9be34c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3d9be34c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3d9be34c
Branch: refs/heads/ignite-2100
Commit: 3d9be34c104cc2e89e2422e4f9c3f126449c8162
Parents: 1224658
Author: sboikov <sb...@gridgain.com>
Authored: Mon Dec 14 13:31:40 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Dec 14 13:31:40 2015 +0300
----------------------------------------------------------------------
.../GridCacheAbstractNodeRestartSelfTest.java | 25 +++++++++-----------
1 file changed, 11 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d9be34c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
index dbd8758..2f4ff6f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
@@ -88,6 +88,9 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
private static final int DFLT_RETRIES = 10;
/** */
+ private static final int LOG_FREQ = 1000;
+
+ /** */
private static final Random RAND = new Random();
/** */
@@ -631,8 +634,6 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
Collection<Thread> threads = new LinkedList<>();
try {
- final int logFreq = 20;
-
final AtomicInteger putCntr = new AtomicInteger();
final CyclicBarrier barrier = new CyclicBarrier(putThreads + restartThreads);
@@ -665,7 +666,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
int c = putCntr.incrementAndGet();
- if (c % logFreq == 0)
+ if (c % LOG_FREQ == 0)
info(">>> Put iteration [cnt=" + c + ", key=" + key + ']');
}
}
@@ -705,7 +706,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
int c = ++cnt;
- if (c % logFreq == 0)
+ if (c % LOG_FREQ == 0)
info(">>> Restart iteration: " + c);
}
}
@@ -756,8 +757,6 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
Collection<Thread> threads = new LinkedList<>();
try {
- final int logFreq = 20;
-
final AtomicInteger txCntr = new AtomicInteger();
final CyclicBarrier barrier = new CyclicBarrier(putThreads + restartThreads);
@@ -799,7 +798,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
try (Transaction tx = txs.txStart(txConcurrency(), REPEATABLE_READ)) {
c = txCntr.incrementAndGet();
- if (c % logFreq == 0) {
+ if (c % LOG_FREQ == 0) {
info(">>> Tx iteration started [cnt=" + c +
", keys=" + keys +
", locNodeId=" + locNodeId + ']');
@@ -823,7 +822,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
// It is ok if primary node leaves grid.
}
- if (c % logFreq == 0) {
+ if (c % LOG_FREQ == 0) {
info(">>> Tx iteration finished [cnt=" + c +
", cacheSize=" + cache.localSize() +
", keys=" + keys +
@@ -864,7 +863,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
int c = ++cnt;
- if (c % logFreq == 0)
+ if (c % LOG_FREQ == 0)
info(">>> Restart iteration: " + c);
}
@@ -913,8 +912,6 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
Collection<Thread> threads = new LinkedList<>();
try {
- final int logFreq = 20;
-
final AtomicInteger txCntr = new AtomicInteger();
final CyclicBarrier barrier = new CyclicBarrier(putThreads + restartThreads);
@@ -955,7 +952,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
try (Transaction tx = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ)) {
c = txCntr.incrementAndGet();
- if (c % logFreq == 0)
+ if (c % LOG_FREQ == 0)
info(">>> Tx iteration started [cnt=" + c + ", keys=" + keys + ", " +
"locNodeId=" + locNodeId + ']');
@@ -972,7 +969,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
// It is ok if primary node leaves grid.
}
- if (c % logFreq == 0) {
+ if (c % LOG_FREQ == 0) {
info(">>> Tx iteration finished [cnt=" + c +
", keys=" + keys + ", " +
"locNodeId=" + locNodeId + ']');
@@ -1010,7 +1007,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
int c = ++cnt;
- if (c % logFreq == 0)
+ if (c % LOG_FREQ == 0)
info(">>> Restart iteration: " + c);
}
}
[6/6] ignite git commit: Merge branch 'ignite-1.5' into ignite-2100
Posted by vo...@apache.org.
Merge branch 'ignite-1.5' into ignite-2100
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e92fb51c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e92fb51c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e92fb51c
Branch: refs/heads/ignite-2100
Commit: e92fb51c7cd77eb7b06653688faded4f59cbd91f
Parents: 74e478d d6b4611
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Dec 14 15:22:23 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Dec 14 15:22:23 2015 +0300
----------------------------------------------------------------------
.../dht/GridPartitionedSingleGetFuture.java | 14 +++++++----
.../GridCacheAbstractNodeRestartSelfTest.java | 25 +++++++++-----------
modules/platforms/cpp/common/src/java.cpp | 8 +++----
3 files changed, 25 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
[2/6] ignite git commit: Merge remote-tracking branch
'origin/ignite-1.5' into ignite-1.5
Posted by vo...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/68d31795
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/68d31795
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/68d31795
Branch: refs/heads/ignite-2100
Commit: 68d317952485dd0a4e09844a9cdbb3a0f23ae399
Parents: 6bf716a f87b80f
Author: sboikov <sb...@gridgain.com>
Authored: Mon Dec 14 12:43:14 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Dec 14 12:43:14 2015 +0300
----------------------------------------------------------------------
.../binary/BinaryMarshallerSelfTest.java | 42 --------------------
.../cpp/core/include/ignite/ignition.h | 41 ++-----------------
.../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 8 ++++
3 files changed, 12 insertions(+), 79 deletions(-)
----------------------------------------------------------------------
[3/6] ignite git commit: ignite-1.5 Fixed NPE in
GridPartitionedSingleGetFuture.
Posted by vo...@apache.org.
ignite-1.5 Fixed NPE in GridPartitionedSingleGetFuture.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1224658f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1224658f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1224658f
Branch: refs/heads/ignite-2100
Commit: 1224658fe0d4b572b9980fa5de65bbb043646377
Parents: 68d3179
Author: sboikov <sb...@gridgain.com>
Authored: Mon Dec 14 13:17:06 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Dec 14 13:17:06 2015 +0300
----------------------------------------------------------------------
.../distributed/dht/GridPartitionedSingleGetFuture.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1224658f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
index 23e7c9a..f3f225a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
@@ -416,7 +416,8 @@ public class GridPartitionedSingleGetFuture extends GridFutureAdapter<Object> im
* @param res Result.
*/
public void onResult(UUID nodeId, GridNearSingleGetResponse res) {
- if (!processResponse(nodeId) || !checkError(res.error(), res.invalidPartitions(), res.topologyVersion()))
+ if (!processResponse(nodeId) ||
+ !checkError(res.error(), res.invalidPartitions(), res.topologyVersion(), nodeId))
return;
Message res0 = res.result();
@@ -451,7 +452,7 @@ public class GridPartitionedSingleGetFuture extends GridFutureAdapter<Object> im
*/
@Override public void onResult(UUID nodeId, GridNearGetResponse res) {
if (!processResponse(nodeId) ||
- !checkError(res.error(), !F.isEmpty(res.invalidPartitions()), res.topologyVersion()))
+ !checkError(res.error(), !F.isEmpty(res.invalidPartitions()), res.topologyVersion(), nodeId))
return;
Collection<GridCacheEntryInfo> infos = res.entries();
@@ -481,10 +482,13 @@ public class GridPartitionedSingleGetFuture extends GridFutureAdapter<Object> im
* @param err Error.
* @param invalidParts Invalid partitions error flag.
* @param rmtTopVer Received topology version.
+ * @param nodeId Node ID.
+ * @return {@code True} if should process received response.
*/
private boolean checkError(@Nullable IgniteCheckedException err,
boolean invalidParts,
- AffinityTopologyVersion rmtTopVer) {
+ AffinityTopologyVersion rmtTopVer,
+ UUID nodeId) {
if (err != null) {
onDone(err);
@@ -499,7 +503,7 @@ public class GridPartitionedSingleGetFuture extends GridFutureAdapter<Object> im
onDone(new IgniteCheckedException("Failed to process invalid partitions response (remote node reported " +
"invalid partitions but remote topology version does not differ from local) " +
"[topVer=" + topVer + ", rmtTopVer=" + rmtTopVer + ", part=" + cctx.affinity().partition(key) +
- ", nodeId=" + node.id() + ']'));
+ ", nodeId=" + nodeId + ']'));
return false;
}