You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by th...@apache.org on 2017/06/03 22:49:17 UTC
apex-malhar git commit: APEXMALHAR-2505 retain original field order
in SnapshotSchema
Repository: apex-malhar
Updated Branches:
refs/heads/master 59b458864 -> 5fa5b275c
APEXMALHAR-2505 retain original field order in SnapshotSchema
Project: http://git-wip-us.apache.org/repos/asf/apex-malhar/repo
Commit: http://git-wip-us.apache.org/repos/asf/apex-malhar/commit/5fa5b275
Tree: http://git-wip-us.apache.org/repos/asf/apex-malhar/tree/5fa5b275
Diff: http://git-wip-us.apache.org/repos/asf/apex-malhar/diff/5fa5b275
Branch: refs/heads/master
Commit: 5fa5b275cc82285321a2fb21c3971425fb65e289
Parents: 59b4588
Author: Thomas Weise <th...@apache.org>
Authored: Mon May 29 10:15:57 2017 -0700
Committer: Thomas Weise <th...@apache.org>
Committed: Mon May 29 10:15:57 2017 -0700
----------------------------------------------------------------------
.../main/java/com/datatorrent/lib/appdata/schemas/Fields.java | 2 +-
.../com/datatorrent/lib/appdata/schemas/FieldsDescriptor.java | 7 ++++---
.../com/datatorrent/lib/appdata/schemas/SnapshotSchema.java | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/5fa5b275/library/src/main/java/com/datatorrent/lib/appdata/schemas/Fields.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/Fields.java b/library/src/main/java/com/datatorrent/lib/appdata/schemas/Fields.java
index 89cddcf..b2d5ea9 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/schemas/Fields.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/schemas/Fields.java
@@ -62,7 +62,7 @@ public class Fields implements Serializable
*/
public Fields(Collection<String> fields)
{
- this.fields = Sets.newHashSet();
+ this.fields = Sets.newLinkedHashSet();
for (String field : fields) {
Preconditions.checkNotNull(field);
http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/5fa5b275/library/src/main/java/com/datatorrent/lib/appdata/schemas/FieldsDescriptor.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/FieldsDescriptor.java b/library/src/main/java/com/datatorrent/lib/appdata/schemas/FieldsDescriptor.java
index ec00fda..ceed34f 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/schemas/FieldsDescriptor.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/schemas/FieldsDescriptor.java
@@ -97,6 +97,7 @@ public class FieldsDescriptor implements Serializable
/**
* This constructor is used for serialization.
*/
+ @SuppressWarnings("unused")
private FieldsDescriptor()
{
//For kryo
@@ -197,7 +198,7 @@ public class FieldsDescriptor implements Serializable
List<String> tempFields = entry.getValue();
Collections.sort(tempFields);
- Object2IntLinkedOpenHashMap<String> fieldToIndex = new Object2IntLinkedOpenHashMap<String>();
+ Object2IntLinkedOpenHashMap<String> fieldToIndex = new Object2IntLinkedOpenHashMap<>();
for (int index = 0; index < tempFields.size(); index++) {
String field = tempFields.get(index);
@@ -231,7 +232,7 @@ public class FieldsDescriptor implements Serializable
Collections.sort(fieldList);
//Array Sizes
- typeToSize = new Object2IntLinkedOpenHashMap<Type>();
+ typeToSize = new Object2IntLinkedOpenHashMap<>();
for (Map.Entry<Type, List<String>> entry : typeToFields.entrySet()) {
Type type = entry.getKey();
@@ -266,7 +267,7 @@ public class FieldsDescriptor implements Serializable
Preconditions.checkNotNull(entry.getValue());
}
- this.fieldToType = Maps.newHashMap(fieldToType);
+ this.fieldToType = Maps.newLinkedHashMap(fieldToType);
}
/**
http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/5fa5b275/library/src/main/java/com/datatorrent/lib/appdata/schemas/SnapshotSchema.java
----------------------------------------------------------------------
diff --git a/library/src/main/java/com/datatorrent/lib/appdata/schemas/SnapshotSchema.java b/library/src/main/java/com/datatorrent/lib/appdata/schemas/SnapshotSchema.java
index b1e6d36..dd6aa64 100644
--- a/library/src/main/java/com/datatorrent/lib/appdata/schemas/SnapshotSchema.java
+++ b/library/src/main/java/com/datatorrent/lib/appdata/schemas/SnapshotSchema.java
@@ -197,7 +197,7 @@ public class SnapshotSchema implements Schema
schema.put(Schema.FIELD_SCHEMA_KEYS, SchemaUtils.createJSONObject(schemaKeys));
}
- valueToType = Maps.newHashMap();
+ valueToType = Maps.newLinkedHashMap();
JSONArray values = schema.getJSONArray(FIELD_VALUES);