[2/2] ignite git commit: Merge branch 'ignite-gg-8.0.2.ea2' of https://github.com/gridgain/apache-ignite into ignite-gg-8.0.2.ea2

[agoncharuk]

Merge branch 'ignite-gg-8.0.2.ea2' of https://github.com/gridgain/apache-ignite 
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/8f691863
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8f691863
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8f691863

Branch: refs/heads/ignite-3477
Commit: 8f69186343dc95aba403e12c8fb7c06a5042916a
Parents: 5e289d8 e1b84b4
Author: Alexey Goncharuk 
Authored: Fri Jan 13 19:45:07 2017 +0300
Committer: Alexey Goncharuk 
Committed: Fri Jan 13 19:45:07 2017 +0300

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


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

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

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

[agoncharuk]

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-3477
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/4] ignite git commit: ignite-gg-8.0.2.ea2 mute tests

[agoncharuk]

Repository: ignite
Updated Branches:
  refs/heads/ignite-3477 beb80830c -> 5e289d812


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-3477
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);
 

[3/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/049247d3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/049247d3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/049247d3

Branch: refs/heads/ignite-3477
Commit: 049247d373d2b0197a36f133b21575462145f635
Parents: 79a546a 2254d37
Author: Alexey Goncharuk 
Authored: Fri Jan 13 19:06:12 2017 +0300
Committer: Alexey Goncharuk 
Committed: Fri Jan 13 19:06:12 2017 +0300

--
 .../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 +---
 .../query/IgniteSqlSplitterSelfTest.java   |  2 +-
 .../testsuites/IgniteDistributedJoinTestSuite.java | 17 +
 9 files changed, 28 insertions(+), 24 deletions(-)
--

[4/4] ignite git commit: Merge branch 'ignite-3477' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-gg-8.0.2.ea2

[agoncharuk]

Merge branch 'ignite-3477' of https://git-wip-us.apache.org/repos/asf/ignite 
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/5e289d81
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5e289d81
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5e289d81

Branch: refs/heads/ignite-3477
Commit: 5e289d81273f6eeac826e7f6b5c4de7df2d067ff
Parents: 049247d beb8083
Author: Alexey Goncharuk 
Authored: Fri Jan 13 19:43:40 2017 +0300
Committer: Alexey Goncharuk 
Committed: Fri Jan 13 19:43:40 2017 +0300

--
 .../util/GridCursorIteratorWrapper.java | 24 
 .../testsuites/IgniteCacheTestSuite5.java   |  4 ++--
 .../query/h2/database/H2TreeIndex.java  |  3 +--
 ...niteCachePartitionedFieldsQuerySelfTest.java |  8 +++
 ...gniteCacheReplicatedFieldsQuerySelfTest.java |  6 ++---
 .../query/h2/opt/GridH2TableSelfTest.java   |  6 ++---
 .../query/h2/sql/GridQueryParsingTest.java  |  4 ++--
 7 files changed, 34 insertions(+), 21 deletions(-)
--

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

[agoncharuk]

Repository: ignite
Updated Branches:
  refs/heads/ignite-3477 5e289d812 -> 8f6918634


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-3477
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 

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

[ptupitsyn]

Repository: ignite
Updated Branches:
  refs/heads/master d10946b8b -> e304b48b9


.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/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.

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

[sboikov]

Merge remote-tracking branch 'origin/ignite-gg-11810-1' 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/86896a81
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/86896a81
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/86896a81

Branch: refs/heads/ignite-gg-11810-1
Commit: 86896a81f1ca0ec927a75ecca2e03915e67cab13
Parents: 4a36602 c7bd20c
Author: sboikov 
Authored: Fri Jan 13 16:37:22 2017 +0300
Committer: sboikov 
Committed: Fri Jan 13 16:37:22 2017 +0300

--

--

[1/2] ignite git commit: # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java

[sboikov]

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


# Conflicts:
#   
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java


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

Branch: refs/heads/ignite-gg-11810-1
Commit: 4a36602cc0598e6970c48dd89f0ddc6361317d73
Parents: 3202edd
Author: sboikov 
Authored: Fri Jan 13 16:36:58 2017 +0300
Committer: sboikov 
Committed: Fri Jan 13 16:36:58 2017 +0300

--
 .../ignite/internal/pagemem/PageMemory.java |   4 +
 .../ignite/internal/pagemem/PageUtils.java  |   2 +-
 .../pagemem/impl/PageMemoryNoStoreImpl.java |  60 +++
 .../internal/pagemem/impl/PageNoStoreImpl.java  |  13 +--
 .../cache/IgniteCacheOffheapManagerImpl.java|  92 ++--
 .../cache/database/CacheDataRowAdapter.java |  82 +++
 .../cache/database/DataStructure.java   |   8 ++
 .../cache/database/tree/BPlusTree.java  | 104 ++-
 .../cache/database/tree/util/PageHandler.java   |  23 
 .../util/GridCursorIteratorWrapper.java |  17 +++
 ...niteCachePartitionedFieldsQuerySelfTest.java |   8 +-
 ...gniteCacheReplicatedFieldsQuerySelfTest.java |   6 +-
 .../query/h2/opt/GridH2TableSelfTest.java   |   6 +-
 .../query/h2/sql/GridQueryParsingTest.java  |   4 +-
 14 files changed, 227 insertions(+), 202 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/4a36602c/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 cfee19f..f90e718 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,6 +38,10 @@ 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/4a36602c/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageUtils.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageUtils.java 
b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageUtils.java
index e9e228a..f824368 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageUtils.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageUtils.java
@@ -130,7 +130,7 @@ public class PageUtils {
 assert addr > 0 : addr;
 assert off >= 0;
 assert bytes != null;
-assert bytesOff >= 0 && bytesOff < bytes.length : bytesOff;
+assert bytesOff >= 0 && (bytesOff < bytes.length || bytes.length == 0) 
: bytesOff;
 
 GridUnsafe.copyMemory(bytes, GridUnsafe.BYTE_ARR_OFF + bytesOff, null, 
addr + off, bytes.length - bytesOff);
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/4a36602c/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 79ac383..fd0ae75 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
@@ -220,13 +220,13 @@ public class PageMemoryNoStoreImpl implements PageMemory {
 relPtr = seg.borrowFreePage();
 
 if (relPtr != INVALID_REL_PTR) {
-absPtr = seg.absolute(relPtr);
+absPtr = seg.absolute(PageIdUtils.pageIndex(relPtr));
 
 break;
 }
 }
 
-// No segments conatined a free page.
+// No segments contained a free page.
 if (relPtr == INVALID_REL_PTR) {
 int segAllocIdx = nextRoundRobinIndex();

[1/9] ignite git commit: Fixed query tests.

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-gg-11810-1 3202edde4 -> c7bd20c5d


Fixed query tests.


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

Branch: refs/heads/ignite-gg-11810-1
Commit: fbf13d4c8d95462a7f67fe706cb93a6902d4d483
Parents: 79a546a
Author: sboikov 
Authored: Thu Jan 12 16:20:33 2017 +0300
Committer: sboikov 
Committed: Thu Jan 12 16:20:33 2017 +0300

--
 .../internal/processors/query/h2/database/H2TreeIndex.java   | 3 +--
 .../near/IgniteCachePartitionedFieldsQuerySelfTest.java  | 8 
 .../replicated/IgniteCacheReplicatedFieldsQuerySelfTest.java | 6 +++---
 .../processors/query/h2/opt/GridH2TableSelfTest.java | 6 ++
 .../processors/query/h2/sql/GridQueryParsingTest.java| 4 ++--
 5 files changed, 12 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/fbf13d4c/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..ef57834 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
@@ -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 {
 return compareRows(getRow(io, buf, idx), row);
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/fbf13d4c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedFieldsQuerySelfTest.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedFieldsQuerySelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedFieldsQuerySelfTest.java
index 26f3191..4934255 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedFieldsQuerySelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedFieldsQuerySelfTest.java
@@ -62,20 +62,20 @@ public class IgniteCachePartitionedFieldsQuerySelfTest 
extends IgniteCacheAbstra
 
 /** @throws Exception If failed. */
 public void testLocalQuery() throws Exception {
-IgniteCache cache = grid(0).cache( null);
+IgniteCache cache = jcache(Integer.class, 
Integer.class);
 
 awaitPartitionMapExchange(true, true, null);
 
-int expected = 0;
+int exp = 0;
 
 for(Cache.Entry e: cache.localEntries(CachePeekMode.PRIMARY)){
 if(e.getValue() instanceof Integer)
-expected++;
+exp++;
 }
 
 QueryCursor qry = cache
 .query(new SqlFieldsQuery("select _key, _val from 
Integer").setLocal(true));
 
-assertEquals(expected, qry.getAll().size());
+assertEquals(exp, qry.getAll().size());
 }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/fbf13d4c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedFieldsQuerySelfTest.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedFieldsQuerySelfTest.java
 

[5/9] ignite git commit: Minor.

[sboikov]

Minor.


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

Branch: refs/heads/ignite-gg-11810-1
Commit: a95a60b80e30f76fe71709370fd157f2b4e90ea5
Parents: 81ce9d5
Author: sboikov 
Authored: Fri Jan 13 13:47:56 2017 +0300
Committer: sboikov 
Committed: Fri Jan 13 13:47:56 2017 +0300

--
 .../pagemem/impl/PageMemoryNoStoreImpl.java | 43 ++--
 .../internal/pagemem/impl/PageNoStoreImpl.java  | 13 ++
 2 files changed, 25 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/a95a60b8/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 79ac383..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
@@ -220,13 +220,13 @@ public class PageMemoryNoStoreImpl implements PageMemory {
 relPtr = seg.borrowFreePage();
 
 if (relPtr != INVALID_REL_PTR) {
-absPtr = seg.absolute(relPtr);
+absPtr = seg.absolute(PageIdUtils.pageIndex(relPtr));
 
 break;
 }
 }
 
-// No segments conatined a free page.
+// No segments contained a free page.
 if (relPtr == INVALID_REL_PTR) {
 int segAllocIdx = nextRoundRobinIndex();
 
@@ -238,7 +238,7 @@ public class PageMemoryNoStoreImpl implements PageMemory {
 relPtr = seg.allocateFreePage(flags);
 
 if (relPtr != INVALID_REL_PTR) {
-absPtr = seg.absolute(relPtr);
+absPtr = seg.absolute(PageIdUtils.pageIndex(relPtr));
 
 break;
 }
@@ -263,7 +263,7 @@ public class PageMemoryNoStoreImpl implements PageMemory {
 
 /** {@inheritDoc} */
 @Override public boolean freePage(int cacheId, long pageId) {
-Segment seg = segment(pageId);
+Segment seg = segment(PageIdUtils.pageIndex(pageId));
 
 seg.releaseFreePage(pageId);
 
@@ -272,9 +272,11 @@ public class PageMemoryNoStoreImpl implements PageMemory {
 
 /** {@inheritDoc} */
 @Override public Page page(int cacheId, long pageId) throws 
IgniteCheckedException {
-Segment seg = segment(pageId);
+int pageIdx = PageIdUtils.pageIndex(pageId);
 
-return seg.acquirePage(cacheId, pageId);
+Segment seg = segment(pageIdx);
+
+return seg.acquirePage(pageIdx, pageId);
 }
 
 /** {@inheritDoc} */
@@ -285,7 +287,7 @@ public class PageMemoryNoStoreImpl implements PageMemory {
 /** {@inheritDoc} */
 @Override public void releasePage(Page p) {
 if (trackAcquiredPages) {
-Segment seg = segment(p.id());
+Segment seg = segment(PageIdUtils.pageIndex(p.id()));
 
 seg.onPageRelease();
 }
@@ -442,12 +444,10 @@ public class PageMemoryNoStoreImpl implements PageMemory {
 }
 
 /**
- * @param pageId Page ID.
+ * @param pageIdx Page index.
  * @return Segment.
  */
-private Segment segment(long pageId) {
-long pageIdx = PageIdUtils.pageIndex(pageId);
-
+private Segment segment(int pageIdx) {
 int segIdx = segmentIndex(pageIdx);
 
 return segments[segIdx];
@@ -537,18 +537,17 @@ public class PageMemoryNoStoreImpl implements PageMemory {
 }
 
 /**
- * @param cacheId Cache ID.
  * @param pageId Page ID to pin.
  * @return Pinned page impl.
  */
 @SuppressWarnings("TypeMayBeWeakened")
-private PageNoStoreImpl acquirePage(int cacheId, long pageId) {
-long absPtr = absolute(pageId);
+private PageNoStoreImpl acquirePage(int pageIdx, long pageId) {
+long absPtr = absolute(pageIdx);
 
 if (trackAcquiredPages)
 acquiredPages.incrementAndGet();
 
-return new PageNoStoreImpl(PageMemoryNoStoreImpl.this, absPtr, 
cacheId, pageId);
+return new PageNoStoreImpl(PageMemoryNoStoreImpl.this, absPtr, 
pageId);
 }
 
 /**
@@ -558,12 +557,10 @@ public class PageMemoryNoStoreImpl implements PageMemory {
 }
 
 /**
- * @param relativePtr Relative pointer.
+ * @param 

[2/9] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-3477' into ignite-gg-11810

[sboikov]

Merge remote-tracking branch 'remotes/origin/ignite-3477' 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/f92ddd25
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f92ddd25
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f92ddd25

Branch: refs/heads/ignite-gg-11810-1
Commit: f92ddd258899298fd51123b200d3e274f534c6e2
Parents: c1d5081 fbf13d4
Author: sboikov 
Authored: Thu Jan 12 16:31:37 2017 +0300
Committer: sboikov 
Committed: Thu Jan 12 16:31:37 2017 +0300

--
 .../near/IgniteCachePartitionedFieldsQuerySelfTest.java  | 8 
 .../replicated/IgniteCacheReplicatedFieldsQuerySelfTest.java | 6 +++---
 .../processors/query/h2/opt/GridH2TableSelfTest.java | 6 ++
 .../processors/query/h2/sql/GridQueryParsingTest.java| 4 ++--
 4 files changed, 11 insertions(+), 13 deletions(-)
--

[7/9] ignite git commit: Fixed lazy search row.

[sboikov]

Fixed lazy search row.


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

Branch: refs/heads/ignite-gg-11810-1
Commit: 0c57ede37682d8526ff9aeca47be2cd1c74f0f15
Parents: 9901183
Author: sboikov 
Authored: Fri Jan 13 14:38:00 2017 +0300
Committer: sboikov 
Committed: Fri Jan 13 14:38:00 2017 +0300

--
 .../cache/IgniteCacheOffheapManagerImpl.java| 44 +++-
 1 file changed, 5 insertions(+), 39 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/0c57ede3/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 3a68b81..3cf42e1 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
@@ -1074,41 +1074,6 @@ public class IgniteCacheOffheapManagerImpl extends 
GridCacheManagerAdapter imple
 /**
  *
  */
-private static class LinkSearchRow implements CacheSearchRow {
-/** */
-private final int hash;
-
-/** */
-private final long link;
-
-/**
- * @param hash Key hash code.
- * @param link Link.
- */
-LinkSearchRow(int hash, long link) {
-this.hash = hash;
-this.link = link;
-}
-
-/** {@inheritDoc} */
-@Override public KeyCacheObject key() {
-throw new UnsupportedOperationException();
-}
-
-/** {@inheritDoc} */
-@Override public long link() {
-return link;
-}
-
-/** {@inheritDoc} */
-@Override public int hash() {
-return hash;
-}
-}
-
-/**
- *
- */
 private class DataRow extends CacheDataRowAdapter {
 /** */
 protected int part = -1;
@@ -1119,8 +1084,9 @@ public class IgniteCacheOffheapManagerImpl extends 
GridCacheManagerAdapter imple
 /**
  * @param hash Hash code.
  * @param link Link.
+ * @param keyOnly If {@code true} initializes only key.
  */
-DataRow(int hash, long link) {
+DataRow(int hash, long link, boolean keyOnly) {
 super(link);
 
 this.hash = hash;
@@ -1129,7 +1095,7 @@ public class IgniteCacheOffheapManagerImpl extends 
GridCacheManagerAdapter imple
 
 try {
 // We can not init data row lazily because underlying buffer 
can be concurrently cleared.
-initFromLink(cctx, false);
+initFromLink(cctx, keyOnly);
 }
 catch (IgniteCheckedException e) {
 throw new IgniteException(e);
@@ -1324,7 +1290,7 @@ public class IgniteCacheOffheapManagerImpl extends 
GridCacheManagerAdapter imple
  * @return Search row.
  */
 private CacheSearchRow keySearchRow(int hash, long link) {
-return new LinkSearchRow(hash, link);
+return new DataRow(hash, link, true);
 }
 
 /**
@@ -1333,7 +1299,7 @@ public class IgniteCacheOffheapManagerImpl extends 
GridCacheManagerAdapter imple
  * @return Data row.
  */
 private CacheDataRow dataRow(int hash, long link) {
-return new DataRow(hash, link);
+return new DataRow(hash, link, false);
 }
 }
 

[3/9] ignite git commit: Merge remote-tracking branch 'origin/ignite-gg-11810' into ignite-gg-11810

[sboikov]

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


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

Branch: refs/heads/ignite-gg-11810-1
Commit: 81ce9d55dc5c62650deb3dc0cee4c259df702e0b
Parents: f92ddd2 33616e0
Author: sboikov 
Authored: Thu Jan 12 16:31:55 2017 +0300
Committer: sboikov 
Committed: Thu Jan 12 16:31:55 2017 +0300

--
 .../cache/IgniteCacheOffheapManagerImpl.java| 234 ++-
 .../processors/cache/database/CacheDataRow.java |  13 +-
 .../cache/database/CacheDataRowAdapter.java |  77 +-
 .../cache/database/CacheSearchRow.java  |  40 
 .../database/FreeListImplSelfTest.java  |   5 +
 .../processors/query/h2/opt/GridH2Row.java  |   5 +
 6 files changed, 230 insertions(+), 144 deletions(-)
--

[9/9] 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/c7bd20c5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c7bd20c5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c7bd20c5

Branch: refs/heads/ignite-gg-11810-1
Commit: c7bd20c5decf79cad225c5f0cb9fd7f2e432bacc
Parents: 3202edd fc9c488
Author: sboikov 
Authored: Fri Jan 13 16:14:10 2017 +0300
Committer: sboikov 
Committed: Fri Jan 13 16:14:10 2017 +0300

--
 .../ignite/internal/pagemem/PageUtils.java  |  2 +-
 .../pagemem/impl/PageMemoryNoStoreImpl.java | 43 ++-
 .../internal/pagemem/impl/PageNoStoreImpl.java  | 13 ++
 .../cache/IgniteCacheOffheapManagerImpl.java| 44 +++-
 .../cache/database/CacheDataRowAdapter.java | 28 +
 .../util/GridCursorIteratorWrapper.java | 17 
 ...niteCachePartitionedFieldsQuerySelfTest.java |  8 ++--
 ...gniteCacheReplicatedFieldsQuerySelfTest.java |  6 +--
 .../query/h2/opt/GridH2TableSelfTest.java   |  6 +--
 .../query/h2/sql/GridQueryParsingTest.java  |  4 +-
 10 files changed, 69 insertions(+), 102 deletions(-)
--


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

[8/9] ignite git commit: Fixed assert for empty byte array.

[sboikov]

Fixed assert for empty byte array.


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

Branch: refs/heads/ignite-gg-11810-1
Commit: fc9c4886c55b611a2e7484599aca87068810ed34
Parents: 0c57ede
Author: sboikov 
Authored: Fri Jan 13 14:59:54 2017 +0300
Committer: sboikov 
Committed: Fri Jan 13 14:59:54 2017 +0300

--
 .../ignite/internal/pagemem/PageUtils.java  |  2 +-
 .../cache/database/CacheDataRowAdapter.java | 28 +++-
 2 files changed, 11 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/fc9c4886/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageUtils.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageUtils.java 
b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageUtils.java
index e9e228a..f824368 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageUtils.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageUtils.java
@@ -130,7 +130,7 @@ public class PageUtils {
 assert addr > 0 : addr;
 assert off >= 0;
 assert bytes != null;
-assert bytesOff >= 0 && bytesOff < bytes.length : bytesOff;
+assert bytesOff >= 0 && (bytesOff < bytes.length || bytes.length == 0) 
: bytesOff;
 
 GridUnsafe.copyMemory(bytes, GridUnsafe.BYTE_ARR_OFF + bytesOff, null, 
addr + off, bytes.length - bytesOff);
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/fc9c4886/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/CacheDataRowAdapter.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/CacheDataRowAdapter.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/CacheDataRowAdapter.java
index acb435e..5288aad 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/CacheDataRowAdapter.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/CacheDataRowAdapter.java
@@ -200,17 +200,13 @@ public class CacheDataRowAdapter implements CacheDataRow {
 int len = PageUtils.getInt(addr, off);
 off += 4;
 
-if (len == 0)
-key = null;
-else {
-byte type = PageUtils.getByte(addr, off);
-off++;
+byte type = PageUtils.getByte(addr, off);
+off++;
 
-byte[] bytes = PageUtils.getBytes(addr, off, len);
-off += len;
+byte[] bytes = PageUtils.getBytes(addr, off, len);
+off += len;
 
-key = coctx.processor().toKeyCacheObject(coctx, type, bytes);
-}
+key = coctx.processor().toKeyCacheObject(coctx, type, bytes);
 
 if (keyOnly) {
 assert key != null: "key";
@@ -221,17 +217,13 @@ public class CacheDataRowAdapter implements CacheDataRow {
 len = PageUtils.getInt(addr, off);
 off += 4;
 
-if (len == 0)
-val = null;
-else {
-byte type = PageUtils.getByte(addr, off);
-off++;
+type = PageUtils.getByte(addr, off);
+off++;
 
-byte[] bytes = PageUtils.getBytes(addr, off, len);
-off += len;
+bytes = PageUtils.getBytes(addr, off, len);
+off += len;
 
-val = coctx.processor().toCacheObject(coctx, type, bytes);
-}
+val = coctx.processor().toCacheObject(coctx, type, bytes);
 
 ver = CacheVersionIO.read(addr + off, false);
 

[4/9] ignite git commit: Added header.

[sboikov]

Added header.


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

Branch: refs/heads/ignite-gg-11810-1
Commit: 42c9da6143140ce57cd7895cc039f3f8966b8179
Parents: fbf13d4
Author: sboikov 
Authored: Thu Jan 12 16:58:33 2017 +0300
Committer: sboikov 
Committed: Thu Jan 12 16:58:33 2017 +0300

--
 .../util/GridCursorIteratorWrapper.java | 24 
 1 file changed, 20 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/42c9da61/modules/core/src/main/java/org/apache/ignite/internal/util/GridCursorIteratorWrapper.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridCursorIteratorWrapper.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridCursorIteratorWrapper.java
index 927e365..e13854b 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridCursorIteratorWrapper.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridCursorIteratorWrapper.java
@@ -1,9 +1,25 @@
-package org.apache.ignite.internal.util;
+/*
+ * 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.
+ */
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.lang.*;
+package org.apache.ignite.internal.util;
 
-import java.util.*;
+import java.util.Iterator;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.lang.GridCursor;
 
 /**
  * Wrap {@code Iterator} and adapt it to {@code GridCursor}.

[6/9] ignite git commit: Fixed lazy search row.

[sboikov]

Fixed lazy search row.


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

Branch: refs/heads/ignite-gg-11810-1
Commit: 9901183e29406eb562aa046c2b96072db920d7c6
Parents: a95a60b 42c9da6
Author: sboikov 
Authored: Fri Jan 13 14:37:27 2017 +0300
Committer: sboikov 
Committed: Fri Jan 13 14:37:27 2017 +0300

--
 .../internal/util/GridCursorIteratorWrapper.java   | 17 +
 1 file changed, 17 insertions(+)
--

ignite git commit: Fixed assert for empty byte array.

[sboikov]

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


Fixed assert for empty byte array.


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

Branch: refs/heads/ignite-gg-11810
Commit: fc9c4886c55b611a2e7484599aca87068810ed34
Parents: 0c57ede
Author: sboikov 
Authored: Fri Jan 13 14:59:54 2017 +0300
Committer: sboikov 
Committed: Fri Jan 13 14:59:54 2017 +0300

--
 .../ignite/internal/pagemem/PageUtils.java  |  2 +-
 .../cache/database/CacheDataRowAdapter.java | 28 +++-
 2 files changed, 11 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/fc9c4886/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageUtils.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageUtils.java 
b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageUtils.java
index e9e228a..f824368 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageUtils.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageUtils.java
@@ -130,7 +130,7 @@ public class PageUtils {
 assert addr > 0 : addr;
 assert off >= 0;
 assert bytes != null;
-assert bytesOff >= 0 && bytesOff < bytes.length : bytesOff;
+assert bytesOff >= 0 && (bytesOff < bytes.length || bytes.length == 0) 
: bytesOff;
 
 GridUnsafe.copyMemory(bytes, GridUnsafe.BYTE_ARR_OFF + bytesOff, null, 
addr + off, bytes.length - bytesOff);
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/fc9c4886/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/CacheDataRowAdapter.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/CacheDataRowAdapter.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/CacheDataRowAdapter.java
index acb435e..5288aad 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/CacheDataRowAdapter.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/CacheDataRowAdapter.java
@@ -200,17 +200,13 @@ public class CacheDataRowAdapter implements CacheDataRow {
 int len = PageUtils.getInt(addr, off);
 off += 4;
 
-if (len == 0)
-key = null;
-else {
-byte type = PageUtils.getByte(addr, off);
-off++;
+byte type = PageUtils.getByte(addr, off);
+off++;
 
-byte[] bytes = PageUtils.getBytes(addr, off, len);
-off += len;
+byte[] bytes = PageUtils.getBytes(addr, off, len);
+off += len;
 
-key = coctx.processor().toKeyCacheObject(coctx, type, bytes);
-}
+key = coctx.processor().toKeyCacheObject(coctx, type, bytes);
 
 if (keyOnly) {
 assert key != null: "key";
@@ -221,17 +217,13 @@ public class CacheDataRowAdapter implements CacheDataRow {
 len = PageUtils.getInt(addr, off);
 off += 4;
 
-if (len == 0)
-val = null;
-else {
-byte type = PageUtils.getByte(addr, off);
-off++;
+type = PageUtils.getByte(addr, off);
+off++;
 
-byte[] bytes = PageUtils.getBytes(addr, off, len);
-off += len;
+bytes = PageUtils.getBytes(addr, off, len);
+off += len;
 
-val = coctx.processor().toCacheObject(coctx, type, bytes);
-}
+val = coctx.processor().toCacheObject(coctx, type, bytes);
 
 ver = CacheVersionIO.read(addr + off, false);
 

ignite git commit: Fixed lazy search row.

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-gg-11810 9901183e2 -> 0c57ede37


Fixed lazy search row.


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

Branch: refs/heads/ignite-gg-11810
Commit: 0c57ede37682d8526ff9aeca47be2cd1c74f0f15
Parents: 9901183
Author: sboikov 
Authored: Fri Jan 13 14:38:00 2017 +0300
Committer: sboikov 
Committed: Fri Jan 13 14:38:00 2017 +0300

--
 .../cache/IgniteCacheOffheapManagerImpl.java| 44 +++-
 1 file changed, 5 insertions(+), 39 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/0c57ede3/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 3a68b81..3cf42e1 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
@@ -1074,41 +1074,6 @@ public class IgniteCacheOffheapManagerImpl extends 
GridCacheManagerAdapter imple
 /**
  *
  */
-private static class LinkSearchRow implements CacheSearchRow {
-/** */
-private final int hash;
-
-/** */
-private final long link;
-
-/**
- * @param hash Key hash code.
- * @param link Link.
- */
-LinkSearchRow(int hash, long link) {
-this.hash = hash;
-this.link = link;
-}
-
-/** {@inheritDoc} */
-@Override public KeyCacheObject key() {
-throw new UnsupportedOperationException();
-}
-
-/** {@inheritDoc} */
-@Override public long link() {
-return link;
-}
-
-/** {@inheritDoc} */
-@Override public int hash() {
-return hash;
-}
-}
-
-/**
- *
- */
 private class DataRow extends CacheDataRowAdapter {
 /** */
 protected int part = -1;
@@ -1119,8 +1084,9 @@ public class IgniteCacheOffheapManagerImpl extends 
GridCacheManagerAdapter imple
 /**
  * @param hash Hash code.
  * @param link Link.
+ * @param keyOnly If {@code true} initializes only key.
  */
-DataRow(int hash, long link) {
+DataRow(int hash, long link, boolean keyOnly) {
 super(link);
 
 this.hash = hash;
@@ -1129,7 +1095,7 @@ public class IgniteCacheOffheapManagerImpl extends 
GridCacheManagerAdapter imple
 
 try {
 // We can not init data row lazily because underlying buffer 
can be concurrently cleared.
-initFromLink(cctx, false);
+initFromLink(cctx, keyOnly);
 }
 catch (IgniteCheckedException e) {
 throw new IgniteException(e);
@@ -1324,7 +1290,7 @@ public class IgniteCacheOffheapManagerImpl extends 
GridCacheManagerAdapter imple
  * @return Search row.
  */
 private CacheSearchRow keySearchRow(int hash, long link) {
-return new LinkSearchRow(hash, link);
+return new DataRow(hash, link, true);
 }
 
 /**
@@ -1333,7 +1299,7 @@ public class IgniteCacheOffheapManagerImpl extends 
GridCacheManagerAdapter imple
  * @return Data row.
  */
 private CacheDataRow dataRow(int hash, long link) {
-return new DataRow(hash, link);
+return new DataRow(hash, link, false);
 }
 }
 

[1/2] ignite git commit: Added header.

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-gg-11810 a95a60b80 -> 9901183e2


Added header.


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

Branch: refs/heads/ignite-gg-11810
Commit: 42c9da6143140ce57cd7895cc039f3f8966b8179
Parents: fbf13d4
Author: sboikov 
Authored: Thu Jan 12 16:58:33 2017 +0300
Committer: sboikov 
Committed: Thu Jan 12 16:58:33 2017 +0300

--
 .../util/GridCursorIteratorWrapper.java | 24 
 1 file changed, 20 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/42c9da61/modules/core/src/main/java/org/apache/ignite/internal/util/GridCursorIteratorWrapper.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridCursorIteratorWrapper.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridCursorIteratorWrapper.java
index 927e365..e13854b 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/util/GridCursorIteratorWrapper.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/util/GridCursorIteratorWrapper.java
@@ -1,9 +1,25 @@
-package org.apache.ignite.internal.util;
+/*
+ * 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.
+ */
 
-import org.apache.ignite.*;
-import org.apache.ignite.internal.util.lang.*;
+package org.apache.ignite.internal.util;
 
-import java.util.*;
+import java.util.Iterator;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.util.lang.GridCursor;
 
 /**
  * Wrap {@code Iterator} and adapt it to {@code GridCursor}.

[2/2] ignite git commit: Fixed lazy search row.

[sboikov]

Fixed lazy search row.


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

Branch: refs/heads/ignite-gg-11810
Commit: 9901183e29406eb562aa046c2b96072db920d7c6
Parents: a95a60b 42c9da6
Author: sboikov 
Authored: Fri Jan 13 14:37:27 2017 +0300
Committer: sboikov 
Committed: Fri Jan 13 14:37:27 2017 +0300

--
 .../internal/util/GridCursorIteratorWrapper.java   | 17 +
 1 file changed, 17 insertions(+)
--

ignite git commit: Minor.

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-gg-11810 81ce9d55d -> a95a60b80


Minor.


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

Branch: refs/heads/ignite-gg-11810
Commit: a95a60b80e30f76fe71709370fd157f2b4e90ea5
Parents: 81ce9d5
Author: sboikov 
Authored: Fri Jan 13 13:47:56 2017 +0300
Committer: sboikov 
Committed: Fri Jan 13 13:47:56 2017 +0300

--
 .../pagemem/impl/PageMemoryNoStoreImpl.java | 43 ++--
 .../internal/pagemem/impl/PageNoStoreImpl.java  | 13 ++
 2 files changed, 25 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/a95a60b8/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 79ac383..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
@@ -220,13 +220,13 @@ public class PageMemoryNoStoreImpl implements PageMemory {
 relPtr = seg.borrowFreePage();
 
 if (relPtr != INVALID_REL_PTR) {
-absPtr = seg.absolute(relPtr);
+absPtr = seg.absolute(PageIdUtils.pageIndex(relPtr));
 
 break;
 }
 }
 
-// No segments conatined a free page.
+// No segments contained a free page.
 if (relPtr == INVALID_REL_PTR) {
 int segAllocIdx = nextRoundRobinIndex();
 
@@ -238,7 +238,7 @@ public class PageMemoryNoStoreImpl implements PageMemory {
 relPtr = seg.allocateFreePage(flags);
 
 if (relPtr != INVALID_REL_PTR) {
-absPtr = seg.absolute(relPtr);
+absPtr = seg.absolute(PageIdUtils.pageIndex(relPtr));
 
 break;
 }
@@ -263,7 +263,7 @@ public class PageMemoryNoStoreImpl implements PageMemory {
 
 /** {@inheritDoc} */
 @Override public boolean freePage(int cacheId, long pageId) {
-Segment seg = segment(pageId);
+Segment seg = segment(PageIdUtils.pageIndex(pageId));
 
 seg.releaseFreePage(pageId);
 
@@ -272,9 +272,11 @@ public class PageMemoryNoStoreImpl implements PageMemory {
 
 /** {@inheritDoc} */
 @Override public Page page(int cacheId, long pageId) throws 
IgniteCheckedException {
-Segment seg = segment(pageId);
+int pageIdx = PageIdUtils.pageIndex(pageId);
 
-return seg.acquirePage(cacheId, pageId);
+Segment seg = segment(pageIdx);
+
+return seg.acquirePage(pageIdx, pageId);
 }
 
 /** {@inheritDoc} */
@@ -285,7 +287,7 @@ public class PageMemoryNoStoreImpl implements PageMemory {
 /** {@inheritDoc} */
 @Override public void releasePage(Page p) {
 if (trackAcquiredPages) {
-Segment seg = segment(p.id());
+Segment seg = segment(PageIdUtils.pageIndex(p.id()));
 
 seg.onPageRelease();
 }
@@ -442,12 +444,10 @@ public class PageMemoryNoStoreImpl implements PageMemory {
 }
 
 /**
- * @param pageId Page ID.
+ * @param pageIdx Page index.
  * @return Segment.
  */
-private Segment segment(long pageId) {
-long pageIdx = PageIdUtils.pageIndex(pageId);
-
+private Segment segment(int pageIdx) {
 int segIdx = segmentIndex(pageIdx);
 
 return segments[segIdx];
@@ -537,18 +537,17 @@ public class PageMemoryNoStoreImpl implements PageMemory {
 }
 
 /**
- * @param cacheId Cache ID.
  * @param pageId Page ID to pin.
  * @return Pinned page impl.
  */
 @SuppressWarnings("TypeMayBeWeakened")
-private PageNoStoreImpl acquirePage(int cacheId, long pageId) {
-long absPtr = absolute(pageId);
+private PageNoStoreImpl acquirePage(int pageIdx, long pageId) {
+long absPtr = absolute(pageIdx);
 
 if (trackAcquiredPages)
 acquiredPages.incrementAndGet();
 
-return new PageNoStoreImpl(PageMemoryNoStoreImpl.this, absPtr, 
cacheId, pageId);
+return new PageNoStoreImpl(PageMemoryNoStoreImpl.this, absPtr, 
pageId);
 }
 
 /**
@@ -558,12 +557,10 @@ public class PageMemoryNoStoreImpl implements PageMemory {
 

ignite git commit: ignite-4293 Do not need store deserialized value for BinaryMarshaller

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/master abc8b9091 -> d10946b8b


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/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.

ignite git commit: Enabled tests.

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-3477 81435cfad -> beb80830c


Enabled tests.


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

Branch: refs/heads/ignite-3477
Commit: beb80830c153ec529d082b3588951af43fdcff33
Parents: 81435cf
Author: sboikov 
Authored: Fri Jan 13 12:07:28 2017 +0300
Committer: sboikov 
Committed: Fri Jan 13 12:07:28 2017 +0300

--
 .../java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/beb80830/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
index aa67011..b4d0822 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
@@ -64,8 +64,8 @@ public class IgniteCacheTestSuite5 extends TestSuite {
 suite.addTest(IgniteCacheReadThroughEvictionsVariationsSuite.suite());
 suite.addTestSuite(IgniteCacheTxIteratorSelfTest.class);
 
-//suite.addTestSuite(ClusterStatePartitionedSelfTest.class);
-//suite.addTestSuite(ClusterStateReplicatedSelfTest.class);
+suite.addTestSuite(ClusterStatePartitionedSelfTest.class);
+suite.addTestSuite(ClusterStateReplicatedSelfTest.class);
 suite.addTestSuite(IgniteCachePartitionLossPolicySelfTest.class);
 
 suite.addTestSuite(CacheRebalancingSelfTest.class);

[2/3] 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-3477
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
 

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

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-3477 42c9da614 -> 81435cfad


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-3477
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();

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

[sboikov]

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


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

Branch: refs/heads/ignite-3477
Commit: 81435cfad1c462eda79e2ed985294828c20984a2
Parents: 42c9da6 90f846a
Author: sboikov 
Authored: Fri Jan 13 12:06:09 2017 +0300
Committer: sboikov 
Committed: Fri Jan 13 12:06:09 2017 +0300

--
 .../main/resources/META-INF/classnames.properties   |  2 --
 .../expiry/IgniteCacheExpiryPolicyAbstractTest.java |  6 ++
 .../main/resources/META-INF/classnames.properties   | 16 +---
 3 files changed, 3 insertions(+), 21 deletions(-)
--

ignite git commit: Do not read old value.

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-gg-11810-2 [created] 922e4b4a3


Do not read old value.


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

Branch: refs/heads/ignite-gg-11810-2
Commit: 922e4b4a3d8205c7805dfb149c8f04bf25f14439
Parents: 81ce9d5
Author: sboikov 
Authored: Fri Jan 13 11:12:42 2017 +0300
Committer: sboikov 
Committed: Fri Jan 13 11:12:42 2017 +0300

--
 .../cache/IgniteCacheOffheapManagerImpl.java| 47 --
 .../cache/database/tree/BPlusTree.java  | 65 
 2 files changed, 80 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/922e4b4a/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 3a68b81..b1c31b9 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
@@ -899,7 +899,7 @@ public class IgniteCacheOffheapManagerImpl extends 
GridCacheManagerAdapter imple
 
 assert dataRow.link() != 0 : dataRow;
 
-CacheDataRow old = dataTree.put(dataRow);
+Long old = dataTree.put(dataRow, CacheDataTree.linkC);
 
 if (old == null)
 storageSize.incrementAndGet();
@@ -909,23 +909,23 @@ public class IgniteCacheOffheapManagerImpl extends 
GridCacheManagerAdapter imple
 
 assert qryMgr.enabled();
 
-if (old != null)
-qryMgr.store(key, p, old.value(), old.version(), val, 
ver, expireTime, dataRow.link());
-else
-qryMgr.store(key, p, null, null, val, ver, expireTime, 
dataRow.link());
+//if (old != null)
+//qryMgr.store(key, p, old.value(), old.version(), 
val, ver, expireTime, dataRow.link());
+//else
+//qryMgr.store(key, p, null, null, val, ver, 
expireTime, dataRow.link());
 }
 
 if (old != null) {
-assert old.link() != 0 : old;
-
-if (pendingEntries != null && old.expireTime() != 0)
-pendingEntries.remove(new PendingRow(old.expireTime(), 
old.link()));
+//assert old.link() != 0 : old;
+//
+//if (pendingEntries != null && old.expireTime() != 0)
+//pendingEntries.remove(new 
PendingRow(old.expireTime(), old.link()));
 
-rowStore.removeRow(old.link());
+rowStore.removeRow(old);
 }
 
 if (pendingEntries != null && expireTime != 0)
-pendingEntries.put(new PendingRow(expireTime, 
dataRow.link()));
+pendingEntries.putx(new PendingRow(expireTime, 
dataRow.link()));
 }
 finally {
 busyLock.leaveBusy();
@@ -1180,6 +1180,13 @@ public class IgniteCacheOffheapManagerImpl extends 
GridCacheManagerAdapter imple
 /** */
 private final GridCacheContext cctx;
 
+/** */
+private static final BPlusTree.RowClosure linkC 
= new RowClosure() {
+@Override public Long oldRow(BPlusIO io, long 
pageAddr, int idx) throws IgniteCheckedException {
+return ((RowLinkIO)io).getLink(pageAddr, idx);
+}
+};
+
 /**
  * @param name Tree name.
  * @param reuseList Reuse list.
@@ -1228,6 +1235,15 @@ public class IgniteCacheOffheapManagerImpl extends 
GridCacheManagerAdapter imple
 return compareKeys(row.key(), link);
 }
 
+/** {@inheritDoc} */
+@Override protected CacheDataRow getRow(BPlusIO io, 
long pageAddr, int idx)
+throws IgniteCheckedException {
+int hash = ((RowLinkIO)io).getHash(pageAddr, idx);
+long link = ((RowLinkIO)io).getLink(pageAddr, idx);
+
+return rowStore.dataRow(hash, link);
+}
+
 /**
  * @param key Key.
  * @param link Link.
@@ -1295,15 +1311,6 @@ public class