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/04/24 10:22:16 UTC
[1/2] ignite git commit:
IgniteCacheClientMultiNodeUpdateTopologyLockTest minor.
Repository: ignite
Updated Branches:
refs/heads/ignite-2.0 7378bc38a -> 1214d7e7e
IgniteCacheClientMultiNodeUpdateTopologyLockTest minor.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/31928067
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/31928067
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/31928067
Branch: refs/heads/ignite-2.0
Commit: 319280678515e4e12c10c0362883f207919e87c2
Parents: 1968e4f
Author: sboikov <sb...@gridgain.com>
Authored: Mon Apr 24 13:20:59 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Apr 24 13:20:59 2017 +0300
----------------------------------------------------------------------
...heClientMultiNodeUpdateTopologyLockTest.java | 28 +++++++++++++-------
1 file changed, 18 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/31928067/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientMultiNodeUpdateTopologyLockTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientMultiNodeUpdateTopologyLockTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientMultiNodeUpdateTopologyLockTest.java
index 4adf5f4..7711bbb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientMultiNodeUpdateTopologyLockTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientMultiNodeUpdateTopologyLockTest.java
@@ -100,7 +100,7 @@ public class IgniteCacheClientMultiNodeUpdateTopologyLockTest extends GridCommon
TestRecordingCommunicationSpi spi2 = TestRecordingCommunicationSpi.spi(ignite(2));
- TestRecordingCommunicationSpi clientSpi = TestRecordingCommunicationSpi.spi(clientNode);
+ final TestRecordingCommunicationSpi clientSpi = TestRecordingCommunicationSpi.spi(clientNode);
final UUID node0Id = ignite(0).cluster().localNode().id();
final UUID node2Id = ignite(2).cluster().localNode().id();
@@ -115,22 +115,30 @@ public class IgniteCacheClientMultiNodeUpdateTopologyLockTest extends GridCommon
}
});
- clientSpi.record(new IgniteBiPredicate<ClusterNode, Message>() {
- @Override public boolean apply(ClusterNode node, Message msg) {
+ clientSpi.blockMessages(new IgniteBiPredicate<ClusterNode, Message>() {
+ @Override public boolean apply(final ClusterNode node, final Message msg) {
if (!node2Id.equals(node.id()))
return false;
if (msg instanceof GridNearTxFinishRequest) {
log.info("Delay message [msg=" + msg + ']');
- try {
- Thread.sleep(5000);
- }
- catch (InterruptedException e) {
- e.printStackTrace();
- }
+ GridTestUtils.runAsync(new Runnable() {
+ @Override public void run() {
+ try {
+ Thread.sleep(5000);
+ }
+ catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+
+ log.info("Send delayed message [msg=" + msg + ']');
+
+ clientSpi.stopBlock(true);
+ }
+ });
- log.info("Send delayed message [msg=" + msg + ']');
+ return true;
}
return false;
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-2.0' into ignite-2.0
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-2.0' into ignite-2.0
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1214d7e7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1214d7e7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1214d7e7
Branch: refs/heads/ignite-2.0
Commit: 1214d7e7e0d0853559e0017366efaf10927aa898
Parents: 3192806 7378bc3
Author: sboikov <sb...@gridgain.com>
Authored: Mon Apr 24 13:21:36 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Apr 24 13:21:36 2017 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/ml/math/Algebra.java | 89 +++++++++-------
.../ignite/ml/math/IdentityValueMapper.java | 3 +-
.../java/org/apache/ignite/ml/math/Matrix.java | 32 +++---
.../org/apache/ignite/ml/math/MurmurHash.java | 16 +--
.../java/org/apache/ignite/ml/math/Tracer.java | 4 +-
.../java/org/apache/ignite/ml/math/Vector.java | 3 +-
.../decompositions/CholeskyDecomposition.java | 8 +-
.../math/decompositions/EigenDecomposition.java | 4 +-
.../ml/math/decompositions/LUDecomposition.java | 8 +-
.../ignite/ml/math/functions/Functions.java | 21 +++-
.../ml/math/impls/matrix/PivotedMatrixView.java | 2 +-
.../impls/matrix/SparseDistributedMatrix.java | 12 +--
.../storage/matrix/CacheMatrixStorage.java | 15 ++-
.../matrix/DenseOffHeapMatrixStorage.java | 14 ++-
.../storage/matrix/FunctionMatrixStorage.java | 16 +--
.../matrix/SparseLocalOnHeapMatrixStorage.java | 18 ++--
.../storage/vector/CacheVectorStorage.java | 12 +--
.../storage/vector/ConstantVectorStorage.java | 9 +-
.../storage/vector/FunctionVectorStorage.java | 16 +--
.../storage/vector/MatrixVectorStorage.java | 18 ++--
.../storage/vector/PivotedVectorStorage.java | 15 +--
.../SingleElementVectorDelegateStorage.java | 12 +--
.../vector/SingleElementVectorStorage.java | 10 +-
.../vector/SparseLocalOffHeapVectorStorage.java | 2 +
.../vector/SparseLocalOnHeapVectorStorage.java | 9 +-
.../ml/math/impls/vector/MatrixVectorView.java | 19 ++--
.../ml/math/impls/vector/PivotedVectorView.java | 13 +--
.../ml/math/impls/vector/RandomVector.java | 5 +-
.../math/impls/vector/SingleElementVector.java | 103 +------------------
.../org/apache/ignite/ml/math/TracerTest.java | 11 +-
.../ml/math/impls/matrix/CacheMatrixTest.java | 10 +-
.../impls/matrix/MatrixKeyMapperForTests.java | 19 ++--
.../storage/matrix/MatrixStorageFixtures.java | 18 ++--
.../SparseLocalOffHeapVectorStorageTest.java | 3 +-
.../math/impls/vector/AbstractVectorTest.java | 41 ++++----
.../ml/math/impls/vector/CacheVectorTest.java | 4 +-
36 files changed, 305 insertions(+), 309 deletions(-)
----------------------------------------------------------------------