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/11/18 14:40:02 UTC
[28/50] [abbrv] ignite git commit: IGNITE-1917: Simplifying schema.
IGNITE-1917: Simplifying schema.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/acb33a53
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/acb33a53
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/acb33a53
Branch: refs/heads/ignite-1917
Commit: acb33a5314300458f1141d03c193c2117dd32a98
Parents: f64358c
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Nov 17 17:58:25 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Nov 17 17:58:25 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/portable/PortableSchema.java | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/acb33a53/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableSchema.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableSchema.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableSchema.java
index d58cf6f..b163fea 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableSchema.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableSchema.java
@@ -44,9 +44,7 @@ public class PortableSchema implements Externalizable {
/** Inline flag. */
private boolean inline;
- /** Map with ID to order. */
- private HashMap<Integer, Integer> idToOrder;
-
+ /** Map form field ID to order. */
private PortableSchemaIntIntMap fastIdToOrder;
/** IDs depending on order. */
@@ -109,7 +107,6 @@ public class PortableSchema implements Externalizable {
id6 = iter.hasNext() ? iter.next() : 0;
id7 = iter.hasNext() ? iter.next() : 0;
- idToOrder = null;
fastIdToOrder = null;
}
else {
@@ -118,7 +115,7 @@ public class PortableSchema implements Externalizable {
id0 = id1 = id2 = id3 = id4 = id5 = id6 = id7 = 0;
ids = new int[fieldIds.size()];
- idToOrder = new HashMap<>();
+ HashMap<Integer, Integer> idToOrder = new HashMap<>();
for (int i = 0; i < fieldIds.size(); i++) {
int fieldId = fieldIds.get(i);
@@ -277,7 +274,7 @@ public class PortableSchema implements Externalizable {
int size = in.readInt();
ids = new int[size];
- idToOrder = U.newHashMap(size);
+ HashMap<Integer, Integer>idToOrder = U.newHashMap(size);
for (int i = 0; i < size; i++) {
int fieldId = in.readInt();