[2/4] ignite git commit: ignite-gg-8.0.2.ea2 mute tests, link to task

[agoncharuk]

ignite-gg-8.0.2.ea2 mute tests, link to task


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e9bb1d90
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e9bb1d90
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e9bb1d90

Branch: refs/heads/ignite-3477
Commit: e9bb1d900f6e65d8371cb32cbb09e79f9ccc8992
Parents: 166d637
Author: Dmitriy Govorukhin 
Authored: Mon Jan 16 18:27:51 2017 +0300
Committer: Dmitriy Govorukhin 
Committed: Mon Jan 16 18:27:51 2017 +0300

--
 .../cache/GridCacheAbstractMetricsSelfTest.java   |  8 +++-
 .../GridCacheReplicatedUnswapAdvancedSelfTest.java|  3 +++
 .../local/LocalCacheOffHeapAndSwapMetricsSelfTest.java| 10 ++
 .../internal/processors/query/h2/IgniteH2Indexing.java|  2 +-
 .../processors/query/h2/database/H2TreeIndex.java |  2 +-
 5 files changed, 22 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e9bb1d90/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
index 5ad7e5c..aca01a5 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
@@ -615,6 +615,8 @@ public abstract class GridCacheAbstractMetricsSelfTest 
extends GridCacheAbstract
  * @throws Exception If failed.
  */
 public void testMisses() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-4536;);
+
 IgniteCache cache = grid(0).cache(null);
 
 int keyCnt = keyCount();
@@ -657,12 +659,14 @@ public abstract class GridCacheAbstractMetricsSelfTest 
extends GridCacheAbstract
  * @throws Exception If failed.
  */
 public void testMissesOnEmptyCache() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-4536;);
+
 IgniteCache cache = grid(0).cache(null);
 
 assertEquals("Expected 0 read", 0, 
cache.localMetrics().getCacheGets());
 assertEquals("Expected 0 miss", 0, 
cache.localMetrics().getCacheMisses());
 
