>From Ritik Raj <[email protected]>: Ritik Raj has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20947?usp=email )
Change subject: [NO ISSSUE][TEST] Making map's iteration deterministic ...................................................................... [NO ISSSUE][TEST] Making map's iteration deterministic Change-Id: I6ef7d66ce856a02069907a73af6fca9cebd66a28 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20947 Reviewed-by: Murtadha Hubail <[email protected]> Tested-by: Jenkins <[email protected]> Reviewed-by: Ritik Raj <[email protected]> --- M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/external_dataset/avro/AvroFileExampleGeneratorUtil.java M asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/avro/avro-types/avro-map/avro-map.02.adm M asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/avro/avro-types/avro-map/avro-map.03.adm 3 files changed, 7 insertions(+), 7 deletions(-) Approvals: Ritik Raj: Looks good to me, but someone else must approve Jenkins: Verified Murtadha Hubail: Looks good to me, approved diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/external_dataset/avro/AvroFileExampleGeneratorUtil.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/external_dataset/avro/AvroFileExampleGeneratorUtil.java index 034c430..5269f4d 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/external_dataset/avro/AvroFileExampleGeneratorUtil.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/external_dataset/avro/AvroFileExampleGeneratorUtil.java @@ -23,7 +23,7 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.ArrayList; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -85,7 +85,7 @@ // First record with various fields GenericRecord record = new GenericData.Record(schema); record.put("unionField", 42); - Map<String, Integer> map = new HashMap<>(); + Map<String, Integer> map = new LinkedHashMap<>(); map.put("key1", 1); map.put("key2", 2); record.put("mapField", map); @@ -102,7 +102,7 @@ //second record to be added GenericRecord record2 = new GenericData.Record(schema); record2.put("unionField", ByteBuffer.wrap(new byte[] { 0x01, 0x05 })); - Map<String, Integer> map2 = new HashMap<>(); + Map<String, Integer> map2 = new LinkedHashMap<>(); map2.put("key3", 3); map2.put("key4", 4); record2.put("mapField", map2); @@ -119,7 +119,7 @@ //Third record to be added GenericRecord record3 = new GenericData.Record(schema); record3.put("unionField", map2); - Map<String, Integer> map3 = new HashMap<>(); + Map<String, Integer> map3 = new LinkedHashMap<>(); map3.put("key4", 121); map3.put("key5", 45); record3.put("mapField", map3); @@ -139,7 +139,7 @@ arrayField.add("value1"); arrayField.add("value2"); record4.put("unionField", arrayField); - Map<String, Integer> map4 = new HashMap<>(); + Map<String, Integer> map4 = new LinkedHashMap<>(); map4.put("key6", 112); map4.put("key7", 548); record4.put("mapField", map4); diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/avro/avro-types/avro-map/avro-map.02.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/avro/avro-types/avro-map/avro-map.02.adm index e3ad7cd..f54a22a 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/avro/avro-types/avro-map/avro-map.02.adm +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/avro/avro-types/avro-map/avro-map.02.adm @@ -1,4 +1,4 @@ [ { "key": "key1", "value": 1 }, { "key": "key2", "value": 2 } ] [ { "key": "key3", "value": 3 }, { "key": "key4", "value": 4 } ] -[ { "key": "key5", "value": 45 }, { "key": "key4", "value": 121 } ] +[ { "key": "key4", "value": 121 }, { "key": "key5", "value": 45 } ] [ { "key": "key6", "value": 112 }, { "key": "key7", "value": 548 } ] diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/avro/avro-types/avro-map/avro-map.03.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/avro/avro-types/avro-map/avro-map.03.adm index 6633f00..8941dfc 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/avro/avro-types/avro-map/avro-map.03.adm +++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/external-dataset/common/avro/avro-types/avro-map/avro-map.03.adm @@ -1,4 +1,4 @@ { "key": "key1", "value": 1 } { "key": "key3", "value": 3 } -{ "key": "key5", "value": 45 } +{ "key": "key4", "value": 121 } { "key": "key6", "value": 112 } -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20947?usp=email To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: asterixdb Gerrit-Branch: lumina Gerrit-Change-Id: I6ef7d66ce856a02069907a73af6fca9cebd66a28 Gerrit-Change-Number: 20947 Gerrit-PatchSet: 3 Gerrit-Owner: Ritik Raj <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Murtadha Hubail <[email protected]> Gerrit-Reviewer: Ritik Raj <[email protected]> Gerrit-CC: Anon. E. Moose #1000171
