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/27 10:37:07 UTC
[3/3] ignite git commit: IGNITE-1770: Field len is not written any
more.
IGNITE-1770: Field len is not written any more.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b5abaee0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b5abaee0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b5abaee0
Branch: refs/heads/ignite-1770
Commit: b5abaee063ae43e91526c79f89cd19908ab89352
Parents: 5be9cf3
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Oct 27 12:37:46 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Oct 27 12:37:46 2015 +0300
----------------------------------------------------------------------
.../internal/portable/PortableReaderExImpl.java | 2 +-
.../internal/portable/PortableWriterExImpl.java | 140 +------------------
.../portable/builder/PortableBuilderImpl.java | 25 +---
3 files changed, 9 insertions(+), 158 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5abaee0/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderExImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderExImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderExImpl.java
index 8dc5eb1..0037dcc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderExImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderExImpl.java
@@ -2566,7 +2566,7 @@ public class PortableReaderExImpl implements PortableReader, PortableRawReaderEx
if (id0 == id) {
int offset = in.readIntPositioned(searchHead + 4);
- in.position(start + offset + 4); // TODO: "+4" will be removed soon.
+ in.position(start + offset);
return true;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5abaee0/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 8cc9dad..d3be134 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
@@ -100,9 +100,6 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
private final int start;
/** */
- private int mark;
-
- /** */
private Class<?> cls;
/** */
@@ -313,25 +310,6 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
}
/**
- * @param bytes Number of bytes to reserve.
- * @return Offset.
- */
- public int reserveAndMark(int bytes) {
- int off0 = reserve(bytes);
-
- mark = out.position();
-
- return off0;
- }
-
- /**
- * @param off Offset.
- */
- public void writeDelta(int off) {
- out.writeInt(off, out.position() - mark);
- }
-
- /**
* Perform post-write activity. This includes:
* - writing object length;
* - writing schema ID;
@@ -954,8 +932,6 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
* @param val Value.
*/
void writeByteField(@Nullable Byte val) {
- doWriteInt(val != null ? 2 : 1);
-
if (val == null)
doWriteByte(NULL);
else {
@@ -968,19 +944,13 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
* @param val Class.
*/
void writeClassField(@Nullable Class val) {
- int lenPos = reserveAndMark(4);
-
doWriteClass(val);
-
- writeDelta(lenPos);
}
/**
* @param val Value.
*/
void writeShortField(@Nullable Short val) {
- doWriteInt(val != null ? 3 : 1);
-
if (val == null)
doWriteByte(NULL);
else {
@@ -993,8 +963,6 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
* @param val Value.
*/
void writeIntField(@Nullable Integer val) {
- doWriteInt(val != null ? 5 : 1);
-
if (val == null)
doWriteByte(NULL);
else {
@@ -1007,8 +975,6 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
* @param val Value.
*/
void writeLongField(@Nullable Long val) {
- doWriteInt(val != null ? 9 : 1);
-
if (val == null)
doWriteByte(NULL);
else {
@@ -1021,8 +987,6 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
* @param val Value.
*/
void writeFloatField(@Nullable Float val) {
- doWriteInt(val != null ? 5 : 1);
-
if (val == null)
doWriteByte(NULL);
else {
@@ -1035,8 +999,6 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
* @param val Value.
*/
void writeDoubleField(@Nullable Double val) {
- doWriteInt(val != null ? 9 : 1);
-
if (val == null)
doWriteByte(NULL);
else {
@@ -1049,8 +1011,6 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
* @param val Value.
*/
void writeCharField(@Nullable Character val) {
- doWriteInt(val != null ? 3 : 1);
-
if (val == null)
doWriteByte(NULL);
else {
@@ -1063,8 +1023,6 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
* @param val Value.
*/
void writeBooleanField(@Nullable Boolean val) {
- doWriteInt(val != null ? 2 : 1);
-
if (val == null)
doWriteByte(NULL);
else {
@@ -1077,29 +1035,20 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
* @param val Value.
*/
void writeDecimalField(@Nullable BigDecimal val) {
- int lenPos = reserveAndMark(4);
-
doWriteDecimal(val);
-
- writeDelta(lenPos);
}
/**
* @param val Value.
*/
void writeStringField(@Nullable String val) {
- int lenPos = reserveAndMark(4);
-
doWriteString(val);
-
- writeDelta(lenPos);
}
/**
* @param val Value.
*/
void writeUuidField(@Nullable UUID val) {
- doWriteInt(val != null ? 17 : 1);
doWriteUuid(val);
}
@@ -1107,7 +1056,6 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
* @param val Value.
*/
void writeDateField(@Nullable Date val) {
- doWriteInt(val != null ? 9 : 1);
doWriteDate(val);
}
@@ -1115,7 +1063,6 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
* @param val Value.
*/
void writeTimestampField(@Nullable Timestamp val) {
- doWriteInt(val != null ? 13 : 1);
doWriteTimestamp(val);
}
@@ -1124,154 +1071,98 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
* @throws PortableException In case of error.
*/
void writeObjectField(@Nullable Object obj) throws PortableException {
- int lenPos = reserveAndMark(4);
-
doWriteObject(obj);
-
- writeDelta(lenPos);
}
/**
* @param val Value.
*/
void writeByteArrayField(@Nullable byte[] val) {
- int lenPos = reserveAndMark(4);
-
doWriteByteArray(val);
-
- writeDelta(lenPos);
}
/**
* @param val Value.
*/
void writeShortArrayField(@Nullable short[] val) {
- int lenPos = reserveAndMark(4);
-
doWriteShortArray(val);
-
- writeDelta(lenPos);
}
/**
* @param val Value.
*/
void writeIntArrayField(@Nullable int[] val) {
- int lenPos = reserveAndMark(4);
-
doWriteIntArray(val);
-
- writeDelta(lenPos);
}
/**
* @param val Value.
*/
void writeLongArrayField(@Nullable long[] val) {
- int lenPos = reserveAndMark(4);
-
doWriteLongArray(val);
-
- writeDelta(lenPos);
}
/**
* @param val Value.
*/
void writeFloatArrayField(@Nullable float[] val) {
- int lenPos = reserveAndMark(4);
-
doWriteFloatArray(val);
-
- writeDelta(lenPos);
}
/**
* @param val Value.
*/
void writeDoubleArrayField(@Nullable double[] val) {
- int lenPos = reserveAndMark(4);
-
doWriteDoubleArray(val);
-
- writeDelta(lenPos);
}
/**
* @param val Value.
*/
void writeCharArrayField(@Nullable char[] val) {
- int lenPos = reserveAndMark(4);
-
doWriteCharArray(val);
-
- writeDelta(lenPos);
}
/**
* @param val Value.
*/
void writeBooleanArrayField(@Nullable boolean[] val) {
- int lenPos = reserveAndMark(4);
-
doWriteBooleanArray(val);
-
- writeDelta(lenPos);
}
/**
* @param val Value.
*/
void writeDecimalArrayField(@Nullable BigDecimal[] val) {
- int lenPos = reserveAndMark(4);
-
doWriteDecimalArray(val);
-
- writeDelta(lenPos);
}
/**
* @param val Value.
*/
void writeStringArrayField(@Nullable String[] val) {
- int lenPos = reserveAndMark(4);
-
doWriteStringArray(val);
-
- writeDelta(lenPos);
}
/**
* @param val Value.
*/
void writeUuidArrayField(@Nullable UUID[] val) {
- int lenPos = reserveAndMark(4);
-
doWriteUuidArray(val);
-
- writeDelta(lenPos);
}
/**
* @param val Value.
*/
void writeDateArrayField(@Nullable Date[] val) {
- int lenPos = reserveAndMark(4);
-
doWriteDateArray(val);
-
- writeDelta(lenPos);
}
/**
* @param val Value.
*/
void writeTimestampArrayField(@Nullable Timestamp[] val) {
- int lenPos = reserveAndMark(4);
-
doWriteTimestampArray(val);
-
- writeDelta(lenPos);
}
/**
@@ -1279,11 +1170,7 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
* @throws PortableException In case of error.
*/
void writeObjectArrayField(@Nullable Object[] val) throws PortableException {
- int lenPos = reserveAndMark(4);
-
doWriteObjectArray(val);
-
- writeDelta(lenPos);
}
/**
@@ -1291,11 +1178,7 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
* @throws PortableException In case of error.
*/
void writeCollectionField(@Nullable Collection<?> col) throws PortableException {
- int lenPos = reserveAndMark(4);
-
doWriteCollection(col);
-
- writeDelta(lenPos);
}
/**
@@ -1303,11 +1186,7 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
* @throws PortableException In case of error.
*/
void writeMapField(@Nullable Map<?, ?> map) throws PortableException {
- int lenPos = reserveAndMark(4);
-
doWriteMap(map);
-
- writeDelta(lenPos);
}
/**
@@ -1315,33 +1194,21 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
* @throws PortableException In case of error.
*/
void writeMapEntryField(@Nullable Map.Entry<?, ?> e) throws PortableException {
- int lenPos = reserveAndMark(4);
-
doWriteMapEntry(e);
-
- writeDelta(lenPos);
}
/**
* @param val Value.
*/
void writeEnumField(@Nullable Enum<?> val) {
- int lenPos = reserveAndMark(4);
-
doWriteEnum(val);
-
- writeDelta(lenPos);
}
/**
* @param val Value.
*/
void writeEnumArrayField(@Nullable Object[] val) {
- int lenPos = reserveAndMark(4);
-
doWriteEnumArray(val);
-
- writeDelta(lenPos);
}
/**
@@ -1349,11 +1216,7 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
* @throws PortableException In case of error.
*/
void writePortableObjectField(@Nullable PortableObjectImpl po) throws PortableException {
- int lenPos = reserveAndMark(4);
-
doWritePortableObject(po);
-
- writeDelta(lenPos);
}
/** {@inheritDoc} */
@@ -1739,6 +1602,7 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
}
/** {@inheritDoc} */
+ @SuppressWarnings("NullableProblems")
@Override public void writeBytes(String s) throws IOException {
int len = s.length();
@@ -1749,6 +1613,7 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
}
/** {@inheritDoc} */
+ @SuppressWarnings("NullableProblems")
@Override public void writeChars(String s) throws IOException {
int len = s.length();
@@ -1759,6 +1624,7 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
}
/** {@inheritDoc} */
+ @SuppressWarnings("NullableProblems")
@Override public void writeUTF(String s) throws IOException {
writeString(s);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/b5abaee0/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 6ea0474..1e12827 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
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.portable.builder;
-import org.apache.ignite.internal.portable.GridPortableMarshaller;
import org.apache.ignite.internal.portable.PortableContext;
import org.apache.ignite.internal.portable.PortableObjectImpl;
import org.apache.ignite.internal.portable.PortableObjectOffheapImpl;
@@ -240,8 +239,6 @@ public class PortableBuilderImpl implements PortableBuilder {
int fieldId = reader.readIntPositioned(footerPos);
int fieldLen = fieldPositionAndLength(footerPos, footerEnd, rawPos).get2();
- reader.skip(4); // TODO: This must be removed.
-
footerPos += 8;
if (assignedFldsById.containsKey(fieldId)) {
@@ -252,11 +249,7 @@ public class PortableBuilderImpl implements PortableBuilder {
if (assignedVal != REMOVED_FIELD_MARKER) {
writer.writeFieldId(fieldId);
- int lenPos = writer.reserveAndMark(4);
-
serializer.writeValue(writer, assignedVal);
-
- writer.writeDelta(lenPos);
}
}
else {
@@ -264,7 +257,6 @@ public class PortableBuilderImpl implements PortableBuilder {
if (fieldLen != 0 && !PortableUtils.isPlainArrayType(type) && PortableUtils.isPlainType(type)) {
writer.writeFieldId(fieldId);
- writer.writeInt(fieldLen);
writer.write(reader.array(), reader.position(), fieldLen);
reader.skip(fieldLen);
@@ -289,11 +281,7 @@ public class PortableBuilderImpl implements PortableBuilder {
reader.skip(fieldLen);
}
- int lenPos = writer.reserveAndMark(4);
-
serializer.writeValue(writer, val);
-
- writer.writeDelta(lenPos);
}
}
}
@@ -324,12 +312,8 @@ public class PortableBuilderImpl implements PortableBuilder {
writer.writeFieldId(fldId);
- int lenPos = writer.reserveAndMark(4);
-
serializer.writeValue(writer, val);
- writer.writeDelta(lenPos);
-
if (metadataEnabled) {
String oldFldTypeName = metadata == null ? null : metadata.fieldTypeName(name);
@@ -411,7 +395,7 @@ public class PortableBuilderImpl implements PortableBuilder {
*/
private IgniteBiTuple<Integer, Integer> fieldPositionAndLength(int footerPos, int footerEnd, int rawPos) {
int fieldOffset = reader.readIntPositioned(footerPos + 4);
- int fieldPos = start + fieldOffset + 4; // TODO: 4 is to be removed.
+ int fieldPos = start + fieldOffset;
// Get field length.
int fieldLen;
@@ -423,7 +407,7 @@ public class PortableBuilderImpl implements PortableBuilder {
// Field is somewhere in the middle, get difference with the next offset.
int nextFieldOffset = reader.readIntPositioned(footerPos + 8 + 4);
- fieldLen = nextFieldOffset - fieldOffset - 4; // TODO: 4 is to be removed.
+ fieldLen = nextFieldOffset - fieldOffset;
}
return F.t(fieldPos, fieldLen);
@@ -461,7 +445,8 @@ public class PortableBuilderImpl implements PortableBuilder {
}
/** {@inheritDoc} */
- @Override public <F> F getField(String name) {
+ @SuppressWarnings("unchecked")
+ @Override public <T> T getField(String name) {
Object val;
if (assignedVals != null && assignedVals.containsKey(name)) {
@@ -478,7 +463,7 @@ public class PortableBuilderImpl implements PortableBuilder {
val = readCache.get(fldId);
}
- return (F)PortableUtils.unwrapLazy(val);
+ return (T)PortableUtils.unwrapLazy(val);
}
/** {@inheritDoc} */