IGNITE-471 - Fixed compilation
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cbb035e5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cbb035e5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cbb035e5 Branch: refs/heads/ignite-471 Commit: cbb035e50036819f56bb2e07c74fcc3a042ed0ec Parents: bfb8c10 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Tue Mar 24 12:52:42 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Tue Mar 24 12:52:42 2015 -0700 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheProcessor.java | 1 + .../cacheobject/IgniteCacheObjectProcessorImpl.java | 3 +-- .../query/h2/twostep/messages/GridQueryRequest.java | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cbb035e5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 404cd89..cf8bf99 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -45,6 +45,7 @@ import org.apache.ignite.internal.processors.cache.version.*; import org.apache.ignite.internal.processors.query.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.future.*; +import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cbb035e5/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 2ba412e..9966db6 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 @@ -26,7 +26,6 @@ import org.apache.ignite.internal.processors.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.query.*; import org.apache.ignite.internal.util.*; -import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.jetbrains.annotations.*; @@ -327,7 +326,7 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme /** * */ - public IgniteCacheObjectImpl(Object val, byte[] valBytes) { + public IgniteCacheObjectImpl(Object val, ByteBuffer valBytes) { super(val, valBytes); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cbb035e5/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java index b4c6668..65631d2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java @@ -50,7 +50,7 @@ public class GridQueryRequest implements Message { private Collection<GridCacheSqlQuery> qrys; /** */ - private byte[] qrysBytes; + private ByteBuffer qrysBytes; /** * Default constructor. @@ -66,7 +66,8 @@ public class GridQueryRequest implements Message { * @param qrys Queries. * @param qrysBytes Marshalled queries. */ - public GridQueryRequest(long reqId, int pageSize, String space, Collection<GridCacheSqlQuery> qrys, byte[] qrysBytes) { + public GridQueryRequest(long reqId, int pageSize, String space, Collection<GridCacheSqlQuery> qrys, + ByteBuffer qrysBytes) { this.reqId = reqId; this.pageSize = pageSize; this.space = space; @@ -132,7 +133,7 @@ public class GridQueryRequest implements Message { writer.incrementState(); case 1: - if (!writer.writeByteArray("qrysBytes", qrysBytes)) + if (!writer.writeByteBuffer("qrysBytes", qrysBytes)) return false; writer.incrementState(); @@ -171,7 +172,7 @@ public class GridQueryRequest implements Message { reader.incrementState(); case 1: - qrysBytes = reader.readByteArray("qrysBytes"); + qrysBytes = reader.readByteBuffer("qrysBytes"); if (!reader.isLastRead()) return false;
