You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/01/12 08:01:49 UTC
[23/24] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-3477' into ignite-gg-11810
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/1b1ca167
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1b1ca167
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1b1ca167
Branch: refs/heads/ignite-gg-11810
Commit: 1b1ca167d5fdf0effe9c1171a3311ceb61aff63d
Parents: 1038a0b 79a546a
Author: sboikov <sb...@gridgain.com>
Authored: Thu Jan 12 11:01:06 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Jan 12 11:01:06 2017 +0300
----------------------------------------------------------------------
.../configuration/CacheConfiguration.java | 30 ---
.../cache/IgniteCacheOffheapManagerImpl.java | 6 +-
.../cache/database/tree/BPlusTree.java | 19 +-
.../cache/query/GridCacheQueryManager.java | 23 ++-
.../cluster/GridClusterStateProcessor.java | 6 +-
.../util/GridCursorIteratorWrapper.java | 36 ++++
.../apache/ignite/internal/util/IgniteTree.java | 70 +++++++
.../offheap/unsafe/GridOffHeapSnapTreeMap.java | 11 +-
.../internal/util/snaptree/SnapTreeMap.java | 10 +-
.../cache/ClusterStateAbstractTest.java | 45 +++--
.../processors/database/BPlusTreeSelfTest.java | 33 ++++
.../query/h2/opt/GridH2SpatialIndex.java | 24 ++-
.../internal/processors/query/h2/H2Cursor.java | 105 ++++++++++
.../processors/query/h2/IgniteH2Indexing.java | 42 +---
.../query/h2/database/H2PkHashIndex.java | 37 ++--
.../query/h2/database/H2TreeIndex.java | 132 +++++--------
.../query/h2/opt/GridH2IndexBase.java | 182 ++++++++++++-----
.../processors/query/h2/opt/GridH2Table.java | 4 +-
.../query/h2/opt/GridH2TreeIndex.java | 195 ++++++++++++-------
.../cache/IgniteCacheAbstractQuerySelfTest.java | 2 +-
...QueryNodeRestartDistributedJoinSelfTest.java | 104 ++++++----
.../query/IgniteSqlDistributedJoinSelfTest.java | 179 +++++++++++++++++
.../query/IgniteSqlSplitterSelfTest.java | 6 +-
.../query/h2/opt/GridH2TableSelfTest.java | 29 +--
.../query/h2/sql/GridQueryParsingTest.java | 2 +-
.../IgniteCacheQuerySelfTestSuite.java | 15 --
.../IgniteCacheQuerySelfTestSuite3.java | 2 +
.../IgniteDistributedJoinTestSuite.java | 38 ++++
.../internal/websession/WebSessionSelfTest.java | 4 +
29 files changed, 969 insertions(+), 422 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1b1ca167/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1b1ca167/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java
index e2b261c,aef7217..e91dda9
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java
@@@ -762,10 -758,9 +761,10 @@@ public abstract class BPlusTree<L, T ex
/**
* @param row Lookup row for exact match.
* @return Found row.
+ * @throws IgniteCheckedException If failed.
*/
@SuppressWarnings("unchecked")
- public final T findOne(L row) throws IgniteCheckedException {
+ @Override public final T findOne(L row) throws IgniteCheckedException {
checkDestroyed();
try {
http://git-wip-us.apache.org/repos/asf/ignite/blob/1b1ca167/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1b1ca167/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java
index bbd14da,31df27c..4d0e6e3
--- 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
@@@ -80,18 -79,24 +78,23 @@@ public class H2TreeIndex extends GridH2
name = BPlusTree.treeName(name, "H2Tree");
- IgniteCacheDatabaseSharedManager dbMgr = cctx.shared().database();
+ if (!cctx.kernalContext().clientNode()) {
+ IgniteCacheDatabaseSharedManager dbMgr = cctx.shared().database();
- RootPage page = cctx.offheap().rootPageForIndex(name);
+ RootPage page = cctx.offheap().rootPageForIndex(name);
- 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<SearchRow> io, long pageAddr, int idx, SearchRow row)
- throws IgniteCheckedException {
- return compareRows(getRow(io, pageAddr, idx), row);
- }
- };
+ 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<SearchRow> io, ByteBuffer buf, int idx, SearchRow row)
++ @Override protected int compare(BPlusIO<SearchRow> io, long pageAddr, int idx, SearchRow row)
+ throws IgniteCheckedException {
- return compareRows(getRow(io, buf, idx), row);
++ return compareRows(getRow(io, pageAddr, idx), row);
+ }
+ };
+ }
+ else
+ // We need indexes on the client node, but index will not contain any data.
+ tree = null;
initDistributedJoinMessaging(tbl);
}