ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [52/52] [abbrv] ignite git commit: IGNITE-950-new Fixed compilation.
Date Fri, 30 Oct 2015 15:52:48 GMT
IGNITE-950-new Fixed compilation.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c0837b46
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c0837b46
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c0837b46

Branch: refs/heads/ignite-950-new
Commit: c0837b466b8b219cd855000f58d45a3f15a4c815
Parents: b5c70a9
Author: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Authored: Fri Oct 30 18:46:25 2015 +0300
Committer: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Committed: Fri Oct 30 18:46:25 2015 +0300

----------------------------------------------------------------------
 .../ignite/igniteobject/IgniteObject.java       | 12 +++---
 .../internal/portable/IgniteObjectEx.java       |  4 +-
 .../internal/portable/IgniteObjectImpl.java     | 11 ++---
 .../portable/IgniteObjectOffheapImpl.java       | 11 ++---
 .../portable/IgniteObjectReaderExImpl.java      | 42 ++++++++++----------
 .../portable/IgniteObjectWriterExImpl.java      |  2 +-
 .../portable/PortableClassDescriptor.java       |  4 +-
 .../internal/portable/PortableContext.java      | 35 ++++------------
 .../internal/portable/PortableFieldImpl.java    | 12 +++---
 .../builder/IgniteObjectBuilderImpl.java        | 15 +++----
 .../GridDistributedTxRemoteAdapter.java         |  3 ++
 .../dotnet/PlatformDotNetCacheStore.java        |  2 +-
 .../apache/ignite/portable/PortableField.java   |  6 ++-
 13 files changed, 73 insertions(+), 86 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/c0837b46/modules/core/src/main/java/org/apache/ignite/igniteobject/IgniteObject.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igniteobject/IgniteObject.java b/modules/core/src/main/java/org/apache/ignite/igniteobject/IgniteObject.java
index 844f7bf..494bcbc 100644
--- a/modules/core/src/main/java/org/apache/ignite/igniteobject/IgniteObject.java
+++ b/modules/core/src/main/java/org/apache/ignite/igniteobject/IgniteObject.java
@@ -17,13 +17,13 @@
 
 package org.apache.ignite.igniteobject;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.TreeMap;
-import org.apache.ignite.IgnitePortables;
-import org.apache.ignite.cache.IgniteObject;
 import org.apache.ignite.marshaller.portable.PortableMarshaller;
