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/13 13:14:17 UTC
[1/9] ignite git commit: Fixed query tests.
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 <sb...@gridgain.com>
Authored: Thu Jan 12 16:20:33 2017 +0300
Committer: sboikov <sb...@gridgain.com>
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<SearchRow> io, ByteBuffer buf, int idx, SearchRow row)
+ @Override protected int compare(BPlusIO<SearchRow> 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<Object, Object> cache = grid(0).cache( null);
+ IgniteCache<Integer, Integer> 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<List<?>> 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 b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedFieldsQuerySelfTest.java
index 4ec840c..953e5fa 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedFieldsQuerySelfTest.java
@@ -48,13 +48,13 @@ public class IgniteCacheReplicatedFieldsQuerySelfTest extends IgniteCacheAbstrac
* @throws Exception If failed.
*/
public void testLostIterator() throws Exception {
- IgniteCache<Object, Object> cache = grid(0).cache(null);
+ IgniteCache<Integer, Integer> cache = intCache;
QueryCursor<List<?>> qry = null;
- int maximumQueryIteratorCount = cache.getConfiguration(CacheConfiguration.class).getMaxQueryIteratorsCount();
+ int maximumQryIterCnt = cache.getConfiguration(CacheConfiguration.class).getMaxQueryIteratorsCount();
- for (int i = 0; i < maximumQueryIteratorCount + 1; i++) {
+ for (int i = 0; i < maximumQryIterCnt + 1; i++) {
QueryCursor<List<?>> q = cache
.query(new SqlFieldsQuery("select _key from Integer where _key >= 0 order by _key"));
http://git-wip-us.apache.org/repos/asf/ignite/blob/fbf13d4c/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..72f186c 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
@@ -27,16 +27,14 @@ import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Random;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicInteger;
-
-import org.apache.ignite.*;
+import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.processors.query.h2.database.H2RowFactory;
-import org.apache.ignite.internal.util.lang.*;
+import org.apache.ignite.internal.util.lang.GridCursor;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.h2.Driver;
http://git-wip-us.apache.org/repos/asf/ignite/blob/fbf13d4c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
index 0992fe2..09a1884 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
@@ -383,10 +383,10 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
checkQuery("update Person p set name='Peter', old = length('zzz') limit 20");
checkQuery("update Person p set name=DEFAULT, old = null limit ?");
checkQuery("update Person p set name=? where old >= ? and old < ? limit ?");
- checkQuery("update Person p set name=(select a.Street from Address a where a.id=p.addrId), old = (select 42)" +
+ checkQuery("update Person p set name=(select a.Street from \"addr\".Address a where a.id=p.addrId), old = (select 42)" +
" where old = sqrt(?)");
checkQuery("update Person p set (name, old) = (select 'Peter', 42)");
- checkQuery("update Person p set (name, old) = (select street, id from Address where id > 5 and id <= ?)");
+ checkQuery("update Person p set (name, old) = (select street, id from \"addr\".Address where id > 5 and id <= ?)");
}
/**
[5/9] ignite git commit: Minor.
Posted by sb...@apache.org.
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 <sb...@gridgain.com>
Authored: Fri Jan 13 13:47:56 2017 +0300
Committer: sboikov <sb...@gridgain.com>
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 pageIdx Page index.
* @return Absolute pointer.
*/
- private long absolute(long relativePtr) {
- int pageIdx = PageIdUtils.pageIndex(relativePtr);
-
+ private long absolute(int pageIdx) {
pageIdx &= idxMask;
long off = ((long)pageIdx) * sysPageSize;
@@ -589,10 +586,12 @@ public class PageMemoryNoStoreImpl implements PageMemory {
* @param pageId Page ID to release.
*/
private void releaseFreePage(long pageId) {
+ int pageIdx = PageIdUtils.pageIndex(pageId);
+
// Clear out flags and file ID.
- long relPtr = PageIdUtils.pageId(0, (byte)0, PageIdUtils.pageIndex(pageId));
+ long relPtr = PageIdUtils.pageId(0, (byte)0, pageIdx);
- long absPtr = absolute(relPtr);
+ long absPtr = absolute(pageIdx);
// Second, write clean relative pointer instead of page ID.
writePageId(absPtr, relPtr);
@@ -624,7 +623,7 @@ public class PageMemoryNoStoreImpl implements PageMemory {
long cnt = ((freePageRelPtrMasked & COUNTER_MASK) + COUNTER_INC) & COUNTER_MASK;
if (freePageRelPtr != INVALID_REL_PTR) {
- long freePageAbsPtr = absolute(freePageRelPtr);
+ long freePageAbsPtr = absolute(PageIdUtils.pageIndex(freePageRelPtr));
long nextFreePageRelPtr = GridUnsafe.getLong(freePageAbsPtr) & ADDRESS_MASK;
http://git-wip-us.apache.org/repos/asf/ignite/blob/a95a60b8/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 3d6a553..d68466f 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
@@ -36,21 +36,17 @@ public class PageNoStoreImpl implements Page {
private long pageId;
/** */
- private int cacheId;
-
- /** */
private PageMemoryNoStoreImpl pageMem;
/**
+ * @param pageMem Page memory.
* @param absPtr Absolute pointer.
+ * @param pageId Page ID.
*/
- PageNoStoreImpl(
- PageMemoryNoStoreImpl pageMem, long absPtr, int cacheId, long pageId
- ) {
+ PageNoStoreImpl(PageMemoryNoStoreImpl pageMem, long absPtr, long pageId) {
this.pageMem = pageMem;
this.absPtr = absPtr;
- this.cacheId = cacheId;
this.pageId = pageId;
}
@@ -68,7 +64,7 @@ public class PageNoStoreImpl implements Page {
/** {@inheritDoc} */
@Override public FullPageId fullId() {
- return new FullPageId(pageId, cacheId);
+ throw new UnsupportedOperationException();
}
/** {@inheritDoc} */
@@ -142,7 +138,6 @@ public class PageNoStoreImpl implements Page {
SB sb = new SB("PageNoStoreImpl [absPtr=0x");
sb.appendHex(absPtr);
- sb.a(", cacheId=").a(cacheId);
sb.a(", pageId=0x").appendHex(pageId);
sb.a("]");
[9/9] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-gg-11810' into ignite-gg-11810-1
Posted by sb...@apache.org.
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 <sb...@gridgain.com>
Authored: Fri Jan 13 16:14:10 2017 +0300
Committer: sboikov <sb...@gridgain.com>
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.
Posted by sb...@apache.org.
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 <sb...@gridgain.com>
Authored: Fri Jan 13 14:59:54 2017 +0300
Committer: sboikov <sb...@gridgain.com>
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);
[7/9] ignite git commit: Fixed lazy search row.
Posted by sb...@apache.org.
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 <sb...@gridgain.com>
Authored: Fri Jan 13 14:38:00 2017 +0300
Committer: sboikov <sb...@gridgain.com>
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);
}
}
[6/9] ignite git commit: Fixed lazy search row.
Posted by sb...@apache.org.
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 <sb...@gridgain.com>
Authored: Fri Jan 13 14:37:27 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Jan 13 14:37:27 2017 +0300
----------------------------------------------------------------------
.../internal/util/GridCursorIteratorWrapper.java | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
[3/9] ignite git commit: Merge remote-tracking branch
'origin/ignite-gg-11810' into ignite-gg-11810
Posted by sb...@apache.org.
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 <sb...@gridgain.com>
Authored: Thu Jan 12 16:31:55 2017 +0300
Committer: sboikov <sb...@gridgain.com>
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(-)
----------------------------------------------------------------------
[2/9] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-3477' into ignite-gg-11810
Posted by sb...@apache.org.
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 <sb...@gridgain.com>
Authored: Thu Jan 12 16:31:37 2017 +0300
Committer: sboikov <sb...@gridgain.com>
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(-)
----------------------------------------------------------------------
[4/9] ignite git commit: Added header.
Posted by sb...@apache.org.
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 <sb...@gridgain.com>
Authored: Thu Jan 12 16:58:33 2017 +0300
Committer: sboikov <sb...@gridgain.com>
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}.