You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/07/14 13:54:39 UTC
[1/6] ignite git commit: Fixed NPE in tests
Repository: ignite
Updated Branches:
refs/heads/ignite-5757 [created] b4fe30c48
Fixed NPE in tests
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/18bdfe96
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/18bdfe96
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/18bdfe96
Branch: refs/heads/ignite-5757
Commit: 18bdfe96a1e579371108c661e3374183c58a296d
Parents: 3c1749d
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Thu Jul 13 15:42:30 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Thu Jul 13 15:42:30 2017 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/database/BPlusTreeSelfTest.java | 4 +++-
.../internal/processors/database/FreeListImplSelfTest.java | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/18bdfe96/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java
index fadfc23..4a32df2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java
@@ -1774,7 +1774,9 @@ public class BPlusTreeSelfTest extends GridCommonAbstractTest {
* @return Page memory.
*/
protected PageMemory createPageMemory() throws Exception {
- MemoryPolicyConfiguration plcCfg = new MemoryPolicyConfiguration().setMaxSize(1024 * MB);
+ MemoryPolicyConfiguration plcCfg = new MemoryPolicyConfiguration()
+ .setInitialSize(1024 * MB)
+ .setMaxSize(1024 * MB);
PageMemory pageMem = new PageMemoryNoStoreImpl(log,
new UnsafeMemoryProvider(log),
http://git-wip-us.apache.org/repos/asf/ignite/blob/18bdfe96/modules/core/src/test/java/org/apache/ignite/internal/processors/database/FreeListImplSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/FreeListImplSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/FreeListImplSelfTest.java
index d650ac1..c190b1d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/FreeListImplSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/FreeListImplSelfTest.java
@@ -335,7 +335,9 @@ public class FreeListImplSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
protected FreeList createFreeList(int pageSize) throws Exception {
- MemoryPolicyConfiguration plcCfg = new MemoryPolicyConfiguration().setMaxSize(1024 * MB);
+ MemoryPolicyConfiguration plcCfg = new MemoryPolicyConfiguration()
+ .setInitialSize(1024 * MB)
+ .setMaxSize(1024 * MB);
pageMem = createPageMemory(pageSize, plcCfg);
[2/6] ignite git commit: Functionality of muted test is debated now
Posted by ag...@apache.org.
Functionality of muted test is debated now
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d9ed07c6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d9ed07c6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d9ed07c6
Branch: refs/heads/ignite-5757
Commit: d9ed07c67e4a4ff3a9de543cbe039ac2a48f03a0
Parents: 18bdfe9
Author: Sergey Chugunov <se...@gmail.com>
Authored: Thu Jul 13 17:32:06 2017 +0300
Committer: Sergey Chugunov <se...@gmail.com>
Committed: Thu Jul 13 17:32:06 2017 +0300
----------------------------------------------------------------------
.../internal/IgniteUpdateNotifierPerClusterSettingSelfTest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d9ed07c6/modules/core/src/test/java/org/apache/ignite/internal/IgniteUpdateNotifierPerClusterSettingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteUpdateNotifierPerClusterSettingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteUpdateNotifierPerClusterSettingSelfTest.java
index a348ea5..5f11088 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteUpdateNotifierPerClusterSettingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteUpdateNotifierPerClusterSettingSelfTest.java
@@ -66,6 +66,8 @@ public class IgniteUpdateNotifierPerClusterSettingSelfTest extends GridCommonAbs
* @throws Exception If failed.
*/
public void testNotifierEnabledForCluster() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-5413");
+
checkNotifierStatusForCluster(true);
}
[6/6] ignite git commit: IGNITE-5757 - Rent partitions on exchange
completion
Posted by ag...@apache.org.
IGNITE-5757 - Rent partitions on exchange completion
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b4fe30c4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b4fe30c4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b4fe30c4
Branch: refs/heads/ignite-5757
Commit: b4fe30c484e07dd0a931ab438257a1f0c7827035
Parents: 1e7e692
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Fri Jul 14 16:54:23 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Fri Jul 14 16:54:23 2017 +0300
----------------------------------------------------------------------
.../dht/GridDhtPartitionTopologyImpl.java | 21 ++++++++++++--------
.../near/GridNearTxPrepareRequest.java | 8 ++++----
2 files changed, 17 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b4fe30c4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
index 601da1b..d0db02b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
@@ -383,9 +383,6 @@ public class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology {
}
}
}
-
- if (node2part != null && node2part.valid())
- checkEvictions(updateSeq, aff);
}
updateRebalanceVersion(aff);
@@ -637,7 +634,12 @@ public class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology {
}
}
- updateRebalanceVersion(grp.affinity().assignments(topVer));
+ List<List<ClusterNode>> aff = grp.affinity().assignments(topVer);
+
+ updateRebalanceVersion(aff);
+
+ if (node2part != null && node2part.valid())
+ checkEvictions(updateSeq, aff);
consistencyCheck();
}
@@ -737,8 +739,9 @@ public class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology {
"[part=" + p + ", topVer=" + topVer + ", this.topVer=" + this.topVer + ']');
}
else if (loc != null && state == RENTING && !showRenting)
- throw new GridDhtInvalidPartitionException(p, "Adding entry to partition that is concurrently evicted " +
- "[part=" + p + ", shouldBeMoving=" + loc.reload() + "]");
+ throw new GridDhtInvalidPartitionException(p, "Adding entry to partition that is concurrently " +
+ "evicted [part=" + p + ", shouldBeMoving=" + loc.reload() + ", belongs=" + belongs +
+ ", topVer=" + topVer + ", curTopVer=" + this.topVer + "]");
if (loc == null) {
if (!treatAllPartAsLoc && !belongs)
@@ -1289,7 +1292,8 @@ public class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology {
if (!affVer.equals(AffinityTopologyVersion.NONE) && affVer.compareTo(topVer) >= 0) {
List<List<ClusterNode>> aff = grp.affinity().assignments(topVer);
- changed |= checkEvictions(updateSeq, aff);
+ if (exchangeVer == null)
+ changed |= checkEvictions(updateSeq, aff);
updateRebalanceVersion(aff);
}
@@ -1478,7 +1482,8 @@ public class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology {
if (!affVer.equals(AffinityTopologyVersion.NONE) && affVer.compareTo(topVer) >= 0) {
List<List<ClusterNode>> aff = grp.affinity().assignments(topVer);
- changed |= checkEvictions(updateSeq, aff);
+ if (exchId == null)
+ changed |= checkEvictions(updateSeq, aff);
updateRebalanceVersion(aff);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b4fe30c4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
index 29c7aad..875f397 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
@@ -406,13 +406,13 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest {
StringBuilder flags = new StringBuilder();
if (near())
- flags.append("near");
+ flags.append("[near]");
if (firstClientRequest())
- flags.append("clientReq");
+ flags.append("[firstClientReq]");
if (implicitSingle())
- flags.append("single");
+ flags.append("[implicitSingle]");
if (explicitLock())
- flags.append("explicitLock");
+ flags.append("[explicitLock]");
return S.toString(GridNearTxPrepareRequest.class, this,
"flags", flags.toString(),
[3/6] ignite git commit: Functionality of GridVersionSelfTest is
debated now
Posted by ag...@apache.org.
Functionality of GridVersionSelfTest is debated now
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/871d9260
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/871d9260
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/871d9260
Branch: refs/heads/ignite-5757
Commit: 871d9260f3b32bed5273852dbdb74c758f73d383
Parents: d9ed07c
Author: Sergey Chugunov <se...@gmail.com>
Authored: Thu Jul 13 18:34:01 2017 +0300
Committer: Sergey Chugunov <se...@gmail.com>
Committed: Thu Jul 13 18:34:01 2017 +0300
----------------------------------------------------------------------
.../test/java/org/apache/ignite/internal/GridVersionSelfTest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/871d9260/modules/core/src/test/java/org/apache/ignite/internal/GridVersionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridVersionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridVersionSelfTest.java
index 4751a0c..13af907 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridVersionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridVersionSelfTest.java
@@ -32,6 +32,8 @@ public class GridVersionSelfTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testVersions() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-5413");
+
String propVal = System.getProperty(IGNITE_UPDATE_NOTIFIER);
System.setProperty(IGNITE_UPDATE_NOTIFIER, "true");
[4/6] ignite git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/ignite into ignite-2.1.3
Posted by ag...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-2.1.3
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2788a740
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2788a740
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2788a740
Branch: refs/heads/ignite-5757
Commit: 2788a740c9aec88d14808d5927a346d121ad42b1
Parents: 18bdfe9 7338445
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Fri Jul 14 12:23:42 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Fri Jul 14 12:23:42 2017 +0300
----------------------------------------------------------------------
examples/config/example-memory-policies.xml | 7 +-
.../jmh/cache/JmhCacheLocksBenchmark.java | 119 +
.../apache/ignite/cache/affinity/Affinity.java | 16 +-
.../rendezvous/RendezvousAffinityFunction.java | 4 +-
.../org/apache/ignite/internal/IgnitionEx.java | 5 +-
.../ignite/internal/binary/BinaryUtils.java | 19 +-
.../internal/binary/BinaryWriterExImpl.java | 4 +-
.../binary/builder/BinaryBuilderSerializer.java | 6 +-
.../eventstorage/GridEventStorageManager.java | 309 +--
.../eventstorage/HighPriorityListener.java | 28 +
.../cache/CacheAffinitySharedManager.java | 211 +-
.../processors/cache/GridCacheMvccManager.java | 5 -
.../GridCachePartitionExchangeManager.java | 140 +-
.../processors/cache/GridCachePreloader.java | 8 +-
.../cache/GridCachePreloaderAdapter.java | 4 +-
.../processors/cache/GridCacheProcessor.java | 2 -
.../cache/distributed/dht/GridDhtTxLocal.java | 13 -
.../preloader/ForceRebalanceExchangeTask.java | 58 +
.../dht/preloader/GridDhtPartitionDemander.java | 22 +-
.../preloader/GridDhtPartitionExchangeId.java | 61 +-
.../GridDhtPartitionsExchangeFuture.java | 136 +-
.../dht/preloader/GridDhtPreloader.java | 33 +-
.../preloader/GridDhtPreloaderAssignments.java | 21 +-
.../RebalanceReassignExchangeTask.java | 44 +
.../continuous/GridContinuousProcessor.java | 91 +-
.../communication/tcp/TcpCommunicationSpi.java | 30 +-
.../tcp/internal/TcpDiscoveryStatistics.java | 6 +-
.../internal/binary/BinaryEnumsSelfTest.java | 71 +
.../binary/BinaryMarshallerSelfTest.java | 61 +
.../sink/flink/FlinkIgniteSinkSelfTest.java | 2 +-
.../Apache.Ignite.Core.Tests.csproj | 17 +-
.../Cache/Query/CacheLinqTest.cs | 2084 ------------------
.../Cache/Query/CacheLinqTestSimpleName.cs | 35 -
.../Cache/Query/CacheLinqTestSqlEscapeAll.cs | 34 -
.../Query/Linq/CacheLinqTest.Aggregates.cs | 91 +
.../Cache/Query/Linq/CacheLinqTest.Base.cs | 506 +++++
.../Query/Linq/CacheLinqTest.CompiledQuery.cs | 215 ++
.../Cache/Query/Linq/CacheLinqTest.Contains.cs | 128 ++
.../Cache/Query/Linq/CacheLinqTest.Custom.cs | 107 +
.../Cache/Query/Linq/CacheLinqTest.DateTime.cs | 89 +
.../Cache/Query/Linq/CacheLinqTest.Functions.cs | 211 ++
.../Query/Linq/CacheLinqTest.Introspection.cs | 145 ++
.../Linq/CacheLinqTest.Join.LocalCollection.cs | 182 ++
.../Cache/Query/Linq/CacheLinqTest.Join.cs | 310 +++
.../Cache/Query/Linq/CacheLinqTest.Misc.cs | 350 +++
.../Cache/Query/Linq/CacheLinqTest.Numerics.cs | 131 ++
.../Cache/Query/Linq/CacheLinqTest.Strings.cs | 91 +
.../Cache/Query/Linq/CacheLinqTestSimpleName.cs | 35 +
.../Query/Linq/CacheLinqTestSqlEscapeAll.cs | 34 +
.../cache/IgniteCacheLockBenchmark.java | 57 +
.../yardstick/cache/IgniteLockBenchmark.java | 47 +
51 files changed, 3664 insertions(+), 2771 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2788a740/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2788a740/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
[5/6] ignite git commit: Merge branch 'ignite-2.1.3' of
https://github.com/gridgain/apache-ignite into ignite-2.1.3
Posted by ag...@apache.org.
Merge branch 'ignite-2.1.3' of https://github.com/gridgain/apache-ignite into ignite-2.1.3
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1e7e692b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1e7e692b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1e7e692b
Branch: refs/heads/ignite-5757
Commit: 1e7e692bd4ce0fe2e092117190b59382840317a7
Parents: 2788a74 871d926
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Fri Jul 14 12:25:08 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Fri Jul 14 12:25:08 2017 +0300
----------------------------------------------------------------------
.../test/java/org/apache/ignite/internal/GridVersionSelfTest.java | 2 ++
.../internal/IgniteUpdateNotifierPerClusterSettingSelfTest.java | 2 ++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------