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/26 13:57:58 UTC
[15/22] ignite git commit: IGNITE-1770: Reader refactoring: removing
unused raw flags.
IGNITE-1770: Reader refactoring: removing unused raw flags.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8fc04070
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8fc04070
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8fc04070
Branch: refs/heads/ignite-1770
Commit: 8fc04070f826b587a88a015bdbf0b3761d4f2c0b
Parents: e53864b
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Oct 26 13:49:38 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Oct 26 13:49:38 2015 +0300
----------------------------------------------------------------------
.../internal/portable/PortableReaderExImpl.java | 32 +++++++++-----------
1 file changed, 15 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8fc04070/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 43c9b21..2426004 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
@@ -485,7 +485,7 @@ public class PortableReaderExImpl implements PortableReader, PortableRawReaderEx
* @throws PortableException In case of error.
*/
@Nullable Object readObject(int fieldId) throws PortableException {
- return hasField(fieldId) ? doReadObject(false) : null;
+ return hasField(fieldId) ? doReadObject() : null;
}
/**
@@ -732,7 +732,7 @@ public class PortableReaderExImpl implements PortableReader, PortableRawReaderEx
Flag flag = checkFlag(OBJ_ARR, false);
if (flag == Flag.NORMAL)
- return doReadObjectArray(false, true);
+ return doReadObjectArray(true);
else if (flag == Flag.HANDLE)
return readHandleField();
}
@@ -909,7 +909,7 @@ public class PortableReaderExImpl implements PortableReader, PortableRawReaderEx
if (obj == null) {
in.position(handle);
- obj = doReadObject(false);
+ obj = doReadObject();
}
return (T)obj;
@@ -1083,7 +1083,7 @@ public class PortableReaderExImpl implements PortableReader, PortableRawReaderEx
/** {@inheritDoc} */
@Override public Object readObject() throws PortableException {
- return doReadObject(true);
+ return doReadObject();
}
/** {@inheritDoc} */
@@ -1270,7 +1270,7 @@ public class PortableReaderExImpl implements PortableReader, PortableRawReaderEx
if (checkFlag(OBJ_ARR, true) == Flag.NULL)
return null;
- return doReadObjectArray(true, true);
+ return doReadObjectArray(true);
}
/** {@inheritDoc} */
@@ -1541,7 +1541,7 @@ public class PortableReaderExImpl implements PortableReader, PortableRawReaderEx
return doReadTimestampArray(raw);
case OBJ_ARR:
- return doReadObjectArray(raw, false);
+ return doReadObjectArray(false);
case COL:
return doReadCollection(raw, false, null);
@@ -1658,11 +1658,10 @@ public class PortableReaderExImpl implements PortableReader, PortableRawReaderEx
}
/**
- * @param raw Raw flag.
* @return Object.
* @throws PortableException In case of error.
*/
- @Nullable private Object doReadObject(boolean raw) throws PortableException {
+ @Nullable private Object doReadObject() throws PortableException {
PortableReaderExImpl reader = new PortableReaderExImpl(ctx, in, in.position(), ldr, rCtx);
return reader.deserialize();
@@ -1693,7 +1692,7 @@ public class PortableReaderExImpl implements PortableReader, PortableRawReaderEx
in.position(handle);
- obj = doReadObject(false);
+ obj = doReadObject();
in.position(retPos);
}
@@ -1858,7 +1857,7 @@ public class PortableReaderExImpl implements PortableReader, PortableRawReaderEx
break;
case OBJ_ARR:
- obj = doReadObjectArray(true, true);
+ obj = doReadObjectArray(true);
break;
@@ -2199,12 +2198,11 @@ public class PortableReaderExImpl implements PortableReader, PortableRawReaderEx
}
/**
- * @param raw Raw flag.
* @param deep Deep flag.
* @return Value.
* @throws PortableException In case of error.
*/
- private Object[] doReadObjectArray(boolean raw, boolean deep) throws PortableException {
+ private Object[] doReadObjectArray(boolean deep) throws PortableException {
int hPos = in.position() - 1;
Class compType = doReadClass();
@@ -2216,7 +2214,7 @@ public class PortableReaderExImpl implements PortableReader, PortableRawReaderEx
setHandler(arr, hPos);
for (int i = 0; i < len; i++)
- arr[i] = deep ? doReadObject(raw) : unmarshal(raw);
+ arr[i] = deep ? doReadObject() : unmarshal();
return arr;
}
@@ -2305,7 +2303,7 @@ public class PortableReaderExImpl implements PortableReader, PortableRawReaderEx
setHandler(col, hPos);
for (int i = 0; i < size; i++)
- col.add(deep ? doReadObject(raw) : unmarshal(raw));
+ col.add(deep ? doReadObject() : unmarshal(raw));
return col;
}
@@ -2384,7 +2382,7 @@ public class PortableReaderExImpl implements PortableReader, PortableRawReaderEx
setHandler(map, hPos);
for (int i = 0; i < size; i++)
- map.put(deep ? doReadObject(raw) : unmarshal(raw), deep ? doReadObject(raw) : unmarshal(raw));
+ map.put(deep ? doReadObject() : unmarshal(raw), deep ? doReadObject() : unmarshal(raw));
return map;
}
@@ -2398,8 +2396,8 @@ public class PortableReaderExImpl implements PortableReader, PortableRawReaderEx
private Map.Entry<?, ?> doReadMapEntry(boolean raw, boolean deep) throws PortableException {
int hPos = in.position() - 1;
- Object val1 = deep ? doReadObject(raw) : unmarshal(raw);
- Object val2 = deep ? doReadObject(raw) : unmarshal(raw);
+ Object val1 = deep ? doReadObject() : unmarshal(raw);
+ Object val2 = deep ? doReadObject() : unmarshal(raw);
GridMapEntry entry = new GridMapEntry<>(val1, val2);