Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 361D5200CBD for ; Wed, 31 May 2017 11:22:55 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 34D8D160BE3; Wed, 31 May 2017 09:22:55 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4DACC160BE7 for ; Wed, 31 May 2017 11:22:52 +0200 (CEST) Received: (qmail 76990 invoked by uid 500); 31 May 2017 09:22:51 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 76794 invoked by uid 99); 31 May 2017 09:22:51 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 May 2017 09:22:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2F884E9652; Wed, 31 May 2017 09:22:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Wed, 31 May 2017 09:22:59 -0000 Message-Id: <287549c2d8444d47a865b0fa852469bc@git.apache.org> In-Reply-To: <35e76c131ae44a50b1bcfcbec4281e1d@git.apache.org> References: <35e76c131ae44a50b1bcfcbec4281e1d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/51] ignite git commit: IGNITE-5313: Removed usages of H2Schema.cacheName with cache-agnostic analogs. The last usage is to be removed as a part of IGNITE-5319. This closes #2021. archived-at: Wed, 31 May 2017 09:22:55 -0000 IGNITE-5313: Removed usages of H2Schema.cacheName with cache-agnostic analogs. The last usage is to be removed as a part of IGNITE-5319. This closes #2021. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fb12f0fa Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fb12f0fa Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fb12f0fa Branch: refs/heads/ignite-5075-pds Commit: fb12f0facc13b90e701cd77d290dccdb827b13a4 Parents: aad3b0c Author: devozerov Authored: Sun May 28 14:20:03 2017 +0300 Committer: devozerov Committed: Sun May 28 14:20:03 2017 +0300 ---------------------------------------------------------------------- .../ignite/internal/GridKernalContext.java | 1 + .../ignite/internal/GridKernalContextImpl.java | 1 + .../internal/binary/BinaryEnumObjectImpl.java | 6 +-- .../internal/binary/BinaryObjectImpl.java | 6 +-- .../binary/BinaryObjectOffheapImpl.java | 6 +-- .../internal/processors/cache/CacheObject.java | 6 +-- .../cache/CacheObjectByteArrayImpl.java | 6 +-- .../processors/cache/CacheObjectImpl.java | 6 +-- .../processors/cache/GridCacheContext.java | 8 ---- .../processors/cache/KeyCacheObjectImpl.java | 6 +-- .../binary/CacheObjectBinaryProcessorImpl.java | 23 +++++------ .../processors/query/GridQueryProcessor.java | 13 ++++++ .../internal/GridAffinityNoCacheSelfTest.java | 7 ++-- .../IgniteIncompleteCacheObjectSelfTest.java | 8 ++-- .../database/FreeListImplSelfTest.java | 7 ++-- .../query/h2/DmlStatementsProcessor.java | 5 ++- .../query/h2/H2ResultSetIterator.java | 4 +- .../processors/query/h2/H2RowDescriptor.java | 19 ++++----- .../processors/query/h2/H2TableDescriptor.java | 22 +++++++--- .../processors/query/h2/H2TableEngine.java | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 42 +++++--------------- .../query/h2/opt/GridH2ValueCacheObject.java | 32 ++++++--------- .../query/h2/twostep/GridMapQueryExecutor.java | 16 +++----- .../h2/twostep/GridReduceQueryExecutor.java | 2 +- .../query/h2/twostep/msg/GridH2CacheObject.java | 39 +++--------------- .../h2/GridIndexingSpiAbstractSelfTest.java | 6 +-- 26 files changed, 126 insertions(+), 173 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fb12f0fa/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java index 7a01200..ef4001f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java @@ -33,6 +33,7 @@ import org.apache.ignite.internal.managers.failover.GridFailoverManager; import org.apache.ignite.internal.managers.indexing.GridIndexingManager; import org.apache.ignite.internal.managers.loadbalancer.GridLoadBalancerManager; import org.apache.ignite.internal.processors.affinity.GridAffinityProcessor; +import org.apache.ignite.internal.processors.cache.CacheObjectValueContext; import org.apache.ignite.internal.processors.cache.GridCacheProcessor; import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor; import org.apache.ignite.internal.processors.closure.GridClosureProcessor; http://git-wip-us.apache.org/repos/asf/ignite/blob/fb12f0fa/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java index 262c5eb..42a9b2c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java @@ -47,6 +47,7 @@ import org.apache.ignite.internal.managers.indexing.GridIndexingManager; import org.apache.ignite.internal.managers.loadbalancer.GridLoadBalancerManager; import org.apache.ignite.internal.processors.affinity.GridAffinityProcessor; import org.apache.ignite.internal.processors.cache.CacheConflictResolutionManager; +import org.apache.ignite.internal.processors.cache.CacheObjectValueContext; import org.apache.ignite.internal.processors.cache.GridCacheProcessor; import org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl; import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor; http://git-wip-us.apache.org/repos/asf/ignite/blob/fb12f0fa/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java index 6a1ad6e..12a0fc3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java @@ -286,7 +286,7 @@ public class BinaryEnumObjectImpl implements BinaryObjectEx, Externalizable, Cac } /** {@inheritDoc} */ - @Override public byte[] valueBytes(CacheObjectContext cacheCtx) throws IgniteCheckedException { + @Override public byte[] valueBytes(CacheObjectValueContext cacheCtx) throws IgniteCheckedException { if (valBytes != null) return valBytes; @@ -335,12 +335,12 @@ public class BinaryEnumObjectImpl implements BinaryObjectEx, Externalizable, Cac } /** {@inheritDoc} */ - @Override public void finishUnmarshal(CacheObjectContext ctx, ClassLoader ldr) throws IgniteCheckedException { + @Override public void finishUnmarshal(CacheObjectValueContext ctx, ClassLoader ldr) throws IgniteCheckedException { this.ctx = ((CacheObjectBinaryProcessorImpl)ctx.kernalContext().cacheObjects()).binaryContext(); } /** {@inheritDoc} */ - @Override public void prepareMarshal(CacheObjectContext ctx) throws IgniteCheckedException { + @Override public void prepareMarshal(CacheObjectValueContext ctx) throws IgniteCheckedException { // No-op. } http://git-wip-us.apache.org/repos/asf/ignite/blob/fb12f0fa/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java index d0d0699..adbb9cb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java @@ -146,7 +146,7 @@ public final class BinaryObjectImpl extends BinaryObjectExImpl implements Extern } /** {@inheritDoc} */ - @Override public byte[] valueBytes(CacheObjectContext ctx) throws IgniteCheckedException { + @Override public byte[] valueBytes(CacheObjectValueContext ctx) throws IgniteCheckedException { if (detached()) return array(); @@ -188,12 +188,12 @@ public final class BinaryObjectImpl extends BinaryObjectExImpl implements Extern } /** {@inheritDoc} */ - @Override public void finishUnmarshal(CacheObjectContext ctx, ClassLoader ldr) throws IgniteCheckedException { + @Override public void finishUnmarshal(CacheObjectValueContext ctx, ClassLoader ldr) throws IgniteCheckedException { this.ctx = ((CacheObjectBinaryProcessorImpl)ctx.kernalContext().cacheObjects()).binaryContext(); } /** {@inheritDoc} */ - @Override public void prepareMarshal(CacheObjectContext ctx) throws IgniteCheckedException { + @Override public void prepareMarshal(CacheObjectValueContext ctx) throws IgniteCheckedException { // No-op. } http://git-wip-us.apache.org/repos/asf/ignite/blob/fb12f0fa/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java index 0a0a7b1..3e73e58 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryObjectOffheapImpl.java @@ -450,7 +450,7 @@ public class BinaryObjectOffheapImpl extends BinaryObjectExImpl implements Exter } /** {@inheritDoc} */ - @Override public byte[] valueBytes(CacheObjectContext ctx) throws IgniteCheckedException { + @Override public byte[] valueBytes(CacheObjectValueContext ctx) throws IgniteCheckedException { throw new UnsupportedOperationException(); } @@ -460,12 +460,12 @@ public class BinaryObjectOffheapImpl extends BinaryObjectExImpl implements Exter } /** {@inheritDoc} */ - @Override public void finishUnmarshal(CacheObjectContext ctx, ClassLoader ldr) throws IgniteCheckedException { + @Override public void finishUnmarshal(CacheObjectValueContext ctx, ClassLoader ldr) throws IgniteCheckedException { throw new UnsupportedOperationException(); } /** {@inheritDoc} */ - @Override public void prepareMarshal(CacheObjectContext ctx) throws IgniteCheckedException { + @Override public void prepareMarshal(CacheObjectValueContext ctx) throws IgniteCheckedException { throw new UnsupportedOperationException(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/fb12f0fa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObject.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObject.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObject.java index 8faaa03..3bc2a6d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObject.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObject.java @@ -50,7 +50,7 @@ public interface CacheObject extends Message { * @return Value bytes. * @throws IgniteCheckedException If failed. */ - public byte[] valueBytes(CacheObjectContext ctx) throws IgniteCheckedException; + public byte[] valueBytes(CacheObjectValueContext ctx) throws IgniteCheckedException; /** * @param ctx Cache object context. @@ -111,11 +111,11 @@ public interface CacheObject extends Message { * @param ldr Class loader. * @throws IgniteCheckedException If failed. */ - public void finishUnmarshal(CacheObjectContext ctx, ClassLoader ldr) throws IgniteCheckedException; + public void finishUnmarshal(CacheObjectValueContext ctx, ClassLoader ldr) throws IgniteCheckedException; /** * @param ctx Context. * @throws IgniteCheckedException If failed. */ - public void prepareMarshal(CacheObjectContext ctx) throws IgniteCheckedException; + public void prepareMarshal(CacheObjectValueContext ctx) throws IgniteCheckedException; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/fb12f0fa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectByteArrayImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectByteArrayImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectByteArrayImpl.java index 6a13f8d..414bebb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectByteArrayImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectByteArrayImpl.java @@ -57,7 +57,7 @@ public class CacheObjectByteArrayImpl implements CacheObject, Externalizable { } /** {@inheritDoc} */ - @Override public void finishUnmarshal(CacheObjectContext ctx, ClassLoader ldr) throws IgniteCheckedException { + @Override public void finishUnmarshal(CacheObjectValueContext ctx, ClassLoader ldr) throws IgniteCheckedException { // No-op. } @@ -70,7 +70,7 @@ public class CacheObjectByteArrayImpl implements CacheObject, Externalizable { } /** {@inheritDoc} */ - @Override public byte[] valueBytes(CacheObjectContext ctx) throws IgniteCheckedException { + @Override public byte[] valueBytes(CacheObjectValueContext ctx) throws IgniteCheckedException { return val; } @@ -114,7 +114,7 @@ public class CacheObjectByteArrayImpl implements CacheObject, Externalizable { } /** {@inheritDoc} */ - @Override public void prepareMarshal(CacheObjectContext ctx) throws IgniteCheckedException { + @Override public void prepareMarshal(CacheObjectValueContext ctx) throws IgniteCheckedException { // No-op. } http://git-wip-us.apache.org/repos/asf/ignite/blob/fb12f0fa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java index 76f354a..2124a97 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java @@ -101,7 +101,7 @@ public class CacheObjectImpl extends CacheObjectAdapter { } /** {@inheritDoc} */ - @Override public byte[] valueBytes(CacheObjectContext ctx) throws IgniteCheckedException { + @Override public byte[] valueBytes(CacheObjectValueContext ctx) throws IgniteCheckedException { if (valBytes == null) valBytes = ctx.kernalContext().cacheObjects().marshal(ctx, val); @@ -109,7 +109,7 @@ public class CacheObjectImpl extends CacheObjectAdapter { } /** {@inheritDoc} */ - @Override public void prepareMarshal(CacheObjectContext ctx) throws IgniteCheckedException { + @Override public void prepareMarshal(CacheObjectValueContext ctx) throws IgniteCheckedException { assert val != null || valBytes != null; if (valBytes == null) @@ -117,7 +117,7 @@ public class CacheObjectImpl extends CacheObjectAdapter { } /** {@inheritDoc} */ - @Override public void finishUnmarshal(CacheObjectContext ctx, ClassLoader ldr) throws IgniteCheckedException { + @Override public void finishUnmarshal(CacheObjectValueContext ctx, ClassLoader ldr) throws IgniteCheckedException { assert val != null || valBytes != null; if (val == null && ctx.storeValue()) http://git-wip-us.apache.org/repos/asf/ignite/blob/fb12f0fa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java index e637122..4c1d615 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java @@ -1417,14 +1417,6 @@ public class GridCacheContext implements Externalizable { } /** - * @return {@code True} if should use offheap (PageMemory) index. - */ - public boolean offheapIndex() { - // TODO GG-10884. - return true; - } - - /** * @return {@code True} if store read-through mode is enabled. */ public boolean readThrough() { http://git-wip-us.apache.org/repos/asf/ignite/blob/fb12f0fa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java index c50672b..1f4e790 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java @@ -73,7 +73,7 @@ public class KeyCacheObjectImpl extends CacheObjectAdapter implements KeyCacheOb } /** {@inheritDoc} */ - @Override public byte[] valueBytes(CacheObjectContext ctx) throws IgniteCheckedException { + @Override public byte[] valueBytes(CacheObjectValueContext ctx) throws IgniteCheckedException { if (valBytes == null) valBytes = ctx.kernalContext().cacheObjects().marshal(ctx, val); @@ -178,13 +178,13 @@ public class KeyCacheObjectImpl extends CacheObjectAdapter implements KeyCacheOb } /** {@inheritDoc} */ - @Override public void prepareMarshal(CacheObjectContext ctx) throws IgniteCheckedException { + @Override public void prepareMarshal(CacheObjectValueContext ctx) throws IgniteCheckedException { if (valBytes == null) valBytes = ctx.kernalContext().cacheObjects().marshal(ctx, val); } /** {@inheritDoc} */ - @Override public void finishUnmarshal(CacheObjectContext ctx, ClassLoader ldr) throws IgniteCheckedException { + @Override public void finishUnmarshal(CacheObjectValueContext ctx, ClassLoader ldr) throws IgniteCheckedException { if (val == null) { assert valBytes != null; http://git-wip-us.apache.org/repos/asf/ignite/blob/fb12f0fa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java index 5567809..a2d319f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java @@ -499,7 +499,7 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm BinaryMetadataHolder holder = metadataLocCache.get(typeId); if (ctx.clientNode()) { - if (holder == null || (holder != null && !holder.metadata().hasSchema(schemaId))) { + if (holder == null || !holder.metadata().hasSchema(schemaId)) { try { transport.requestUpToDateMetadata(typeId).get(); @@ -737,7 +737,7 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm /** {@inheritDoc} */ @Override public byte[] marshal(CacheObjectValueContext ctx, Object val) throws IgniteCheckedException { - if (!((CacheObjectBinaryContext)ctx).binaryEnabled() || binaryMarsh == null) + if (!ctx.binaryEnabled() || binaryMarsh == null) return super.marshal(ctx, val); byte[] arr = binaryMarsh.marshal(val); @@ -750,20 +750,16 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm /** {@inheritDoc} */ @Override public Object unmarshal(CacheObjectValueContext ctx, byte[] bytes, ClassLoader clsLdr) throws IgniteCheckedException { - if (!((CacheObjectBinaryContext)ctx).binaryEnabled() || binaryMarsh == null) + if (!ctx.binaryEnabled() || binaryMarsh == null) return super.unmarshal(ctx, bytes, clsLdr); return binaryMarsh.unmarshal(bytes, clsLdr); } /** {@inheritDoc} */ - @Override public KeyCacheObject toCacheKeyObject( - CacheObjectContext ctx, - @Nullable GridCacheContext cctx, - Object obj, - boolean userObj - ) { - if (!((CacheObjectBinaryContext)ctx).binaryEnabled()) + @Override public KeyCacheObject toCacheKeyObject(CacheObjectContext ctx, @Nullable GridCacheContext cctx, + Object obj, boolean userObj) { + if (!ctx.binaryEnabled()) return super.toCacheKeyObject(ctx, cctx, obj, userObj); if (obj instanceof KeyCacheObject) { @@ -794,7 +790,7 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm /** {@inheritDoc} */ @Nullable @Override public CacheObject toCacheObject(CacheObjectContext ctx, @Nullable Object obj, boolean userObj) { - if (!((CacheObjectBinaryContext)ctx).binaryEnabled()) + if (!ctx.binaryEnabled()) return super.toCacheObject(ctx, obj, userObj); if (obj == null || obj instanceof CacheObject) @@ -819,7 +815,8 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm } /** {@inheritDoc} */ - @Override public KeyCacheObject toKeyCacheObject(CacheObjectContext ctx, byte type, byte[] bytes) throws IgniteCheckedException { + @Override public KeyCacheObject toKeyCacheObject(CacheObjectContext ctx, byte type, byte[] bytes) + throws IgniteCheckedException { if (type == BinaryObjectImpl.TYPE_BINARY) return new BinaryObjectImpl(binaryContext(), bytes, 0); @@ -828,7 +825,7 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm /** {@inheritDoc} */ @Override public Object unwrapTemporary(GridCacheContext ctx, Object obj) throws BinaryObjectException { - if (!((CacheObjectBinaryContext)ctx.cacheObjectContext()).binaryEnabled()) + if (!ctx.cacheObjectContext().binaryEnabled()) return obj; if (obj instanceof BinaryObjectOffheapImpl) http://git-wip-us.apache.org/repos/asf/ignite/blob/fb12f0fa/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java index 65151c7..f3da6d0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java @@ -145,6 +145,9 @@ public class GridQueryProcessor extends GridProcessorAdapter { /** */ private final GridQueryIndexing idx; + /** Value object context. */ + private final CacheQueryObjectValueContext valCtx; + /** All indexes. */ private final ConcurrentMap idxs = new ConcurrentHashMap<>(); @@ -203,6 +206,8 @@ public class GridQueryProcessor extends GridProcessorAdapter { else idx = INDEXING.inClassPath() ? U.newInstance(INDEXING.className()) : null; + valCtx = new CacheQueryObjectValueContext(ctx); + ioLsnr = new GridMessageListener() { @Override public void onMessage(UUID nodeId, Object msg) { if (msg instanceof SchemaOperationStatusMessage) { @@ -2375,6 +2380,14 @@ public class GridQueryProcessor extends GridProcessorAdapter { } } + + /** + * @return Value object context. + */ + public CacheQueryObjectValueContext objectContext() { + return valCtx; + } + /** * @param ver Version. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/fb12f0fa/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityNoCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityNoCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityNoCacheSelfTest.java index e144325..a974cdb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityNoCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityNoCacheSelfTest.java @@ -243,7 +243,7 @@ public class GridAffinityNoCacheSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public byte[] valueBytes(CacheObjectContext ctx) throws IgniteCheckedException { + @Override public byte[] valueBytes(CacheObjectValueContext ctx) throws IgniteCheckedException { throw new UnsupportedOperationException(); } @@ -284,12 +284,13 @@ public class GridAffinityNoCacheSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public void finishUnmarshal(CacheObjectContext ctx, ClassLoader ldr) throws IgniteCheckedException { + @Override public void finishUnmarshal(CacheObjectValueContext ctx, ClassLoader ldr) + throws IgniteCheckedException { throw new UnsupportedOperationException(); } /** {@inheritDoc} */ - @Override public void prepareMarshal(CacheObjectContext ctx) throws IgniteCheckedException { + @Override public void prepareMarshal(CacheObjectValueContext ctx) throws IgniteCheckedException { throw new UnsupportedOperationException(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/fb12f0fa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteIncompleteCacheObjectSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteIncompleteCacheObjectSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteIncompleteCacheObjectSelfTest.java index 77b6836..5b6d7f3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteIncompleteCacheObjectSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteIncompleteCacheObjectSelfTest.java @@ -107,7 +107,7 @@ public class IgniteIncompleteCacheObjectSelfTest extends GridCommonAbstractTest } /** {@inheritDoc} */ - @Override public byte[] valueBytes(final CacheObjectContext ctx) throws IgniteCheckedException { + @Override public byte[] valueBytes(final CacheObjectValueContext ctx) throws IgniteCheckedException { return new byte[0]; } @@ -148,13 +148,13 @@ public class IgniteIncompleteCacheObjectSelfTest extends GridCommonAbstractTest } /** {@inheritDoc} */ - @Override public void finishUnmarshal(final CacheObjectContext ctx, - final ClassLoader ldr) throws IgniteCheckedException { + @Override public void finishUnmarshal(final CacheObjectValueContext ctx, final ClassLoader ldr) + throws IgniteCheckedException { // No-op } /** {@inheritDoc} */ - @Override public void prepareMarshal(final CacheObjectContext ctx) throws IgniteCheckedException { + @Override public void prepareMarshal(final CacheObjectValueContext ctx) throws IgniteCheckedException { // No-op } http://git-wip-us.apache.org/repos/asf/ignite/blob/fb12f0fa/modules/core/src/test/java/org/apache/ignite/internal/processors/database/FreeListImplSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/FreeListImplSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/FreeListImplSelfTest.java index a487218..7ccddb7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/FreeListImplSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/FreeListImplSelfTest.java @@ -469,7 +469,7 @@ public class FreeListImplSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public byte[] valueBytes(CacheObjectContext ctx) throws IgniteCheckedException { + @Override public byte[] valueBytes(CacheObjectValueContext ctx) throws IgniteCheckedException { return data; } @@ -517,12 +517,13 @@ public class FreeListImplSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public void finishUnmarshal(CacheObjectContext ctx, ClassLoader ldr) throws IgniteCheckedException { + @Override public void finishUnmarshal(CacheObjectValueContext ctx, ClassLoader ldr) + throws IgniteCheckedException { assert false; } /** {@inheritDoc} */ - @Override public void prepareMarshal(CacheObjectContext ctx) throws IgniteCheckedException { + @Override public void prepareMarshal(CacheObjectValueContext ctx) throws IgniteCheckedException { assert false; } http://git-wip-us.apache.org/repos/asf/ignite/blob/fb12f0fa/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/DmlStatementsProcessor.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/DmlStatementsProcessor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/DmlStatementsProcessor.java index 352fe85..d48c373 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/DmlStatementsProcessor.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/DmlStatementsProcessor.java @@ -282,7 +282,8 @@ public class DmlStatementsProcessor { QueryCursorImpl> stepCur = new QueryCursorImpl<>(new Iterable>() { @Override public Iterator> iterator() { try { - return new GridQueryCacheObjectsIterator(res.iterator(), idx.valueContext(), cctx.keepBinary()); + return new GridQueryCacheObjectsIterator(res.iterator(), idx.objectContext(), + cctx.keepBinary()); } catch (IgniteCheckedException e) { throw new IgniteException(e); @@ -372,7 +373,7 @@ public class DmlStatementsProcessor { cur = new QueryCursorImpl<>(new Iterable>() { @Override public Iterator> iterator() { try { - return new GridQueryCacheObjectsIterator(res.iterator(), idx.valueContext(), cctx.keepBinary()); + return new GridQueryCacheObjectsIterator(res.iterator(), idx.objectContext(), cctx.keepBinary()); } catch (IgniteCheckedException e) { throw new IgniteException(e); http://git-wip-us.apache.org/repos/asf/ignite/blob/fb12f0fa/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2ResultSetIterator.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2ResultSetIterator.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2ResultSetIterator.java index 494f069..7b447dc 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2ResultSetIterator.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2ResultSetIterator.java @@ -120,9 +120,7 @@ public abstract class H2ResultSetIterator extends GridCloseableIteratorAdapte if (val instanceof GridH2ValueCacheObject) { GridH2ValueCacheObject valCacheObj = (GridH2ValueCacheObject)values[c]; - GridCacheContext cctx = valCacheObj.getCacheContext(); - - row[c] = valCacheObj.getObject(cctx != null && cctx.needValueCopy()); + row[c] = valCacheObj.getObject(true); } else row[c] = val.getObject(); http://git-wip-us.apache.org/repos/asf/ignite/blob/fb12f0fa/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2RowDescriptor.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2RowDescriptor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2RowDescriptor.java index fbc9d6c..327ca14 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2RowDescriptor.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2RowDescriptor.java @@ -218,9 +218,9 @@ public class H2RowDescriptor implements GridH2RowDescriptor { CacheObject co = (CacheObject)obj; if (type == Value.JAVA_OBJECT) - return new GridH2ValueCacheObject(idx.cacheContext(schema.cacheName()), co); + return new GridH2ValueCacheObject(co, idx.objectContext()); - obj = co.value(idx.objectContext(schema.cacheName()), false); + obj = co.value(idx.objectContext(), false); } switch (type) { @@ -280,8 +280,7 @@ public class H2RowDescriptor implements GridH2RowDescriptor { /** {@inheritDoc} */ @Override public GridH2Row createRow(KeyCacheObject key, int partId, @Nullable CacheObject val, - GridCacheVersion ver, - long expirationTime) throws IgniteCheckedException { + GridCacheVersion ver, long expirationTime) throws IgniteCheckedException { GridH2Row row; try { @@ -298,15 +297,11 @@ public class H2RowDescriptor implements GridH2RowDescriptor { "or configure key type as common super class for all actual keys for this value type.", e); } - GridCacheContext cctx = idx.cacheContext(schema.cacheName()); + row.ver = ver; - if (cctx.offheapIndex()) { - row.ver = ver; - - row.key = key; - row.val = val; - row.partId = partId; - } + row.key = key; + row.val = val; + row.partId = partId; return row; } http://git-wip-us.apache.org/repos/asf/ignite/blob/fb12f0fa/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2TableDescriptor.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2TableDescriptor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2TableDescriptor.java index 2440788..eedfc3a 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2TableDescriptor.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2TableDescriptor.java @@ -59,6 +59,9 @@ public class H2TableDescriptor implements GridH2SystemIndexFactory { /** */ private final H2Schema schema; + /** Cache name. */ + private final String cacheName; + /** */ private GridH2Table tbl; @@ -74,11 +77,13 @@ public class H2TableDescriptor implements GridH2SystemIndexFactory { * @param idx Indexing. * @param schema Schema. * @param type Type descriptor. + * @param cacheName Cache name. */ - H2TableDescriptor(IgniteH2Indexing idx, H2Schema schema, GridQueryTypeDescriptor type) { + H2TableDescriptor(IgniteH2Indexing idx, H2Schema schema, GridQueryTypeDescriptor type, String cacheName) { this.idx = idx; this.type = type; this.schema = schema; + this.cacheName = cacheName; fullTblName = H2Utils.withQuotes(schema.schemaName()) + "." + H2Utils.withQuotes(type.tableName()); } @@ -140,6 +145,13 @@ public class H2TableDescriptor implements GridH2SystemIndexFactory { } /** + * @return Cache name. + */ + String cacheName() { + return cacheName; + } + + /** * @return Type. */ GridQueryTypeDescriptor type() { @@ -167,7 +179,7 @@ public class H2TableDescriptor implements GridH2SystemIndexFactory { H2RowFactory rowFactory(GridH2RowDescriptor rowDesc) { GridCacheContext cctx = schema.cacheContext(); - if (cctx.affinityNode() && cctx.offheapIndex()) + if (cctx.affinityNode()) return new H2RowFactory(rowDesc, cctx); return null; @@ -209,7 +221,7 @@ public class H2TableDescriptor implements GridH2SystemIndexFactory { if (type().valueClass() == String.class) { try { - luceneIdx = new GridLuceneIndex(idx.kernalContext(), schema.offheap(), schema.cacheName(), type); + luceneIdx = new GridLuceneIndex(idx.kernalContext(), schema.offheap(), tbl.cacheName(), type); } catch (IgniteCheckedException e1) { throw new IgniteException(e1); @@ -222,7 +234,7 @@ public class H2TableDescriptor implements GridH2SystemIndexFactory { if (textIdx != null) { try { - luceneIdx = new GridLuceneIndex(idx.kernalContext(), schema.offheap(), schema.cacheName(), type); + luceneIdx = new GridLuceneIndex(idx.kernalContext(), schema.offheap(), tbl.cacheName(), type); } catch (IgniteCheckedException e1) { throw new IgniteException(e1); @@ -319,7 +331,7 @@ public class H2TableDescriptor implements GridH2SystemIndexFactory { private Index createHashIndex(H2Schema schema, GridH2Table tbl, String idxName, List cols) { GridCacheContext cctx = schema.cacheContext(); - if (cctx.affinityNode() && cctx.offheapIndex()) { + if (cctx.affinityNode()) { assert pkHashIdx == null : pkHashIdx; pkHashIdx = new H2PkHashIndex(cctx, tbl, idxName, cols); http://git-wip-us.apache.org/repos/asf/ignite/blob/fb12f0fa/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2TableEngine.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2TableEngine.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2TableEngine.java index 4cf5166..db34064 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2TableEngine.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/H2TableEngine.java @@ -82,7 +82,7 @@ public class H2TableEngine implements TableEngine { /** {@inheritDoc} */ @Override public TableBase createTable(CreateTableData createTblData) { - resTbl0 = new GridH2Table(createTblData, rowDesc0, rowFactory0, tblDesc0, tblDesc0.schema().cacheName()); + resTbl0 = new GridH2Table(createTblData, rowDesc0, rowFactory0, tblDesc0, tblDesc0.cacheName()); return resTbl0; } http://git-wip-us.apache.org/repos/asf/ignite/blob/fb12f0fa/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java index 508c8be..1e19954 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java @@ -62,7 +62,6 @@ import org.apache.ignite.internal.jdbc2.JdbcSqlFieldsQuery; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.CacheEntryImpl; import org.apache.ignite.internal.processors.cache.CacheObject; -import org.apache.ignite.internal.processors.cache.CacheObjectContext; import org.apache.ignite.internal.processors.cache.CacheObjectValueContext; import org.apache.ignite.internal.processors.cache.GridCacheAdapter; import org.apache.ignite.internal.processors.cache.GridCacheAffinityManager; @@ -579,27 +578,6 @@ public class IgniteH2Indexing implements GridQueryIndexing { tbl.luceneIndex().store(k, v, ver, expirationTime); } - /** - * @param cacheName Cache name. - * @return Cache object context. - */ - public CacheObjectContext objectContext(String cacheName) { - GridCacheContext cctx = cacheContext(cacheName); - - return cctx != null ? cctx.cacheObjectContext() : null; - } - - /** - * @param cacheName Cache name. - * @return Cache object context. - */ - public GridCacheContext cacheContext(String cacheName) { - if (ctx == null) - return null; - - return ctx.cache().internalCache(cacheName).context(); - } - /** {@inheritDoc} */ @Override public void remove(String cacheName, GridQueryTypeDescriptor type, @@ -1118,7 +1096,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { QueryCursorImpl> cursor = new QueryCursorImpl<>(new Iterable>() { @Override public Iterator> iterator() { try { - return new GridQueryCacheObjectsIterator(res.iterator(), valueContext(), keepBinary); + return new GridQueryCacheObjectsIterator(res.iterator(), objectContext(), keepBinary); } catch (IgniteCheckedException e) { throw new IgniteException(e); @@ -1443,10 +1421,10 @@ public class IgniteH2Indexing implements GridQueryIndexing { if (tblCnt > 0) { caches0.add(cctx.cacheId()); - for (QueryTable table : twoStepQry.tables()) { - String tblCacheName = cacheName(table.schema()); + for (QueryTable tblKey : twoStepQry.tables()) { + GridH2Table tbl = dataTable(tblKey); - int cacheId = CU.cacheId(tblCacheName); + int cacheId = CU.cacheId(tbl.cacheName()); caches0.add(cacheId); } @@ -1600,7 +1578,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { H2Schema schema = schemas.get(schemaName); - H2TableDescriptor tbl = new H2TableDescriptor(this, schema, type); + H2TableDescriptor tbl = new H2TableDescriptor(this, schema, type, cacheName); try { Connection conn = connectionForThread(schemaName); @@ -1837,7 +1815,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { Cursor cursor = hashIdx.find((Session)null, null, null); - int cacheId = CU.cacheId(tbl.schema().cacheName()); + int cacheId = CU.cacheId(cacheName); GridCacheContext cctx = ctx.cache().context().cacheContext(cacheId); @@ -2036,10 +2014,10 @@ public class IgniteH2Indexing implements GridQueryIndexing { } /** - * @return Value context. + * @return Value object context. */ - public CacheObjectValueContext valueContext() { - return valCtx; + public CacheObjectValueContext objectContext() { + return ctx.query().objectContext(); } /** @@ -2243,7 +2221,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { H2Schema rmv = schemas.remove(schema); if (rmv != null) { - cacheName2schema.remove(rmv.cacheName()); + cacheName2schema.remove(cacheName); mapQryExec.onCacheStop(cacheName); dmlProc.onCacheStop(cacheName); http://git-wip-us.apache.org/repos/asf/ignite/blob/fb12f0fa/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2ValueCacheObject.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2ValueCacheObject.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2ValueCacheObject.java index a2f5c88..d18668f 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2ValueCacheObject.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2ValueCacheObject.java @@ -22,8 +22,7 @@ import java.sql.SQLException; import java.sql.Types; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.internal.processors.cache.CacheObject; -import org.apache.ignite.internal.processors.cache.CacheObjectContext; -import org.apache.ignite.internal.processors.cache.GridCacheContext; +import org.apache.ignite.internal.processors.cache.CacheObjectValueContext; import org.h2.message.DbException; import org.h2.util.JdbcUtils; import org.h2.util.Utils; @@ -38,18 +37,20 @@ public class GridH2ValueCacheObject extends Value { /** */ private CacheObject obj; - /** */ - private GridCacheContext cctx; + /** Object value context. */ + private CacheObjectValueContext valCtx; /** - * @param cctx Cache context. + * Constructor. + * * @param obj Object. + * @param valCtx Object value context. */ - public GridH2ValueCacheObject(GridCacheContext cctx, CacheObject obj) { + public GridH2ValueCacheObject(CacheObject obj, CacheObjectValueContext valCtx) { assert obj != null; this.obj = obj; - this.cctx = cctx; // Allowed to be null in tests. + this.valCtx = valCtx; } /** @@ -60,10 +61,10 @@ public class GridH2ValueCacheObject extends Value { } /** - * @return Cache context. + * @return Value context. */ - public GridCacheContext getCacheContext() { - return cctx; + public CacheObjectValueContext valueContext() { + return valCtx; } /** {@inheritDoc} */ @@ -96,19 +97,12 @@ public class GridH2ValueCacheObject extends Value { return Utils.cloneByteArray(getBytesNoCopy()); } - /** - * @return Cache object context. - */ - private CacheObjectContext objectContext() { - return cctx == null ? null : cctx.cacheObjectContext(); - } - /** {@inheritDoc} */ @Override public byte[] getBytesNoCopy() { if (obj.cacheObjectType() == CacheObject.TYPE_REGULAR) { // Result must be the same as `marshaller.marshall(obj.value(coctx, false));` try { - return obj.valueBytes(objectContext()); + return obj.valueBytes(valCtx); } catch (IgniteCheckedException e) { throw DbException.convert(e); @@ -129,7 +123,7 @@ public class GridH2ValueCacheObject extends Value { * @return Value. */ public Object getObject(boolean cpy) { - return obj.isPlatformType() ? obj.value(objectContext(), cpy) : obj; + return obj.isPlatformType() ? obj.value(valCtx, cpy) : obj; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/fb12f0fa/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java index b7bdde5..afaf68d 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java @@ -1146,17 +1146,13 @@ public class GridMapQueryExecutor { if (val instanceof GridH2ValueCacheObject) { GridH2ValueCacheObject valCacheObj = (GridH2ValueCacheObject)val; - GridCacheContext cctx = valCacheObj.getCacheContext(); - - if (cctx != null && cctx.needValueCopy()) { - row[j] = new GridH2ValueCacheObject(valCacheObj.getCacheContext(), valCacheObj.getCacheObject()) { - @Override public Object getObject() { - return getObject(true); - } - }; + row[j] = new GridH2ValueCacheObject(valCacheObj.getCacheObject(), h2.objectContext()) { + @Override public Object getObject() { + return getObject(true); + } + }; - copied = true; - } + copied = true; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/fb12f0fa/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java index 8d9d953..9445534 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java @@ -818,7 +818,7 @@ public class GridReduceQueryExecutor { continue; } - return new GridQueryCacheObjectsIterator(resIter, h2.valueContext(), keepPortable); + return new GridQueryCacheObjectsIterator(resIter, h2.objectContext(), keepPortable); } catch (IgniteCheckedException | RuntimeException e) { U.closeQuiet(r.connection()); http://git-wip-us.apache.org/repos/asf/ignite/blob/fb12f0fa/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2CacheObject.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2CacheObject.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2CacheObject.java index d0e8cb6..bc3b7a3 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2CacheObject.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/msg/GridH2CacheObject.java @@ -21,7 +21,7 @@ import java.nio.ByteBuffer; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.processors.cache.CacheObject; -import org.apache.ignite.internal.processors.cache.GridCacheContext; +import org.apache.ignite.internal.processors.cache.CacheObjectValueContext; import org.apache.ignite.internal.processors.query.h2.opt.GridH2ValueCacheObject; import org.apache.ignite.plugin.extensions.communication.MessageReader; import org.apache.ignite.plugin.extensions.communication.MessageWriter; @@ -32,9 +32,6 @@ import org.h2.value.Value; */ public class GridH2CacheObject extends GridH2ValueMessage { /** */ - private int cacheId; - - /** */ private CacheObject obj; /** @@ -51,26 +48,16 @@ public class GridH2CacheObject extends GridH2ValueMessage { public GridH2CacheObject(GridH2ValueCacheObject v) throws IgniteCheckedException { this.obj = v.getCacheObject(); - GridCacheContext cctx = v.getCacheContext(); - - if (cctx != null) { - this.cacheId = cctx.cacheId(); - - obj.prepareMarshal(cctx.cacheObjectContext()); - } + obj.prepareMarshal(v.valueContext()); } /** {@inheritDoc} */ @Override public Value value(GridKernalContext ctx) throws IgniteCheckedException { - GridCacheContext cctx = null; + CacheObjectValueContext valCtx = ctx.query().objectContext(); - if (ctx != null) { - cctx = ctx.cache().context().cacheContext(cacheId); + obj.finishUnmarshal(valCtx, ctx.cache().context().deploy().globalLoader()); - obj.finishUnmarshal(cctx.cacheObjectContext(), cctx.deploy().globalLoader()); - } - - return new GridH2ValueCacheObject(cctx, obj); + return new GridH2ValueCacheObject(obj, valCtx); } /** {@inheritDoc} */ @@ -85,14 +72,6 @@ public class GridH2CacheObject extends GridH2ValueMessage { switch (reader.state()) { case 0: - cacheId = reader.readInt("cacheId"); - - if (!reader.isLastRead()) - return false; - - reader.incrementState(); - - case 1: obj = reader.readMessage("obj"); if (!reader.isLastRead()) @@ -121,12 +100,6 @@ public class GridH2CacheObject extends GridH2ValueMessage { switch (writer.state()) { case 0: - if (!writer.writeInt("cacheId", cacheId)) - return false; - - writer.incrementState(); - - case 1: if (!writer.writeMessage("obj", obj)) return false; @@ -144,7 +117,7 @@ public class GridH2CacheObject extends GridH2ValueMessage { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 2; + return 1; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/fb12f0fa/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java index 1f73dcb..73a7191 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java @@ -742,7 +742,7 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract } /** {@inheritDoc} */ - @Override public byte[] valueBytes(CacheObjectContext ctx) throws IgniteCheckedException { + @Override public byte[] valueBytes(CacheObjectValueContext ctx) throws IgniteCheckedException { return JdbcUtils.serialize(val, null); } @@ -788,12 +788,12 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract } /** {@inheritDoc} */ - @Override public void finishUnmarshal(CacheObjectContext ctx, ClassLoader ldr) throws IgniteCheckedException { + @Override public void finishUnmarshal(CacheObjectValueContext ctx, ClassLoader ldr) throws IgniteCheckedException { throw new UnsupportedOperationException(); } /** {@inheritDoc} */ - @Override public void prepareMarshal(CacheObjectContext ctx) throws IgniteCheckedException { + @Override public void prepareMarshal(CacheObjectValueContext ctx) throws IgniteCheckedException { throw new UnsupportedOperationException(); }