+import org.apache.ignite.portable.PortableField;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -109,7 +109,7 @@ public interface IgniteObject extends Serializable, Cloneable {
      *
      * @return Type ID.
      */
-    @Override public int typeId();
+    public int typeId();
 
     /**
      * Gets meta data for this portable object.
@@ -134,16 +134,16 @@ public interface IgniteObject extends Serializable, Cloneable {
      * @param fieldName Field name.
      * @return {@code true} if field is set.
      */
-    @Override public boolean hasField(String fieldName);
+    public boolean hasField(String fieldName);
 
     /**
      * Gets field descriptor.
      *
      * @param fieldName Field name.
      * @return Field descriptor.
-     * @throws PortableException If failed.
+     * @throws IgniteObjectException If failed.
      */
-    public PortableField fieldDescriptor(String fieldName) throws PortableException;
+    public PortableField fieldDescriptor(String fieldName) throws IgniteObjectException;
 
     /**
      * Gets fully deserialized instance of portable object.

http://git-wip-us.apache.org/repos/asf/ignite/blob/c0837b46/modules/core/src/main/java/org/apache/ignite/internal/portable/IgniteObjectEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/IgniteObjectEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/portable/IgniteObjectEx.java
index 078f67f..16412b6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/IgniteObjectEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/IgniteObjectEx.java
@@ -62,9 +62,9 @@ public abstract class IgniteObjectEx implements IgniteObject {
      *
      * @param fieldId Field ID.
      * @return Field value.
-     * @throws PortableException In case of any other error.
+     * @throws IgniteObjectException In case of any other error.
      */
-    @Nullable public abstract <F> F field(int fieldId) throws PortableException;
+    @Nullable public abstract <F> F field(int fieldId) throws IgniteObjectException;
 
     /**
      * Get field by offset.

http://git-wip-us.apache.org/repos/asf/ignite/blob/c0837b46/modules/core/src/main/java/org/apache/ignite/internal/portable/IgniteObjectImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/IgniteObjectImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/portable/IgniteObjectImpl.java
index 3303ad9..7b16b66 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/IgniteObjectImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/IgniteObjectImpl.java
@@ -32,6 +32,7 @@ import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 import org.apache.ignite.igniteobject.IgniteObjectException;
 import org.apache.ignite.igniteobject.IgniteObjectMetadata;
 import org.apache.ignite.igniteobject.IgniteObject;
+import org.apache.ignite.portable.PortableField;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.Externalizable;
@@ -260,8 +261,8 @@ public final class IgniteObjectImpl extends IgniteObjectEx implements
Externaliz
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Nullable @Override public <F> F field(int fieldId) throws PortableException {
-        PortableReaderExImpl reader = new PortableReaderExImpl(ctx, arr, start, null);
+    @Nullable @Override public <F> F field(int fieldId) throws IgniteObjectException
{
+        IgniteObjectReaderExImpl reader = new IgniteObjectReaderExImpl(ctx, arr, start, null);
 
         return (F)reader.unmarshalField(fieldId);
     }
@@ -345,7 +346,7 @@ public final class IgniteObjectImpl extends IgniteObjectEx implements
Externaliz
 
             default: {
                 // TODO: Pass absolute offset, not relative.
-                PortableReaderExImpl reader = new PortableReaderExImpl(ctx, arr, start, null);
+                IgniteObjectReaderExImpl reader = new IgniteObjectReaderExImpl(ctx, arr,
start, null);
 
                 val = reader.unmarshalFieldByOffset(fieldOffset);
             }
@@ -402,13 +403,13 @@ public final class IgniteObjectImpl extends IgniteObjectEx implements
Externaliz
 
     /** {@inheritDoc} */
     @Override protected PortableSchema createSchema() {
-        PortableReaderExImpl reader = new PortableReaderExImpl(ctx, arr, start, null);
+        IgniteObjectReaderExImpl reader = new IgniteObjectReaderExImpl(ctx, arr, start, null);
 
         return reader.createSchema();
     }
 
     /** {@inheritDoc} */
-    @Override public PortableField fieldDescriptor(String fieldName) throws PortableException
{
+    @Override public PortableField fieldDescriptor(String fieldName) throws IgniteObjectException
{
         int typeId = typeId();
 
         PortableSchemaRegistry schemaReg = ctx.schemaRegistry(typeId);

http://git-wip-us.apache.org/repos/asf/ignite/blob/c0837b46/modules/core/src/main/java/org/apache/ignite/internal/portable/IgniteObjectOffheapImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/IgniteObjectOffheapImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/portable/IgniteObjectOffheapImpl.java
index 753ff3b..d54fd0a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/IgniteObjectOffheapImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/IgniteObjectOffheapImpl.java
@@ -33,6 +33,7 @@ import org.apache.ignite.plugin.extensions.communication.MessageWriter;
 import org.apache.ignite.igniteobject.IgniteObjectException;
 import org.apache.ignite.igniteobject.IgniteObjectMetadata;
 import org.apache.ignite.igniteobject.IgniteObject;
+import org.apache.ignite.portable.PortableField;
 import org.jetbrains.annotations.Nullable;
 import sun.misc.Unsafe;
 
@@ -107,7 +108,7 @@ public class IgniteObjectOffheapImpl extends IgniteObjectEx implements
Externali
 
     /** {@inheritDoc} */
     @Override protected PortableSchema createSchema() {
-        PortableReaderExImpl reader = new PortableReaderExImpl(ctx,
+        IgniteObjectReaderExImpl reader = new IgniteObjectReaderExImpl(ctx,
             new PortableOffheapInputStream(ptr, size, false),
             start,
             null);
@@ -116,7 +117,7 @@ public class IgniteObjectOffheapImpl extends IgniteObjectEx implements
Externali
     }
 
     /** {@inheritDoc} */
-    @Override public PortableField fieldDescriptor(String fieldName) throws PortableException
{
+    @Override public PortableField fieldDescriptor(String fieldName) throws IgniteObjectException
{
         int typeId = typeId();
 
         PortableSchemaRegistry schemaReg = ctx.schemaRegistry(typeId);
@@ -167,8 +168,8 @@ public class IgniteObjectOffheapImpl extends IgniteObjectEx implements
Externali
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Nullable @Override public <F> F field(int fieldId) throws PortableException {
-        PortableReaderExImpl reader = new PortableReaderExImpl(ctx,
+    @Nullable @Override public <F> F field(int fieldId) throws IgniteObjectException
{
+        IgniteObjectReaderExImpl reader = new IgniteObjectReaderExImpl(ctx,
             new PortableOffheapInputStream(ptr, size, false),
             start,
             null);
@@ -179,7 +180,7 @@ public class IgniteObjectOffheapImpl extends IgniteObjectEx implements
Externali
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
     @Nullable @Override protected <F> F fieldByOffset(int fieldOffset) {
-        PortableReaderExImpl reader = new PortableReaderExImpl(ctx,
+        IgniteObjectReaderExImpl reader = new IgniteObjectReaderExImpl(ctx,
             new PortableOffheapInputStream(ptr, size, false),
             start,
             null);

http://git-wip-us.apache.org/repos/asf/ignite/blob/c0837b46/modules/core/src/main/java/org/apache/ignite/internal/portable/IgniteObjectReaderExImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/IgniteObjectReaderExImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/portable/IgniteObjectReaderExImpl.java
index 38a8a58..d178b6b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/IgniteObjectReaderExImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/IgniteObjectReaderExImpl.java
@@ -17,22 +17,6 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.internal.portable.streams.PortableHeapInputStream;
-import org.apache.ignite.internal.portable.streams.PortableInputStream;
-import org.apache.ignite.internal.util.GridEnumCache;
-import org.apache.ignite.internal.util.lang.GridMapEntry;
-import org.apache.ignite.internal.util.typedef.internal.SB;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.igniteobject.IgniteObjectException;
-import org.apache.ignite.igniteobject.IgniteObjectInvalidClassException;
-import org.apache.ignite.igniteobject.IgniteObject;
-import org.apache.ignite.igniteobject.IgniteObjectRawReader;
-import org.apache.ignite.igniteobject.IgniteObjectReader;
-import org.apache.ignite.lang.IgniteBiTuple;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
 import java.io.ByteArrayInputStream;
 import java.io.EOFException;
 import java.io.IOException;
@@ -55,6 +39,22 @@ import java.util.TreeSet;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentSkipListSet;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.igniteobject.IgniteObject;
+import org.apache.ignite.igniteobject.IgniteObjectException;
+import org.apache.ignite.igniteobject.IgniteObjectIdMapper;
+import org.apache.ignite.igniteobject.IgniteObjectInvalidClassException;
+import org.apache.ignite.igniteobject.IgniteObjectRawReader;
+import org.apache.ignite.igniteobject.IgniteObjectReader;
+import org.apache.ignite.internal.portable.streams.PortableHeapInputStream;
+import org.apache.ignite.internal.portable.streams.PortableInputStream;
+import org.apache.ignite.internal.util.GridEnumCache;
+import org.apache.ignite.internal.util.lang.GridMapEntry;
+import org.apache.ignite.internal.util.typedef.internal.SB;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.apache.ignite.internal.portable.GridPortableMarshaller.ARR_LIST;
@@ -157,7 +157,7 @@ public class IgniteObjectReaderExImpl implements IgniteObjectReader, IgniteObjec
     private int footerLen;
 
     /** ID mapper. */
-    private PortableIdMapper idMapper;
+    private IgniteObjectIdMapper idMapper;
 
     /** Schema Id. */
     private int schemaId;
@@ -215,7 +215,7 @@ public class IgniteObjectReaderExImpl implements IgniteObjectReader, IgniteObjec
         byte hdr = in.readByte();
 
         if (hdr != GridPortableMarshaller.OBJ)
-            throw new PortableException("Invalid header [pos=" + retPos + "expected=" + GridPortableMarshaller.OBJ
+
+            throw new IgniteObjectException("Invalid header [pos=" + retPos + "expected="
+ GridPortableMarshaller.OBJ +
                 ", actual=" + hdr + ']');
 
         PortableUtils.checkProtocolVersion(in.readByte());
@@ -277,9 +277,9 @@ public class IgniteObjectReaderExImpl implements IgniteObjectReader, IgniteObjec
     /**
      * @param offset Offset in the array.
      * @return Unmarshalled value.
-     * @throws PortableException In case of error.
+     * @throws IgniteObjectException In case of error.
      */
-    public Object unmarshal(int offset) throws PortableException {
+    public Object unmarshal(int offset) throws IgniteObjectException {
         in.position(offset);
 
         return in.position() >= 0 ? unmarshal() : null;
@@ -1328,7 +1328,7 @@ public class IgniteObjectReaderExImpl implements IgniteObjectReader,
IgniteObjec
     }
 
     /** {@inheritDoc} */
-    @Nullable @Override public <T> Collection<T> readCollection() throws PortableException
{
+    @Nullable @Override public <T> Collection<T> readCollection() throws IgniteObjectException
{
         if (checkFlag(COL) == Flag.NULL)
             return null;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c0837b46/modules/core/src/main/java/org/apache/ignite/internal/portable/IgniteObjectWriterExImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/IgniteObjectWriterExImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/portable/IgniteObjectWriterExImpl.java
index 5421bea..34ea5e8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/IgniteObjectWriterExImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/IgniteObjectWriterExImpl.java
@@ -1835,7 +1835,7 @@ public class IgniteObjectWriterExImpl implements IgniteObjectWriter,
IgniteObjec
          * @param writer Writer.
          * @param cnt Count.
          */
-        public void writeAndPop(PortableWriterExImpl writer, int cnt) {
+        public void writeAndPop(IgniteObjectWriterExImpl writer, int cnt) {
             int startIdx = idx - cnt * 2;
 
             assert startIdx >= 0;

http://git-wip-us.apache.org/repos/asf/ignite/blob/c0837b46/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
index 4cad80b..5d76b0f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java
@@ -72,7 +72,7 @@ public class PortableClassDescriptor {
     private final IgniteObjectSerializer serializer;
 
     /** ID mapper. */
-    private final PortableIdMapper idMapper;
+    private final IgniteObjectIdMapper idMapper;
 
     /** */
     private final Mode mode;
@@ -323,7 +323,7 @@ public class PortableClassDescriptor {
      *
      * @return ID mapper.
      */
-    public PortableIdMapper idMapper() {
+    public IgniteObjectIdMapper idMapper() {
         return idMapper;
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c0837b46/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
index 3b32e67..2120485 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableContext.java
@@ -17,28 +17,6 @@
 
 package org.apache.ignite.internal.portable;
 
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.internal.IgniteKernal;
-import org.apache.ignite.internal.IgnitionEx;
-import org.apache.ignite.internal.processors.cache.portable.CacheObjectPortableProcessorImpl;
-import org.apache.ignite.internal.util.GridConcurrentHashSet;
-import org.apache.ignite.internal.util.IgniteUtils;
-import org.apache.ignite.internal.util.lang.GridMapEntry;
-import org.apache.ignite.internal.util.typedef.T2;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.lang.IgniteBiTuple;
-import org.apache.ignite.marshaller.MarshallerContext;
-import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
-import org.apache.ignite.marshaller.portable.PortableMarshaller;
-import org.apache.ignite.portable.PortableException;
-import org.apache.ignite.portable.PortableIdMapper;
-import org.apache.ignite.portable.PortableInvalidClassException;
-import org.apache.ignite.portable.PortableMetadata;
-import org.apache.ignite.portable.PortableSerializer;
-import org.apache.ignite.portable.PortableTypeConfiguration;
-import org.jetbrains.annotations.Nullable;
-import org.jsr166.ConcurrentHashMap8;
-
 import java.io.Externalizable;
 import java.io.File;
 import java.io.IOException;
@@ -74,10 +52,17 @@ import java.util.jar.JarFile;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.cache.CacheKeyConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.igniteobject.IgniteObjectConfiguration;
+import org.apache.ignite.igniteobject.IgniteObjectException;
+import org.apache.ignite.igniteobject.IgniteObjectIdMapper;
+import org.apache.ignite.igniteobject.IgniteObjectInvalidClassException;
+import org.apache.ignite.igniteobject.IgniteObjectMetadata;
+import org.apache.ignite.igniteobject.IgniteObjectSerializer;
 import org.apache.ignite.internal.IgniteKernal;
 import org.apache.ignite.internal.IgnitionEx;
 import org.apache.ignite.internal.processors.cache.portable.CacheObjectPortableProcessorImpl;
 import org.apache.ignite.internal.util.GridConcurrentHashSet;
+import org.apache.ignite.internal.util.IgniteUtils;
 import org.apache.ignite.internal.util.lang.GridMapEntry;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.T2;
@@ -86,12 +71,6 @@ import org.apache.ignite.lang.IgniteBiTuple;
 import org.apache.ignite.marshaller.MarshallerContext;
 import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
 import org.apache.ignite.marshaller.portable.PortableMarshaller;
-import org.apache.ignite.igniteobject.IgniteObjectException;
-import org.apache.ignite.igniteobject.IgniteObjectIdMapper;
-import org.apache.ignite.igniteobject.IgniteObjectInvalidClassException;
-import org.apache.ignite.igniteobject.IgniteObjectMetadata;
-import org.apache.ignite.igniteobject.IgniteObjectSerializer;
-import org.apache.ignite.igniteobject.IgniteObjectConfiguration;
 import org.jetbrains.annotations.Nullable;
 import org.jsr166.ConcurrentHashMap8;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c0837b46/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableFieldImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableFieldImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableFieldImpl.java
index 5780b76..26626aa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableFieldImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableFieldImpl.java
@@ -17,8 +17,8 @@
 
 package org.apache.ignite.internal.portable;
 
+import org.apache.ignite.igniteobject.IgniteObject;
 import org.apache.ignite.portable.PortableField;
-import org.apache.ignite.portable.PortableObject;
 
 /**
  * Implementation of portable field descriptor.
@@ -42,16 +42,16 @@ public class PortableFieldImpl implements PortableField {
     }
 
     /** {@inheritDoc} */
-    @Override public boolean exists(PortableObject obj) {
-        PortableObjectEx obj0 = (PortableObjectEx)obj;
+    @Override public boolean exists(IgniteObject obj) {
+        IgniteObjectEx obj0 = (IgniteObjectEx)obj;
 
         return fieldOffset(obj0) != 0;
     }
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override public <T> T value(PortableObject obj) {
-        PortableObjectEx obj0 = (PortableObjectEx)obj;
+    @Override public <T> T value(IgniteObject obj) {
+        IgniteObjectEx obj0 = (IgniteObjectEx)obj;
 
         int offset = fieldOffset(obj0);
 
@@ -64,7 +64,7 @@ public class PortableFieldImpl implements PortableField {
      * @param obj Object.
      * @return Field offset.
      */
-    private int fieldOffset(PortableObjectEx obj) {
+    private int fieldOffset(IgniteObjectEx obj) {
         int schemaId = obj.schemaId();
 
         PortableSchema schema = schemas.schema(schemaId);

http://git-wip-us.apache.org/repos/asf/ignite/blob/c0837b46/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/IgniteObjectBuilderImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/IgniteObjectBuilderImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/IgniteObjectBuilderImpl.java
index ccba7e6..7c167f3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/IgniteObjectBuilderImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/IgniteObjectBuilderImpl.java
@@ -17,11 +17,18 @@
 
 package org.apache.ignite.internal.portable.builder;
 
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
 import org.apache.ignite.igniteobject.IgniteObject;
 import org.apache.ignite.igniteobject.IgniteObjectBuilder;
+import org.apache.ignite.igniteobject.IgniteObjectException;
 import org.apache.ignite.igniteobject.IgniteObjectInvalidClassException;
-import org.apache.ignite.internal.portable.GridPortableMarshaller;
+import org.apache.ignite.igniteobject.IgniteObjectMetadata;
 import org.apache.ignite.internal.portable.IgniteObjectImpl;
+import org.apache.ignite.internal.portable.IgniteObjectOffheapImpl;
 import org.apache.ignite.internal.portable.IgniteObjectWriterExImpl;
 import org.apache.ignite.internal.portable.PortableContext;
 import org.apache.ignite.internal.portable.PortableUtils;
@@ -32,12 +39,6 @@ import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.lang.IgniteBiTuple;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-
 import static org.apache.ignite.internal.portable.GridPortableMarshaller.DFLT_HDR_LEN;
 import static org.apache.ignite.internal.portable.GridPortableMarshaller.HASH_CODE_POS;
 import static org.apache.ignite.internal.portable.GridPortableMarshaller.PROTO_VER_POS;

http://git-wip-us.apache.org/repos/asf/ignite/blob/c0837b46/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
index fcbf58d..3aa7e1c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
@@ -586,6 +586,7 @@ public class GridDistributedTxRemoteAdapter extends IgniteTxAdapter
                                                 false,
                                                 true,
                                                 true,
+                                                txEntry.keepBinary(),
                                                 topVer,
                                                 null,
                                                 replicate ? DR_BACKUP : DR_NONE,
@@ -602,6 +603,7 @@ public class GridDistributedTxRemoteAdapter extends IgniteTxAdapter
                                                 txEntry.ttl(),
                                                 true,
                                                 true,
+                                                txEntry.keepBinary(),
                                                 topVer,
                                                 null,
                                                 replicate ? DR_BACKUP : DR_NONE,
@@ -632,6 +634,7 @@ public class GridDistributedTxRemoteAdapter extends IgniteTxAdapter
                                             false,
                                             true,
                                             true,
+                                            txEntry.keepBinary(),
                                             topVer,
                                             null,
                                             replicate ? DR_BACKUP : DR_NONE,

http://git-wip-us.apache.org/repos/asf/ignite/blob/c0837b46/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
index b8a6c9b..68ede20 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/dotnet/PlatformDotNetCacheStore.java
@@ -345,7 +345,7 @@ public class PlatformDotNetCacheStore<K, V> implements CacheStore<K,
V>, Platfor
      * @param writer Writer.
      * @param convertPortable Convert portable flag.
      */
-    protected void write(PortableRawWriterEx writer, boolean convertPortable) {
+    protected void write(IgniteObjectRawWriterEx writer, boolean convertPortable) {
         writer.writeString(typName);
         writer.writeBoolean(convertPortable);
         writer.writeMap(props);

http://git-wip-us.apache.org/repos/asf/ignite/blob/c0837b46/modules/core/src/main/java/org/apache/ignite/portable/PortableField.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/portable/PortableField.java b/modules/core/src/main/java/org/apache/ignite/portable/PortableField.java
index f8851ee..62475fb 100644
--- a/modules/core/src/main/java/org/apache/ignite/portable/PortableField.java
+++ b/modules/core/src/main/java/org/apache/ignite/portable/PortableField.java
@@ -17,6 +17,8 @@
 
 package org.apache.ignite.portable;
 
+import org.apache.ignite.igniteobject.IgniteObject;
+
 /**
  * Portable object field. Can be used to speed object field lookup.
  */
@@ -27,7 +29,7 @@ public interface PortableField {
      * @param obj Object.
      * @return {@code True} if exists.
      */
-    public boolean exists(PortableObject obj);
+    public boolean exists(IgniteObject obj);
 
     /**
      * Get field's value from the given object.
@@ -35,5 +37,5 @@ public interface PortableField {
      * @param obj Object.
      * @return Value.
      */
-    public <T> T value(PortableObject obj);
+    public <T> T value(IgniteObject obj);
 }


Mime
View raw message