ignite-950-new - Prepare to rename.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b73334e9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b73334e9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b73334e9 Branch: refs/heads/ignite-1753-1282 Commit: b73334e99b60183eb692627b1130b8d2ed69b73c Parents: 7ad34ab Author: Alexey Goncharuk <[email protected]> Authored: Wed Nov 4 17:00:43 2015 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Wed Nov 4 17:00:43 2015 +0300 ---------------------------------------------------------------------- modules/core/src/main/java/org/apache/ignite/IgniteBinary.java | 6 +++--- .../org/apache/ignite/internal/portable/BinaryObjectImpl.java | 6 +++--- .../ignite/internal/portable/BinaryObjectOffheapImpl.java | 2 +- .../ignite/internal/portable/GridPortableMarshaller.java | 2 +- .../apache/ignite/internal/processors/cache/CacheObject.java | 2 +- .../ignite/internal/processors/cache/CacheObjectAdapter.java | 2 +- .../internal/processors/cache/CacheObjectByteArrayImpl.java | 2 +- .../ignite/internal/processors/cache/CacheObjectImpl.java | 2 +- .../ignite/internal/processors/cache/GridCacheMapEntry.java | 6 +++--- .../cache/portable/CacheObjectPortableProcessorImpl.java | 2 +- .../processors/query/h2/opt/GridH2ValueCacheObject.java | 2 +- .../processors/query/h2/GridIndexingSpiAbstractSelfTest.java | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b73334e9/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java b/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java index ebbbd53..71be821 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteBinary.java @@ -311,7 +311,7 @@ public interface IgniteBinary { * @param typeId ID of the type. * @return Newly portable builder. */ - public BinaryObjectBuilder builder(int typeId); + public BinaryObjectBuilder builder(int typeId) throws BinaryObjectException; /** * Creates new portable builder. @@ -319,7 +319,7 @@ public interface IgniteBinary { * @param typeName Type name. * @return Newly portable builder. */ - public BinaryObjectBuilder builder(String typeName); + public BinaryObjectBuilder builder(String typeName) throws BinaryObjectException; /** * Creates portable builder initialized by existing portable object. @@ -327,7 +327,7 @@ public interface IgniteBinary { * @param portableObj Portable object to initialize builder. * @return Portable builder. */ - public BinaryObjectBuilder builder(BinaryObject portableObj); + public BinaryObjectBuilder builder(BinaryObject portableObj) throws BinaryObjectException; /** * Gets metadata for provided class. http://git-wip-us.apache.org/repos/asf/ignite/blob/b73334e9/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java index 9b76604..7bf1ee8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java @@ -70,7 +70,7 @@ import static org.apache.ignite.internal.portable.GridPortableMarshaller.UUID; public final class BinaryObjectImpl extends BinaryObjectEx implements Externalizable, Message, CacheObject, KeyCacheObject { /** */ - public static final byte TYPE_PORTABLE = 100; + public static final byte TYPE_BINARY = 100; /** */ private static final long serialVersionUID = 0L; @@ -115,8 +115,8 @@ public final class BinaryObjectImpl extends BinaryObjectEx implements Externaliz } /** {@inheritDoc} */ - @Override public byte type() { - return TYPE_PORTABLE; + @Override public byte cacheObjectType() { + return TYPE_BINARY; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/b73334e9/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectOffheapImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectOffheapImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectOffheapImpl.java index 139e5c9..6f51de1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectOffheapImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectOffheapImpl.java @@ -389,7 +389,7 @@ public class BinaryObjectOffheapImpl extends BinaryObjectEx implements Externali } /** {@inheritDoc} */ - @Override public byte type() { + @Override public byte cacheObjectType() { throw new UnsupportedOperationException(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b73334e9/modules/core/src/main/java/org/apache/ignite/internal/portable/GridPortableMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/GridPortableMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/GridPortableMarshaller.java index 3ab1051..056a7c7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/portable/GridPortableMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/GridPortableMarshaller.java @@ -232,7 +232,7 @@ public class GridPortableMarshaller { /** * @param obj Object to marshal. * @return Byte array. -. * @throws org.apache.ignite.igniteobject.IgniteObjectException In case of error. + * @throws org.apache.ignite.binary.BinaryObjectException In case of error. */ public byte[] marshal(@Nullable Object obj) throws BinaryObjectException { if (obj == null) http://git-wip-us.apache.org/repos/asf/ignite/blob/b73334e9/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 3e311dc..81129bd 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 @@ -48,7 +48,7 @@ public interface CacheObject extends Message { /** * @return Object type. */ - public byte type(); + public byte cacheObjectType(); /** * Gets flag indicating whether object value is a platform type. Platform types will be automatically http://git-wip-us.apache.org/repos/asf/ignite/blob/b73334e9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java index a3f37f6..df20646 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectAdapter.java @@ -49,7 +49,7 @@ public abstract class CacheObjectAdapter implements CacheObject, Externalizable } /** {@inheritDoc} */ - @Override public byte type() { + @Override public byte cacheObjectType() { return TYPE_REGULAR; } http://git-wip-us.apache.org/repos/asf/ignite/blob/b73334e9/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 b7c8a61..e961d84 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 @@ -75,7 +75,7 @@ public class CacheObjectByteArrayImpl implements CacheObject, Externalizable { } /** {@inheritDoc} */ - @Override public byte type() { + @Override public byte cacheObjectType() { return TYPE_BYTE_ARR; } http://git-wip-us.apache.org/repos/asf/ignite/blob/b73334e9/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 af2e042..694027f 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 @@ -48,7 +48,7 @@ public class CacheObjectImpl extends CacheObjectAdapter { /** {@inheritDoc} */ @Override public boolean isPlatformType() { - return true; // TODO not true. + return true; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/b73334e9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index 48c17ab..a5762ad 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -234,7 +234,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme if (cctx.kernalContext().config().isPeerClassLoadingEnabled()) { Object val0 = null; - if (val != null && val.type() != CacheObject.TYPE_BYTE_ARR) { + if (val != null && val.cacheObjectType() != CacheObject.TYPE_BYTE_ARR) { val0 = cctx.cacheObjects().unmarshal(cctx.cacheObjectContext(), val.valueBytes(cctx.cacheObjectContext()), cctx.deploy().globalLoader()); @@ -253,7 +253,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme assert mem != null; if (val != null) { - byte type = val.type(); + byte type = val.cacheObjectType(); offHeapPointer(mem.putOffHeap(offHeapPointer(), val.valueBytes(cctx.cacheObjectContext()), type)); } @@ -625,7 +625,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme try { byte[] bytes = val.valueBytes(cctx.cacheObjectContext()); - return new IgniteBiTuple<>(bytes, val.type()); + return new IgniteBiTuple<>(bytes, val.cacheObjectType()); } catch (IgniteCheckedException e) { throw new IgniteException(e); http://git-wip-us.apache.org/repos/asf/ignite/blob/b73334e9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java index 95fa0ad..0adeb09 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/portable/CacheObjectPortableProcessorImpl.java @@ -781,7 +781,7 @@ public class CacheObjectPortableProcessorImpl extends IgniteCacheObjectProcessor /** {@inheritDoc} */ @Override public CacheObject toCacheObject(CacheObjectContext ctx, byte type, byte[] bytes) { - if (type == BinaryObjectImpl.TYPE_PORTABLE) + if (type == BinaryObjectImpl.TYPE_BINARY) return new BinaryObjectImpl(portableContext(), bytes, 0); return super.toCacheObject(ctx, type, bytes); http://git-wip-us.apache.org/repos/asf/ignite/blob/b73334e9/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 73d7c4e..fd0e6ed 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 @@ -104,7 +104,7 @@ public class GridH2ValueCacheObject extends Value { /** {@inheritDoc} */ @Override public byte[] getBytesNoCopy() { - if (obj.type() == CacheObject.TYPE_REGULAR) { + if (obj.cacheObjectType() == CacheObject.TYPE_REGULAR) { // Result must be the same as `marshaller.marshall(obj.value(coctx, false));` try { return obj.valueBytes(objectContext()); http://git-wip-us.apache.org/repos/asf/ignite/blob/b73334e9/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 5278758..194fb82 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 @@ -565,7 +565,7 @@ public abstract class GridIndexingSpiAbstractSelfTest extends GridCommonAbstract } /** {@inheritDoc} */ - @Override public byte type() { + @Override public byte cacheObjectType() { throw new UnsupportedOperationException(); }
