You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/10/23 16:28:22 UTC
[7/8] ignite git commit: IGNITE-1770: Better raw mode handling.
IGNITE-1770: Better raw mode handling.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7cf21365
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7cf21365
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7cf21365
Branch: refs/heads/ignite-1770
Commit: 7cf21365f124c16560eba05d14507e7e124a838b
Parents: 2a8b75a
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Oct 23 17:27:10 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Oct 23 17:27:10 2015 +0300
----------------------------------------------------------------------
.../internal/portable/PortableClassDescriptor.java | 9 +++------
.../ignite/internal/portable/PortableWriterExImpl.java | 11 +++--------
.../internal/portable/builder/PortableBuilderImpl.java | 7 +------
3 files changed, 7 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7cf21365/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 ee78fd0..3764c24 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
@@ -515,8 +515,7 @@ public class PortableClassDescriptor {
else
((PortableMarshalAware)obj).writePortable(writer);
- writer.writeRawOffsetIfNeeded();
- writer.writeLength();
+ writer.writeLengthAndRawOffset();
if (obj.getClass() != PortableMetaDataImpl.class
&& ctx.isMetaDataChanged(typeId, writer.metaDataHashSum())) {
@@ -544,8 +543,7 @@ public class PortableClassDescriptor {
throw new PortableException("Failed to write Externalizable object: " + obj, e);
}
- writer.writeRawOffsetIfNeeded();
- writer.writeLength();
+ writer.writeLengthAndRawOffset();
}
break;
@@ -555,8 +553,7 @@ public class PortableClassDescriptor {
for (FieldInfo info : fields)
info.write(obj, writer);
- writer.writeRawOffsetIfNeeded();
- writer.writeLength();
+ writer.writeLengthAndRawOffset();
}
break;
http://git-wip-us.apache.org/repos/asf/ignite/blob/7cf21365/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java
index e671db1..fdff5ce 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java
@@ -330,16 +330,11 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
/**
*
*/
- public void writeLength() {
- out.writeInt(start + TOTAL_LEN_POS, out.position() - start);
- }
-
- /**
- *
- */
- public void writeRawOffsetIfNeeded() {
+ public void writeLengthAndRawOffset() {
if (rawOffPos == 0)
out.writeInt(start + RAW_DATA_OFF_POS, out.position() - start);
+
+ out.writeInt(start + TOTAL_LEN_POS, out.position() - start);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/7cf21365/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderImpl.java
index f905b26..4d52b27 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/builder/PortableBuilderImpl.java
@@ -32,10 +32,6 @@ import org.apache.ignite.portable.PortableMetadata;
import org.apache.ignite.portable.PortableObject;
import org.jetbrains.annotations.Nullable;
import org.apache.ignite.internal.portable.*;
-import org.apache.ignite.internal.processors.cache.portable.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.portable.*;
import static org.apache.ignite.internal.portable.GridPortableMarshaller.CLS_NAME_POS;
import static org.apache.ignite.internal.portable.GridPortableMarshaller.DFLT_HDR_LEN;
@@ -399,8 +395,7 @@ public class PortableBuilderImpl implements PortableBuilder {
writer.write(reader.array(), rawOff, len - rawOff);
}
- writer.writeRawOffsetIfNeeded();
- writer.writeLength();
+ writer.writeLengthAndRawOffset();
}
/** {@inheritDoc} */