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/cf8a9c13 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cf8a9c13 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cf8a9c13 Branch: refs/heads/ignite-471 Commit: cf8a9c136e6439973505a6de5523b11c1ce08d7c Parents: 44299b7 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Fri Apr 24 15:34:28 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Fri Apr 24 15:34:28 2015 -0700 ---------------------------------------------------------------------- .../internal/processors/datastreamer/DataStreamerRequest.java | 4 ++-- .../internal/processors/portable/GridPortableInputStream.java | 2 ++ .../processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf8a9c13/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java index a164f22..2d8cc10 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerRequest.java @@ -324,7 +324,7 @@ public class DataStreamerRequest implements Message { writer.incrementState(); case 12: - if (!writer.writeByteArray("updaterBytes", updaterBytes)) + if (!writer.writeByteBuffer("updaterBytes", updaterBytes)) return false; writer.incrementState(); @@ -449,7 +449,7 @@ public class DataStreamerRequest implements Message { reader.incrementState(); case 12: - updaterBytes = reader.readByteArray("updaterBytes"); + updaterBytes = reader.readByteBuffer("updaterBytes"); if (!reader.isLastRead()) return false; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf8a9c13/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/GridPortableInputStream.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/GridPortableInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/GridPortableInputStream.java index f630d01..8264fd1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/GridPortableInputStream.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/portable/GridPortableInputStream.java @@ -149,6 +149,8 @@ public interface GridPortableInputStream extends GridPortableStream { */ public double[] readDoubleArray(int cnt); + public int read(byte[] arr, int off, int len); + /** * Gets amount of remaining data in bytes. * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cf8a9c13/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java index 6fb2bb5..23fa81f 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java @@ -28,7 +28,6 @@ import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.processors.datastructures.*; import org.apache.ignite.internal.processors.query.*; import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.spi.discovery.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -73,7 +72,7 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA cfg.setPeerClassLoadingEnabled(false); -Ã if (hasCache) + if (hasCache) cfg.setCacheConfiguration(cache(null, true), cache(CACHE, true), cache(EMPTY_CACHE, true), cache(CACHE_NO_PRIMITIVES, false), cache(CACHE_COMPLEX_KEYS, false)); else