-Integer key =  null;
+Integer key = null;
 
 for (int i = 0; i < 1000; i++) {
 if (affinity(cache).isPrimary(grid(0).localNode(), i)) {
@@ -709,6 +713,8 @@ public abstract class GridCacheAbstractMetricsSelfTest 
extends GridCacheAbstract
  * @throws Exception If failed.
  */
 public void testManualEvictions() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-4536;);
+
 IgniteCache cache = grid(0).cache(null);
 
 if (cache.getConfiguration(CacheConfiguration.class).getCacheMode() == 
CacheMode.PARTITIONED)

http://git-wip-us.apache.org/repos/asf/ignite/blob/e9bb1d90/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java
index a1a92d4..006cb87 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedUnswapAdvancedSelfTest.java
@@ -69,6 +69,9 @@ public class GridCacheReplicatedUnswapAdvancedSelfTest 
extends GridCommonAbstrac
  * @throws Exception If failed.
  */
 public void testUnswapAdvanced() throws Exception {
+//TODO GG-11141
+fail();
+
 Ignite g1 = startGrid(1);
 Ignite g2 = startGrid(2);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/e9bb1d90/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/LocalCacheOffHeapAndSwapMetricsSelfTest.java
--
diff --git 

[1/4] ignite git commit: ignite-gg-8.0.2.ea2 fix testDuplicatedDiscoveryDataRemoved

[agoncharuk]

Repository: ignite
Updated Branches:
  refs/heads/ignite-3477 8f6918634 -> 6c31bc1a5


ignite-gg-8.0.2.ea2 fix testDuplicatedDiscoveryDataRemoved


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/166d6371
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/166d6371
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/166d6371

Branch: refs/heads/ignite-3477
Commit: 166d63713c259f0b5882c41dffd3bf66d47da0fd
Parents: e1b84b4
Author: Dmitriy Govorukhin 
Authored: Mon Jan 16 17:38:49 2017 +0300
Committer: Dmitriy Govorukhin 
Committed: Mon Jan 16 17:38:49 2017 +0300

--
 .../processors/cache/DynamicCacheChangeRequest.java | 8 
 .../internal/processors/cache/GridCacheProcessor.java   | 9 +
 .../org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 1 -
 3 files changed, 9 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/166d6371/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
index a3116ad..1e5ab88 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
@@ -35,7 +35,7 @@ public class DynamicCacheChangeRequest implements 
Serializable {
 private static final long serialVersionUID = 0L;
 
 /** */
-private UUID requestId;
+private UUID reqId;
 
 /** Start ID. */
 private IgniteUuid deploymentId;
@@ -95,8 +95,8 @@ public class DynamicCacheChangeRequest implements 
Serializable {
  * @param cacheName Cache stop name.
  * @param initiatingNodeId Initiating node ID.
  */
-public DynamicCacheChangeRequest(UUID requestId, String cacheName, UUID 
initiatingNodeId) {
-this.requestId = requestId;
+public DynamicCacheChangeRequest(UUID reqId, String cacheName, UUID 
initiatingNodeId) {
+this.reqId = reqId;
 this.cacheName = cacheName;
 this.initiatingNodeId = initiatingNodeId;
 }
@@ -105,7 +105,7 @@ public class DynamicCacheChangeRequest implements 
Serializable {
  * @return Request ID.
  */
 public UUID requestId() {
-return requestId;
+return reqId;
 }
 
 /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/166d6371/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 1e5fcc1..7f4fb99 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -2041,8 +2041,9 @@ public class GridCacheProcessor extends 
GridProcessorAdapter {
 
 if (desc == null)
 continue;
-
-DynamicCacheChangeRequest req = new 
DynamicCacheChangeRequest(UUID.randomUUID(), cache.name(), null);
+// requestId must be null because on different node will be 
different byte [] and we get duplicate discovery data
+// see TcpDiscoveryNodeAddedMessage#addDiscoveryData 
'Arrays.equals(curData, discoDataEntry.getValue())'
+DynamicCacheChangeRequest req = new 
DynamicCacheChangeRequest(null, cache.name(), null);
 
 req.startCacheConfiguration(desc.cacheConfiguration());
 
@@ -2068,7 +2069,7 @@ public class GridCacheProcessor extends 
GridProcessorAdapter {
 
 for (DynamicCacheDescriptor desc : registeredCaches.values()) {
 DynamicCacheChangeRequest req = new DynamicCacheChangeRequest(
-UUID.randomUUID(), desc.cacheConfiguration().getName(), 
null);
+null, desc.cacheConfiguration().getName(), null);
 
 req.startCacheConfiguration(desc.cacheConfiguration());
 
@@ -2083,7 +2084,7 @@ public class GridCacheProcessor extends 
GridProcessorAdapter {
 
 for (DynamicCacheDescriptor desc : registeredTemplates.values()) {
 DynamicCacheChangeRequest req = new DynamicCacheChangeRequest(
-UUID.randomUUID(), 

[4/4] ignite git commit: Merge remote-tracking branch 'community/ignite-gg-8.0.2.ea2' into ignite-gg-8.0.2.ea2

[agoncharuk]

Merge remote-tracking branch 'community/ignite-gg-8.0.2.ea2' into 
ignite-gg-8.0.2.ea2


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6c31bc1a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6c31bc1a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6c31bc1a

Branch: refs/heads/ignite-3477
Commit: 6c31bc1a59b56de5328af3d9c160e35dd7e52c34
Parents: 8f69186 6e5bfea
Author: Alexey Goncharuk 
Authored: Mon Jan 16 21:10:08 2017 +0300
Committer: Alexey Goncharuk 
Committed: Mon Jan 16 21:10:08 2017 +0300

--
 .../org/apache/ignite/internal/IgnitionEx.java  |  3 ++-
 .../cache/DynamicCacheChangeRequest.java|  8 +++---
 .../processors/cache/GridCacheProcessor.java|  9 ---
 .../ignite/spi/discovery/tcp/ServerImpl.java|  1 -
 .../cache/GridCacheAbstractMetricsSelfTest.java |  8 +-
 ...idCacheReplicatedUnswapAdvancedSelfTest.java |  3 +++
 ...LocalCacheOffHeapAndSwapMetricsSelfTest.java | 10 
 .../processors/query/h2/IgniteH2Indexing.java   |  2 +-
 .../query/h2/database/H2TreeIndex.java  |  2 +-
 .../query/h2/opt/GridH2TreeIndex.java   | 26 
 .../query/h2/opt/GridH2TableSelfTest.java   |  8 +-
 11 files changed, 56 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/6c31bc1a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java
--

http://git-wip-us.apache.org/repos/asf/ignite/blob/6c31bc1a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TableSelfTest.java
--

[3/4] ignite git commit: ignite-gg-8.0.2.ea2 fix query test

[agoncharuk]

ignite-gg-8.0.2.ea2 fix query test


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6e5bfea3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6e5bfea3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6e5bfea3

Branch: refs/heads/ignite-3477
Commit: 6e5bfea3b71068bc4c4487e68d1d9ced4069005a
Parents: e9bb1d9
Author: Dmitriy Govorukhin 
Authored: Mon Jan 16 21:09:04 2017 +0300
Committer: Dmitriy Govorukhin 
Committed: Mon Jan 16 21:09:04 2017 +0300

--
 .../org/apache/ignite/internal/IgnitionEx.java  |  3 ++-
 .../query/h2/opt/GridH2TreeIndex.java   | 26 
 .../query/h2/opt/GridH2TableSelfTest.java   |  8 +-
 .../query/h2/sql/GridQueryParsingTest.java  |  4 +--
 4 files changed, 27 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/6e5bfea3/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java 
b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index b464127..b47ed15 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -2381,7 +2381,8 @@ public class IgnitionEx {
 
 grid = null;
 
-stopExecutors(log);
+if (log != null)
+stopExecutors(log);
 
 log = null;
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/6e5bfea3/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TreeIndex.java
--
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TreeIndex.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TreeIndex.java
index 4fa8b0f..0f93f52 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TreeIndex.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TreeIndex.java
@@ -499,8 +499,8 @@ public class GridH2TreeIndex extends GridH2IndexBase 
implements Comparator find(GridSearchRowPointer 
lower, GridSearchRowPointer upper)
 throws IgniteCheckedException {
-if (lower == null || upper == null)
-throw new NullPointerException();
 
-NavigableMap subMap =
-tree.subMap(lower, false, upper, false);
+Collection rows;
 
-return new GridCursorIteratorWrapper<>(subMap.values().iterator());
+if (lower == null && upper == null)
+rows = tree.values();
+else if (lower != null && upper == null)
+rows = tree.tailMap(lower).values();
+else if (lower == null)
+rows = tree.headMap(upper).values();
+else
+rows = tree.subMap(lower, true, upper, true).values();
+
+return new GridCursorIteratorWrapper<>(rows.iterator());
 }
 
 /** {@inheritDoc} */
@@ -532,16 +538,16 @@ public class GridH2TreeIndex extends GridH2IndexBase 
implements Comparatorhttp://git-wip-us.apache.org/repos/asf/ignite/blob/6e5bfea3/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TableSelfTest.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TableSelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TableSelfTest.java
index 5daf415..dcb1840 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TableSelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2TableSelfTest.java
@@ -70,6 +70,9 @@ public class GridH2TableSelfTest extends 
GridCommonAbstractTest {
 /** */
 private static final String PK_NAME = "__GG_PK_";
 
+/** Hash. */
+private static final String HASH = "__GG_HASH";
+
 /** */
 private static final String STR_IDX_NAME = "__GG_IDX_";
 
@@ -105,6 +108,7 @@ public class GridH2TableSelfTest extends 
GridCommonAbstractTest {
 IndexColumn x = tbl.indexColumn(3, SortOrder.DESCENDING);
 
 idxs.add(new GridH2TreeIndex(PK_NAME, tbl, true, 
F.asList(id)));
+idxs.add(new GridH2TreeIndex(HASH, tbl, 

ignite git commit: IGNITE-4045 .NET: Support DML API - fix code analysis warnings

[ptupitsyn]

Repository: ignite
Updated Branches:
  refs/heads/master b7908d7a6 -> 7b711a324


IGNITE-4045 .NET: Support DML API - fix code analysis warnings


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7b711a32
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7b711a32
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7b711a32

Branch: refs/heads/master
Commit: 7b711a3248b0dafdcea195766b50be4d44656f7f
Parents: b7908d7
Author: Pavel Tupitsyn 
Authored: Mon Jan 16 19:50:35 2017 +0300
Committer: Pavel Tupitsyn 
Committed: Mon Jan 16 19:50:35 2017 +0300

--
 .../Apache.Ignite.Core.csproj   |  1 +
 .../Binary/BinaryArrayEqualityComparer.cs   |  2 +-
 .../Binary/BinaryEqualityComparerSerializer.cs  |  2 +-
 .../Impl/Binary/DateTimeHolder.cs   | 22 +++-
 .../Impl/Binary/Io/IBinaryStream.cs | 16 -
 .../Impl/Binary/Io/IBinaryStreamProcessor.cs| 36 
 6 files changed, 60 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/7b711a32/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj 
b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
index 42ccdd4..d58c872 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@ -185,6 +185,7 @@
 
 
 
+
 
 
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/7b711a32/modules/platforms/dotnet/Apache.Ignite.Core/Binary/BinaryArrayEqualityComparer.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Binary/BinaryArrayEqualityComparer.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core/Binary/BinaryArrayEqualityComparer.cs
index 09f7f0f..4e29a91 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core/Binary/BinaryArrayEqualityComparer.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core/Binary/BinaryArrayEqualityComparer.cs
@@ -26,7 +26,7 @@ namespace Apache.Ignite.Core.Binary
 /// 
 /// Compares binary object equality using underlying byte array.
 /// 
-public class BinaryArrayEqualityComparer : 
IEqualityComparer, IBinaryEqualityComparer,
+public sealed class BinaryArrayEqualityComparer : 
IEqualityComparer, IBinaryEqualityComparer,
 IBinaryStreamProcessor, int>
 {
 /// 

http://git-wip-us.apache.org/repos/asf/ignite/blob/7b711a32/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryEqualityComparerSerializer.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryEqualityComparerSerializer.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryEqualityComparerSerializer.cs
index aa4795e..bb26076 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryEqualityComparerSerializer.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryEqualityComparerSerializer.cs
@@ -92,7 +92,7 @@ namespace Apache.Ignite.Core.Impl.Binary
 };
 
 default:
-throw new ArgumentOutOfRangeException();
+throw new ArgumentOutOfRangeException("reader", type, 
"Invalid EqualityComparer type code");
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/7b711a32/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/DateTimeHolder.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/DateTimeHolder.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/DateTimeHolder.cs
index 6adb847..21c56a9 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/DateTimeHolder.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/DateTimeHolder.cs
@@ -69,7 +69,7 @@ namespace Apache.Ignite.Core.Impl.Binary
 public override bool Equals(object obj)
 {
 if (ReferenceEquals(null, obj)) return false;
-return obj is DateTimeHolder && _item.Equals(((DateTimeHolder) 
obj)._item);
+return obj is DateTimeHolder && Equals((DateTimeHolder) obj);
 }
 
 /**  */
@@ -77,5 +77,25 @@ namespace Apache.Ignite.Core.Impl.Binary
 {
 return _item.GetHashCode();
 }
+
+/**  */
+public static bool operator ==(DateTimeHolder left, 

[12/12] ignite git commit: merge from master

[yzhdanov]

merge from master


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ecd727c4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ecd727c4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ecd727c4

Branch: refs/heads/ignite-comm-balance-master
Commit: ecd727c4df9d9f53ece4a24182d964102e2c1508
Parents: 18229e8 b7908d7
Author: Yakov Zhdanov 
Authored: Mon Jan 16 18:21:10 2017 +0300
Committer: Yakov Zhdanov 
Committed: Mon Jan 16 18:21:10 2017 +0300

--
 .../ignite/cache/query/SqlFieldsQuery.java  |   6 +
 .../store/jdbc/dialect/BasicJdbcDialect.java|  31 +-
 .../GridClientConnectionManagerAdapter.java |   7 +-
 .../impl/connection/GridClientTopology.java |  53 +++-
 .../GridNearAtomicAbstractUpdateFuture.java |  34 ++-
 .../GridNearAtomicSingleUpdateFuture.java   |  48 ++-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |  61 ++--
 .../IgniteCacheObjectProcessorImpl.java |   5 +-
 .../utils/PlatformConfigurationUtils.java   | 128 +++-
 .../processors/query/GridQueryProcessor.java|   2 +-
 .../store/jdbc/CacheJdbcPojoStoreTest.java  |  48 ++-
 .../ignite/cache/store/jdbc/model/Person.java   |   2 +-
 .../cache/CacheEntryProcessorCopySelfTest.java  |   6 +-
 .../cache/GridCacheBasicStoreAbstractTest.java  |   2 +-
 .../GridCacheDhtEvictionsDisabledSelfTest.java  |   5 +-
 .../AtomicPutAllChangingTopologyTest.java   | 212 +
 .../IgniteCacheFailoverTestSuite.java   |   3 +
 .../apache/ignite/stream/flume/IgniteSink.java  |   7 +-
 .../hadoop/impl/v2/HadoopV2TaskContext.java |   7 -
 ...niteCacheAbstractInsertSqlQuerySelfTest.java |  14 +-
 .../IgniteCacheAbstractSqlDmlQuerySelfTest.java |   6 +-
 .../IgniteCacheInsertSqlQuerySelfTest.java  |  18 +-
 .../cache/IgniteCacheMergeSqlQuerySelfTest.java |  14 +-
 .../IgniteCacheUpdateSqlQuerySelfTest.java  |   4 +-
 .../Apache.Ignite.Core.Tests.csproj |   3 +
 .../Binary/BinaryBuilderSelfTest.cs | 159 ++
 .../BinaryBuilderSelfTestArrayIdentity.cs   |  34 +++
 .../Binary/BinaryEqualityComparerTest.cs| 279 +
 .../Binary/IO/BinaryStreamsTest.cs  |  19 ++
 .../Cache/CacheConfigurationTest.cs |   5 +-
 .../Cache/Query/CacheDmlQueriesTest.cs  | 296 +++
 .../IgniteConfigurationSerializerTest.cs|  46 ++-
 .../IgniteConfigurationTest.cs  |  28 ++
 .../Apache.Ignite.Core.csproj   |   4 +
 .../Binary/BinaryArrayEqualityComparer.cs   | 149 ++
 .../Binary/BinaryConfiguration.cs   |  24 ++
 .../Binary/BinaryTypeConfiguration.cs   |  14 +
 .../Cache/Configuration/QueryEntity.cs  |  33 ++-
 .../Cache/Configuration/QueryField.cs   |   6 +
 .../Apache.Ignite.Core/IgniteConfiguration.cs   |  85 --
 .../IgniteConfigurationSection.xsd  |  19 ++
 .../Apache.Ignite.Core/Impl/Binary/Binary.cs|  28 +-
 .../Binary/BinaryEqualityComparerSerializer.cs  |  99 +++
 .../Impl/Binary/BinaryFieldEqualityComparer.cs  | 138 +
 .../Impl/Binary/BinaryFullTypeDescriptor.cs |  21 +-
 .../Impl/Binary/BinaryObject.cs |  31 +-
 .../Impl/Binary/BinaryObjectBuilder.cs  |  62 +++-
 .../Impl/Binary/BinaryObjectHeader.cs   |  21 +-
 .../Impl/Binary/BinaryObjectSchemaHolder.cs |  22 ++
 .../Impl/Binary/BinaryReader.cs |  16 +-
 .../Binary/BinarySurrogateTypeDescriptor.cs |   6 +
 .../Impl/Binary/BinarySystemHandlers.cs |   6 +-
 .../Impl/Binary/BinaryWriter.cs |  11 +-
 .../Impl/Binary/DateTimeHolder.cs   |  15 +-
 .../Impl/Binary/IBinaryEqualityComparer.cs  |  53 
 .../Impl/Binary/IBinaryTypeDescriptor.cs|   5 +
 .../Impl/Binary/Io/BinaryHeapStream.cs  |   9 +
 .../Impl/Binary/Io/BinaryStreamBase.cs  |  13 +
 .../Impl/Binary/Io/IBinaryStream.cs |  25 ++
 .../Impl/Binary/Marshaller.cs   |  22 +-
 .../Impl/Binary/SerializableObjectHolder.cs |  16 +
 .../Common/IgniteConfigurationXmlSerializer.cs  |   5 +-
 .../Impl/Memory/PlatformMemoryStream.cs |  16 +
 63 files changed, 2271 insertions(+), 295 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/ecd727c4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
--
diff --cc 
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
index fb4ca78,c92e0f5..a77facc
--- 

[07/12] ignite git commit: IGNITE-4545 Added cache for router hostnames. - Fixes #1428.

[yzhdanov]

IGNITE-4545 Added cache for router hostnames. - Fixes #1428.

Signed-off-by: Andrey Novikov 


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/27ba69b5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/27ba69b5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/27ba69b5

Branch: refs/heads/ignite-comm-balance-master
Commit: 27ba69b55f645a022f2e84cc4db76309b02850e3
Parents: 79401b2
Author: Andrey Novikov 
Authored: Mon Jan 16 11:22:34 2017 +0700
Committer: Andrey Novikov 
Committed: Mon Jan 16 11:22:34 2017 +0700

--
 .../GridClientConnectionManagerAdapter.java |  7 ++-
 .../impl/connection/GridClientTopology.java | 53 
 2 files changed, 49 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/27ba69b5/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
index 12baee0..f714e7a 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
@@ -85,6 +85,9 @@ public abstract class GridClientConnectionManagerAdapter 
implements GridClientCo
 /** Class logger. */
 private final Logger log;
 
+/** All local enabled MACs. */
+private final Collection macs;
+
 /** NIO server. */
 private GridNioServer srv;
 
@@ -166,6 +169,8 @@ public abstract class GridClientConnectionManagerAdapter 
implements GridClientCo
 if (marshId == null && cfg.getMarshaller() == null)
 throw new GridClientException("Failed to start client (marshaller 
is not configured).");
 
+macs = U.allLocalMACs();
+
 if (cfg.getProtocol() == GridClientProtocol.TCP) {
 try {
 IgniteLogger gridLog = new JavaLogger(false);
@@ -316,7 +321,7 @@ public abstract class GridClientConnectionManagerAdapter 
implements GridClientCo
 }
 
 boolean sameHost = node.attributes().isEmpty() ||
-F.containsAny(U.allLocalMACs(), 
node.attribute(ATTR_MACS).toString().split(", "));
+F.containsAny(macs, node.attribute(ATTR_MACS).toString().split(", 
"));
 
 Collection srvs = new LinkedHashSet<>();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/27ba69b5/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java
index effd5b3..97aa586 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java
@@ -21,7 +21,6 @@ import java.net.InetSocketAddress;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.Map;
 import java.util.Set;
@@ -61,12 +60,18 @@ public class GridClientTopology {
 /** Cached last error prevented topology from update. */
 private GridClientException lastError;
 
+/** Router addresses from configuration.  */
+private final String routers;
+
 /**
  * Set of router addresses to infer direct connectivity
  * when client is working in router connection mode.
  * {@code null} when client is working in direct connection node.
  */
-private final Set routerAddrs;
+private final Set routerAddrs;
+
+/** List of all known local MACs */
+private final Collection macsCache;
 
 /** Protocol. */
 private final GridClientProtocol prot;
@@ -96,8 +101,38 @@ public class GridClientTopology {
 metricsCache = cfg.isEnableMetricsCache();
 attrCache = cfg.isEnableAttributesCache();
 prot = cfg.getProtocol();
-routerAddrs = (!cfg.getRouters().isEmpty() && 
cfg.getServers().isEmpty()) ?
-new HashSet<>(cfg.getRouters()) : null;
+
+if (!cfg.getRouters().isEmpty() && cfg.getServers().isEmpty()) {
+routers = 

[08/12] ignite git commit: IGNITE-4424 REPLICATED cache isn't synced across nodes

[yzhdanov]

IGNITE-4424 REPLICATED cache isn't synced across nodes


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/82dd9128
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/82dd9128
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/82dd9128

Branch: refs/heads/ignite-comm-balance-master
Commit: 82dd912889b0dfca213edb1374c1fa0ed79411fd
Parents: 27ba69b
Author: Anton Vinogradov 
Authored: Fri Dec 30 13:41:34 2016 +0300
Committer: Anton Vinogradov 
Committed: Mon Jan 16 12:18:14 2017 +0300

--
 .../GridNearAtomicAbstractUpdateFuture.java |  34 ++-
 .../GridNearAtomicSingleUpdateFuture.java   |  44 ++--
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |  57 ++---
 .../AtomicPutAllChangingTopologyTest.java   | 212 +++
 .../IgniteCacheFailoverTestSuite.java   |   3 +
 5 files changed, 284 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/82dd9128/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
index 2fbabaa..c92e0f5 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
@@ -212,14 +212,18 @@ public abstract class GridNearAtomicAbstractUpdateFuture 
extends GridFutureAdapt
 // Cannot remap.
 remapCnt = 1;
 
-map(topVer);
+GridCacheVersion futVer = addAtomicFuture(topVer);
+
+if (futVer != null)
+map(topVer, futVer);
 }
 }
 
 /**
  * @param topVer Topology version.
+ * @param futVer Future version
  */
-protected abstract void map(AffinityTopologyVersion topVer);
+protected abstract void map(AffinityTopologyVersion topVer, 
GridCacheVersion futVer);
 
 /**
  * Maps future on ready topology.
@@ -302,7 +306,7 @@ public abstract class GridNearAtomicAbstractUpdateFuture 
extends GridFutureAdapt
  * @param req Request.
  * @param e Error.
  */
-protected void onSendError(GridNearAtomicAbstractUpdateRequest req, 
IgniteCheckedException e) {
+protected final void onSendError(GridNearAtomicAbstractUpdateRequest req, 
IgniteCheckedException e) {
 synchronized (mux) {
 GridNearAtomicUpdateResponse res = new 
GridNearAtomicUpdateResponse(cctx.cacheId(),
 req.nodeId(),
@@ -314,4 +318,28 @@ public abstract class GridNearAtomicAbstractUpdateFuture 
extends GridFutureAdapt
 onResult(req.nodeId(), res, true);
 }
 }
+
+/**
+ * Adds future prevents topology change before operation complete.
+ * Should be invoked before topology lock released.
+ *
+ * @param topVer Topology version.
+ * @return Future version in case future added.
+ */
+protected final GridCacheVersion addAtomicFuture(AffinityTopologyVersion 
topVer) {
+GridCacheVersion futVer = cctx.versions().next(topVer);
+
+synchronized (mux) {
+assert this.futVer == null : this;
+assert this.topVer == AffinityTopologyVersion.ZERO : this;
+
+this.topVer = topVer;
+this.futVer = futVer;
+}
+
+if (storeFuture() && !cctx.mvcc().addAtomicFuture(futVer, this))
+return null;
+
+return futVer;
+}
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/82dd9128/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
index bd231cf..7376aff 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
@@ -348,14 +348,7 @@ public class 

[11/12] ignite git commit: IGNITE-4045 .NET: Support DML API

[yzhdanov]

IGNITE-4045 .NET: Support DML API

This closes #1309


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b7908d7a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b7908d7a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b7908d7a

Branch: refs/heads/ignite-comm-balance-master
Commit: b7908d7a65f07615f2ff183e107c5002658bd511
Parents: d6d42c2
Author: Pavel Tupitsyn 
Authored: Mon Jan 16 17:48:08 2017 +0300
Committer: Pavel Tupitsyn 
Committed: Mon Jan 16 17:48:08 2017 +0300

--
 .../utils/PlatformConfigurationUtils.java   | 128 +++-
 .../Apache.Ignite.Core.Tests.csproj |   3 +
 .../Binary/BinaryBuilderSelfTest.cs | 159 ++
 .../BinaryBuilderSelfTestArrayIdentity.cs   |  34 +++
 .../Binary/BinaryEqualityComparerTest.cs| 279 +
 .../Binary/IO/BinaryStreamsTest.cs  |  19 ++
 .../Cache/CacheConfigurationTest.cs |   5 +-
 .../Cache/Query/CacheDmlQueriesTest.cs  | 296 +++
 .../IgniteConfigurationSerializerTest.cs|  46 ++-
 .../IgniteConfigurationTest.cs  |  28 ++
 .../Apache.Ignite.Core.csproj   |   4 +
 .../Binary/BinaryArrayEqualityComparer.cs   | 149 ++
 .../Binary/BinaryConfiguration.cs   |  24 ++
 .../Binary/BinaryTypeConfiguration.cs   |  14 +
 .../Cache/Configuration/QueryEntity.cs  |  33 ++-
 .../Cache/Configuration/QueryField.cs   |   6 +
 .../Apache.Ignite.Core/IgniteConfiguration.cs   |  85 --
 .../IgniteConfigurationSection.xsd  |  19 ++
 .../Apache.Ignite.Core/Impl/Binary/Binary.cs|  28 +-
 .../Binary/BinaryEqualityComparerSerializer.cs  |  99 +++
 .../Impl/Binary/BinaryFieldEqualityComparer.cs  | 138 +
 .../Impl/Binary/BinaryFullTypeDescriptor.cs |  21 +-
 .../Impl/Binary/BinaryObject.cs |  31 +-
 .../Impl/Binary/BinaryObjectBuilder.cs  |  62 +++-
 .../Impl/Binary/BinaryObjectHeader.cs   |  21 +-
 .../Impl/Binary/BinaryObjectSchemaHolder.cs |  22 ++
 .../Binary/BinarySurrogateTypeDescriptor.cs |   6 +
 .../Impl/Binary/BinarySystemHandlers.cs |   6 +-
 .../Impl/Binary/BinaryWriter.cs |  11 +-
 .../Impl/Binary/DateTimeHolder.cs   |  15 +-
 .../Impl/Binary/IBinaryEqualityComparer.cs  |  53 
 .../Impl/Binary/IBinaryTypeDescriptor.cs|   5 +
 .../Impl/Binary/Io/BinaryHeapStream.cs  |   9 +
 .../Impl/Binary/Io/BinaryStreamBase.cs  |  13 +
 .../Impl/Binary/Io/IBinaryStream.cs |  25 ++
 .../Impl/Binary/Marshaller.cs   |  22 +-
 .../Impl/Binary/SerializableObjectHolder.cs |  16 +
 .../Common/IgniteConfigurationXmlSerializer.cs  |   5 +-
 .../Impl/Memory/PlatformMemoryStream.cs |  16 +
 39 files changed, 1803 insertions(+), 152 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/b7908d7a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
index f845675..c0fde97 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
@@ -17,8 +17,12 @@
 
 package org.apache.ignite.internal.processors.platform.utils;
 
+import org.apache.ignite.binary.BinaryArrayIdentityResolver;
+import org.apache.ignite.binary.BinaryFieldIdentityResolver;
+import org.apache.ignite.binary.BinaryIdentityResolver;
 import org.apache.ignite.binary.BinaryRawReader;
 import org.apache.ignite.binary.BinaryRawWriter;
+import org.apache.ignite.binary.BinaryTypeConfiguration;
 import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
 import org.apache.ignite.cache.CacheAtomicityMode;
 import org.apache.ignite.cache.CacheMemoryMode;
@@ -68,6 +72,8 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.HashSet;
 
 /**
  * Configuration utils.
@@ -428,14 +434,25 @@ public class PlatformConfigurationUtils {
 
 // Fields
 int cnt = in.readInt();
+Set keyFields = new HashSet<>(cnt);
 
 if (cnt > 0) {
 LinkedHashMap fields = new LinkedHashMap<>(cnt);
 
-for (int i = 0; i < cnt; i++)
-

[04/12] ignite git commit: .NET: Improve exception messages for binary misconfiguration and missing assemblies

[yzhdanov]

.NET: Improve exception messages for binary misconfiguration and missing 
assemblies


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e304b48b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e304b48b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e304b48b

Branch: refs/heads/ignite-comm-balance-master
Commit: e304b48b92fe75027442b7f7cfb46b421d58ae49
Parents: d10946b
Author: Pavel Tupitsyn 
Authored: Fri Jan 13 16:49:48 2017 +0300
Committer: Pavel Tupitsyn 
Committed: Fri Jan 13 16:49:48 2017 +0300

--
 .../Apache.Ignite.Core/Impl/Binary/BinaryReader.cs  | 16 
 1 file changed, 12 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e304b48b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs
index 100091f..d9facc3 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs
@@ -697,10 +697,18 @@ namespace Apache.Ignite.Core.Impl.Binary
 if (desc.Type == null)
 {
 if (desc is BinarySurrogateTypeDescriptor)
-throw new BinaryObjectException("Unknown type ID: 
" + hdr.TypeId);
-
-throw new BinaryObjectException("No matching type 
found for object [typeId=" +
-desc.TypeId + ", 
typeName=" + desc.TypeName + ']');
+{
+throw new BinaryObjectException(string.Format(
+"Unknown type ID: {0}. " +
+"This usually indicates missing 
BinaryConfiguration." +
+"Make sure that all nodes have the same 
BinaryConfiguration.", hdr.TypeId));
+}
+
+throw new BinaryObjectException(string.Format(
+"No matching type found for object [typeId={0}, 
typeName={1}]." +
+"This usually indicates that assembly with 
specified type is not loaded on a node." +
+"When using Apache.Ignite.exe, make sure to load 
assemblies with -assembly parameter.",
+desc.TypeId, desc.TypeName));
 }
 
 // Preserve old frame.

[05/12] ignite git commit: Added more metrics to Flume IgniteSink.

[yzhdanov]

Added more metrics to Flume IgniteSink.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6045a246
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6045a246
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6045a246

Branch: refs/heads/ignite-comm-balance-master
Commit: 6045a2469a4d2e23cad918b44e002c7de237abcb
Parents: e304b48
Author: shroman 
Authored: Sat Jan 14 21:14:34 2017 +0900
Committer: shroman 
Committed: Sat Jan 14 21:14:34 2017 +0900

--
 .../main/java/org/apache/ignite/stream/flume/IgniteSink.java  | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/6045a246/modules/flume/src/main/java/org/apache/ignite/stream/flume/IgniteSink.java
--
diff --git 
a/modules/flume/src/main/java/org/apache/ignite/stream/flume/IgniteSink.java 
b/modules/flume/src/main/java/org/apache/ignite/stream/flume/IgniteSink.java
index e6e7e90..083e833 100644
--- a/modules/flume/src/main/java/org/apache/ignite/stream/flume/IgniteSink.java
+++ b/modules/flume/src/main/java/org/apache/ignite/stream/flume/IgniteSink.java
@@ -85,7 +85,7 @@ public class IgniteSink extends AbstractSink implements 
Configurable {
 }
 
 /**
- * Starts a grid and initializes na event transformer.
+ * Starts a grid and initializes an event transformer.
  */
 @SuppressWarnings("unchecked")
 @Override synchronized public void start() {
@@ -109,9 +109,13 @@ public class IgniteSink extends AbstractSink implements 
Configurable {
 catch (Exception e) {
 log.error("Failed to start grid", e);
 
+sinkCounter.incrementConnectionFailedCount();
+
 throw new FlumeException("Failed to start grid", e);
 }
 
+sinkCounter.incrementConnectionCreatedCount();
+
 super.start();
 }
 
@@ -122,6 +126,7 @@ public class IgniteSink extends AbstractSink implements 
Configurable {
 if (ignite != null)
 ignite.close();
 
+sinkCounter.incrementConnectionClosedCount();
 sinkCounter.stop();
 
 super.stop();

[03/12] ignite git commit: ignite-4293 Do not need store deserialized value for BinaryMarshaller

[yzhdanov]

ignite-4293 Do not need store deserialized value for BinaryMarshaller


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d10946b8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d10946b8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d10946b8

Branch: refs/heads/ignite-comm-balance-master
Commit: d10946b8b107dee499a5798a4679ab5d14499764
Parents: abc8b90
Author: Alexandr Kuramshin 
Authored: Fri Jan 13 12:26:39 2017 +0300
Committer: sboikov 
Committed: Fri Jan 13 12:26:39 2017 +0300

--
 .../processors/cacheobject/IgniteCacheObjectProcessorImpl.java | 5 ++---
 .../java/org/apache/ignite/cache/store/jdbc/model/Person.java  | 2 +-
 .../processors/cache/CacheEntryProcessorCopySelfTest.java  | 6 --
 .../processors/cache/GridCacheBasicStoreAbstractTest.java  | 2 +-
 .../distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java | 5 +
 5 files changed, 9 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d10946b8/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
index 208ec62..614c612 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
@@ -244,9 +244,8 @@ public class IgniteCacheObjectProcessorImpl extends 
GridProcessorAdapter impleme
 
 CacheMemoryMode memMode = ccfg.getMemoryMode();
 
-boolean storeVal = ctx.config().isPeerClassLoadingEnabled() ||
-GridQueryProcessor.isEnabled(ccfg) ||
-!ccfg.isCopyOnRead();
+boolean storeVal = !ccfg.isCopyOnRead() || (!isBinaryEnabled(ccfg) &&
+(GridQueryProcessor.isEnabled(ccfg) || 
ctx.config().isPeerClassLoadingEnabled()));
 
 CacheObjectContext res = new CacheObjectContext(ctx,
 ccfg.getName(),

http://git-wip-us.apache.org/repos/asf/ignite/blob/d10946b8/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java
 
b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java
index ddf309b..52ddfc8 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java
@@ -196,7 +196,7 @@ public class Person implements Serializable {
 @Override public String toString() {
 return "Person [id=" + id +
 ", orgId=" + orgId +
-", birthday=" + birthday.getTime() +
+", birthday=" + (birthday == null ? null : birthday.getTime()) +
 ", name=" + name +
 "]";
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/d10946b8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEntryProcessorCopySelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEntryProcessorCopySelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEntryProcessorCopySelfTest.java
index 21395e6..f44889b 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEntryProcessorCopySelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEntryProcessorCopySelfTest.java
@@ -30,6 +30,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
 import org.apache.ignite.cache.CacheEntryProcessor;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.binary.BinaryMarshaller;
 import org.apache.ignite.internal.util.typedef.internal.CU;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
@@ -93,8 +94,9 @@ public class CacheEntryProcessorCopySelfTest extends 
GridCommonAbstractTest {
 doTest(true, false, OLD_VAL, 1);
 
 // One deserialization due to copyOnRead == true.
-// Additional deserialization in case p2p enabled 

[09/12] ignite git commit: IGNITE-4514: Hadoop: fixed intermittent intermittent failure in HadoopCommandLineTest.testHiveCommandLine. This closes #1397.

[yzhdanov]

IGNITE-4514: Hadoop: fixed intermittent intermittent failure in 
HadoopCommandLineTest.testHiveCommandLine. This closes #1397.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d6d42c2a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d6d42c2a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d6d42c2a

Branch: refs/heads/ignite-comm-balance-master
Commit: d6d42c2a17b7cf53a71d59931b2cf838bd8116c9
Parents: 82dd912
Author: Ivan Veselovskiy 
Authored: Mon Jan 16 16:46:20 2017 +0300
Committer: devozerov 
Committed: Mon Jan 16 16:46:20 2017 +0300

--
 .../processors/hadoop/impl/v2/HadoopV2TaskContext.java| 7 ---
 1 file changed, 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d6d42c2a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java
--
diff --git 
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java
 
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java
index d328550..5229590 100644
--- 
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java
+++ 
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java
@@ -42,7 +42,6 @@ import org.apache.hadoop.util.ReflectionUtils;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.hadoop.io.PartiallyRawComparator;
 import org.apache.ignite.hadoop.io.TextPartiallyRawComparator;
-import org.apache.ignite.internal.processors.hadoop.HadoopClassLoader;
 import org.apache.ignite.internal.processors.hadoop.HadoopCommonUtils;
 import org.apache.ignite.internal.processors.hadoop.HadoopExternalSplit;
 import org.apache.ignite.internal.processors.hadoop.HadoopInputSplit;
@@ -508,12 +507,6 @@ public class HadoopV2TaskContext extends HadoopTaskContext 
{
 FileSystem fs;
 
 try {
-// This assertion uses .startsWith() instead of .equals() because 
task class loaders may
-// be reused between tasks of the same job.
-assert ((HadoopClassLoader)getClass().getClassLoader()).name()
-.startsWith(HadoopClassLoader.nameForTask(taskInfo(), true));
-
-// We also cache Fs there, all them will be cleared explicitly 
upon the Job end.
 fs = fileSystemForMrUserWithCaching(jobDir.toUri(), jobConf(), 
fsMap);
 }
 catch (IOException e) {

[02/12] ignite git commit: IGNITE-4531: SQL: Use correct property name in BinaryProperty. This closes 1419.

[yzhdanov]

IGNITE-4531: SQL: Use correct property name in BinaryProperty. This closes 1419.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/abc8b909
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/abc8b909
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/abc8b909

Branch: refs/heads/ignite-comm-balance-master
Commit: abc8b9091e9eda8cc43f398939bf1fb6035f7a3f
Parents: 1f358db
Author: Alexander Paschenko 
Authored: Thu Jan 12 10:50:14 2017 +0300
Committer: devozerov 
Committed: Thu Jan 12 10:50:14 2017 +0300

--
 .../processors/query/GridQueryProcessor.java  |  2 +-
 ...IgniteCacheAbstractInsertSqlQuerySelfTest.java | 14 +++---
 .../IgniteCacheAbstractSqlDmlQuerySelfTest.java   |  6 +++---
 .../cache/IgniteCacheInsertSqlQuerySelfTest.java  | 18 ++
 .../cache/IgniteCacheMergeSqlQuerySelfTest.java   | 14 +++---
 .../cache/IgniteCacheUpdateSqlQuerySelfTest.java  |  4 ++--
 6 files changed, 30 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/abc8b909/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index 58f94f4..3286bac 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -2147,7 +2147,7 @@ public class GridQueryProcessor extends 
GridProcessorAdapter {
 if (!(obj instanceof BinaryObjectBuilder))
 throw new UnsupportedOperationException("Individual properties 
can be set for binary builders only");
 
-setValue0((BinaryObjectBuilder) obj, name(), propVal, type());
+setValue0((BinaryObjectBuilder) obj, propName, propVal, type());
 }
 
 /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/abc8b909/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java
index df4259e..86d01c7 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java
@@ -151,7 +151,7 @@ public abstract class 
IgniteCacheAbstractInsertSqlQuerySelfTest extends GridComm
 LinkedHashMap flds = new LinkedHashMap<>();
 
 flds.put("id", Integer.class.getName());
-flds.put("name", String.class.getName());
+flds.put("firstName", String.class.getName());
 
 s2p.setFields(flds);
 
@@ -172,7 +172,7 @@ public abstract class 
IgniteCacheAbstractInsertSqlQuerySelfTest extends GridComm
 LinkedHashMap flds = new LinkedHashMap<>();
 
 flds.put("id", Integer.class.getName());
-flds.put("name", String.class.getName());
+flds.put("firstName", String.class.getName());
 
 i2p.setFields(flds);
 
@@ -194,7 +194,7 @@ public abstract class 
IgniteCacheAbstractInsertSqlQuerySelfTest extends GridComm
 
 flds.put("key", Integer.class.getName());
 flds.put("id", Integer.class.getName());
-flds.put("name", String.class.getName());
+flds.put("firstName", String.class.getName());
 
 k2p.setFields(flds);
 
@@ -216,7 +216,7 @@ public abstract class 
IgniteCacheAbstractInsertSqlQuerySelfTest extends GridComm
 
 flds.put("Id", Integer.class.getName());
 flds.put("id", Integer.class.getName());
-flds.put("name", String.class.getName());
+flds.put("firstName", String.class.getName());
 flds.put("IntVal", Integer.class.getName());
 
 k22p.setFields(flds);
@@ -240,7 +240,7 @@ public abstract class 
IgniteCacheAbstractInsertSqlQuerySelfTest extends GridComm
 flds.put("key", Integer.class.getName());
 flds.put("strKey", String.class.getName());
 flds.put("id", Integer.class.getName());
-

[01/12] ignite git commit: updated 'setCollocated' flag documentation

[yzhdanov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-comm-balance-master 18229e8a5 -> ecd727c4d


updated 'setCollocated' flag documentation


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1f358db1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1f358db1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1f358db1

Branch: refs/heads/ignite-comm-balance-master
Commit: 1f358db1eb3c9a28dd1a66042539796c1ef5ac45
Parents: ff0caf8
Author: Denis Magda 
Authored: Wed Jan 11 13:43:39 2017 -0800
Committer: Denis Magda 
Committed: Wed Jan 11 13:43:39 2017 -0800

--
 .../java/org/apache/ignite/cache/query/SqlFieldsQuery.java | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/1f358db1/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java 
b/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
index 9b17e78..eac8cfc 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
@@ -164,6 +164,12 @@ public class SqlFieldsQuery extends Query {
 /**
  * Sets flag defining if this query is collocated.
  *
+ * Collocation flag is used for optimization purposes of queries with 
GROUP BY statements.
+ * Whenever Ignite executes a distributed query, it sends sub-queries to 
individual cluster members.
+ * If you know in advance that the elements of your query selection are 
collocated together on the same node and
+ * you group by collocated key (primary or affinity key), then Ignite can 
make significant performance and network
+ * optimizations by grouping data on remote nodes.
+ *
  * @param collocated Flag value.
  * @return {@code this} For chaining.
  */

[06/12] ignite git commit: IGNITE-4518 Fixed parallel load of cache. - Fixes #1426.

[yzhdanov]

IGNITE-4518 Fixed parallel load of cache. - Fixes #1426.

Signed-off-by: Andrey Novikov 


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/79401b2e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/79401b2e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/79401b2e

Branch: refs/heads/ignite-comm-balance-master
Commit: 79401b2ebf814eeffa36d41a82d1238d8eccc7e9
Parents: 6045a24
Author: Andrey Novikov 
Authored: Mon Jan 16 10:33:16 2017 +0700
Committer: Andrey Novikov 
Committed: Mon Jan 16 10:33:16 2017 +0700

--
 .../store/jdbc/dialect/BasicJdbcDialect.java| 31 -
 .../store/jdbc/CacheJdbcPojoStoreTest.java  | 48 +++-
 2 files changed, 66 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/79401b2e/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java
 
b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java
index 3ab112a..139f3fc 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java
@@ -173,13 +173,15 @@ public class BasicJdbcDialect implements JdbcDialect {
 if (appendLowerBound) {
 sb.a("(");
 
-for (int cnt = keyCols.size(); cnt > 0; cnt--) {
-for (int j = 0; j < cnt; j++)
-if (j == cnt - 1)
-sb.a(cols[j]).a(" > ? ");
+for (int keyCnt = keyCols.size(); keyCnt > 0; keyCnt--) {
+for (int idx = 0; idx < keyCnt; idx++) {
+if (idx == keyCnt - 1)
+sb.a(cols[idx]).a(" > ? ");
 else
-sb.a(cols[j]).a(" = ? AND ");
-if (cnt != 1)
+sb.a(cols[idx]).a(" = ? AND ");
+}
+
+if (keyCnt != 1)
 sb.a("OR ");
 }
 
@@ -192,13 +194,18 @@ public class BasicJdbcDialect implements JdbcDialect {
 if (appendUpperBound) {
 sb.a("(");
 
-for (int cnt = keyCols.size(); cnt > 0; cnt--) {
-for (int j = 0; j < cnt; j++)
-if (j == cnt - 1)
-sb.a(cols[j]).a(" <= ? ");
+for (int keyCnt = keyCols.size(); keyCnt > 0; keyCnt--) {
+for (int idx = 0, lastIdx = keyCnt - 1; idx < keyCnt; idx++) {
+sb.a(cols[idx]);
+
+// For composite key when not all of the key columns are 
constrained should use < (strictly less).
+if (idx == lastIdx)
+sb.a(keyCnt == keyCols.size() ? " <= ? " : " < ? ");
 else
-sb.a(cols[j]).a(" = ? AND ");
-if (cnt != 1)
+sb.a(" = ? AND ");
+}
+
+if (keyCnt != 1)
 sb.a(" OR ");
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/79401b2e/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
 
b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
index d8f75d3..4a0b1da 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
@@ -216,7 +216,7 @@ public class CacheJdbcPojoStoreTest extends 
GridAbstractCacheStoreSelfTest> 2) & 1);
+prnComplexStmt.setInt(2, (i >> 1) & 1);
+prnComplexStmt.setInt(3, i % 2);
+
+prnComplexStmt.setString(4, "name");
+prnComplexStmt.setInt(5, 1000 + i * 500);
+
+prnComplexStmt.addBatch();
+}
+
+prnComplexStmt.executeBatch();
+
+U.closeQuiet(prnComplexStmt);
+
+conn.commit();
+
+U.closeQuiet(conn);
+
+final Collection prnComplexKeys = new 
ConcurrentLinkedQueue<>();
+
+IgniteBiInClosure c = new CI2() {
+@Override public void apply(Object k, Object v) {
+if (k instanceof PersonComplexKey && v instanceof Person)
+

[1/2] ignite git commit: IGNITE-4045 .NET: Support DML API

[ptupitsyn]

Repository: ignite
Updated Branches:
  refs/heads/master d6d42c2a1 -> b7908d7a6


http://git-wip-us.apache.org/repos/asf/ignite/blob/b7908d7a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs
--
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs
index 08789b6..ce9fcf6 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfiguration.cs
@@ -157,8 +157,6 @@
 {
 IgniteArgumentCheck.NotNull(configuration, "configuration");
 
-CopyLocalProperties(configuration);
-
 using (var stream = IgniteManager.Memory.Allocate().GetStream())
 {
 var marsh = new Marshaller(configuration.BinaryConfiguration);
@@ -171,6 +169,8 @@
 
 ReadCore(marsh.StartUnmarshal(stream));
 }
+
+CopyLocalProperties(configuration);
 }
 
 /// 
@@ -255,12 +255,37 @@
 writer.WriteBoolean(false);
 
 // Binary config
-var isCompactFooterSet = BinaryConfiguration != null && 
BinaryConfiguration.CompactFooterInternal != null;
+if (BinaryConfiguration != null)
+{
+writer.WriteBoolean(true);
 
-writer.WriteBoolean(isCompactFooterSet);
+if (BinaryConfiguration.CompactFooterInternal != null)
+{
+writer.WriteBoolean(true);
+writer.WriteBoolean(BinaryConfiguration.CompactFooter);
+}
+else
+{
+writer.WriteBoolean(false);
+}
+
+// Send only descriptors with non-null EqualityComparer to 
preserve old behavior where
+// remote nodes can have no BinaryConfiguration.
+var types = writer.Marshaller.GetUserTypeDescriptors().Where(x 
=> x.EqualityComparer != null).ToList();
+
+writer.WriteInt(types.Count);
 
-if (isCompactFooterSet)
-writer.WriteBoolean(BinaryConfiguration.CompactFooter);
+foreach (var type in types)
+{
+
writer.WriteString(BinaryUtils.SimpleTypeName(type.TypeName));
+writer.WriteBoolean(type.IsEnum);
+BinaryEqualityComparerSerializer.Write(writer, 
type.EqualityComparer);
+}
+}
+else
+{
+writer.WriteBoolean(false);
+}
 
 // User attributes
 var attrs = UserAttributes;
@@ -361,7 +386,28 @@
 if (r.ReadBoolean())
 {
 BinaryConfiguration = BinaryConfiguration ?? new 
BinaryConfiguration();
-BinaryConfiguration.CompactFooter = r.ReadBoolean();
+
+if (r.ReadBoolean())
+BinaryConfiguration.CompactFooter = r.ReadBoolean();
+
+var typeCount = r.ReadInt();
+
+if (typeCount > 0)
+{
+var types = new List(typeCount);
+
+for (var i = 0; i < typeCount; i++)
+{
+types.Add(new BinaryTypeConfiguration
+{
+TypeName = r.ReadString(),
+IsEnum = r.ReadBoolean(),
+EqualityComparer = 
BinaryEqualityComparerSerializer.Read(r)
+});
+}
+
+BinaryConfiguration.TypeConfigurations = types;
+}
 }
 
 // User attributes
@@ -402,17 +448,15 @@
 /// The binary reader.
 private void Read(BinaryReader binaryReader)
 {
-var r = binaryReader;
-
-CopyLocalProperties(r.Marshaller.Ignite.Configuration);
+ReadCore(binaryReader);
 
-ReadCore(r);
+CopyLocalProperties(binaryReader.Marshaller.Ignite.Configuration);
 
 // Misc
-IgniteHome = r.ReadString();
+IgniteHome = binaryReader.ReadString();
 
-JvmInitialMemoryMb = (int) (r.ReadLong()/1024/2014);
-JvmMaxMemoryMb = (int) (r.ReadLong()/1024/2014);
+JvmInitialMemoryMb = (int) (binaryReader.ReadLong()/1024/2014);
+JvmMaxMemoryMb = (int) (binaryReader.ReadLong()/1024/2014);
 
 // Local data (not from reader)
 JvmDllPath = 
Process.GetCurrentProcess().Modules.OfType()
@@ -426,9 +470,16 @@
 private void CopyLocalProperties(IgniteConfiguration cfg)
 {
 GridName = cfg.GridName;
-BinaryConfiguration = cfg.BinaryConfiguration == null
-? null
-: new 

[2/2] ignite git commit: IGNITE-4045 .NET: Support DML API

[ptupitsyn]

IGNITE-4045 .NET: Support DML API

This closes #1309


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b7908d7a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b7908d7a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b7908d7a

Branch: refs/heads/master
Commit: b7908d7a65f07615f2ff183e107c5002658bd511
Parents: d6d42c2
Author: Pavel Tupitsyn 
Authored: Mon Jan 16 17:48:08 2017 +0300
Committer: Pavel Tupitsyn 
Committed: Mon Jan 16 17:48:08 2017 +0300

--
 .../utils/PlatformConfigurationUtils.java   | 128 +++-
 .../Apache.Ignite.Core.Tests.csproj |   3 +
 .../Binary/BinaryBuilderSelfTest.cs | 159 ++
 .../BinaryBuilderSelfTestArrayIdentity.cs   |  34 +++
 .../Binary/BinaryEqualityComparerTest.cs| 279 +
 .../Binary/IO/BinaryStreamsTest.cs  |  19 ++
 .../Cache/CacheConfigurationTest.cs |   5 +-
 .../Cache/Query/CacheDmlQueriesTest.cs  | 296 +++
 .../IgniteConfigurationSerializerTest.cs|  46 ++-
 .../IgniteConfigurationTest.cs  |  28 ++
 .../Apache.Ignite.Core.csproj   |   4 +
 .../Binary/BinaryArrayEqualityComparer.cs   | 149 ++
 .../Binary/BinaryConfiguration.cs   |  24 ++
 .../Binary/BinaryTypeConfiguration.cs   |  14 +
 .../Cache/Configuration/QueryEntity.cs  |  33 ++-
 .../Cache/Configuration/QueryField.cs   |   6 +
 .../Apache.Ignite.Core/IgniteConfiguration.cs   |  85 --
 .../IgniteConfigurationSection.xsd  |  19 ++
 .../Apache.Ignite.Core/Impl/Binary/Binary.cs|  28 +-
 .../Binary/BinaryEqualityComparerSerializer.cs  |  99 +++
 .../Impl/Binary/BinaryFieldEqualityComparer.cs  | 138 +
 .../Impl/Binary/BinaryFullTypeDescriptor.cs |  21 +-
 .../Impl/Binary/BinaryObject.cs |  31 +-
 .../Impl/Binary/BinaryObjectBuilder.cs  |  62 +++-
 .../Impl/Binary/BinaryObjectHeader.cs   |  21 +-
 .../Impl/Binary/BinaryObjectSchemaHolder.cs |  22 ++
 .../Binary/BinarySurrogateTypeDescriptor.cs |   6 +
 .../Impl/Binary/BinarySystemHandlers.cs |   6 +-
 .../Impl/Binary/BinaryWriter.cs |  11 +-
 .../Impl/Binary/DateTimeHolder.cs   |  15 +-
 .../Impl/Binary/IBinaryEqualityComparer.cs  |  53 
 .../Impl/Binary/IBinaryTypeDescriptor.cs|   5 +
 .../Impl/Binary/Io/BinaryHeapStream.cs  |   9 +
 .../Impl/Binary/Io/BinaryStreamBase.cs  |  13 +
 .../Impl/Binary/Io/IBinaryStream.cs |  25 ++
 .../Impl/Binary/Marshaller.cs   |  22 +-
 .../Impl/Binary/SerializableObjectHolder.cs |  16 +
 .../Common/IgniteConfigurationXmlSerializer.cs  |   5 +-
 .../Impl/Memory/PlatformMemoryStream.cs |  16 +
 39 files changed, 1803 insertions(+), 152 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/b7908d7a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
index f845675..c0fde97 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java
@@ -17,8 +17,12 @@
 
 package org.apache.ignite.internal.processors.platform.utils;
 
+import org.apache.ignite.binary.BinaryArrayIdentityResolver;
+import org.apache.ignite.binary.BinaryFieldIdentityResolver;
+import org.apache.ignite.binary.BinaryIdentityResolver;
 import org.apache.ignite.binary.BinaryRawReader;
 import org.apache.ignite.binary.BinaryRawWriter;
+import org.apache.ignite.binary.BinaryTypeConfiguration;
 import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
 import org.apache.ignite.cache.CacheAtomicityMode;
 import org.apache.ignite.cache.CacheMemoryMode;
@@ -68,6 +72,8 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.HashSet;
 
 /**
  * Configuration utils.
@@ -428,14 +434,25 @@ public class PlatformConfigurationUtils {
 
 // Fields
 int cnt = in.readInt();
+Set keyFields = new HashSet<>(cnt);
 
 if (cnt > 0) {
 LinkedHashMap fields = new LinkedHashMap<>(cnt);
 
-for (int i = 0; i < cnt; i++)
-

[09/12] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-gg-11810' into ignite-gg-11810-1

[sboikov]

Merge remote-tracking branch 'remotes/origin/ignite-gg-11810' into 
ignite-gg-11810-1


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d4ccd898
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d4ccd898
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d4ccd898

Branch: refs/heads/ignite-gg-11810-1
Commit: d4ccd898bff2fa5dc622d1b852879a5a109edf04
Parents: 86896a8 fa28a2e
Author: sboikov 
Authored: Mon Jan 16 16:52:14 2017 +0300
Committer: sboikov 
Committed: Mon Jan 16 16:52:14 2017 +0300

--
 .../delta/DataPageInsertFragmentRecord.java |  5 +-
 .../wal/record/delta/DataPageInsertRecord.java  |  5 +-
 .../wal/record/delta/DataPageRemoveRecord.java  |  5 +-
 .../delta/DataPageSetFreeListPageRecord.java|  3 +-
 .../wal/record/delta/FixCountRecord.java|  3 +-
 .../record/delta/FixLeftmostChildRecord.java|  3 +-
 .../pagemem/wal/record/delta/FixRemoveId.java   |  3 +-
 .../wal/record/delta/InitNewPageRecord.java |  5 +-
 .../wal/record/delta/InnerReplaceRecord.java|  3 +-
 .../pagemem/wal/record/delta/InsertRecord.java  |  3 +-
 .../pagemem/wal/record/delta/MergeRecord.java   |  3 +-
 .../wal/record/delta/MetaPageAddRootRecord.java |  5 +-
 .../wal/record/delta/MetaPageCutRootRecord.java |  5 +-
 .../wal/record/delta/MetaPageInitRecord.java|  5 +-
 .../record/delta/MetaPageInitRootRecord.java|  5 +-
 .../delta/MetaPageUpdateLastAllocatedIndex.java |  3 +-
 ...aPageUpdateLastSuccessfulFullSnapshotId.java |  3 +-
 .../MetaPageUpdateLastSuccessfulSnapshotId.java |  3 +-
 .../delta/MetaPageUpdateNextSnapshotId.java |  3 +-
 .../MetaPageUpdatePartitionDataRecord.java  |  3 +-
 .../wal/record/delta/NewRootInitRecord.java |  5 +-
 .../wal/record/delta/PageDeltaRecord.java   |  6 +-
 .../delta/PageListMetaResetCountRecord.java |  3 +-
 .../record/delta/PagesListAddPageRecord.java|  5 +-
 .../delta/PagesListInitNewPageRecord.java   |  7 +-
 .../record/delta/PagesListRemovePageRecord.java |  3 +-
 .../record/delta/PagesListSetNextRecord.java|  3 +-
 .../delta/PagesListSetPreviousRecord.java   |  3 +-
 .../pagemem/wal/record/delta/RecycleRecord.java |  3 +-
 .../pagemem/wal/record/delta/RemoveRecord.java  |  3 +-
 .../pagemem/wal/record/delta/ReplaceRecord.java |  3 +-
 .../record/delta/SplitExistingPageRecord.java   |  3 +-
 .../record/delta/SplitForwardPageRecord.java|  3 +-
 .../record/delta/TrackingPageDeltaRecord.java   |  9 ++-
 .../processors/cache/GridCacheAdapter.java  |  2 +-
 .../processors/cache/GridCacheMapEntry.java |  3 +-
 .../cache/IgniteCacheOffheapManagerImpl.java| 44 ++
 .../cache/database/MetadataStorage.java | 42 ++
 .../cache/database/tree/io/BPlusIO.java | 12 +++
 .../cache/database/tree/io/PageIO.java  | 44 +-
 .../cache/database/tree/io/PageMetaIO.java  |  9 +++
 .../cache/database/tree/io/TrackingPageIO.java  | 84 ++--
 .../cache/database/tree/util/PageHandler.java   | 36 +
 .../apache/ignite/internal/util/GridUnsafe.java | 12 +++
 .../resources/META-INF/classnames.properties|  2 -
 .../internal/ClusterNodeMetricsSelfTest.java|  2 +
 .../GridDeploymentMessageCountSelfTest.java |  3 +
 .../cache/ClusterStateAbstractTest.java |  3 +-
 .../database/tree/io/TrackingPageIOTest.java| 69 
 .../IgniteCacheExpiryPolicyAbstractTest.java|  6 +-
 .../processors/database/BPlusTreeSelfTest.java  | 11 +++
 .../testsuites/IgniteComputeGridTestSuite.java  |  1 -
 .../resources/META-INF/classnames.properties| 16 +---
 .../query/h2/database/H2TreeIndex.java  |  2 +-
 .../query/h2/database/io/H2InnerIO.java | 10 +++
 .../query/h2/database/io/H2LeafIO.java  | 10 +++
 .../query/IgniteSqlSplitterSelfTest.java|  2 +-
 .../IgniteDistributedJoinTestSuite.java | 17 
 58 files changed, 423 insertions(+), 154 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d4ccd898/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
--

http://git-wip-us.apache.org/repos/asf/ignite/blob/d4ccd898/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/MetadataStorage.java
--

http://git-wip-us.apache.org/repos/asf/ignite/blob/d4ccd898/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/util/PageHandler.java
--

[04/12] ignite git commit: ignite-gg-8.0.2.ea2 fix test, add licenses header, mute metrics test

[sboikov]

ignite-gg-8.0.2.ea2 fix test, add licenses header, mute metrics test


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2254d372
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2254d372
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2254d372

Branch: refs/heads/ignite-gg-11810-1
Commit: 2254d37232ea994ff9dd63917cbd9c8c599bbb12
Parents: 00e88cc
Author: Dmitriy Govorukhin 
Authored: Fri Jan 13 15:40:26 2017 +0300
Committer: Dmitriy Govorukhin 
Committed: Fri Jan 13 15:40:26 2017 +0300

--
 .../internal/ClusterNodeMetricsSelfTest.java   |  2 ++
 .../testsuites/IgniteComputeGridTestSuite.java |  1 -
 .../query/IgniteSqlSplitterSelfTest.java   |  2 +-
 .../testsuites/IgniteDistributedJoinTestSuite.java | 17 +
 4 files changed, 20 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/2254d372/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
index 77359ab..97d17e2 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
@@ -116,6 +116,8 @@ public class ClusterNodeMetricsSelfTest extends 
GridCommonAbstractTest {
  * @throws Exception If failed.
  */
 public void testAllocatedMemory() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-4536;);
+
 Ignite ignite = grid();
 
 final IgniteCache onHeapCache = 
ignite.getOrCreateCache(ON_HEAP_TIERED_NAME);

http://git-wip-us.apache.org/repos/asf/ignite/blob/2254d372/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
index 8a501fd..c6b7a15 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
@@ -133,7 +133,6 @@ public class IgniteComputeGridTestSuite {
 suite.addTestSuite(GridMultipleJobsSelfTest.class);
 suite.addTestSuite(GridCheckpointManagerSelfTest.class);
 suite.addTestSuite(GridCheckpointTaskSelfTest.class);
-suite.addTestSuite(ClusterNodeMetricsSelfTest.class);
 suite.addTestSuite(GridTaskNameAnnotationSelfTest.class);
 suite.addTestSuite(GridJobCheckpointCleanupSelfTest.class);
 suite.addTestSuite(GridEventStorageSelfTest.class);

http://git-wip-us.apache.org/repos/asf/ignite/blob/2254d372/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
index 8140a1d..75bbe00 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
@@ -974,7 +974,7 @@ public class IgniteSqlSplitterSelfTest extends 
GridCommonAbstractTest {
 c1.put(key++, p);
 }
 
-String select = "select count(*) from Organization o, \"pers\".Person2 
p where p.orgId = o._key";
+String select = "select count(*) from \"org\".Organization o, 
\"pers\".Person2 p where p.orgId = o._key";
 
 String plan = (String)c2.query(new SqlFieldsQuery("explain " + select)
 
.setDistributedJoins(true).setEnforceJoinOrder(enforceJoinOrder).setPageSize(pageSize))

http://git-wip-us.apache.org/repos/asf/ignite/blob/2254d372/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDistributedJoinTestSuite.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDistributedJoinTestSuite.java
 
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDistributedJoinTestSuite.java
index dca640f..5371856 100644
--- 

[06/12] ignite git commit: Merge remote-tracking branch 'remotes/community/ignite-gg-8.0.2.ea2' into ignite-gg-11810

[sboikov]

Merge remote-tracking branch 'remotes/community/ignite-gg-8.0.2.ea2' into 
ignite-gg-11810

# Conflicts:
#   
modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e81cfdbe
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e81cfdbe
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e81cfdbe

Branch: refs/heads/ignite-gg-11810-1
Commit: e81cfdbefd89502ac239fcccb8bd0a8037e52290
Parents: fc9c488 e1b84b4
Author: sboikov 
Authored: Mon Jan 16 11:43:17 2017 +0300
Committer: sboikov 
Committed: Mon Jan 16 11:43:17 2017 +0300

--
 .../processors/cache/GridCacheAdapter.java |  2 +-
 .../processors/cache/GridCacheMapEntry.java|  3 +--
 .../main/resources/META-INF/classnames.properties  |  2 --
 .../internal/ClusterNodeMetricsSelfTest.java   |  2 ++
 .../GridDeploymentMessageCountSelfTest.java|  3 +++
 .../processors/cache/ClusterStateAbstractTest.java |  3 ++-
 .../IgniteCacheExpiryPolicyAbstractTest.java   |  6 ++
 .../testsuites/IgniteComputeGridTestSuite.java |  1 -
 .../main/resources/META-INF/classnames.properties  | 16 +---
 .../processors/query/h2/database/H2TreeIndex.java  |  2 +-
 .../query/IgniteSqlSplitterSelfTest.java   |  2 +-
 .../testsuites/IgniteDistributedJoinTestSuite.java | 17 +
 12 files changed, 31 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e81cfdbe/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--

http://git-wip-us.apache.org/repos/asf/ignite/blob/e81cfdbe/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
--

http://git-wip-us.apache.org/repos/asf/ignite/blob/e81cfdbe/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
--

http://git-wip-us.apache.org/repos/asf/ignite/blob/e81cfdbe/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDistributedJoinTestSuite.java
--

[02/12] ignite git commit: GG-11794 WIP on command-line utility.

[sboikov]

GG-11794 WIP on command-line utility.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/90f846af
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/90f846af
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/90f846af

Branch: refs/heads/ignite-gg-11810-1
Commit: 90f846af029bdc8d62b8a176ca9a144dee4c1cec
Parents: f96c590
Author: Alexey Kuznetsov 
Authored: Thu Jan 12 18:35:04 2017 +0700
Committer: Alexey Kuznetsov 
Committed: Thu Jan 12 18:35:04 2017 +0700

--
 .../main/resources/META-INF/classnames.properties   |  2 --
 .../main/resources/META-INF/classnames.properties   | 16 +---
 2 files changed, 1 insertion(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/90f846af/modules/core/src/main/resources/META-INF/classnames.properties
--
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties 
b/modules/core/src/main/resources/META-INF/classnames.properties
index 445f072..9060161 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -1846,7 +1846,6 @@ 
org.apache.ignite.internal.visor.util.VisorClusterGroupEmptyException
 org.apache.ignite.internal.visor.util.VisorEventMapper
 org.apache.ignite.internal.visor.util.VisorExceptionWrapper
 org.apache.ignite.internal.visor.util.VisorTaskUtils$4
-org.apache.ignite.internal.visor.util.VisorTaskUtils$5
 org.apache.ignite.internal.websession.WebSessionAttributeProcessor
 org.apache.ignite.internal.websession.WebSessionEntity
 org.apache.ignite.lang.IgniteBiClosure
@@ -1899,7 +1898,6 @@ 
org.apache.ignite.spi.checkpoint.sharedfs.SharedFsCheckpointData
 org.apache.ignite.spi.collision.jobstealing.JobStealingRequest
 
org.apache.ignite.spi.collision.priorityqueue.PriorityQueueCollisionSpi$PriorityGridCollisionJobContextComparator
 org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$1
-org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$10
 org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$11
 org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$12
 org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$2$ConnectClosure

http://git-wip-us.apache.org/repos/asf/ignite/blob/90f846af/modules/hadoop/src/main/resources/META-INF/classnames.properties
--
diff --git a/modules/hadoop/src/main/resources/META-INF/classnames.properties 
b/modules/hadoop/src/main/resources/META-INF/classnames.properties
index 0ac17cf..051094d 100644
--- a/modules/hadoop/src/main/resources/META-INF/classnames.properties
+++ b/modules/hadoop/src/main/resources/META-INF/classnames.properties
@@ -26,20 +26,9 @@ org.apache.ignite.hadoop.util.KerberosUserNameMapper
 org.apache.ignite.hadoop.util.KerberosUserNameMapper$State
 org.apache.ignite.hadoop.util.UserNameMapper
 org.apache.ignite.internal.processors.hadoop.HadoopAttributes
-org.apache.ignite.internal.processors.hadoop.HadoopDefaultJobInfo
 org.apache.ignite.internal.processors.hadoop.HadoopExternalSplit
-org.apache.ignite.internal.processors.hadoop.HadoopFileBlock
-org.apache.ignite.internal.processors.hadoop.HadoopInputSplit
-org.apache.ignite.internal.processors.hadoop.HadoopJobId
-org.apache.ignite.internal.processors.hadoop.HadoopJobInfo
-org.apache.ignite.internal.processors.hadoop.HadoopJobPhase
-org.apache.ignite.internal.processors.hadoop.HadoopJobProperty
-org.apache.ignite.internal.processors.hadoop.HadoopJobStatus
-org.apache.ignite.internal.processors.hadoop.HadoopMapReducePlan
 org.apache.ignite.internal.processors.hadoop.HadoopSplitWrapper
 org.apache.ignite.internal.processors.hadoop.HadoopTaskCancelledException
-org.apache.ignite.internal.processors.hadoop.HadoopTaskInfo
-org.apache.ignite.internal.processors.hadoop.HadoopTaskType
 org.apache.ignite.internal.processors.hadoop.counter.HadoopCounterAdapter
 org.apache.ignite.internal.processors.hadoop.counter.HadoopCountersImpl
 
org.apache.ignite.internal.processors.hadoop.counter.HadoopCountersImpl$CounterKey
@@ -73,7 +62,6 @@ 
org.apache.ignite.internal.processors.hadoop.jobtracker.HadoopJobTracker$RemoveM
 
org.apache.ignite.internal.processors.hadoop.jobtracker.HadoopJobTracker$RemoveReducerProcessor
 
org.apache.ignite.internal.processors.hadoop.jobtracker.HadoopJobTracker$StackedProcessor
 
org.apache.ignite.internal.processors.hadoop.jobtracker.HadoopJobTracker$UpdatePhaseProcessor
-org.apache.ignite.internal.processors.hadoop.message.HadoopMessage
 org.apache.ignite.internal.processors.hadoop.planner.HadoopDefaultMapReducePlan
 

[10/12] ignite git commit: gg-11810

[sboikov]

gg-11810


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/30918634
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/30918634
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/30918634

Branch: refs/heads/ignite-gg-11810-1
Commit: 30918634c4b2409f5b3ff29e46b7fb3bfae281aa
Parents: fa28a2e
Author: sboikov 
Authored: Mon Jan 16 16:58:42 2017 +0300
Committer: sboikov 
Committed: Mon Jan 16 16:58:42 2017 +0300

--
 .../main/java/org/apache/ignite/internal/pagemem/Page.java| 7 ---
 .../apache/ignite/internal/pagemem/impl/PageNoStoreImpl.java  | 7 ---
 2 files changed, 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/30918634/modules/core/src/main/java/org/apache/ignite/internal/pagemem/Page.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/Page.java 
b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/Page.java
index 4ecad9e..2667e44 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/Page.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/Page.java
@@ -17,8 +17,6 @@
 
 package org.apache.ignite.internal.pagemem;
 
-import java.nio.ByteBuffer;
-
 /**
  *
  */
@@ -50,11 +48,6 @@ public interface Page extends AutoCloseable {
 /**
  * @return ByteBuffer for modifying the page.
  */
-public ByteBuffer getForWrite();
-
-/**
- * @return ByteBuffer for modifying the page.
- */
 public long getForWritePointer();
 
 /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/30918634/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageNoStoreImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageNoStoreImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageNoStoreImpl.java
index d68466f..b52df55 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageNoStoreImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageNoStoreImpl.java
@@ -23,8 +23,6 @@ import org.apache.ignite.internal.pagemem.PageIdUtils;
 import org.apache.ignite.internal.processors.cache.database.tree.io.PageIO;
 import org.apache.ignite.internal.util.typedef.internal.SB;
 
-import java.nio.ByteBuffer;
-
 /**
  *
  */
@@ -81,11 +79,6 @@ public class PageNoStoreImpl implements Page {
 }
 
 /** {@inheritDoc} */
-@Override public ByteBuffer getForWrite() {
-throw new UnsupportedOperationException();
-}
-
-/** {@inheritDoc} */
 @Override public long getForWritePointer() {
 int tag = PageIdUtils.tag(pageId);
 boolean locked = pageMem.writeLockPage(absPtr, tag);

[11/12] ignite git commit: gg-11810

[sboikov]

gg-11810


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/173f3d6f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/173f3d6f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/173f3d6f

Branch: refs/heads/ignite-gg-11810-1
Commit: 173f3d6f1ab5105cced0fa1ece2f10f054fd110b
Parents: d4ccd89
Author: sboikov 
Authored: Mon Jan 16 17:06:44 2017 +0300
Committer: sboikov 
Committed: Mon Jan 16 17:06:44 2017 +0300

--
 .../ignite/internal/pagemem/PageMemory.java |   4 -
 .../pagemem/impl/PageMemoryNoStoreImpl.java |  17 ---
 .../cache/IgniteCacheOffheapManagerImpl.java|  48 -
 .../cache/database/CacheDataRowAdapter.java |  54 +-
 .../cache/database/DataStructure.java   |   8 --
 .../cache/database/tree/BPlusTree.java  | 104 +--
 .../cache/database/tree/util/PageHandler.java   |  23 
 7 files changed, 100 insertions(+), 158 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/173f3d6f/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageMemory.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageMemory.java 
b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageMemory.java
index f90e718..cfee19f 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageMemory.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageMemory.java
@@ -38,10 +38,6 @@ public interface PageMemory extends LifecycleAware, 
PageIdAllocator {
  */
 public Page page(int cacheId, long pageId) throws IgniteCheckedException;
 
-public long readLockPage0(int cacheId, long pageId);
-
-public void readUnlockPage0(long pageAddr);
-
 /**
  * @see #page(int, long)
  * Will not read page from file if it is not present in memory.

http://git-wip-us.apache.org/repos/asf/ignite/blob/173f3d6f/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java
index fd0ae75..41e401d 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java
@@ -365,23 +365,6 @@ public class PageMemoryNoStoreImpl implements PageMemory {
 return rwLock.readLock(absPtr + LOCK_OFFSET, tag);
 }
 
-@Override public long readLockPage0(int cacheId, long pageId) {
-int pageIdx = PageIdUtils.pageIndex(pageId);
-
-Segment seg = segment(pageIdx);
-
-long absPtr = seg.absolute(pageIdx);
-
-if (readLockPage(absPtr, PageIdUtils.tag(pageId)))
-return absPtr + PageMemoryNoStoreImpl.PAGE_OVERHEAD;
-
-return 0;
-}
-
-@Override public void readUnlockPage0(long pageAddr) {
-readUnlockPage(pageAddr - PAGE_OVERHEAD);
-}
-
 /**
  * @param absPtr Page absolute address.
  */

http://git-wip-us.apache.org/repos/asf/ignite/blob/173f3d6f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
index c0c3ea1..45cef13 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
@@ -1205,41 +1205,41 @@ public class IgniteCacheOffheapManagerImpl extends 
GridCacheManagerAdapter imple
 
 PageMemory pageMem = cctx.shared().database().pageMemory();
 
-//try (Page page = page(pageId(link))) {
-//}
-long pageAddr = pageMem.readLockPage0(0, pageId(link)); // 
Non-empty data page must not be recycled.
+try (Page page = page(pageId(link))) {
+long pageAddr = page.getForReadPointer(); // Non-empty data 
page must not be recycled.
 
-assert pageAddr != 0L : link;
+assert pageAddr != 0L : link;
 
-try {
-DataPageIO io = DataPageIO.VERSIONS.forPage(pageAddr);
+try {
+   

[07/12] ignite git commit: gg-11810

[sboikov]

http://git-wip-us.apache.org/repos/asf/ignite/blob/fa28a2e5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/database/tree/io/TrackingPageIOTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/database/tree/io/TrackingPageIOTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/database/tree/io/TrackingPageIOTest.java
index ac05727..e2767bb 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/database/tree/io/TrackingPageIOTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/database/tree/io/TrackingPageIOTest.java
@@ -18,6 +18,7 @@
 package org.apache.ignite.internal.processors.cache.database.tree.io;
 
 import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.NavigableSet;
@@ -26,9 +27,6 @@ import java.util.TreeSet;
 import java.util.concurrent.ThreadLocalRandom;
 import junit.framework.TestCase;
 import org.apache.ignite.internal.util.GridUnsafe;
-import sun.misc.JavaNioAccess;
-import sun.misc.SharedSecrets;
-import sun.nio.ch.DirectBuffer;
 
 /**
  *
@@ -40,26 +38,13 @@ public class TrackingPageIOTest extends TestCase {
 /** */
 private final TrackingPageIO io = TrackingPageIO.VERSIONS.latest();
 
-/** */
-private long buf;
-
-@Override protected void setUp() throws Exception {
-super.setUp();
-
-buf = GridUnsafe.allocateMemory(PAGE_SIZE);
-}
-
-@Override protected void tearDown() throws Exception {
-if (buf != 0L)
-GridUnsafe.freeMemory(buf);
-
-super.tearDown();
-}
-
 /**
  *
  */
 public void testBasics() {
+ByteBuffer buf = ByteBuffer.allocateDirect(PAGE_SIZE);
+buf.order(ByteOrder.nativeOrder());
+
 io.markChanged(buf, 2, 0, -1, PAGE_SIZE);
 
 assertTrue(io.wasChanged(buf, 2, 0, -1, PAGE_SIZE));
@@ -69,18 +54,13 @@ public class TrackingPageIOTest extends TestCase {
 assertFalse(io.wasChanged(buf, 2, 1,  0, PAGE_SIZE));
 }
 
-private long allocate() {
-return GridUnsafe.allocateMemory(PAGE_SIZE);
-}
-
-private void free(long addr) {
-GridUnsafe.freeMemory(addr);
-}
-
 /**
  *
  */
 public void testMarkingRandomly() {
+ByteBuffer buf = ByteBuffer.allocateDirect(PAGE_SIZE);
+buf.order(ByteOrder.nativeOrder());
+
 int cntOfPageToTrack = io.countOfPageToTrack(PAGE_SIZE);
 
 for (int i = 0; i < 1001; i++)
@@ -91,6 +71,9 @@ public class TrackingPageIOTest extends TestCase {
  *
  */
 public void testZeroingRandomly() {
+ByteBuffer buf = ByteBuffer.allocateDirect(PAGE_SIZE);
+buf.order(ByteOrder.nativeOrder());
+
 for (int i = 0; i < 1001; i++)
 checkMarkingRandomly(buf, i, true);
 }
@@ -99,7 +82,7 @@ public class TrackingPageIOTest extends TestCase {
  * @param buf Buffer.
  * @param backupId Backup id.
  */
-private void checkMarkingRandomly(long buf, int backupId, boolean 
testZeroing) {
+private void checkMarkingRandomly(ByteBuffer buf, int backupId, boolean 
testZeroing) {
 ThreadLocalRandom rand = ThreadLocalRandom.current();
 
 int track = io.countOfPageToTrack(PAGE_SIZE);
@@ -110,7 +93,7 @@ public class TrackingPageIOTest extends TestCase {
 
 assert basePageId >= 0;
 
-PageIO.setPageId(buf, basePageId);
+PageIO.setPageId(GridUnsafe.bufferAddress(buf), basePageId);
 
 Map map = new HashMap<>();
 
@@ -145,7 +128,13 @@ public class TrackingPageIOTest extends TestCase {
 }
 }
 
+/**
+ * @throws Exception If failed.
+ */
 public void testFindNextChangedPage() throws Exception {
+ByteBuffer buf = ByteBuffer.allocateDirect(PAGE_SIZE);
+buf.order(ByteOrder.nativeOrder());
+
 for (int i = 0; i < 101; i++)
 checkFindingRandomly(buf, i);
 }
@@ -154,7 +143,7 @@ public class TrackingPageIOTest extends TestCase {
  * @param buf Buffer.
  * @param backupId Backup id.
  */
-private void checkFindingRandomly(long buf, int backupId) {
+private void checkFindingRandomly(ByteBuffer buf, int backupId) {
 ThreadLocalRandom rand = ThreadLocalRandom.current();
 
 int track = io.countOfPageToTrack(PAGE_SIZE);
@@ -165,7 +154,7 @@ public class TrackingPageIOTest extends TestCase {
 
 assert basePageId >= 0;
 
-PageIO.setPageId(buf, basePageId);
+PageIO.setPageId(GridUnsafe.bufferAddress(buf), basePageId);
 
 try {
 TreeSet setIdx = new TreeSet<>();
@@ -195,7 +184,13 @@ public class TrackingPageIOTest extends TestCase {
 }
 }
 
+/**
+ *
+ */
 public void testMerging() {
+ByteBuffer buf = 

[08/12] ignite git commit: gg-11810

[sboikov]

gg-11810


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fa28a2e5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fa28a2e5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fa28a2e5

Branch: refs/heads/ignite-gg-11810-1
Commit: fa28a2e5c78345ede3ac1aaa53d070e1b4ac4808
Parents: e81cfdb
Author: sboikov 
Authored: Mon Jan 16 13:24:36 2017 +0300
Committer: sboikov 
Committed: Mon Jan 16 16:23:27 2017 +0300

--
 .../delta/DataPageInsertFragmentRecord.java |  5 +-
 .../wal/record/delta/DataPageInsertRecord.java  |  5 +-
 .../wal/record/delta/DataPageRemoveRecord.java  |  5 +-
 .../delta/DataPageSetFreeListPageRecord.java|  3 +-
 .../wal/record/delta/FixCountRecord.java|  3 +-
 .../record/delta/FixLeftmostChildRecord.java|  3 +-
 .../pagemem/wal/record/delta/FixRemoveId.java   |  3 +-
 .../wal/record/delta/InitNewPageRecord.java |  5 +-
 .../wal/record/delta/InnerReplaceRecord.java|  3 +-
 .../pagemem/wal/record/delta/InsertRecord.java  |  3 +-
 .../pagemem/wal/record/delta/MergeRecord.java   |  3 +-
 .../wal/record/delta/MetaPageAddRootRecord.java |  5 +-
 .../wal/record/delta/MetaPageCutRootRecord.java |  5 +-
 .../wal/record/delta/MetaPageInitRecord.java|  5 +-
 .../record/delta/MetaPageInitRootRecord.java|  5 +-
 .../delta/MetaPageUpdateLastAllocatedIndex.java |  3 +-
 ...aPageUpdateLastSuccessfulFullSnapshotId.java |  3 +-
 .../MetaPageUpdateLastSuccessfulSnapshotId.java |  3 +-
 .../delta/MetaPageUpdateNextSnapshotId.java |  3 +-
 .../MetaPageUpdatePartitionDataRecord.java  |  3 +-
 .../wal/record/delta/NewRootInitRecord.java |  5 +-
 .../wal/record/delta/PageDeltaRecord.java   |  6 +-
 .../delta/PageListMetaResetCountRecord.java |  3 +-
 .../record/delta/PagesListAddPageRecord.java|  5 +-
 .../delta/PagesListInitNewPageRecord.java   |  7 +-
 .../record/delta/PagesListRemovePageRecord.java |  3 +-
 .../record/delta/PagesListSetNextRecord.java|  3 +-
 .../delta/PagesListSetPreviousRecord.java   |  3 +-
 .../pagemem/wal/record/delta/RecycleRecord.java |  3 +-
 .../pagemem/wal/record/delta/RemoveRecord.java  |  3 +-
 .../pagemem/wal/record/delta/ReplaceRecord.java |  3 +-
 .../record/delta/SplitExistingPageRecord.java   |  3 +-
 .../record/delta/SplitForwardPageRecord.java|  3 +-
 .../record/delta/TrackingPageDeltaRecord.java   |  9 ++-
 .../cache/IgniteCacheOffheapManagerImpl.java| 44 ++
 .../cache/database/MetadataStorage.java | 42 ++
 .../cache/database/tree/io/BPlusIO.java | 12 +++
 .../cache/database/tree/io/PageIO.java  | 44 +-
 .../cache/database/tree/io/PageMetaIO.java  |  9 +++
 .../cache/database/tree/io/TrackingPageIO.java  | 84 ++--
 .../cache/database/tree/util/PageHandler.java   | 36 +
 .../apache/ignite/internal/util/GridUnsafe.java | 12 +++
 .../database/tree/io/TrackingPageIOTest.java| 69 
 .../processors/database/BPlusTreeSelfTest.java  | 11 +++
 .../query/h2/database/io/H2InnerIO.java | 10 +++
 .../query/h2/database/io/H2LeafIO.java  | 10 +++
 46 files changed, 392 insertions(+), 126 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/fa28a2e5/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageInsertFragmentRecord.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageInsertFragmentRecord.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageInsertFragmentRecord.java
index 919bf04..eeaabd1 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageInsertFragmentRecord.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageInsertFragmentRecord.java
@@ -18,6 +18,7 @@
 package org.apache.ignite.internal.pagemem.wal.record.delta;
 
 import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.pagemem.PageMemory;
 import org.apache.ignite.internal.processors.cache.database.tree.io.DataPageIO;
 
 /**
@@ -49,10 +50,10 @@ public class DataPageInsertFragmentRecord extends 
PageDeltaRecord {
 }
 
 /** {@inheritDoc} */
-@Override public void applyDelta(long pageAddr, int pageSize) throws 
IgniteCheckedException {
+@Override public void applyDelta(PageMemory pageMem, long pageAddr) throws 
IgniteCheckedException {
 DataPageIO io = DataPageIO.VERSIONS.forPage(pageAddr);
 
-io.addRowFragment(pageAddr, payload, lastLink, pageSize);
+io.addRowFragment(pageAddr, payload, lastLink, 

[01/12] ignite git commit: ignite-gg-8.0.2.e2 mute test, link to issue IGNITE-305

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-gg-11810-1 86896a81f -> 329c5cb4d


ignite-gg-8.0.2.e2 mute test, link to issue IGNITE-305


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f96c5903
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f96c5903
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f96c5903

Branch: refs/heads/ignite-gg-11810-1
Commit: f96c59039a8b5f7d2b8e8070fe1ca43183b4eaaf
Parents: 43eefb0
Author: Dmitriy Govorukhin 
Authored: Thu Jan 12 12:21:12 2017 +0300
Committer: Dmitriy Govorukhin 
Committed: Thu Jan 12 12:21:12 2017 +0300

--
 .../cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java  | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/f96c5903/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
index 0e2ed2d..4ceb1b6 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
@@ -37,13 +37,10 @@ import javax.cache.expiry.ModifiedExpiryPolicy;
 import javax.cache.processor.EntryProcessor;
 import javax.cache.processor.MutableEntry;
 import org.apache.ignite.IgniteCache;
-import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.cache.CacheMemoryMode;
-import org.apache.ignite.cache.CachePeekMode;
 import org.apache.ignite.cluster.ClusterNode;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.NearCacheConfiguration;
-import org.apache.ignite.internal.IgniteInterruptedCheckedException;
 import org.apache.ignite.internal.IgniteKernal;
 import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
 import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
@@ -52,7 +49,6 @@ import 
org.apache.ignite.internal.processors.cache.IgniteCacheAbstractTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtInvalidPartitionException;
 import org.apache.ignite.internal.util.lang.GridAbsPredicate;
 import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.util.typedef.PAX;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.transactions.Transaction;
@@ -362,6 +358,8 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest 
extends IgniteCacheAbs
  * @throws Exception If failed.
  */
 public void testAccess() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-305;);
+
 factory = new FactoryBuilder.SingletonFactory<>(new 
TestPolicy(60_000L, 61_000L, 62_000L));
 
 startGrids();

[12/12] ignite git commit: Merge remote-tracking branch 'remotes/community/ignite-gg-11810' into ignite-gg-11810-1

[sboikov]

Merge remote-tracking branch 'remotes/community/ignite-gg-11810' into 
ignite-gg-11810-1


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/329c5cb4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/329c5cb4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/329c5cb4

Branch: refs/heads/ignite-gg-11810-1
Commit: 329c5cb4d8acf1fe231a819a7617628a95131e97
Parents: 173f3d6 3091863
Author: sboikov 
Authored: Mon Jan 16 17:11:44 2017 +0300
Committer: sboikov 
Committed: Mon Jan 16 17:11:44 2017 +0300

--
 .../main/java/org/apache/ignite/internal/pagemem/Page.java| 7 ---
 .../apache/ignite/internal/pagemem/impl/PageNoStoreImpl.java  | 7 ---
 2 files changed, 14 deletions(-)
--

[05/12] ignite git commit: ignite-gg-8.0.2.ea2 fix IgniteCacheP2pUnmarshallingErrorTest.testResponseMessageOnUnmarshallingFailed and IgniteCacheClientQueryReplicatedNodeRestartSelfTest.testRestarts

[sboikov]

ignite-gg-8.0.2.ea2 fix 
IgniteCacheP2pUnmarshallingErrorTest.testResponseMessageOnUnmarshallingFailed 
and IgniteCacheClientQueryReplicatedNodeRestartSelfTest.testRestarts


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e1b84b41
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e1b84b41
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e1b84b41

Branch: refs/heads/ignite-gg-11810-1
Commit: e1b84b41bd4ae52631f17f79396d6921385c0dcc
Parents: 2254d37
Author: Dmitriy Govorukhin 
Authored: Fri Jan 13 19:27:47 2017 +0300
Committer: Dmitriy Govorukhin 
Committed: Fri Jan 13 19:27:47 2017 +0300

--
 .../ignite/internal/processors/cache/GridCacheAdapter.java  | 2 +-
 .../ignite/internal/processors/cache/GridCacheMapEntry.java | 3 +--
 .../internal/processors/query/h2/database/H2TreeIndex.java  | 5 ++---
 3 files changed, 4 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e1b84b41/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 93270ea..2d688da 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
@@ -2180,7 +2180,7 @@ public abstract class GridCacheAdapter implements 
IgniteInternalCache(e);
 }
 catch (IgniteCheckedException e) {
 return new GridFinishedFuture<>(e);

http://git-wip-us.apache.org/repos/asf/ignite/blob/e1b84b41/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 3363124..c1acb84 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
@@ -573,9 +573,8 @@ public abstract class GridCacheMapEntry extends 
GridMetadataAwareAdapter impleme
 val = this.val;
 
 if (val == null) {
-if (isStartVersion()) {
+if (isStartVersion())
 val = unswap(true, false);
-}
 }
 
 if (val != null) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/e1b84b41/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
--
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
index 31df27c..3268d9d 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
@@ -79,7 +79,7 @@ public class H2TreeIndex extends GridH2IndexBase {
 
 name = BPlusTree.treeName(name, "H2Tree");
 
-if (!cctx.kernalContext().clientNode()) {
+if (!cctx.kernalContext().clientNode() && cctx.affinityNode()) {
 IgniteCacheDatabaseSharedManager dbMgr = cctx.shared().database();
 
 RootPage page = cctx.offheap().rootPageForIndex(name);
@@ -87,8 +87,7 @@ public class H2TreeIndex extends GridH2IndexBase {
 tree = new H2Tree(name, cctx.offheap().reuseListForIndex(name), 
cctx.cacheId(),
 dbMgr.pageMemory(), cctx.shared().wal(), 
cctx.offheap().globalRemoveId(),
 tbl.rowFactory(), page.pageId().pageId(), page.isAllocated()) {
-@Override
-protected int compare(BPlusIO io, ByteBuffer buf, 
int idx, SearchRow row)
+@Override protected int compare(BPlusIO io, 
ByteBuffer buf, int idx, SearchRow row)
 throws IgniteCheckedException {
 

[03/12] ignite git commit: ignite-gg-8.0.2.ea2 mute tests

[sboikov]

ignite-gg-8.0.2.ea2 mute tests


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/00e88cc9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/00e88cc9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/00e88cc9

Branch: refs/heads/ignite-gg-11810-1
Commit: 00e88cc938b24d9f3dd13057ec5593fd72cce28e
Parents: 90f846a
Author: Dmitriy Govorukhin 
Authored: Fri Jan 13 12:16:43 2017 +0300
Committer: Dmitriy Govorukhin 
Committed: Fri Jan 13 12:16:43 2017 +0300

--
 .../managers/deployment/GridDeploymentMessageCountSelfTest.java   | 3 +++
 .../internal/processors/cache/ClusterStateAbstractTest.java   | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/00e88cc9/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
index 20c5b93..b02dce0 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
@@ -126,6 +126,9 @@ public class GridDeploymentMessageCountSelfTest extends 
GridCommonAbstractTest {
  * @throws Exception If failed.
  */
 public void testCacheValueDeploymentOnPut() throws Exception {
+//TODO GG-11141
+fail();
+
 ClassLoader ldr = getExternalClassLoader();
 
 Class valCls = ldr.loadClass(TEST_VALUE);

http://git-wip-us.apache.org/repos/asf/ignite/blob/00e88cc9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClusterStateAbstractTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClusterStateAbstractTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClusterStateAbstractTest.java
index a454270..731d3a6 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClusterStateAbstractTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClusterStateAbstractTest.java
@@ -280,7 +280,8 @@ public abstract class ClusterStateAbstractTest extends 
GridCommonAbstractTest {
  * @throws Exception If fails.
  */
 public void testDeactivationWithPendingLock() throws Exception {
-fail("Safe way for deactivate cluster must be implemented.");
+//TODO GG-11851
+fail();
 
 startGrids(GRID_CNT);
 

ignite git commit: communications connections logging and paired connections for servers,

[yzhdanov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-comm-balance-master 9339e9159 -> 18229e8a5


communications connections logging and paired connections for servers,


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/18229e8a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/18229e8a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/18229e8a

Branch: refs/heads/ignite-comm-balance-master
Commit: 18229e8a5963a9b6f5b7c7a4ca3872270bcacf90
Parents: 9339e91
Author: Yakov Zhdanov 
Authored: Mon Jan 16 17:03:43 2017 +0300
Committer: Yakov Zhdanov 
Committed: Mon Jan 16 17:03:43 2017 +0300

--
 .../main/java/org/apache/ignite/BenchAtomic.java  |  3 +--
 .../communication/tcp/TcpCommunicationSpi.java| 18 --
 2 files changed, 17 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/18229e8a/modules/core/src/main/java/org/apache/ignite/BenchAtomic.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/BenchAtomic.java 
b/modules/core/src/main/java/org/apache/ignite/BenchAtomic.java
index f2c0c73..7a2e3eb 100644
--- a/modules/core/src/main/java/org/apache/ignite/BenchAtomic.java
+++ b/modules/core/src/main/java/org/apache/ignite/BenchAtomic.java
@@ -228,8 +228,7 @@ public class BenchAtomic {
 return new CacheConfiguration()
 .setName("1")
 .setAtomicityMode(CacheAtomicityMode.ATOMIC)
-   // .setAffinity(new FairAffinityFunction(1024))
-.setBackups(0)
+.setBackups(1)
 .setAtomicWriteOrderMode(CacheAtomicWriteOrderMode.PRIMARY)
 .setRebalanceMode(CacheRebalanceMode.SYNC)
 .setCopyOnRead(false)

http://git-wip-us.apache.org/repos/asf/ignite/blob/18229e8a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index ae0e6f0..be79414 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -360,6 +360,10 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
 
 @Override public void onConnected(GridNioSession ses) {
 if (ses.accepted()) {
+if (log.isInfoEnabled())
+log.info("Accepted incoming communication connection 
[locAddr=" + ses.localAddress() +
+", rmtAddr=" + ses.remoteAddress() + ']');
+
 if (log.isDebugEnabled())
 log.debug("Sending local node ID to newly accepted 
session: " + ses);
 
@@ -370,6 +374,11 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
 U.error(log, "Failed to send message: " + e, e);
 }
 }
+else {
+if (log.isInfoEnabled())
+log.info("Established outgoing communication 
connection [locAddr=" + ses.localAddress() +
+", rmtAddr=" + ses.remoteAddress() + ']');
+}
 }
 
 @Override public void onDisconnected(GridNioSession ses, @Nullable 
Exception e) {
@@ -979,7 +988,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
 private IpcSharedMemoryServerEndpoint shmemSrv;
 
 /** */
-private boolean usePairedConnections;
+private Boolean usePairedConnections;
 
 /** */
 private int connectionsPerNode = DFLT_CONN_PER_NODE;
@@ -1113,6 +1122,11 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
 if (ignite != null) {
 setAddressResolver(ignite.configuration().getAddressResolver());
 setLocalAddress(ignite.configuration().getLocalHost());
+
+if (usePairedConnections == null) {
+// If not set, by default should be true for server and false 
for client.
+usePairedConnections = !ignite.configuration().isClientMode();
+}
 }
 }
 
@@ -1181,7 +1195,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
 
 /** {@inheritDoc} */
 @Override public boolean isUsePairedConnections() {
-return usePairedConnections;
+return usePairedConnections == null ? false : usePairedConnections;
 }
 
 /**

ignite git commit: IGNITE-4503: Hadoop: added boundary checks to HadoopDirectDataInput. This closes # 1416.

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-2.0 d14e0727b -> f1365421c


IGNITE-4503: Hadoop: added boundary checks to HadoopDirectDataInput. This 
closes # 1416.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f1365421
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f1365421
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f1365421

Branch: refs/heads/ignite-2.0
Commit: f1365421c299b754a10edf8b6f156aeeb5ff0ce1
Parents: d14e072
Author: tledkov-gridgain 
Authored: Mon Jan 16 16:57:27 2017 +0300
Committer: devozerov 
Committed: Mon Jan 16 16:57:27 2017 +0300

--
 .../shuffle/direct/HadoopDirectDataInput.java   | 41 +++-
 1 file changed, 39 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/f1365421/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/direct/HadoopDirectDataInput.java
--
diff --git 
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/direct/HadoopDirectDataInput.java
 
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/direct/HadoopDirectDataInput.java
index 6f0e2b0..8031c9f 100644
--- 
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/direct/HadoopDirectDataInput.java
+++ 
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/direct/HadoopDirectDataInput.java
@@ -17,6 +17,7 @@
 
 package org.apache.ignite.internal.processors.hadoop.shuffle.direct;
 
+import java.io.EOFException;
 import org.apache.ignite.internal.util.GridUnsafe;
 import org.apache.ignite.internal.util.typedef.internal.SB;
 import org.jetbrains.annotations.NotNull;
@@ -59,6 +60,8 @@ public class HadoopDirectDataInput extends InputStream 
implements DataInput {
 
 /** {@inheritDoc} */
 @Override public void readFully(@NotNull byte[] b, int off, int len) 
throws IOException {
+checkRange(len);
+
 System.arraycopy(buf, pos, b, off, len);
 
 pos += len;
@@ -66,9 +69,16 @@ public class HadoopDirectDataInput extends InputStream 
implements DataInput {
 
 /** {@inheritDoc} */
 @Override public int skipBytes(int n) throws IOException {
-pos += n;
+if (n < 0)
+throw new IllegalArgumentException();
+
+assert pos <= buf.length;
+
+int toSkip = Math.min(buf.length - pos, n);
 
-return n;
+pos += toSkip;
+
+return toSkip;
 }
 
 /** {@inheritDoc} */
@@ -78,6 +88,8 @@ public class HadoopDirectDataInput extends InputStream 
implements DataInput {
 
 /** {@inheritDoc} */
 @Override public byte readByte() throws IOException {
+checkRange(1);
+
 byte res = GridUnsafe.getByte(buf, BYTE_ARR_OFF + pos);
 
 pos += 1;
@@ -92,6 +104,8 @@ public class HadoopDirectDataInput extends InputStream 
implements DataInput {
 
 /** {@inheritDoc} */
 @Override public short readShort() throws IOException {
+checkRange(2);
+
 short res = GridUnsafe.getShort(buf, BYTE_ARR_OFF + pos);
 
 pos += 2;
@@ -106,6 +120,8 @@ public class HadoopDirectDataInput extends InputStream 
implements DataInput {
 
 /** {@inheritDoc} */
 @Override public char readChar() throws IOException {
+checkRange(2);
+
 char res = GridUnsafe.getChar(buf, BYTE_ARR_OFF + pos);
 
 pos += 2;
@@ -115,6 +131,8 @@ public class HadoopDirectDataInput extends InputStream 
implements DataInput {
 
 /** {@inheritDoc} */
 @Override public int readInt() throws IOException {
+checkRange(4);
+
 int res = GridUnsafe.getInt(buf, BYTE_ARR_OFF + pos);
 
 pos += 4;
@@ -124,6 +142,8 @@ public class HadoopDirectDataInput extends InputStream 
implements DataInput {
 
 /** {@inheritDoc} */
 @Override public long readLong() throws IOException {
+checkRange(8);
+
 long res = GridUnsafe.getLong(buf, BYTE_ARR_OFF + pos);
 
 pos += 8;
@@ -133,6 +153,8 @@ public class HadoopDirectDataInput extends InputStream 
implements DataInput {
 
 /** {@inheritDoc} */
 @Override public float readFloat() throws IOException {
+checkRange(4);
+
 float res = GridUnsafe.getFloat(buf, BYTE_ARR_OFF + pos);
 
 pos += 4;
@@ -142,6 +164,8 @@ public class HadoopDirectDataInput extends InputStream 
implements DataInput {
 
 /** {@inheritDoc} */
 @Override public double readDouble() throws IOException {
+checkRange(8);
+
 double res = GridUnsafe.getDouble(buf, BYTE_ARR_OFF + pos);
 
 pos += 8;
@@ -193,4 +217,17 @@ public class HadoopDirectDataInput extends 

ignite git commit: IGNITE-4514: Hadoop: fixed intermittent intermittent failure in HadoopCommandLineTest.testHiveCommandLine. This closes #1397.

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/master 82dd91288 -> d6d42c2a1


IGNITE-4514: Hadoop: fixed intermittent intermittent failure in 
HadoopCommandLineTest.testHiveCommandLine. This closes #1397.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d6d42c2a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d6d42c2a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d6d42c2a

Branch: refs/heads/master
Commit: d6d42c2a17b7cf53a71d59931b2cf838bd8116c9
Parents: 82dd912
Author: Ivan Veselovskiy 
Authored: Mon Jan 16 16:46:20 2017 +0300
Committer: devozerov 
Committed: Mon Jan 16 16:46:20 2017 +0300

--
 .../processors/hadoop/impl/v2/HadoopV2TaskContext.java| 7 ---
 1 file changed, 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d6d42c2a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java
--
diff --git 
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java
 
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java
index d328550..5229590 100644
--- 
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java
+++ 
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java
@@ -42,7 +42,6 @@ import org.apache.hadoop.util.ReflectionUtils;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.hadoop.io.PartiallyRawComparator;
 import org.apache.ignite.hadoop.io.TextPartiallyRawComparator;
-import org.apache.ignite.internal.processors.hadoop.HadoopClassLoader;
 import org.apache.ignite.internal.processors.hadoop.HadoopCommonUtils;
 import org.apache.ignite.internal.processors.hadoop.HadoopExternalSplit;
 import org.apache.ignite.internal.processors.hadoop.HadoopInputSplit;
@@ -508,12 +507,6 @@ public class HadoopV2TaskContext extends HadoopTaskContext 
{
 FileSystem fs;
 
 try {
-// This assertion uses .startsWith() instead of .equals() because 
task class loaders may
-// be reused between tasks of the same job.
-assert ((HadoopClassLoader)getClass().getClassLoader()).name()
-.startsWith(HadoopClassLoader.nameForTask(taskInfo(), true));
-
-// We also cache Fs there, all them will be cleared explicitly 
upon the Job end.
 fs = fileSystemForMrUserWithCaching(jobDir.toUri(), jobConf(), 
fsMap);
 }
 catch (IOException e) {

[1/2] ignite git commit: gg-11810

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-gg-11810 e81cfdbef -> fa28a2e5c


http://git-wip-us.apache.org/repos/asf/ignite/blob/fa28a2e5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/database/tree/io/TrackingPageIOTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/database/tree/io/TrackingPageIOTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/database/tree/io/TrackingPageIOTest.java
index ac05727..e2767bb 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/database/tree/io/TrackingPageIOTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/database/tree/io/TrackingPageIOTest.java
@@ -18,6 +18,7 @@
 package org.apache.ignite.internal.processors.cache.database.tree.io;
 
 import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.NavigableSet;
@@ -26,9 +27,6 @@ import java.util.TreeSet;
 import java.util.concurrent.ThreadLocalRandom;
 import junit.framework.TestCase;
 import org.apache.ignite.internal.util.GridUnsafe;
-import sun.misc.JavaNioAccess;
-import sun.misc.SharedSecrets;
-import sun.nio.ch.DirectBuffer;
 
 /**
  *
@@ -40,26 +38,13 @@ public class TrackingPageIOTest extends TestCase {
 /** */
 private final TrackingPageIO io = TrackingPageIO.VERSIONS.latest();
 
-/** */
-private long buf;
-
-@Override protected void setUp() throws Exception {
-super.setUp();
-
-buf = GridUnsafe.allocateMemory(PAGE_SIZE);
-}
-
-@Override protected void tearDown() throws Exception {
-if (buf != 0L)
-GridUnsafe.freeMemory(buf);
-
-super.tearDown();
-}
-
 /**
  *
  */
 public void testBasics() {
+ByteBuffer buf = ByteBuffer.allocateDirect(PAGE_SIZE);
+buf.order(ByteOrder.nativeOrder());
+
 io.markChanged(buf, 2, 0, -1, PAGE_SIZE);
 
 assertTrue(io.wasChanged(buf, 2, 0, -1, PAGE_SIZE));
@@ -69,18 +54,13 @@ public class TrackingPageIOTest extends TestCase {
 assertFalse(io.wasChanged(buf, 2, 1,  0, PAGE_SIZE));
 }
 
-private long allocate() {
-return GridUnsafe.allocateMemory(PAGE_SIZE);
-}
-
-private void free(long addr) {
-GridUnsafe.freeMemory(addr);
-}
-
 /**
  *
  */
 public void testMarkingRandomly() {
+ByteBuffer buf = ByteBuffer.allocateDirect(PAGE_SIZE);
+buf.order(ByteOrder.nativeOrder());
+
 int cntOfPageToTrack = io.countOfPageToTrack(PAGE_SIZE);
 
 for (int i = 0; i < 1001; i++)
@@ -91,6 +71,9 @@ public class TrackingPageIOTest extends TestCase {
  *
  */
 public void testZeroingRandomly() {
+ByteBuffer buf = ByteBuffer.allocateDirect(PAGE_SIZE);
+buf.order(ByteOrder.nativeOrder());
+
 for (int i = 0; i < 1001; i++)
 checkMarkingRandomly(buf, i, true);
 }
@@ -99,7 +82,7 @@ public class TrackingPageIOTest extends TestCase {
  * @param buf Buffer.
  * @param backupId Backup id.
  */
-private void checkMarkingRandomly(long buf, int backupId, boolean 
testZeroing) {
+private void checkMarkingRandomly(ByteBuffer buf, int backupId, boolean 
testZeroing) {
 ThreadLocalRandom rand = ThreadLocalRandom.current();
 
 int track = io.countOfPageToTrack(PAGE_SIZE);
@@ -110,7 +93,7 @@ public class TrackingPageIOTest extends TestCase {
 
 assert basePageId >= 0;
 
-PageIO.setPageId(buf, basePageId);
+PageIO.setPageId(GridUnsafe.bufferAddress(buf), basePageId);
 
 Map map = new HashMap<>();
 
@@ -145,7 +128,13 @@ public class TrackingPageIOTest extends TestCase {
 }
 }
 
+/**
+ * @throws Exception If failed.
+ */
 public void testFindNextChangedPage() throws Exception {
+ByteBuffer buf = ByteBuffer.allocateDirect(PAGE_SIZE);
+buf.order(ByteOrder.nativeOrder());
+
 for (int i = 0; i < 101; i++)
 checkFindingRandomly(buf, i);
 }
@@ -154,7 +143,7 @@ public class TrackingPageIOTest extends TestCase {
  * @param buf Buffer.
  * @param backupId Backup id.
  */
-private void checkFindingRandomly(long buf, int backupId) {
+private void checkFindingRandomly(ByteBuffer buf, int backupId) {
 ThreadLocalRandom rand = ThreadLocalRandom.current();
 
 int track = io.countOfPageToTrack(PAGE_SIZE);
@@ -165,7 +154,7 @@ public class TrackingPageIOTest extends TestCase {
 
 assert basePageId >= 0;
 
-PageIO.setPageId(buf, basePageId);
+PageIO.setPageId(GridUnsafe.bufferAddress(buf), basePageId);
 
 try {
 TreeSet setIdx = new TreeSet<>();
@@ -195,7 +184,13 @@ public class TrackingPageIOTest extends TestCase {
 }
 }
 
+/**
+ 

[2/2] ignite git commit: gg-11810

[sboikov]

gg-11810


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fa28a2e5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fa28a2e5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fa28a2e5

Branch: refs/heads/ignite-gg-11810
Commit: fa28a2e5c78345ede3ac1aaa53d070e1b4ac4808
Parents: e81cfdb
Author: sboikov 
Authored: Mon Jan 16 13:24:36 2017 +0300
Committer: sboikov 
Committed: Mon Jan 16 16:23:27 2017 +0300

--
 .../delta/DataPageInsertFragmentRecord.java |  5 +-
 .../wal/record/delta/DataPageInsertRecord.java  |  5 +-
 .../wal/record/delta/DataPageRemoveRecord.java  |  5 +-
 .../delta/DataPageSetFreeListPageRecord.java|  3 +-
 .../wal/record/delta/FixCountRecord.java|  3 +-
 .../record/delta/FixLeftmostChildRecord.java|  3 +-
 .../pagemem/wal/record/delta/FixRemoveId.java   |  3 +-
 .../wal/record/delta/InitNewPageRecord.java |  5 +-
 .../wal/record/delta/InnerReplaceRecord.java|  3 +-
 .../pagemem/wal/record/delta/InsertRecord.java  |  3 +-
 .../pagemem/wal/record/delta/MergeRecord.java   |  3 +-
 .../wal/record/delta/MetaPageAddRootRecord.java |  5 +-
 .../wal/record/delta/MetaPageCutRootRecord.java |  5 +-
 .../wal/record/delta/MetaPageInitRecord.java|  5 +-
 .../record/delta/MetaPageInitRootRecord.java|  5 +-
 .../delta/MetaPageUpdateLastAllocatedIndex.java |  3 +-
 ...aPageUpdateLastSuccessfulFullSnapshotId.java |  3 +-
 .../MetaPageUpdateLastSuccessfulSnapshotId.java |  3 +-
 .../delta/MetaPageUpdateNextSnapshotId.java |  3 +-
 .../MetaPageUpdatePartitionDataRecord.java  |  3 +-
 .../wal/record/delta/NewRootInitRecord.java |  5 +-
 .../wal/record/delta/PageDeltaRecord.java   |  6 +-
 .../delta/PageListMetaResetCountRecord.java |  3 +-
 .../record/delta/PagesListAddPageRecord.java|  5 +-
 .../delta/PagesListInitNewPageRecord.java   |  7 +-
 .../record/delta/PagesListRemovePageRecord.java |  3 +-
 .../record/delta/PagesListSetNextRecord.java|  3 +-
 .../delta/PagesListSetPreviousRecord.java   |  3 +-
 .../pagemem/wal/record/delta/RecycleRecord.java |  3 +-
 .../pagemem/wal/record/delta/RemoveRecord.java  |  3 +-
 .../pagemem/wal/record/delta/ReplaceRecord.java |  3 +-
 .../record/delta/SplitExistingPageRecord.java   |  3 +-
 .../record/delta/SplitForwardPageRecord.java|  3 +-
 .../record/delta/TrackingPageDeltaRecord.java   |  9 ++-
 .../cache/IgniteCacheOffheapManagerImpl.java| 44 ++
 .../cache/database/MetadataStorage.java | 42 ++
 .../cache/database/tree/io/BPlusIO.java | 12 +++
 .../cache/database/tree/io/PageIO.java  | 44 +-
 .../cache/database/tree/io/PageMetaIO.java  |  9 +++
 .../cache/database/tree/io/TrackingPageIO.java  | 84 ++--
 .../cache/database/tree/util/PageHandler.java   | 36 +
 .../apache/ignite/internal/util/GridUnsafe.java | 12 +++
 .../database/tree/io/TrackingPageIOTest.java| 69 
 .../processors/database/BPlusTreeSelfTest.java  | 11 +++
 .../query/h2/database/io/H2InnerIO.java | 10 +++
 .../query/h2/database/io/H2LeafIO.java  | 10 +++
 46 files changed, 392 insertions(+), 126 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/fa28a2e5/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageInsertFragmentRecord.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageInsertFragmentRecord.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageInsertFragmentRecord.java
index 919bf04..eeaabd1 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageInsertFragmentRecord.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/DataPageInsertFragmentRecord.java
@@ -18,6 +18,7 @@
 package org.apache.ignite.internal.pagemem.wal.record.delta;
 
 import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.pagemem.PageMemory;
 import org.apache.ignite.internal.processors.cache.database.tree.io.DataPageIO;
 
 /**
@@ -49,10 +50,10 @@ public class DataPageInsertFragmentRecord extends 
PageDeltaRecord {
 }
 
 /** {@inheritDoc} */
-@Override public void applyDelta(long pageAddr, int pageSize) throws 
IgniteCheckedException {
+@Override public void applyDelta(PageMemory pageMem, long pageAddr) throws 
IgniteCheckedException {
 DataPageIO io = DataPageIO.VERSIONS.forPage(pageAddr);
 
-io.addRowFragment(pageAddr, payload, lastLink, pageSize);
+io.addRowFragment(pageAddr, payload, lastLink, 

[1/2] ignite git commit: IGNITE-4428: Hadoop: moved HadoopMapReducePlanner and dependent classes to public space. This closes #1389. This closes #1394.

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-2.0 77ca2e636 -> d14e0727b


http://git-wip-us.apache.org/repos/asf/ignite/blob/d14e0727/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/HadoopDefaultMapReducePlan.java
--
diff --git 
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/HadoopDefaultMapReducePlan.java
 
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/HadoopDefaultMapReducePlan.java
index 7aaf3fa..1004e3c 100644
--- 
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/HadoopDefaultMapReducePlan.java
+++ 
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/HadoopDefaultMapReducePlan.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.processors.hadoop.planner;
 
-import org.apache.ignite.internal.processors.hadoop.HadoopInputSplit;
-import org.apache.ignite.internal.processors.hadoop.HadoopMapReducePlan;
+import org.apache.ignite.hadoop.HadoopInputSplit;
+import org.apache.ignite.hadoop.HadoopMapReducePlan;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;

http://git-wip-us.apache.org/repos/asf/ignite/blob/d14e0727/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffle.java
--
diff --git 
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffle.java
 
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffle.java
index 8ffea8c..6f9b7a4 100644
--- 
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffle.java
+++ 
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffle.java
@@ -25,9 +25,9 @@ import 
org.apache.ignite.internal.managers.communication.GridIoPolicy;
 import org.apache.ignite.internal.managers.communication.GridMessageListener;
 import org.apache.ignite.internal.processors.hadoop.HadoopComponent;
 import org.apache.ignite.internal.processors.hadoop.HadoopContext;
-import org.apache.ignite.internal.processors.hadoop.HadoopInputSplit;
+import org.apache.ignite.hadoop.HadoopInputSplit;
 import org.apache.ignite.internal.processors.hadoop.HadoopJobId;
-import org.apache.ignite.internal.processors.hadoop.HadoopMapReducePlan;
+import org.apache.ignite.hadoop.HadoopMapReducePlan;
 import org.apache.ignite.internal.processors.hadoop.HadoopTaskContext;
 import org.apache.ignite.internal.processors.hadoop.HadoopTaskInput;
 import org.apache.ignite.internal.processors.hadoop.HadoopTaskOutput;

http://git-wip-us.apache.org/repos/asf/ignite/blob/d14e0727/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java
--
diff --git 
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java
 
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java
index 318ead3..25925fc 100644
--- 
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java
+++ 
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java
@@ -21,7 +21,7 @@ import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteLogger;
 import org.apache.ignite.internal.IgniteInternalFuture;
 import org.apache.ignite.internal.IgniteInterruptedCheckedException;
-import org.apache.ignite.internal.processors.hadoop.HadoopJob;
+import org.apache.ignite.internal.processors.hadoop.HadoopJobEx;
 import org.apache.ignite.internal.processors.hadoop.HadoopJobId;
 import 
org.apache.ignite.internal.processors.hadoop.HadoopMapperAwareTaskOutput;
 import org.apache.ignite.internal.processors.hadoop.HadoopMapperUtils;
@@ -86,7 +86,7 @@ public class HadoopShuffleJob implements AutoCloseable {
 private static final boolean DFLT_SHUFFLE_MSG_GZIP = false;
 
 /** */
-private final HadoopJob job;
+private final HadoopJobEx job;
 
 /** */
 private final GridUnsafeMemory mem;
@@ -169,7 +169,7 @@ public class HadoopShuffleJob implements AutoCloseable {
  * @param embedded Whether shuffle is running in embedded mode.
  * @throws IgniteCheckedException If error.
  */
-public HadoopShuffleJob(T locReduceAddr, IgniteLogger log, HadoopJob job, 
GridUnsafeMemory mem,
+public HadoopShuffleJob(T locReduceAddr, IgniteLogger log, HadoopJobEx 
job, GridUnsafeMemory mem,
 int totalReducerCnt, int[] locReducers, int locMappersCnt, boolean 
embedded) throws IgniteCheckedException {
 this.locReduceAddr = locReduceAddr;
 this.totalReducerCnt = totalReducerCnt;
@@ 

[2/2] ignite git commit: IGNITE-4428: Hadoop: moved HadoopMapReducePlanner and dependent classes to public space. This closes #1389. This closes #1394.

[vozerov]

IGNITE-4428: Hadoop: moved HadoopMapReducePlanner and dependent classes to 
public space. This closes #1389. This closes #1394.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d14e0727
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d14e0727
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d14e0727

Branch: refs/heads/ignite-2.0
Commit: d14e0727b3dd61ab5ec2957133d77dbc25e9ba68
Parents: 77ca2e6
Author: tledkov-gridgain 
Authored: Mon Jan 16 16:36:25 2017 +0300
Committer: devozerov 
Committed: Mon Jan 16 16:36:25 2017 +0300

--
 .../configuration/HadoopConfiguration.java  |   2 +-
 .../apache/ignite/hadoop/HadoopInputSplit.java  |  54 +++
 .../org/apache/ignite/hadoop/HadoopJob.java |  74 ++
 .../ignite/hadoop/HadoopMapReducePlan.java  |  80 +++
 .../ignite/hadoop/HadoopMapReducePlanner.java   |  40 ++
 .../processors/hadoop/HadoopDefaultJobInfo.java |   4 +-
 .../processors/hadoop/HadoopFileBlock.java  |   1 +
 .../processors/hadoop/HadoopInputSplit.java |  54 ---
 .../internal/processors/hadoop/HadoopJob.java   | 107 --
 .../internal/processors/hadoop/HadoopJobEx.java | 140 +++
 .../processors/hadoop/HadoopJobInfo.java|  54 +++
 .../processors/hadoop/HadoopMapReducePlan.java  |  80 ---
 .../hadoop/HadoopMapReducePlanner.java  |  40 --
 .../processors/hadoop/HadoopTaskContext.java|   6 +-
 .../processors/hadoop/HadoopTaskInfo.java   |   1 +
 .../hadoop/counter/HadoopCounterWriter.java |   4 +-
 .../resources/META-INF/classnames.properties|   4 +-
 .../fs/IgniteHadoopFileSystemCounterWriter.java |   6 +-
 .../IgniteHadoopWeightedMapReducePlanner.java   |  10 +-
 .../planner/HadoopAbstractMapReducePlanner.java | 118 
 .../planner/HadoopTestRoundRobinMrPlanner.java  |  75 ++
 .../processors/hadoop/HadoopCommonUtils.java|   1 +
 .../processors/hadoop/HadoopContext.java|   2 +
 .../processors/hadoop/HadoopExternalSplit.java  |   1 +
 .../processors/hadoop/HadoopSplitWrapper.java   |   1 +
 .../HadoopFileSystemCounterWriterDelegate.java  |   4 +-
 ...doopFileSystemCounterWriterDelegateImpl.java |   4 +-
 .../hadoop/impl/v1/HadoopV1MapTask.java |   6 +-
 .../hadoop/impl/v1/HadoopV1ReduceTask.java  |   4 +-
 .../hadoop/impl/v1/HadoopV1Splitter.java|   2 +-
 .../hadoop/impl/v2/HadoopV2Context.java |   2 +-
 .../processors/hadoop/impl/v2/HadoopV2Job.java  |  15 +-
 .../hadoop/impl/v2/HadoopV2Splitter.java|   2 +-
 .../hadoop/impl/v2/HadoopV2TaskContext.java |   6 +-
 .../hadoop/jobtracker/HadoopJobMetadata.java|   4 +-
 .../hadoop/jobtracker/HadoopJobTracker.java |  32 ++---
 .../planner/HadoopAbstractMapReducePlanner.java | 116 ---
 .../planner/HadoopDefaultMapReducePlan.java |   4 +-
 .../hadoop/shuffle/HadoopShuffle.java   |   4 +-
 .../hadoop/shuffle/HadoopShuffleJob.java|   7 +-
 .../HadoopEmbeddedTaskExecutor.java |   8 +-
 .../hadoop/taskexecutor/HadoopRunnableTask.java |   6 +-
 .../taskexecutor/HadoopTaskExecutorAdapter.java |   8 +-
 .../external/HadoopExternalTaskExecutor.java|  16 +--
 .../child/HadoopChildProcessRunner.java |   4 +-
 .../resources/META-INF/classnames.properties|   4 +-
 .../hadoop/impl/HadoopCommandLineTest.java  |   4 +-
 .../hadoop/impl/HadoopJobTrackerSelfTest.java   |   1 +
 .../hadoop/impl/HadoopPlannerMockJob.java   |  10 +-
 .../hadoop/impl/HadoopTasksAllVersionsTest.java |  16 +--
 .../hadoop/impl/HadoopTasksV1Test.java  |   4 +-
 .../hadoop/impl/HadoopTasksV2Test.java  |   4 +-
 .../impl/HadoopTestRoundRobinMrPlanner.java |  75 --
 .../hadoop/impl/HadoopTestTaskContext.java  |   6 +-
 .../hadoop/impl/HadoopV2JobSelfTest.java|   6 +-
 .../HadoopWeightedMapReducePlannerTest.java |   6 +-
 .../collections/HadoopAbstractMapTest.java  |   4 +-
 57 files changed, 738 insertions(+), 615 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d14e0727/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java
 
b/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java
index 84014d6..6443a67 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/configuration/HadoopConfiguration.java
@@ -18,7 +18,7 @@
 package org.apache.ignite.configuration;
 
 import 

[09/18] ignite git commit: IGNITE-3886 .NET: Fix build script to use latest build tools

[vozerov]

IGNITE-3886 .NET: Fix build script to use latest build tools

This fixes C++ compilation issue with retargeted projects


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ff0caf81
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ff0caf81
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ff0caf81

Branch: refs/heads/ignite-2.0
Commit: ff0caf810f3bb76f284555dd37f93706c9edf1e7
Parents: 58188e8
Author: Pavel Tupitsyn 
Authored: Tue Jan 10 17:49:07 2017 +0300
Committer: Pavel Tupitsyn 
Committed: Tue Jan 10 17:49:07 2017 +0300

--
 modules/platforms/dotnet/build.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/ff0caf81/modules/platforms/dotnet/build.ps1
--
diff --git a/modules/platforms/dotnet/build.ps1 
b/modules/platforms/dotnet/build.ps1
index be7e638..4b5d937 100644
--- a/modules/platforms/dotnet/build.ps1
+++ b/modules/platforms/dotnet/build.ps1
@@ -127,7 +127,7 @@ else {
 
 # 2) Build .NET
 # Detect MSBuild 4.0+
-for ($i=4; $i -le 20; $i++) {
+for ($i=20; $i -ge 4; $i--) {
 $regKey = "HKLM:\software\Microsoft\MSBuild\ToolsVersions\$i.0"
 if (Test-Path $regKey) { break }
 }

[01/18] ignite git commit: IGNITE-4461: Hadoop: added automatic resolution of "raw" comparator for Text class.

[vozerov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-2.0 6090ebdfc -> 77ca2e636


IGNITE-4461: Hadoop: added automatic resolution of "raw" comparator for Text 
class.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f406887c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f406887c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f406887c

Branch: refs/heads/ignite-2.0
Commit: f406887c274550317e1b6fbbe1bb302f53a5eaad
Parents: beb242b
Author: devozerov 
Authored: Thu Jan 5 14:48:06 2017 +0300
Committer: devozerov 
Committed: Thu Jan 5 14:48:35 2017 +0300

--
 .../hadoop/impl/v2/HadoopV2TaskContext.java | 64 ++--
 1 file changed, 46 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/f406887c/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java
--
diff --git 
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java
 
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java
index e9cae1c..d328550 100644
--- 
a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java
+++ 
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/v2/HadoopV2TaskContext.java
@@ -41,6 +41,7 @@ import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.util.ReflectionUtils;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.hadoop.io.PartiallyRawComparator;
+import org.apache.ignite.hadoop.io.TextPartiallyRawComparator;
 import org.apache.ignite.internal.processors.hadoop.HadoopClassLoader;
 import org.apache.ignite.internal.processors.hadoop.HadoopCommonUtils;
 import org.apache.ignite.internal.processors.hadoop.HadoopExternalSplit;
@@ -76,6 +77,8 @@ import java.io.File;
 import java.io.IOException;
 import java.security.PrivilegedExceptionAction;
 import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.Callable;
 
@@ -99,6 +102,9 @@ public class HadoopV2TaskContext extends HadoopTaskContext {
 private static final HadoopLazyConcurrentMap fsMap
 = createHadoopLazyConcurrentMap();
 
+/** Default partial comparator mappings. */
+private static final Map PARTIAL_COMPARATORS = new 
HashMap<>();
+
 /**
  * This method is called with reflection upon Job finish with class loader 
of each task.
  * This will clean up all the Fs created for specific task.
@@ -111,24 +117,6 @@ public class HadoopV2TaskContext extends HadoopTaskContext 
{
 fsMap.close();
 }
 
-/**
- * Check for combiner grouping support (available since Hadoop 2.3).
- */
-static {
-boolean ok;
-
-try {
-
JobContext.class.getDeclaredMethod("getCombinerKeyGroupingComparator");
-
-ok = true;
-}
-catch (NoSuchMethodException ignore) {
-ok = false;
-}
-
-COMBINE_KEY_GROUPING_SUPPORTED = ok;
-}
-
 /** Flag is set if new context-object code is used for running the mapper. 
*/
 private final boolean useNewMapper;
 
@@ -153,6 +141,23 @@ public class HadoopV2TaskContext extends HadoopTaskContext 
{
 /** Counters for task. */
 private final HadoopCounters cntrs = new HadoopCountersImpl();
 
+static {
+boolean ok;
+
+try {
+
JobContext.class.getDeclaredMethod("getCombinerKeyGroupingComparator");
+
+ok = true;
+}
+catch (NoSuchMethodException ignore) {
+ok = false;
+}
+
+COMBINE_KEY_GROUPING_SUPPORTED = ok;
+
+PARTIAL_COMPARATORS.put(Text.class.getName(), 
TextPartiallyRawComparator.class.getName());
+}
+
 /**
  * @param taskInfo Task info.
  * @param job Job.
@@ -181,6 +186,8 @@ public class HadoopV2TaskContext extends HadoopTaskContext {
 // For map-reduce jobs prefer local writes.
 jobConf.setBooleanIfUnset(PARAM_IGFS_PREFER_LOCAL_WRITES, true);
 
+initializePartiallyRawComparator(jobConf);
+
 jobCtx = new JobContextImpl(jobConf, new 
JobID(jobId.globalId().toString(), jobId.localId()));
 
 useNewMapper = jobConf.getUseNewMapper();
@@ -447,6 +454,7 @@ public class HadoopV2TaskContext extends HadoopTaskContext {
 }
 
 /** {@inheritDoc} */
+@SuppressWarnings("unchecked")
 @Override public Comparator groupComparator() {
 Comparator res;
 
@@ -581,4 +589,24 

[04/18] ignite git commit: IGNITE-4493: ODBC: Added missing diagnostic records for error cases

[vozerov]

IGNITE-4493: ODBC: Added missing diagnostic records for error cases

This closes #1396


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9e8e9798
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9e8e9798
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9e8e9798

Branch: refs/heads/ignite-2.0
Commit: 9e8e9798dae8b92cfbf4d940856dec35d3e30f54
Parents: bf118aa
Author: Sergey Kalashnikov 
Authored: Tue Jan 10 11:10:56 2017 +0300
Committer: Pavel Tupitsyn 
Committed: Tue Jan 10 11:10:56 2017 +0300

--
 .../cpp/odbc-test/src/api_robustness_test.cpp   | 113 +++-
 .../cpp/odbc/include/ignite/odbc/common_types.h |  29 ++-
 .../cpp/odbc/include/ignite/odbc/statement.h| 143 +++
 modules/platforms/cpp/odbc/src/connection.cpp   |   2 +-
 .../odbc/src/diagnostic/diagnostic_record.cpp   |  38 
 modules/platforms/cpp/odbc/src/odbc.cpp | 118 -
 modules/platforms/cpp/odbc/src/statement.cpp| 176 ---
 7 files changed, 484 insertions(+), 135 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/9e8e9798/modules/platforms/cpp/odbc-test/src/api_robustness_test.cpp
--
diff --git a/modules/platforms/cpp/odbc-test/src/api_robustness_test.cpp 
b/modules/platforms/cpp/odbc-test/src/api_robustness_test.cpp
index 13a5ea6..0b6df93 100644
--- a/modules/platforms/cpp/odbc-test/src/api_robustness_test.cpp
+++ b/modules/platforms/cpp/odbc-test/src/api_robustness_test.cpp
@@ -50,7 +50,7 @@ using ignite::impl::binary::BinaryUtils;
 /**
  * Test setup fixture.
  */
-struct ApiRobustnessTestSuiteFixture 
+struct ApiRobustnessTestSuiteFixture
 {
 void Prepare()
 {
@@ -206,6 +206,33 @@ struct ApiRobustnessTestSuiteFixture
 
 // Operation is not supported. However, there should be no crash.
 BOOST_CHECK(ret == SQL_ERROR);
+
+CheckSQLStatementDiagnosticError("HY106");
+}
+
+void CheckSQLDiagnosticError(int16_t handleType, SQLHANDLE handle, const 
std::string& expectSqlState)
+{
+SQLCHAR state[ODBC_BUFFER_SIZE];
+SQLINTEGER nativeError = 0;
+SQLCHAR message[ODBC_BUFFER_SIZE];
+SQLSMALLINT messageLen = 0;
+
+SQLRETURN ret = SQLGetDiagRec(handleType, handle, 1, state, 
, message, sizeof(message), );
+
+const std::string sqlState = reinterpret_cast(state);
+BOOST_REQUIRE_EQUAL(ret, SQL_SUCCESS);
+BOOST_REQUIRE_EQUAL(sqlState, expectSqlState);
+BOOST_REQUIRE(messageLen > 0);
+}
+
+void CheckSQLStatementDiagnosticError(const std::string& expectSqlState)
+{
+CheckSQLDiagnosticError(SQL_HANDLE_STMT, stmt, expectSqlState);
+}
+
+void CheckSQLConnectionDiagnosticError(const std::string& expectSqlState)
+{
+CheckSQLDiagnosticError(SQL_HANDLE_DBC, dbc, expectSqlState);
 }
 
 /**
@@ -234,6 +261,43 @@ struct ApiRobustnessTestSuiteFixture
 SQLHSTMT stmt;
 };
 
+SQLSMALLINT unsupportedC[] = {
+SQL_C_INTERVAL_YEAR,
+SQL_C_INTERVAL_MONTH,
+SQL_C_INTERVAL_DAY,
+SQL_C_INTERVAL_HOUR,
+SQL_C_INTERVAL_MINUTE,
+SQL_C_INTERVAL_SECOND,
+SQL_C_INTERVAL_YEAR_TO_MONTH,
+SQL_C_INTERVAL_DAY_TO_HOUR,
+SQL_C_INTERVAL_DAY_TO_MINUTE,
+SQL_C_INTERVAL_DAY_TO_SECOND,
+SQL_C_INTERVAL_HOUR_TO_MINUTE,
+SQL_C_INTERVAL_HOUR_TO_SECOND,
+SQL_C_INTERVAL_MINUTE_TO_SECOND
+};
+
+SQLSMALLINT unsupportedSql[] = {
+SQL_WVARCHAR,
+SQL_WLONGVARCHAR,
+SQL_REAL,
+SQL_NUMERIC,
+SQL_TYPE_TIME,
+SQL_INTERVAL_MONTH,
+SQL_INTERVAL_YEAR,
+SQL_INTERVAL_YEAR_TO_MONTH,
+SQL_INTERVAL_DAY,
+SQL_INTERVAL_HOUR,
+SQL_INTERVAL_MINUTE,
+SQL_INTERVAL_SECOND,
+SQL_INTERVAL_DAY_TO_HOUR,
+SQL_INTERVAL_DAY_TO_MINUTE,
+SQL_INTERVAL_DAY_TO_SECOND,
+SQL_INTERVAL_HOUR_TO_MINUTE,
+SQL_INTERVAL_HOUR_TO_SECOND,
+SQL_INTERVAL_MINUTE_TO_SECOND
+};
+
 BOOST_FIXTURE_TEST_SUITE(ApiRobustnessTestSuite, ApiRobustnessTestSuiteFixture)
 
 BOOST_AUTO_TEST_CASE(TestSQLDriverConnect)
@@ -516,6 +580,19 @@ BOOST_AUTO_TEST_CASE(TestSQLBindCol)
 
 ODBC_FAIL_ON_ERROR(ret, SQL_HANDLE_STMT, stmt);
 
+//Unsupported data types
+for(int i = 0; i < sizeof(unsupportedC)/sizeof(unsupportedC[0]); ++i)
+{
+ret = SQLBindCol(stmt, 1, unsupportedC[i], , sizeof(ind1), );
+BOOST_REQUIRE_EQUAL(ret, SQL_ERROR);
+CheckSQLStatementDiagnosticError("HY003");
+}
+
+// Size is negative.
+ret = SQLBindCol(stmt, 1, SQL_C_SLONG, , -1, );
+BOOST_REQUIRE_EQUAL(ret, SQL_ERROR);
+  

[16/18] ignite git commit: IGNITE-4545 Added cache for router hostnames. - Fixes #1428.

[vozerov]

IGNITE-4545 Added cache for router hostnames. - Fixes #1428.

Signed-off-by: Andrey Novikov 


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/27ba69b5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/27ba69b5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/27ba69b5

Branch: refs/heads/ignite-2.0
Commit: 27ba69b55f645a022f2e84cc4db76309b02850e3
Parents: 79401b2
Author: Andrey Novikov 
Authored: Mon Jan 16 11:22:34 2017 +0700
Committer: Andrey Novikov 
Committed: Mon Jan 16 11:22:34 2017 +0700

--
 .../GridClientConnectionManagerAdapter.java |  7 ++-
 .../impl/connection/GridClientTopology.java | 53 
 2 files changed, 49 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/27ba69b5/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
index 12baee0..f714e7a 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java
@@ -85,6 +85,9 @@ public abstract class GridClientConnectionManagerAdapter 
implements GridClientCo
 /** Class logger. */
 private final Logger log;
 
+/** All local enabled MACs. */
+private final Collection macs;
+
 /** NIO server. */
 private GridNioServer srv;
 
@@ -166,6 +169,8 @@ public abstract class GridClientConnectionManagerAdapter 
implements GridClientCo
 if (marshId == null && cfg.getMarshaller() == null)
 throw new GridClientException("Failed to start client (marshaller 
is not configured).");
 
+macs = U.allLocalMACs();
+
 if (cfg.getProtocol() == GridClientProtocol.TCP) {
 try {
 IgniteLogger gridLog = new JavaLogger(false);
@@ -316,7 +321,7 @@ public abstract class GridClientConnectionManagerAdapter 
implements GridClientCo
 }
 
 boolean sameHost = node.attributes().isEmpty() ||
-F.containsAny(U.allLocalMACs(), 
node.attribute(ATTR_MACS).toString().split(", "));
+F.containsAny(macs, node.attribute(ATTR_MACS).toString().split(", 
"));
 
 Collection srvs = new LinkedHashSet<>();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/27ba69b5/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java
index effd5b3..97aa586 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientTopology.java
@@ -21,7 +21,6 @@ import java.net.InetSocketAddress;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.Map;
 import java.util.Set;
@@ -61,12 +60,18 @@ public class GridClientTopology {
 /** Cached last error prevented topology from update. */
 private GridClientException lastError;
 
+/** Router addresses from configuration.  */
+private final String routers;
+
 /**
  * Set of router addresses to infer direct connectivity
  * when client is working in router connection mode.
  * {@code null} when client is working in direct connection node.
  */
-private final Set routerAddrs;
+private final Set routerAddrs;
+
+/** List of all known local MACs */
+private final Collection macsCache;
 
 /** Protocol. */
 private final GridClientProtocol prot;
@@ -96,8 +101,38 @@ public class GridClientTopology {
 metricsCache = cfg.isEnableMetricsCache();
 attrCache = cfg.isEnableAttributesCache();
 prot = cfg.getProtocol();
-routerAddrs = (!cfg.getRouters().isEmpty() && 
cfg.getServers().isEmpty()) ?
-new HashSet<>(cfg.getRouters()) : null;
+
+if (!cfg.getRouters().isEmpty() && cfg.getServers().isEmpty()) {
+routers = cfg.getRouters().toString();
+

[17/18] ignite git commit: IGNITE-4424 REPLICATED cache isn't synced across nodes

[vozerov]

IGNITE-4424 REPLICATED cache isn't synced across nodes


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/82dd9128
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/82dd9128
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/82dd9128

Branch: refs/heads/ignite-2.0
Commit: 82dd912889b0dfca213edb1374c1fa0ed79411fd
Parents: 27ba69b
Author: Anton Vinogradov 
Authored: Fri Dec 30 13:41:34 2016 +0300
Committer: Anton Vinogradov 
Committed: Mon Jan 16 12:18:14 2017 +0300

--
 .../GridNearAtomicAbstractUpdateFuture.java |  34 ++-
 .../GridNearAtomicSingleUpdateFuture.java   |  44 ++--
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |  57 ++---
 .../AtomicPutAllChangingTopologyTest.java   | 212 +++
 .../IgniteCacheFailoverTestSuite.java   |   3 +
 5 files changed, 284 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/82dd9128/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
index 2fbabaa..c92e0f5 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
@@ -212,14 +212,18 @@ public abstract class GridNearAtomicAbstractUpdateFuture 
extends GridFutureAdapt
 // Cannot remap.
 remapCnt = 1;
 
-map(topVer);
+GridCacheVersion futVer = addAtomicFuture(topVer);
+
+if (futVer != null)
+map(topVer, futVer);
 }
 }
 
 /**
  * @param topVer Topology version.
+ * @param futVer Future version
  */
-protected abstract void map(AffinityTopologyVersion topVer);
+protected abstract void map(AffinityTopologyVersion topVer, 
GridCacheVersion futVer);
 
 /**
  * Maps future on ready topology.
@@ -302,7 +306,7 @@ public abstract class GridNearAtomicAbstractUpdateFuture 
extends GridFutureAdapt
  * @param req Request.
  * @param e Error.
  */
-protected void onSendError(GridNearAtomicAbstractUpdateRequest req, 
IgniteCheckedException e) {
+protected final void onSendError(GridNearAtomicAbstractUpdateRequest req, 
IgniteCheckedException e) {
 synchronized (mux) {
 GridNearAtomicUpdateResponse res = new 
GridNearAtomicUpdateResponse(cctx.cacheId(),
 req.nodeId(),
@@ -314,4 +318,28 @@ public abstract class GridNearAtomicAbstractUpdateFuture 
extends GridFutureAdapt
 onResult(req.nodeId(), res, true);
 }
 }
+
+/**
+ * Adds future prevents topology change before operation complete.
+ * Should be invoked before topology lock released.
+ *
+ * @param topVer Topology version.
+ * @return Future version in case future added.
+ */
+protected final GridCacheVersion addAtomicFuture(AffinityTopologyVersion 
topVer) {
+GridCacheVersion futVer = cctx.versions().next(topVer);
+
+synchronized (mux) {
+assert this.futVer == null : this;
+assert this.topVer == AffinityTopologyVersion.ZERO : this;
+
+this.topVer = topVer;
+this.futVer = futVer;
+}
+
+if (storeFuture() && !cctx.mvcc().addAtomicFuture(futVer, this))
+return null;
+
+return futVer;
+}
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/82dd9128/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
index bd231cf..7376aff 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
@@ -348,14 +348,7 @@ public class 

[08/18] ignite git commit: IGNITE-3885 .NET: Add link to Ignite.NET development page in readme.md

[vozerov]

IGNITE-3885 .NET: Add link to Ignite.NET development page in readme.md


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/58188e81
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/58188e81
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/58188e81

Branch: refs/heads/ignite-2.0
Commit: 58188e81b262c26f93b29f3facd3e77f4325e359
Parents: c4d67d2
Author: Pavel Tupitsyn 
Authored: Tue Jan 10 17:32:57 2017 +0300
Committer: Pavel Tupitsyn 
Committed: Tue Jan 10 17:32:57 2017 +0300

--
 modules/platforms/dotnet/README.md | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/58188e81/modules/platforms/dotnet/README.md
--
diff --git a/modules/platforms/dotnet/README.md 
b/modules/platforms/dotnet/README.md
index 528a219..cbdc7c9 100644
--- a/modules/platforms/dotnet/README.md
+++ b/modules/platforms/dotnet/README.md
@@ -147,4 +147,8 @@ You can find the full Apache Ignite documentation here: 
[Full documentation][doc
 
 [apache-homepage]: https://ignite.apache.org/
 [getting-started]: https://apacheignite-net.readme.io/docs/getting-started-2
-[docs]: https://apacheignite-net.readme.io/docs
\ No newline at end of file
+[docs]: https://apacheignite-net.readme.io/docs
+
+## Contribute to Ignite.NET
+
+See [Ignite.NET 
Development](https://cwiki.apache.org/confluence/display/IGNITE/Ignite.NET+Development)
 on wiki.
\ No newline at end of file

[05/18] ignite git commit: IGNITE-4470 Added support for log file configuration via environmental variable IGNITE_ODBC_LOG_PATH

[vozerov]

IGNITE-4470 Added support for log file configuration via environmental variable 
IGNITE_ODBC_LOG_PATH

This closes #1384


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/825fe9cd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/825fe9cd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/825fe9cd

Branch: refs/heads/ignite-2.0
Commit: 825fe9cd64ded64068c573d7e3c3901efae6283f
Parents: 9e8e979
Author: Sergey Kalashnikov 
Authored: Tue Jan 10 15:57:05 2017 +0300
Committer: Pavel Tupitsyn 
Committed: Tue Jan 10 15:57:05 2017 +0300

--
 modules/platforms/cpp/odbc/Makefile.am  |   3 +-
 modules/platforms/cpp/odbc/include/Makefile.am  |   3 +-
 .../ignite/odbc/config/connection_info.h|   2 -
 .../cpp/odbc/include/ignite/odbc/log.h  | 123 ++
 .../odbc/include/ignite/odbc/meta/column_meta.h |   2 -
 .../cpp/odbc/include/ignite/odbc/utility.h  |  19 +--
 .../odbc/os/linux/src/system/socket_client.cpp  |   9 +-
 .../odbc/os/win/src/system/socket_client.cpp|   9 +-
 .../src/system/ui/dsn_configuration_window.cpp  |  18 +-
 .../cpp/odbc/os/win/src/system_dsn.cpp  |  17 +-
 .../platforms/cpp/odbc/project/vs/odbc.vcxproj  |   2 +
 .../cpp/odbc/project/vs/odbc.vcxproj.filters|   6 +
 .../cpp/odbc/src/config/connection_info.cpp |   3 -
 modules/platforms/cpp/odbc/src/connection.cpp   |  19 ++-
 .../odbc/src/diagnostic/diagnosable_adapter.cpp |   3 +-
 modules/platforms/cpp/odbc/src/entry_points.cpp |  52 +++---
 modules/platforms/cpp/odbc/src/log.cpp  |  83 +
 .../platforms/cpp/odbc/src/meta/column_meta.cpp |   4 -
 modules/platforms/cpp/odbc/src/odbc.cpp | 167 ++-
 .../odbc/src/query/column_metadata_query.cpp|  13 +-
 .../platforms/cpp/odbc/src/query/data_query.cpp |  23 ++-
 .../cpp/odbc/src/query/table_metadata_query.cpp |  12 +-
 modules/platforms/cpp/odbc/src/statement.cpp|  11 +-
 modules/platforms/cpp/odbc/src/utility.cpp  |  18 +-
 24 files changed, 412 insertions(+), 209 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/825fe9cd/modules/platforms/cpp/odbc/Makefile.am
--
diff --git a/modules/platforms/cpp/odbc/Makefile.am 
b/modules/platforms/cpp/odbc/Makefile.am
index 1eb42d1..de6f75a 100644
--- a/modules/platforms/cpp/odbc/Makefile.am
+++ b/modules/platforms/cpp/odbc/Makefile.am
@@ -79,7 +79,8 @@ libignite_odbc_la_SOURCES = \
 src/column.cpp \
 src/statement.cpp \
 src/type_traits.cpp \
-src/utility.cpp
+src/utility.cpp \
+src/log.cpp
 
 clean-local:
$(RM) *.gcno *.gcda

http://git-wip-us.apache.org/repos/asf/ignite/blob/825fe9cd/modules/platforms/cpp/odbc/include/Makefile.am
--
diff --git a/modules/platforms/cpp/odbc/include/Makefile.am 
b/modules/platforms/cpp/odbc/include/Makefile.am
index 073dcaa..36d8e25 100644
--- a/modules/platforms/cpp/odbc/include/Makefile.am
+++ b/modules/platforms/cpp/odbc/include/Makefile.am
@@ -53,7 +53,8 @@ noinst_HEADERS = \
 ignite/odbc/cursor.h \
 ignite/odbc/common_types.h \
 ignite/odbc/result_page.h \
-ignite/odbc/type_traits.h
+ignite/odbc/type_traits.h \
+ignite/odbc/log.h
 
 uninstall-hook:
if [ -d ${includedir}/ignite ]; then find ${includedir}/ignite -type d 
-empty -delete; fi

http://git-wip-us.apache.org/repos/asf/ignite/blob/825fe9cd/modules/platforms/cpp/odbc/include/ignite/odbc/config/connection_info.h
--
diff --git 
a/modules/platforms/cpp/odbc/include/ignite/odbc/config/connection_info.h 
b/modules/platforms/cpp/odbc/include/ignite/odbc/config/connection_info.h
index e0ed152..d421952 100644
--- a/modules/platforms/cpp/odbc/include/ignite/odbc/config/connection_info.h
+++ b/modules/platforms/cpp/odbc/include/ignite/odbc/config/connection_info.h
@@ -40,7 +40,6 @@ namespace ignite
 /** Info type. */
 typedef unsigned short InfoType;
 
-#ifdef ODBC_DEBUG
 /**
  * Convert type to string containing its name.
  * Debug function.
@@ -48,7 +47,6 @@ namespace ignite
  * @return Null-terminated string containing types name.
  */
 static const char* InfoTypeToString(InfoType type);
-#endif
 
 /**
  * Constructor.

http://git-wip-us.apache.org/repos/asf/ignite/blob/825fe9cd/modules/platforms/cpp/odbc/include/ignite/odbc/log.h
--
diff --git a/modules/platforms/cpp/odbc/include/ignite/odbc/log.h 

[13/18] ignite git commit: .NET: Improve exception messages for binary misconfiguration and missing assemblies

[vozerov]

.NET: Improve exception messages for binary misconfiguration and missing 
assemblies


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e304b48b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e304b48b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e304b48b

Branch: refs/heads/ignite-2.0
Commit: e304b48b92fe75027442b7f7cfb46b421d58ae49
Parents: d10946b
Author: Pavel Tupitsyn 
Authored: Fri Jan 13 16:49:48 2017 +0300
Committer: Pavel Tupitsyn 
Committed: Fri Jan 13 16:49:48 2017 +0300

--
 .../Apache.Ignite.Core/Impl/Binary/BinaryReader.cs  | 16 
 1 file changed, 12 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e304b48b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs
index 100091f..d9facc3 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Binary/BinaryReader.cs
@@ -697,10 +697,18 @@ namespace Apache.Ignite.Core.Impl.Binary
 if (desc.Type == null)
 {
 if (desc is BinarySurrogateTypeDescriptor)
-throw new BinaryObjectException("Unknown type ID: 
" + hdr.TypeId);
-
-throw new BinaryObjectException("No matching type 
found for object [typeId=" +
-desc.TypeId + ", 
typeName=" + desc.TypeName + ']');
+{
+throw new BinaryObjectException(string.Format(
+"Unknown type ID: {0}. " +
+"This usually indicates missing 
BinaryConfiguration." +
+"Make sure that all nodes have the same 
BinaryConfiguration.", hdr.TypeId));
+}
+
+throw new BinaryObjectException(string.Format(
+"No matching type found for object [typeId={0}, 
typeName={1}]." +
+"This usually indicates that assembly with 
specified type is not loaded on a node." +
+"When using Apache.Ignite.exe, make sure to load 
assemblies with -assembly parameter.",
+desc.TypeId, desc.TypeName));
 }
 
 // Preserve old frame.

[06/18] ignite git commit: IGNITE-4532 .NET: Fix build warnings

[vozerov]

IGNITE-4532 .NET: Fix build warnings


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/87fbb275
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/87fbb275
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/87fbb275

Branch: refs/heads/ignite-2.0
Commit: 87fbb275eb9d11084485e6b4314b5bf7f8d42a1a
Parents: 825fe9c
Author: Pavel Tupitsyn 
Authored: Tue Jan 10 16:02:26 2017 +0300
Committer: Pavel Tupitsyn 
Committed: Tue Jan 10 16:02:26 2017 +0300

--
 .../platforms/cpp/common/project/vs/common.vcxproj  |  1 +
 modules/platforms/cpp/jni/project/vs/jni.vcxproj|  1 +
 .../Apache.Ignite.AspNet.Tests.csproj   |  7 ++-
 .../Apache.Ignite.AspNet.csproj |  5 +
 .../Apache.Ignite.Benchmarks.csproj |  5 +
 .../Apache.Ignite.Core.Tests.TestDll.csproj |  5 +
 .../Apache.Ignite.Core.Tests.csproj |  5 +
 .../dotnet/Apache.Ignite.Core.Tests/TestUtils.cs|  1 -
 .../Apache.Ignite.Core/Apache.Ignite.Core.csproj| 16 
 .../Impl/Unmanaged/UnmanagedUtils.cs|  4 ++--
 .../Apache.Ignite.EntityFramework.Tests.csproj  |  5 +
 .../Apache.Ignite.EntityFramework.csproj|  9 +++--
 .../Impl/ArrayDbDataReader.cs   |  5 +
 .../Impl/DataReaderResult.cs|  2 ++
 .../Impl/DbCommandInfo.cs   | 11 +++
 .../Impl/DbCommandProxy.cs  |  1 +
 .../Apache.Ignite.Linq/Apache.Ignite.Linq.csproj|  5 +
 .../Apache.Ignite.Log4Net.csproj|  5 +
 .../Apache.Ignite.Log4Net/IgniteLog4NetLogger.cs| 16 
 .../Apache.Ignite.NLog/Apache.Ignite.NLog.csproj|  5 +
 modules/platforms/dotnet/Apache.Ignite.sln  |  3 +++
 .../dotnet/Apache.Ignite/Apache.Ignite.csproj   |  5 +
 .../Apache.Ignite.Examples.csproj   |  3 +++
 .../Apache.Ignite.ExamplesDll.csproj|  4 
 .../Services/MapService.cs  |  2 --
 25 files changed, 107 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/87fbb275/modules/platforms/cpp/common/project/vs/common.vcxproj
--
diff --git a/modules/platforms/cpp/common/project/vs/common.vcxproj 
b/modules/platforms/cpp/common/project/vs/common.vcxproj
index 99fd551..b4431f8 100644
--- a/modules/platforms/cpp/common/project/vs/common.vcxproj
+++ b/modules/platforms/cpp/common/project/vs/common.vcxproj
@@ -97,6 +97,7 @@
   Disabled
   
_SCL_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;IGNITEJVM_EXPORTS;_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;%(PreprocessorDefinitions)
   
$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\os\win\include;%(AdditionalIncludeDirectories)
+  ProgramDatabase
 
 
   Windows

http://git-wip-us.apache.org/repos/asf/ignite/blob/87fbb275/modules/platforms/cpp/jni/project/vs/jni.vcxproj
--
diff --git a/modules/platforms/cpp/jni/project/vs/jni.vcxproj 
b/modules/platforms/cpp/jni/project/vs/jni.vcxproj
index f080a68..cb03197 100644
--- a/modules/platforms/cpp/jni/project/vs/jni.vcxproj
+++ b/modules/platforms/cpp/jni/project/vs/jni.vcxproj
@@ -97,6 +97,7 @@
   Disabled
   
WIN32;_DEBUG;_WINDOWS;_USRDLL;IGNITEJVM_EXPORTS;_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;%(PreprocessorDefinitions)
   
$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\os\win\include;%(AdditionalIncludeDirectories)
+  ProgramDatabase
 
 
   Windows

http://git-wip-us.apache.org/repos/asf/ignite/blob/87fbb275/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/Apache.Ignite.AspNet.Tests.csproj
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/Apache.Ignite.AspNet.Tests.csproj
 
b/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/Apache.Ignite.AspNet.Tests.csproj
index aed74db..628942d 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/Apache.Ignite.AspNet.Tests.csproj
+++ 
b/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/Apache.Ignite.AspNet.Tests.csproj
@@ -21,7 +21,8 @@
 prompt
 4
 true
-AllRules.ruleset
+MinimumRecommendedRules.ruleset
+true
   
   
 pdbonly
@@ -30,6 +31,7 @@
 TRACE
 prompt
 4
+true
   
   
 true
@@ -37,6 +39,9 @@
   
 
Apache.Ignite.AspNet.Tests.snk
   
+  
+
None
+  
   
 
   

[14/18] ignite git commit: Added more metrics to Flume IgniteSink.

[vozerov]

Added more metrics to Flume IgniteSink.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6045a246
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6045a246
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6045a246

Branch: refs/heads/ignite-2.0
Commit: 6045a2469a4d2e23cad918b44e002c7de237abcb
Parents: e304b48
Author: shroman 
Authored: Sat Jan 14 21:14:34 2017 +0900
Committer: shroman 
Committed: Sat Jan 14 21:14:34 2017 +0900

--
 .../main/java/org/apache/ignite/stream/flume/IgniteSink.java  | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/6045a246/modules/flume/src/main/java/org/apache/ignite/stream/flume/IgniteSink.java
--
diff --git 
a/modules/flume/src/main/java/org/apache/ignite/stream/flume/IgniteSink.java 
b/modules/flume/src/main/java/org/apache/ignite/stream/flume/IgniteSink.java
index e6e7e90..083e833 100644
--- a/modules/flume/src/main/java/org/apache/ignite/stream/flume/IgniteSink.java
+++ b/modules/flume/src/main/java/org/apache/ignite/stream/flume/IgniteSink.java
@@ -85,7 +85,7 @@ public class IgniteSink extends AbstractSink implements 
Configurable {
 }
 
 /**
- * Starts a grid and initializes na event transformer.
+ * Starts a grid and initializes an event transformer.
  */
 @SuppressWarnings("unchecked")
 @Override synchronized public void start() {
@@ -109,9 +109,13 @@ public class IgniteSink extends AbstractSink implements 
Configurable {
 catch (Exception e) {
 log.error("Failed to start grid", e);
 
+sinkCounter.incrementConnectionFailedCount();
+
 throw new FlumeException("Failed to start grid", e);
 }
 
+sinkCounter.incrementConnectionCreatedCount();
+
 super.start();
 }
 
@@ -122,6 +126,7 @@ public class IgniteSink extends AbstractSink implements 
Configurable {
 if (ignite != null)
 ignite.close();
 
+sinkCounter.incrementConnectionClosedCount();
 sinkCounter.stop();
 
 super.stop();

[10/18] ignite git commit: updated 'setCollocated' flag documentation

[vozerov]

updated 'setCollocated' flag documentation


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1f358db1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1f358db1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1f358db1

Branch: refs/heads/ignite-2.0
Commit: 1f358db1eb3c9a28dd1a66042539796c1ef5ac45
Parents: ff0caf8
Author: Denis Magda 
Authored: Wed Jan 11 13:43:39 2017 -0800
Committer: Denis Magda 
Committed: Wed Jan 11 13:43:39 2017 -0800

--
 .../java/org/apache/ignite/cache/query/SqlFieldsQuery.java | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/1f358db1/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java 
b/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
index 9b17e78..eac8cfc 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
@@ -164,6 +164,12 @@ public class SqlFieldsQuery extends Query {
 /**
  * Sets flag defining if this query is collocated.
  *
+ * Collocation flag is used for optimization purposes of queries with 
GROUP BY statements.
+ * Whenever Ignite executes a distributed query, it sends sub-queries to 
individual cluster members.
+ * If you know in advance that the elements of your query selection are 
collocated together on the same node and
+ * you group by collocated key (primary or affinity key), then Ignite can 
make significant performance and network
+ * optimizations by grouping data on remote nodes.
+ *
  * @param collocated Flag value.
  * @return {@code this} For chaining.
  */

[02/18] ignite git commit: .NET: Fix non-ascii chars in AssemblyInfo

[vozerov]

.NET: Fix non-ascii chars in AssemblyInfo


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d2e6007b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d2e6007b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d2e6007b

Branch: refs/heads/ignite-2.0
Commit: d2e6007b905b6c19cd87786a039229156d10c013
Parents: f406887
Author: Pavel Tupitsyn 
Authored: Mon Jan 9 12:40:42 2017 +0300
Committer: Pavel Tupitsyn 
Committed: Mon Jan 9 12:40:42 2017 +0300

--
 .../dotnet/Apache.Ignite.AspNet.Tests/Properties/AssemblyInfo.cs   | 2 +-
 .../dotnet/Apache.Ignite.AspNet/Properties/AssemblyInfo.cs | 2 +-
 .../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d2e6007b/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/Properties/AssemblyInfo.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/Properties/AssemblyInfo.cs
 
b/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/Properties/AssemblyInfo.cs
index f5fa618..1bca0e8 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/Properties/AssemblyInfo.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.AspNet.Tests/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-/*
+/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.

http://git-wip-us.apache.org/repos/asf/ignite/blob/d2e6007b/modules/platforms/dotnet/Apache.Ignite.AspNet/Properties/AssemblyInfo.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.AspNet/Properties/AssemblyInfo.cs 
b/modules/platforms/dotnet/Apache.Ignite.AspNet/Properties/AssemblyInfo.cs
index d72c9db..0926a46 100644
--- a/modules/platforms/dotnet/Apache.Ignite.AspNet/Properties/AssemblyInfo.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.AspNet/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-/*
+/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.

http://git-wip-us.apache.org/repos/asf/ignite/blob/d2e6007b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
index cc833ea..1fc6c59 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-/*
+/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.

[07/18] ignite git commit: .NET: Fix flaky tests - improve assertions

[vozerov]

.NET: Fix flaky tests - improve assertions


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c4d67d2a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c4d67d2a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c4d67d2a

Branch: refs/heads/ignite-2.0
Commit: c4d67d2ab737c398c9158dfeb67dc979f5c052af
Parents: 87fbb27
Author: Pavel Tupitsyn 
Authored: Tue Jan 10 16:07:36 2017 +0300
Committer: Pavel Tupitsyn 
Committed: Tue Jan 10 16:07:36 2017 +0300

--
 .../dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs | 2 ++
 .../platforms/dotnet/Apache.Ignite.Core.Tests/MessagingTest.cs | 6 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c4d67d2a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs
index 250f974..1239794 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheAbstractTest.cs
@@ -309,6 +309,8 @@ namespace Apache.Ignite.Core.Tests.Cache
 
 Ignition.Start(cfg);
 }
+
+Assert.AreEqual(GridCount(), 
GetIgnite(0).GetCluster().GetNodes().Count);
 }
 
 /// 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c4d67d2a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/MessagingTest.cs
--
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/MessagingTest.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/MessagingTest.cs
index 82c6742..8b57c81 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/MessagingTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/MessagingTest.cs
@@ -56,6 +56,8 @@ namespace Apache.Ignite.Core.Tests
 _grid1 = 
Ignition.Start(Configuration("config\\compute\\compute-grid1.xml"));
 _grid2 = 
Ignition.Start(Configuration("config\\compute\\compute-grid2.xml"));
 _grid3 = 
Ignition.Start(Configuration("config\\compute\\compute-grid3.xml"));
+
+Assert.AreEqual(3, _grid1.GetCluster().GetNodes().Count);
 }
 
 /// 
@@ -556,7 +558,9 @@ namespace Apache.Ignite.Core.Tests
 Func resultFunc, int 
expectedRepeat)
 {
 // check if expected message count has been received; Wait returns 
false if there were none.
-Assert.IsTrue(ReceivedEvent.Wait(MessageTimeout));
+Assert.IsTrue(ReceivedEvent.Wait(MessageTimeout),
+string.Format("expectedMessages: {0}, expectedRepeat: {1}, 
remaining: {2}",
+expectedMessages, expectedRepeat, 
ReceivedEvent.CurrentCount));
 
 expectedMessages = expectedMessages.SelectMany(x => 
Enumerable.Repeat(x, expectedRepeat));
 

[12/18] ignite git commit: ignite-4293 Do not need store deserialized value for BinaryMarshaller

[vozerov]

ignite-4293 Do not need store deserialized value for BinaryMarshaller


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d10946b8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d10946b8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d10946b8

Branch: refs/heads/ignite-2.0
Commit: d10946b8b107dee499a5798a4679ab5d14499764
Parents: abc8b90
Author: Alexandr Kuramshin 
Authored: Fri Jan 13 12:26:39 2017 +0300
Committer: sboikov 
Committed: Fri Jan 13 12:26:39 2017 +0300

--
 .../processors/cacheobject/IgniteCacheObjectProcessorImpl.java | 5 ++---
 .../java/org/apache/ignite/cache/store/jdbc/model/Person.java  | 2 +-
 .../processors/cache/CacheEntryProcessorCopySelfTest.java  | 6 --
 .../processors/cache/GridCacheBasicStoreAbstractTest.java  | 2 +-
 .../distributed/dht/GridCacheDhtEvictionsDisabledSelfTest.java | 5 +
 5 files changed, 9 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d10946b8/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
index 208ec62..614c612 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
@@ -244,9 +244,8 @@ public class IgniteCacheObjectProcessorImpl extends 
GridProcessorAdapter impleme
 
 CacheMemoryMode memMode = ccfg.getMemoryMode();
 
-boolean storeVal = ctx.config().isPeerClassLoadingEnabled() ||
-GridQueryProcessor.isEnabled(ccfg) ||
-!ccfg.isCopyOnRead();
+boolean storeVal = !ccfg.isCopyOnRead() || (!isBinaryEnabled(ccfg) &&
+(GridQueryProcessor.isEnabled(ccfg) || 
ctx.config().isPeerClassLoadingEnabled()));
 
 CacheObjectContext res = new CacheObjectContext(ctx,
 ccfg.getName(),

http://git-wip-us.apache.org/repos/asf/ignite/blob/d10946b8/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java
 
b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java
index ddf309b..52ddfc8 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/model/Person.java
@@ -196,7 +196,7 @@ public class Person implements Serializable {
 @Override public String toString() {
 return "Person [id=" + id +
 ", orgId=" + orgId +
-", birthday=" + birthday.getTime() +
+", birthday=" + (birthday == null ? null : birthday.getTime()) +
 ", name=" + name +
 "]";
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/d10946b8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEntryProcessorCopySelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEntryProcessorCopySelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEntryProcessorCopySelfTest.java
index 21395e6..f44889b 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEntryProcessorCopySelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEntryProcessorCopySelfTest.java
@@ -30,6 +30,7 @@ import org.apache.ignite.cache.CacheAtomicityMode;
 import org.apache.ignite.cache.CacheEntryProcessor;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.binary.BinaryMarshaller;
 import org.apache.ignite.internal.util.typedef.internal.CU;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
@@ -93,8 +94,9 @@ public class CacheEntryProcessorCopySelfTest extends 
GridCommonAbstractTest {
 doTest(true, false, OLD_VAL, 1);
 
 // One deserialization due to copyOnRead == true.
-// Additional deserialization in case p2p enabled due to 

[18/18] ignite git commit: Merge branch 'master' into ignite-2.0

[vozerov]

Merge branch 'master' 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/77ca2e63
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/77ca2e63
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/77ca2e63

Branch: refs/heads/ignite-2.0
Commit: 77ca2e636c73e464f833f227c4894df0785ae9e2
Parents: 6090ebd 82dd912
Author: devozerov 
Authored: Mon Jan 16 16:07:49 2017 +0300
Committer: devozerov 
Committed: Mon Jan 16 16:07:49 2017 +0300

--
 .../ignite/cache/query/SqlFieldsQuery.java  |   6 +
 .../store/jdbc/dialect/BasicJdbcDialect.java|  31 +-
 .../GridClientConnectionManagerAdapter.java |   7 +-
 .../impl/connection/GridClientTopology.java |  53 +++-
 .../GridNearAtomicAbstractUpdateFuture.java |  34 ++-
 .../GridNearAtomicSingleUpdateFuture.java   |  44 +--
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |  57 ++--
 .../IgniteCacheObjectProcessorImpl.java |   5 +-
 .../processors/query/GridQueryProcessor.java|   2 +-
 .../store/jdbc/CacheJdbcPojoStoreTest.java  |  48 +++-
 .../ignite/cache/store/jdbc/model/Person.java   |   2 +-
 .../cache/CacheEntryProcessorCopySelfTest.java  |   6 +-
 .../cache/GridCacheBasicStoreAbstractTest.java  |   2 +-
 .../GridCacheDhtEvictionsDisabledSelfTest.java  |   5 +-
 .../AtomicPutAllChangingTopologyTest.java   | 212 ++
 .../IgniteCacheFailoverTestSuite.java   |   3 +
 .../apache/ignite/stream/flume/IgniteSink.java  |   7 +-
 .../hadoop/impl/v2/HadoopV2TaskContext.java |  64 +++--
 ...niteCacheAbstractInsertSqlQuerySelfTest.java |  14 +-
 .../IgniteCacheAbstractSqlDmlQuerySelfTest.java |   6 +-
 .../IgniteCacheInsertSqlQuerySelfTest.java  |  18 +-
 .../cache/IgniteCacheMergeSqlQuerySelfTest.java |  14 +-
 .../IgniteCacheUpdateSqlQuerySelfTest.java  |   4 +-
 .../cpp/common/project/vs/common.vcxproj|   1 +
 .../platforms/cpp/jni/project/vs/jni.vcxproj|   1 +
 .../cpp/odbc-test/src/api_robustness_test.cpp   | 113 +++-
 modules/platforms/cpp/odbc/Makefile.am  |   3 +-
 modules/platforms/cpp/odbc/include/Makefile.am  |   3 +-
 .../cpp/odbc/include/ignite/odbc/common_types.h |  29 +-
 .../ignite/odbc/config/connection_info.h|   2 -
 .../cpp/odbc/include/ignite/odbc/log.h  | 123 
 .../odbc/include/ignite/odbc/meta/column_meta.h |   2 -
 .../cpp/odbc/include/ignite/odbc/statement.h| 143 +++---
 .../cpp/odbc/include/ignite/odbc/utility.h  |  19 +-
 .../odbc/os/linux/src/system/socket_client.cpp  |   9 +-
 .../odbc/os/win/src/system/socket_client.cpp|   9 +-
 .../src/system/ui/dsn_configuration_window.cpp  |  18 +-
 .../cpp/odbc/os/win/src/system_dsn.cpp  |  17 +-
 .../platforms/cpp/odbc/project/vs/odbc.vcxproj  |   2 +
 .../cpp/odbc/project/vs/odbc.vcxproj.filters|   6 +
 .../cpp/odbc/src/config/connection_info.cpp |   3 -
 modules/platforms/cpp/odbc/src/connection.cpp   |  21 +-
 .../odbc/src/diagnostic/diagnosable_adapter.cpp |   3 +-
 .../odbc/src/diagnostic/diagnostic_record.cpp   |  38 +++
 modules/platforms/cpp/odbc/src/entry_points.cpp |  52 ++--
 modules/platforms/cpp/odbc/src/log.cpp  |  83 ++
 .../platforms/cpp/odbc/src/meta/column_meta.cpp |   4 -
 modules/platforms/cpp/odbc/src/odbc.cpp | 283 ---
 .../odbc/src/query/column_metadata_query.cpp|  13 +-
 .../platforms/cpp/odbc/src/query/data_query.cpp |  23 +-
 .../cpp/odbc/src/query/table_metadata_query.cpp |  12 +-
 modules/platforms/cpp/odbc/src/statement.cpp| 187 ++--
 modules/platforms/cpp/odbc/src/utility.cpp  |  18 +-
 .../Apache.Ignite.AspNet.Tests.csproj   |   7 +-
 .../Properties/AssemblyInfo.cs  |   2 +-
 .../Apache.Ignite.AspNet.csproj |   5 +
 .../Properties/AssemblyInfo.cs  |   2 +-
 .../Apache.Ignite.Benchmarks.csproj |   5 +
 .../Apache.Ignite.Core.Tests.TestDll.csproj |   5 +
 .../Apache.Ignite.Core.Tests.csproj |   6 +
 .../Cache/CacheAbstractTest.cs  |   2 +
 .../Log/ConcurrentMemoryTarget.cs   |  73 +
 .../Log/NLogLoggerTest.cs   |   5 +-
 .../Apache.Ignite.Core.Tests/MessagingTest.cs   |   6 +-
 .../Properties/AssemblyInfo.cs  |   2 +-
 .../Apache.Ignite.Core.Tests/TestUtils.cs   |   1 -
 .../Apache.Ignite.Core.csproj   |  16 +-
 .../Impl/Binary/BinaryReader.cs |  16 +-
 .../Impl/Unmanaged/UnmanagedUtils.cs|   4 +-
 .../Apache.Ignite.EntityFramework.Tests.csproj  |   5 +
 .../Apache.Ignite.EntityFramework.csproj|   9 +-
 .../Impl/ArrayDbDataReader.cs   |   5 +
 .../Impl/DataReaderResult.cs|   2 +
 .../Impl/DbCommandInfo.cs   |  11 +

[11/18] ignite git commit: IGNITE-4531: SQL: Use correct property name in BinaryProperty. This closes 1419.

[vozerov]

IGNITE-4531: SQL: Use correct property name in BinaryProperty. This closes 1419.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/abc8b909
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/abc8b909
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/abc8b909

Branch: refs/heads/ignite-2.0
Commit: abc8b9091e9eda8cc43f398939bf1fb6035f7a3f
Parents: 1f358db
Author: Alexander Paschenko 
Authored: Thu Jan 12 10:50:14 2017 +0300
Committer: devozerov 
Committed: Thu Jan 12 10:50:14 2017 +0300

--
 .../processors/query/GridQueryProcessor.java  |  2 +-
 ...IgniteCacheAbstractInsertSqlQuerySelfTest.java | 14 +++---
 .../IgniteCacheAbstractSqlDmlQuerySelfTest.java   |  6 +++---
 .../cache/IgniteCacheInsertSqlQuerySelfTest.java  | 18 ++
 .../cache/IgniteCacheMergeSqlQuerySelfTest.java   | 14 +++---
 .../cache/IgniteCacheUpdateSqlQuerySelfTest.java  |  4 ++--
 6 files changed, 30 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/abc8b909/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index 58f94f4..3286bac 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -2147,7 +2147,7 @@ public class GridQueryProcessor extends 
GridProcessorAdapter {
 if (!(obj instanceof BinaryObjectBuilder))
 throw new UnsupportedOperationException("Individual properties 
can be set for binary builders only");
 
-setValue0((BinaryObjectBuilder) obj, name(), propVal, type());
+setValue0((BinaryObjectBuilder) obj, propName, propVal, type());
 }
 
 /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/abc8b909/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java
index df4259e..86d01c7 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java
@@ -151,7 +151,7 @@ public abstract class 
IgniteCacheAbstractInsertSqlQuerySelfTest extends GridComm
 LinkedHashMap flds = new LinkedHashMap<>();
 
 flds.put("id", Integer.class.getName());
-flds.put("name", String.class.getName());
+flds.put("firstName", String.class.getName());
 
 s2p.setFields(flds);
 
@@ -172,7 +172,7 @@ public abstract class 
IgniteCacheAbstractInsertSqlQuerySelfTest extends GridComm
 LinkedHashMap flds = new LinkedHashMap<>();
 
 flds.put("id", Integer.class.getName());
-flds.put("name", String.class.getName());
+flds.put("firstName", String.class.getName());
 
 i2p.setFields(flds);
 
@@ -194,7 +194,7 @@ public abstract class 
IgniteCacheAbstractInsertSqlQuerySelfTest extends GridComm
 
 flds.put("key", Integer.class.getName());
 flds.put("id", Integer.class.getName());
-flds.put("name", String.class.getName());
+flds.put("firstName", String.class.getName());
 
 k2p.setFields(flds);
 
@@ -216,7 +216,7 @@ public abstract class 
IgniteCacheAbstractInsertSqlQuerySelfTest extends GridComm
 
 flds.put("Id", Integer.class.getName());
 flds.put("id", Integer.class.getName());
-flds.put("name", String.class.getName());
+flds.put("firstName", String.class.getName());
 flds.put("IntVal", Integer.class.getName());
 
 k22p.setFields(flds);
@@ -240,7 +240,7 @@ public abstract class 
IgniteCacheAbstractInsertSqlQuerySelfTest extends GridComm
 flds.put("key", Integer.class.getName());
 flds.put("strKey", String.class.getName());
 flds.put("id", Integer.class.getName());
-flds.put("name", 

[03/18] ignite git commit: IGNITE-4412 fix NLogLoggerTest thread safety issue

[vozerov]

IGNITE-4412 fix NLogLoggerTest thread safety issue

This closes #1401


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bf118aad
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bf118aad
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bf118aad

Branch: refs/heads/ignite-2.0
Commit: bf118aad8d8251144062d97c476fbe5f817d8018
Parents: d2e6007
Author: Sergey Stronchinskiy 
Authored: Mon Jan 9 15:36:11 2017 +0300
Committer: Pavel Tupitsyn 
Committed: Mon Jan 9 15:36:11 2017 +0300

--
 .../Apache.Ignite.Core.Tests.csproj |  1 +
 .../Log/ConcurrentMemoryTarget.cs   | 73 
 .../Log/NLogLoggerTest.cs   |  5 +-
 3 files changed, 76 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/bf118aad/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
index 5948593..55adfe4 100644
--- 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
@@ -77,6 +77,7 @@
 
 
 
+
 
 
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/bf118aad/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Log/ConcurrentMemoryTarget.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Log/ConcurrentMemoryTarget.cs
 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Log/ConcurrentMemoryTarget.cs
new file mode 100644
index 000..66bdbe2
--- /dev/null
+++ 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Log/ConcurrentMemoryTarget.cs
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Apache.Ignite.Core.Tests.Log
+{
+using System.Collections.Generic;
+using System.Linq;
+using global::NLog;
+using global::NLog.Targets;
+
+/// 
+/// NLog target which supports logging from multiple threads.
+/// 
+public class ConcurrentMemoryTarget : TargetWithLayout
+{
+///  Object used for locking. 
+private readonly object _locker = new object();
+
+///  Logs. 
+private readonly IList _logs;
+
+/// 
+/// Initializes a new instance of the  class.
+/// 
+public ConcurrentMemoryTarget()
+{
+_logs = new List();
+Name = "ConcurrentMemoryTarget";
+}
+
+/// 
+/// Gets the collection of logs gathered in the .
+/// 
+public IEnumerable Logs
+{
+get
+{
+lock (_locker)
+{
+return _logs.ToList();
+}
+}
+}
+
+/// 
+/// Renders the logging event message and adds it to the internal 
ArrayList of log messages.
+/// 
+/// The logging event.
+protected override void Write(LogEventInfo logEvent)
+{
+lock (_locker)
+{
+var msg = Layout.Render(logEvent);
+
+_logs.Add(msg);
+}
+}
+}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/bf118aad/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Log/NLogLoggerTest.cs
--
diff --git 
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Log/NLogLoggerTest.cs 
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Log/NLogLoggerTest.cs
index 7806ecd..2743353 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Log/NLogLoggerTest.cs
+++ 

[15/18] ignite git commit: IGNITE-4518 Fixed parallel load of cache. - Fixes #1426.

[vozerov]

IGNITE-4518 Fixed parallel load of cache. - Fixes #1426.

Signed-off-by: Andrey Novikov 


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/79401b2e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/79401b2e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/79401b2e

Branch: refs/heads/ignite-2.0
Commit: 79401b2ebf814eeffa36d41a82d1238d8eccc7e9
Parents: 6045a24
Author: Andrey Novikov 
Authored: Mon Jan 16 10:33:16 2017 +0700
Committer: Andrey Novikov 
Committed: Mon Jan 16 10:33:16 2017 +0700

--
 .../store/jdbc/dialect/BasicJdbcDialect.java| 31 -
 .../store/jdbc/CacheJdbcPojoStoreTest.java  | 48 +++-
 2 files changed, 66 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/79401b2e/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java
 
b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java
index 3ab112a..139f3fc 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/dialect/BasicJdbcDialect.java
@@ -173,13 +173,15 @@ public class BasicJdbcDialect implements JdbcDialect {
 if (appendLowerBound) {
 sb.a("(");
 
-for (int cnt = keyCols.size(); cnt > 0; cnt--) {
-for (int j = 0; j < cnt; j++)
-if (j == cnt - 1)
-sb.a(cols[j]).a(" > ? ");
+for (int keyCnt = keyCols.size(); keyCnt > 0; keyCnt--) {
+for (int idx = 0; idx < keyCnt; idx++) {
+if (idx == keyCnt - 1)
+sb.a(cols[idx]).a(" > ? ");
 else
-sb.a(cols[j]).a(" = ? AND ");
-if (cnt != 1)
+sb.a(cols[idx]).a(" = ? AND ");
+}
+
+if (keyCnt != 1)
 sb.a("OR ");
 }
 
@@ -192,13 +194,18 @@ public class BasicJdbcDialect implements JdbcDialect {
 if (appendUpperBound) {
 sb.a("(");
 
-for (int cnt = keyCols.size(); cnt > 0; cnt--) {
-for (int j = 0; j < cnt; j++)
-if (j == cnt - 1)
-sb.a(cols[j]).a(" <= ? ");
+for (int keyCnt = keyCols.size(); keyCnt > 0; keyCnt--) {
+for (int idx = 0, lastIdx = keyCnt - 1; idx < keyCnt; idx++) {
+sb.a(cols[idx]);
+
+// For composite key when not all of the key columns are 
constrained should use < (strictly less).
+if (idx == lastIdx)
+sb.a(keyCnt == keyCols.size() ? " <= ? " : " < ? ");
 else
-sb.a(cols[j]).a(" = ? AND ");
-if (cnt != 1)
+sb.a(" = ? AND ");
+}
+
+if (keyCnt != 1)
 sb.a(" OR ");
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/79401b2e/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
 
b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
index d8f75d3..4a0b1da 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoStoreTest.java
@@ -216,7 +216,7 @@ public class CacheJdbcPojoStoreTest extends 
GridAbstractCacheStoreSelfTest> 2) & 1);
+prnComplexStmt.setInt(2, (i >> 1) & 1);
+prnComplexStmt.setInt(3, i % 2);
+
+prnComplexStmt.setString(4, "name");
+prnComplexStmt.setInt(5, 1000 + i * 500);
+
+prnComplexStmt.addBatch();
+}
+
+prnComplexStmt.executeBatch();
+
+U.closeQuiet(prnComplexStmt);
+
+conn.commit();
+
+U.closeQuiet(conn);
+
+final Collection prnComplexKeys = new 
ConcurrentLinkedQueue<>();
+
+IgniteBiInClosure c = new CI2() {
+@Override public void apply(Object k, Object v) {
+if (k instanceof PersonComplexKey && v instanceof Person)
+

ignite git commit: IGNITE-4424 REPLICATED cache isn't synced across nodes

[av]

Repository: ignite
Updated Branches:
  refs/heads/master 27ba69b55 -> 82dd91288


IGNITE-4424 REPLICATED cache isn't synced across nodes


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/82dd9128
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/82dd9128
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/82dd9128

Branch: refs/heads/master
Commit: 82dd912889b0dfca213edb1374c1fa0ed79411fd
Parents: 27ba69b
Author: Anton Vinogradov 
Authored: Fri Dec 30 13:41:34 2016 +0300
Committer: Anton Vinogradov 
Committed: Mon Jan 16 12:18:14 2017 +0300

--
 .../GridNearAtomicAbstractUpdateFuture.java |  34 ++-
 .../GridNearAtomicSingleUpdateFuture.java   |  44 ++--
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |  57 ++---
 .../AtomicPutAllChangingTopologyTest.java   | 212 +++
 .../IgniteCacheFailoverTestSuite.java   |   3 +
 5 files changed, 284 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/82dd9128/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
index 2fbabaa..c92e0f5 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
@@ -212,14 +212,18 @@ public abstract class GridNearAtomicAbstractUpdateFuture 
extends GridFutureAdapt
 // Cannot remap.
 remapCnt = 1;
 
-map(topVer);
+GridCacheVersion futVer = addAtomicFuture(topVer);
+
+if (futVer != null)
+map(topVer, futVer);
 }
 }
 
 /**
  * @param topVer Topology version.
+ * @param futVer Future version
  */
-protected abstract void map(AffinityTopologyVersion topVer);
+protected abstract void map(AffinityTopologyVersion topVer, 
GridCacheVersion futVer);
 
 /**
  * Maps future on ready topology.
@@ -302,7 +306,7 @@ public abstract class GridNearAtomicAbstractUpdateFuture 
extends GridFutureAdapt
  * @param req Request.
  * @param e Error.
  */
-protected void onSendError(GridNearAtomicAbstractUpdateRequest req, 
IgniteCheckedException e) {
+protected final void onSendError(GridNearAtomicAbstractUpdateRequest req, 
IgniteCheckedException e) {
 synchronized (mux) {
 GridNearAtomicUpdateResponse res = new 
GridNearAtomicUpdateResponse(cctx.cacheId(),
 req.nodeId(),
@@ -314,4 +318,28 @@ public abstract class GridNearAtomicAbstractUpdateFuture 
extends GridFutureAdapt
 onResult(req.nodeId(), res, true);
 }
 }
+
+/**
+ * Adds future prevents topology change before operation complete.
+ * Should be invoked before topology lock released.
+ *
+ * @param topVer Topology version.
+ * @return Future version in case future added.
+ */
+protected final GridCacheVersion addAtomicFuture(AffinityTopologyVersion 
topVer) {
+GridCacheVersion futVer = cctx.versions().next(topVer);
+
+synchronized (mux) {
+assert this.futVer == null : this;
+assert this.topVer == AffinityTopologyVersion.ZERO : this;
+
+this.topVer = topVer;
+this.futVer = futVer;
+}
+
+if (storeFuture() && !cctx.mvcc().addAtomicFuture(futVer, this))
+return null;
+
+return futVer;
+}
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/82dd9128/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
index bd231cf..7376aff 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
+++ 

[2/6] ignite git commit: GG-11794 WIP on command-line utility.

[sboikov]

GG-11794 WIP on command-line utility.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/90f846af
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/90f846af
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/90f846af

Branch: refs/heads/ignite-gg-11810
Commit: 90f846af029bdc8d62b8a176ca9a144dee4c1cec
Parents: f96c590
Author: Alexey Kuznetsov 
Authored: Thu Jan 12 18:35:04 2017 +0700
Committer: Alexey Kuznetsov 
Committed: Thu Jan 12 18:35:04 2017 +0700

--
 .../main/resources/META-INF/classnames.properties   |  2 --
 .../main/resources/META-INF/classnames.properties   | 16 +---
 2 files changed, 1 insertion(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/90f846af/modules/core/src/main/resources/META-INF/classnames.properties
--
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties 
b/modules/core/src/main/resources/META-INF/classnames.properties
index 445f072..9060161 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -1846,7 +1846,6 @@ 
org.apache.ignite.internal.visor.util.VisorClusterGroupEmptyException
 org.apache.ignite.internal.visor.util.VisorEventMapper
 org.apache.ignite.internal.visor.util.VisorExceptionWrapper
 org.apache.ignite.internal.visor.util.VisorTaskUtils$4
-org.apache.ignite.internal.visor.util.VisorTaskUtils$5
 org.apache.ignite.internal.websession.WebSessionAttributeProcessor
 org.apache.ignite.internal.websession.WebSessionEntity
 org.apache.ignite.lang.IgniteBiClosure
@@ -1899,7 +1898,6 @@ 
org.apache.ignite.spi.checkpoint.sharedfs.SharedFsCheckpointData
 org.apache.ignite.spi.collision.jobstealing.JobStealingRequest
 
org.apache.ignite.spi.collision.priorityqueue.PriorityQueueCollisionSpi$PriorityGridCollisionJobContextComparator
 org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$1
-org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$10
 org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$11
 org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$12
 org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi$2$ConnectClosure

http://git-wip-us.apache.org/repos/asf/ignite/blob/90f846af/modules/hadoop/src/main/resources/META-INF/classnames.properties
--
diff --git a/modules/hadoop/src/main/resources/META-INF/classnames.properties 
b/modules/hadoop/src/main/resources/META-INF/classnames.properties
index 0ac17cf..051094d 100644
--- a/modules/hadoop/src/main/resources/META-INF/classnames.properties
+++ b/modules/hadoop/src/main/resources/META-INF/classnames.properties
@@ -26,20 +26,9 @@ org.apache.ignite.hadoop.util.KerberosUserNameMapper
 org.apache.ignite.hadoop.util.KerberosUserNameMapper$State
 org.apache.ignite.hadoop.util.UserNameMapper
 org.apache.ignite.internal.processors.hadoop.HadoopAttributes
-org.apache.ignite.internal.processors.hadoop.HadoopDefaultJobInfo
 org.apache.ignite.internal.processors.hadoop.HadoopExternalSplit
-org.apache.ignite.internal.processors.hadoop.HadoopFileBlock
-org.apache.ignite.internal.processors.hadoop.HadoopInputSplit
-org.apache.ignite.internal.processors.hadoop.HadoopJobId
-org.apache.ignite.internal.processors.hadoop.HadoopJobInfo
-org.apache.ignite.internal.processors.hadoop.HadoopJobPhase
-org.apache.ignite.internal.processors.hadoop.HadoopJobProperty
-org.apache.ignite.internal.processors.hadoop.HadoopJobStatus
-org.apache.ignite.internal.processors.hadoop.HadoopMapReducePlan
 org.apache.ignite.internal.processors.hadoop.HadoopSplitWrapper
 org.apache.ignite.internal.processors.hadoop.HadoopTaskCancelledException
-org.apache.ignite.internal.processors.hadoop.HadoopTaskInfo
-org.apache.ignite.internal.processors.hadoop.HadoopTaskType
 org.apache.ignite.internal.processors.hadoop.counter.HadoopCounterAdapter
 org.apache.ignite.internal.processors.hadoop.counter.HadoopCountersImpl
 
org.apache.ignite.internal.processors.hadoop.counter.HadoopCountersImpl$CounterKey
@@ -73,7 +62,6 @@ 
org.apache.ignite.internal.processors.hadoop.jobtracker.HadoopJobTracker$RemoveM
 
org.apache.ignite.internal.processors.hadoop.jobtracker.HadoopJobTracker$RemoveReducerProcessor
 
org.apache.ignite.internal.processors.hadoop.jobtracker.HadoopJobTracker$StackedProcessor
 
org.apache.ignite.internal.processors.hadoop.jobtracker.HadoopJobTracker$UpdatePhaseProcessor
-org.apache.ignite.internal.processors.hadoop.message.HadoopMessage
 org.apache.ignite.internal.processors.hadoop.planner.HadoopDefaultMapReducePlan
 

[3/6] ignite git commit: ignite-gg-8.0.2.ea2 mute tests

[sboikov]

ignite-gg-8.0.2.ea2 mute tests


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/00e88cc9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/00e88cc9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/00e88cc9

Branch: refs/heads/ignite-gg-11810
Commit: 00e88cc938b24d9f3dd13057ec5593fd72cce28e
Parents: 90f846a
Author: Dmitriy Govorukhin 
Authored: Fri Jan 13 12:16:43 2017 +0300
Committer: Dmitriy Govorukhin 
Committed: Fri Jan 13 12:16:43 2017 +0300

--
 .../managers/deployment/GridDeploymentMessageCountSelfTest.java   | 3 +++
 .../internal/processors/cache/ClusterStateAbstractTest.java   | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/00e88cc9/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
index 20c5b93..b02dce0 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
@@ -126,6 +126,9 @@ public class GridDeploymentMessageCountSelfTest extends 
GridCommonAbstractTest {
  * @throws Exception If failed.
  */
 public void testCacheValueDeploymentOnPut() throws Exception {
+//TODO GG-11141
+fail();
+
 ClassLoader ldr = getExternalClassLoader();
 
 Class valCls = ldr.loadClass(TEST_VALUE);

http://git-wip-us.apache.org/repos/asf/ignite/blob/00e88cc9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClusterStateAbstractTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClusterStateAbstractTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClusterStateAbstractTest.java
index a454270..731d3a6 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClusterStateAbstractTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/ClusterStateAbstractTest.java
@@ -280,7 +280,8 @@ public abstract class ClusterStateAbstractTest extends 
GridCommonAbstractTest {
  * @throws Exception If fails.
  */
 public void testDeactivationWithPendingLock() throws Exception {
-fail("Safe way for deactivate cluster must be implemented.");
+//TODO GG-11851
+fail();
 
 startGrids(GRID_CNT);
 

[6/6] ignite git commit: Merge remote-tracking branch 'remotes/community/ignite-gg-8.0.2.ea2' into ignite-gg-11810

[sboikov]

Merge remote-tracking branch 'remotes/community/ignite-gg-8.0.2.ea2' into 
ignite-gg-11810

# Conflicts:
#   
modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e81cfdbe
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e81cfdbe
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e81cfdbe

Branch: refs/heads/ignite-gg-11810
Commit: e81cfdbefd89502ac239fcccb8bd0a8037e52290
Parents: fc9c488 e1b84b4
Author: sboikov 
Authored: Mon Jan 16 11:43:17 2017 +0300
Committer: sboikov 
Committed: Mon Jan 16 11:43:17 2017 +0300

--
 .../processors/cache/GridCacheAdapter.java |  2 +-
 .../processors/cache/GridCacheMapEntry.java|  3 +--
 .../main/resources/META-INF/classnames.properties  |  2 --
 .../internal/ClusterNodeMetricsSelfTest.java   |  2 ++
 .../GridDeploymentMessageCountSelfTest.java|  3 +++
 .../processors/cache/ClusterStateAbstractTest.java |  3 ++-
 .../IgniteCacheExpiryPolicyAbstractTest.java   |  6 ++
 .../testsuites/IgniteComputeGridTestSuite.java |  1 -
 .../main/resources/META-INF/classnames.properties  | 16 +---
 .../processors/query/h2/database/H2TreeIndex.java  |  2 +-
 .../query/IgniteSqlSplitterSelfTest.java   |  2 +-
 .../testsuites/IgniteDistributedJoinTestSuite.java | 17 +
 12 files changed, 31 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e81cfdbe/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--

http://git-wip-us.apache.org/repos/asf/ignite/blob/e81cfdbe/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
--

http://git-wip-us.apache.org/repos/asf/ignite/blob/e81cfdbe/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
--

http://git-wip-us.apache.org/repos/asf/ignite/blob/e81cfdbe/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDistributedJoinTestSuite.java
--

[5/6] ignite git commit: ignite-gg-8.0.2.ea2 fix IgniteCacheP2pUnmarshallingErrorTest.testResponseMessageOnUnmarshallingFailed and IgniteCacheClientQueryReplicatedNodeRestartSelfTest.testRestarts

[sboikov]

ignite-gg-8.0.2.ea2 fix 
IgniteCacheP2pUnmarshallingErrorTest.testResponseMessageOnUnmarshallingFailed 
and IgniteCacheClientQueryReplicatedNodeRestartSelfTest.testRestarts


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e1b84b41
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e1b84b41
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e1b84b41

Branch: refs/heads/ignite-gg-11810
Commit: e1b84b41bd4ae52631f17f79396d6921385c0dcc
Parents: 2254d37
Author: Dmitriy Govorukhin 
Authored: Fri Jan 13 19:27:47 2017 +0300
Committer: Dmitriy Govorukhin 
Committed: Fri Jan 13 19:27:47 2017 +0300

--
 .../ignite/internal/processors/cache/GridCacheAdapter.java  | 2 +-
 .../ignite/internal/processors/cache/GridCacheMapEntry.java | 3 +--
 .../internal/processors/query/h2/database/H2TreeIndex.java  | 5 ++---
 3 files changed, 4 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/e1b84b41/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 93270ea..2d688da 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
@@ -2180,7 +2180,7 @@ public abstract class GridCacheAdapter implements 
IgniteInternalCache(e);
 }
 catch (IgniteCheckedException e) {
 return new GridFinishedFuture<>(e);

http://git-wip-us.apache.org/repos/asf/ignite/blob/e1b84b41/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 3363124..c1acb84 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
@@ -573,9 +573,8 @@ public abstract class GridCacheMapEntry extends 
GridMetadataAwareAdapter impleme
 val = this.val;
 
 if (val == null) {
-if (isStartVersion()) {
+if (isStartVersion())
 val = unswap(true, false);
-}
 }
 
 if (val != null) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/e1b84b41/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
--
diff --git 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
index 31df27c..3268d9d 100644
--- 
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
+++ 
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
@@ -79,7 +79,7 @@ public class H2TreeIndex extends GridH2IndexBase {
 
 name = BPlusTree.treeName(name, "H2Tree");
 
-if (!cctx.kernalContext().clientNode()) {
+if (!cctx.kernalContext().clientNode() && cctx.affinityNode()) {
 IgniteCacheDatabaseSharedManager dbMgr = cctx.shared().database();
 
 RootPage page = cctx.offheap().rootPageForIndex(name);
@@ -87,8 +87,7 @@ public class H2TreeIndex extends GridH2IndexBase {
 tree = new H2Tree(name, cctx.offheap().reuseListForIndex(name), 
cctx.cacheId(),
 dbMgr.pageMemory(), cctx.shared().wal(), 
cctx.offheap().globalRemoveId(),
 tbl.rowFactory(), page.pageId().pageId(), page.isAllocated()) {
-@Override
-protected int compare(BPlusIO io, ByteBuffer buf, 
int idx, SearchRow row)
+@Override protected int compare(BPlusIO io, 
ByteBuffer buf, int idx, SearchRow row)
 throws IgniteCheckedException {
 

[4/6] ignite git commit: ignite-gg-8.0.2.ea2 fix test, add licenses header, mute metrics test

[sboikov]

ignite-gg-8.0.2.ea2 fix test, add licenses header, mute metrics test


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2254d372
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2254d372
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2254d372

Branch: refs/heads/ignite-gg-11810
Commit: 2254d37232ea994ff9dd63917cbd9c8c599bbb12
Parents: 00e88cc
Author: Dmitriy Govorukhin 
Authored: Fri Jan 13 15:40:26 2017 +0300
Committer: Dmitriy Govorukhin 
Committed: Fri Jan 13 15:40:26 2017 +0300

--
 .../internal/ClusterNodeMetricsSelfTest.java   |  2 ++
 .../testsuites/IgniteComputeGridTestSuite.java |  1 -
 .../query/IgniteSqlSplitterSelfTest.java   |  2 +-
 .../testsuites/IgniteDistributedJoinTestSuite.java | 17 +
 4 files changed, 20 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/2254d372/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
index 77359ab..97d17e2 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java
@@ -116,6 +116,8 @@ public class ClusterNodeMetricsSelfTest extends 
GridCommonAbstractTest {
  * @throws Exception If failed.
  */
 public void testAllocatedMemory() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-4536;);
+
 Ignite ignite = grid();
 
 final IgniteCache onHeapCache = 
ignite.getOrCreateCache(ON_HEAP_TIERED_NAME);

http://git-wip-us.apache.org/repos/asf/ignite/blob/2254d372/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
index 8a501fd..c6b7a15 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteComputeGridTestSuite.java
@@ -133,7 +133,6 @@ public class IgniteComputeGridTestSuite {
 suite.addTestSuite(GridMultipleJobsSelfTest.class);
 suite.addTestSuite(GridCheckpointManagerSelfTest.class);
 suite.addTestSuite(GridCheckpointTaskSelfTest.class);
-suite.addTestSuite(ClusterNodeMetricsSelfTest.class);
 suite.addTestSuite(GridTaskNameAnnotationSelfTest.class);
 suite.addTestSuite(GridJobCheckpointCleanupSelfTest.class);
 suite.addTestSuite(GridEventStorageSelfTest.class);

http://git-wip-us.apache.org/repos/asf/ignite/blob/2254d372/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
index 8140a1d..75bbe00 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
@@ -974,7 +974,7 @@ public class IgniteSqlSplitterSelfTest extends 
GridCommonAbstractTest {
 c1.put(key++, p);
 }
 
-String select = "select count(*) from Organization o, \"pers\".Person2 
p where p.orgId = o._key";
+String select = "select count(*) from \"org\".Organization o, 
\"pers\".Person2 p where p.orgId = o._key";
 
 String plan = (String)c2.query(new SqlFieldsQuery("explain " + select)
 
.setDistributedJoins(true).setEnforceJoinOrder(enforceJoinOrder).setPageSize(pageSize))

http://git-wip-us.apache.org/repos/asf/ignite/blob/2254d372/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDistributedJoinTestSuite.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDistributedJoinTestSuite.java
 
b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteDistributedJoinTestSuite.java
index dca640f..5371856 100644
--- 

[1/6] ignite git commit: ignite-gg-8.0.2.e2 mute test, link to issue IGNITE-305

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-gg-11810 fc9c4886c -> e81cfdbef


ignite-gg-8.0.2.e2 mute test, link to issue IGNITE-305


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f96c5903
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f96c5903
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f96c5903

Branch: refs/heads/ignite-gg-11810
Commit: f96c59039a8b5f7d2b8e8070fe1ca43183b4eaaf
Parents: 43eefb0
Author: Dmitriy Govorukhin 
Authored: Thu Jan 12 12:21:12 2017 +0300
Committer: Dmitriy Govorukhin 
Committed: Thu Jan 12 12:21:12 2017 +0300

--
 .../cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java  | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/f96c5903/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
index 0e2ed2d..4ceb1b6 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
@@ -37,13 +37,10 @@ import javax.cache.expiry.ModifiedExpiryPolicy;
 import javax.cache.processor.EntryProcessor;
 import javax.cache.processor.MutableEntry;
 import org.apache.ignite.IgniteCache;
-import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.cache.CacheMemoryMode;
-import org.apache.ignite.cache.CachePeekMode;
 import org.apache.ignite.cluster.ClusterNode;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.NearCacheConfiguration;
-import org.apache.ignite.internal.IgniteInterruptedCheckedException;
 import org.apache.ignite.internal.IgniteKernal;
 import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
 import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
@@ -52,7 +49,6 @@ import 
org.apache.ignite.internal.processors.cache.IgniteCacheAbstractTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtInvalidPartitionException;
 import org.apache.ignite.internal.util.lang.GridAbsPredicate;
 import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.util.typedef.PAX;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.transactions.Transaction;
@@ -362,6 +358,8 @@ public abstract class IgniteCacheExpiryPolicyAbstractTest 
extends IgniteCacheAbs
  * @throws Exception If failed.
  */
 public void testAccess() throws Exception {
+fail("https://issues.apache.org/jira/browse/IGNITE-305;);
+
 factory = new FactoryBuilder.SingletonFactory<>(new 
TestPolicy(60_000L, 61_000L, 62_000L));
 
 startGrids();