Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

disable modifiable collection transformer for Maps #554

Merged
merged 2 commits into from
Mar 13, 2024
Merged

disable modifiable collection transformer for Maps #554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b03955
disable modifiable collection transformer for Maps
li-ukumar Mar 13, 2024
5d1ffec
test updates
li-ukumar Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions avro-builder/tests/codegen-110/src/main/avro/vs110/TestCollections.avsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,16 @@
"type": "array",
"items": "int"
}
},
{
"name": "unionOfIntMap",
"type": [
"null",
{
"type": "map",
"values": "int"
}
]
}
],
"type": "record"
Expand Down
10 changes: 10 additions & 0 deletions avro-builder/tests/codegen-111/src/main/avro/vs111/TestCollections.avsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,16 @@
"type": "array",
"items": "int"
}
},
{
"name": "unionOfIntMap",
"type": [
"null",
{
"type": "map",
"values": "int"
}
]
}
],
"type": "record"
Expand Down
10 changes: 10 additions & 0 deletions avro-builder/tests/codegen-14/src/main/avro/vs14/TestCollections.avsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,16 @@
"type": "array",
"items": "int"
}
},
{
"name": "unionOfIntMap",
"type": [
"null",
{
"type": "map",
"values": "int"
}
]
}
],
"type": "record"
Expand Down
10 changes: 10 additions & 0 deletions avro-builder/tests/codegen-15/src/main/avro/vs15/TestCollections.avsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,16 @@
"type": "array",
"items": "int"
}
},
{
"name": "unionOfIntMap",
"type": [
"null",
{
"type": "map",
"values": "int"
}
]
}
],
"type": "record"
Expand Down
10 changes: 10 additions & 0 deletions avro-builder/tests/codegen-16/src/main/avro/vs16/TestCollections.avsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,16 @@
"type": "array",
"items": "int"
}
},
{
"name": "unionOfIntMap",
"type": [
"null",
{
"type": "map",
"values": "int"
}
]
}
],
"type": "record"
Expand Down
10 changes: 10 additions & 0 deletions avro-builder/tests/codegen-17/src/main/avro/vs17/TestCollections.avsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,16 @@
"type": "array",
"items": "int"
}
},
{
"name": "unionOfIntMap",
"type": [
"null",
{
"type": "map",
"values": "int"
}
]
}
],
"type": "record"
Expand Down
10 changes: 10 additions & 0 deletions avro-builder/tests/codegen-18/src/main/avro/vs18/TestCollections.avsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,16 @@
"type": "array",
"items": "int"
}
},
{
"name": "unionOfIntMap",
"type": [
"null",
{
"type": "map",
"values": "int"
}
]
}
],
"type": "record"
Expand Down
10 changes: 10 additions & 0 deletions avro-builder/tests/codegen-19/src/main/avro/vs19/TestCollections.avsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,16 @@
"type": "array",
"items": "int"
}
},
{
"name": "unionOfIntMap",
"type": [
"null",
{
"type": "map",
"values": "int"
}
]
}
],
"type": "record"
Expand Down
10 changes: 10 additions & 0 deletions avro-builder/tests/codegen-charseq-method/src/main/avro/charseqmethod/TestCollections.avsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,16 @@
"type": "array",
"items": "int"
}
},
{
"name": "unionOfIntMap",
"type": [
"null",
{
"type": "map",
"values": "int"
}
]
}
],
"type": "record"
Expand Down
10 changes: 10 additions & 0 deletions ...lder/tests/codegen-no-utf8-in-putbyindex/src/main/avro/charseqmethod/TestCollections.avsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,16 @@
"type": "array",
"items": "int"
}
},
{
"name": "unionOfIntMap",
"type": [
"null",
{
"type": "map",
"values": "int"
}
]
}
],
"type": "record"
Expand Down
25 changes: 14 additions & 11 deletions .../tests/tests-allavro/src/test/java/com/linkedin/avroutil1/builder/SpecificRecordTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1374,6 +1374,7 @@ private Object[][] testStringTypeParamsProvider() {
put("arOfUnionOfStr", "java.util.List<java.lang.String>");
put("arOfMapOfUnionOfArray", "java.util.List<java.util.Map<java.lang.String, java.util.List<java.lang.String>>>");
put("intAr", "java.util.List<java.lang.Integer>");
put("unionOfIntMap", "java.util.Map<java.lang.String, java.lang.Integer>");
}};

Map<String, String> vs14TestCollectionsCharSeqFieldToType = new LinkedHashMap<String, String>() {{
Expand All @@ -1386,6 +1387,7 @@ private Object[][] testStringTypeParamsProvider() {
put("arOfUnionOfStr", "java.util.List<java.lang.CharSequence>");
put("arOfMapOfUnionOfArray", "java.util.List<java.util.Map<java.lang.CharSequence, java.util.List<java.lang.CharSequence>>>");
put("intAr", "java.util.List<java.lang.Integer>");
put("unionOfIntMap", "java.util.Map<java.lang.CharSequence, java.lang.Integer>");
}};

return new Object[][]{
Expand Down Expand Up @@ -1493,6 +1495,11 @@ public void testRecordWithCharSeqStringTypeForMethods() throws Exception {
put("key1", Arrays.asList("val1", "val2"));
put("key2", Arrays.asList("val10", "val20"));
}};

Map<CharSequence, Integer> mapOfInt = new HashMap<CharSequence, Integer>() {{
put("key1", 1);
put("key2", 2);
}};
charseqmethod.TestCollections.Builder testCollectionsBuilder = charseqmethod.TestCollections.newBuilder()
.setStr(str)
.setStrAr(Arrays.asList(str))
Expand All @@ -1501,7 +1508,8 @@ public void testRecordWithCharSeqStringTypeForMethods() throws Exception {
.setArOfMap(Arrays.asList(mapCharSeq))
.setUnionOfMap(mapCharSeq)
.setArOfUnionOfStr(Arrays.asList(str))
.setArOfMapOfUnionOfArray(Arrays.asList(mapOfList)).setIntAr(Arrays.asList(1, 2, 3));
.setArOfMapOfUnionOfArray(Arrays.asList(mapOfList)).setIntAr(Arrays.asList(1, 2, 3))
.setUnionOfIntMap(mapOfInt);

charseqmethod.TestCollections testCollections = testCollectionsBuilder.build();

Expand Down Expand Up @@ -1840,7 +1848,8 @@ public void testNewBuilder() throws Exception {
.setArOfMap(instance.getArOfMap())
.setUnionOfMap(instance.getUnionOfMap())
.setArOfUnionOfStr(instance.getArOfUnionOfStr())
.setArOfMapOfUnionOfArray(instance.getArOfMapOfUnionOfArray());
.setArOfMapOfUnionOfArray(instance.getArOfMapOfUnionOfArray())
.setUnionOfIntMap(instance.getUnionOfIntMap());

TestCollections.newBuilder(builder);

Expand Down Expand Up @@ -1870,9 +1879,7 @@ public void modifiablePrimitiveCollectionTest() {


// Union (null, Map<String, String>)
instance.getUnionOfMap().put("key1", tba);
Assert.assertEquals(tba, instance.getUnionOfMap().get("key1"));
Assert.assertEquals(new Utf8(tba), instance.unionOfMap.get(new Utf8("key1")));
Assert.assertThrows(UnsupportedOperationException.class, () -> instance.getUnionOfMap().put("key1", tba));

instance.getIntAr().add(Integer.MAX_VALUE);
Assert.assertEquals((int) instance.getIntAr().get(instance.getIntAr().size() - 1), Integer.MAX_VALUE);
Expand Down Expand Up @@ -1902,9 +1909,7 @@ public void modifiablePrimitiveCollectionTestForCharSeq() {


// Union (null, Map<String, String>)
instance.getUnionOfMap().put("key1", tba);
Assert.assertEquals(tba, instance.getUnionOfMap().get("key1"));
Assert.assertEquals(new Utf8(tba), instance.unionOfMap.get(new Utf8("key1")));
Assert.assertThrows(UnsupportedOperationException.class, () -> instance.getUnionOfMap().put("key1", tba));

instance.getIntAr().add(Integer.MAX_VALUE);
Assert.assertEquals((int) instance.getIntAr().get(instance.getIntAr().size() - 1), Integer.MAX_VALUE);
Expand Down Expand Up @@ -1934,9 +1939,7 @@ public void testCharSeqAccessorForNoUtf8() {


// Union (null, Map<String, String>)
instance.getUnionOfMap().put("key1", tba);
Assert.assertEquals(tba, instance.getUnionOfMap().get("key1"));
Assert.assertEquals(new Utf8(tba), instance.unionOfMap.get(new Utf8("key1")));
Assert.assertThrows(UnsupportedOperationException.class, () -> instance.getUnionOfMap().put("key1", tba));

instance.getIntAr().add(Integer.MAX_VALUE);
Assert.assertEquals((int) instance.getIntAr().get(instance.getIntAr().size() - 1), Integer.MAX_VALUE);
Expand Down
106 changes: 0 additions & 106 deletions ...t/java/com/linkedin/avroutil1/compatibility/collectiontransformer/CollectionViewTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@

import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.avro.util.Utf8;
import org.testng.Assert;
import org.testng.annotations.Test;
Expand Down Expand Up @@ -126,108 +124,4 @@ public void testCharSequenceListView() {
Assert.assertTrue(utf8List.contains(u));
}
}

@Test
public void testStringMapView() {
Map<Utf8, Utf8> utf8Map = new HashMap<>();
List<String> keys = Arrays.asList("key1", "key2", "key3");
String val = "value";

Map<String, String> map = CollectionTransformerUtil.createStringMapView(utf8Map);

// utf8 map is empty
Assert.assertEquals(utf8Map.size(), 0);
// view should be empty
Assert.assertEquals(map.size(), 0);

// insert in view
for (String key : keys) {
map.put(key, key + val);
}

// view should have 3 elements
for (String key : keys) {
Assert.assertTrue(map.containsKey(key));
}
// utf8 map should contain the same 3 elements
for (String key : keys) {
Assert.assertTrue(utf8Map.containsKey(new Utf8(key)));
}

// remove from map
for (String key : keys) {
map.remove(key);
}
// view should be empty
Assert.assertEquals(map.size(), 0);
}

@Test
public void testUtf8MapView() {
Map<Utf8, Utf8> utf8Map = new HashMap<>();
List<Utf8> keys = Arrays.asList(new Utf8("key1"), new Utf8("key2"), new Utf8("key3"));
Utf8 val = new Utf8("value");

Map<Utf8, Utf8> map = CollectionTransformerUtil.createUtf8MapView(utf8Map);
// utf8 map is empty
Assert.assertEquals(utf8Map.size(), 0);
// view should be empty
Assert.assertEquals(map.size(), 0);

// insert in view
for (Utf8 key : keys) {
map.put(key, val);
}

// view should have 3 elements
for (Utf8 key : keys) {
Assert.assertTrue(map.containsKey(key));
}
// utf8 map should contain the same 3 elements
for (Utf8 key : keys) {
Assert.assertTrue(utf8Map.containsKey(key));
}

// remove from view
for (Utf8 key : keys) {
map.remove(key);
}
// view should be empty
Assert.assertEquals(map.size(), 0);
}

@Test
public void testCharSequenceMapView() {
Map<Utf8, Utf8> utf8Map = new HashMap<>();
List<CharSequence> keys = Arrays.asList("key1", "key2", "key3");
String val = "value";

Map<CharSequence, CharSequence> map = CollectionTransformerUtil.createCharSequenceMapView(utf8Map);

// utf8 map is empty
Assert.assertEquals(utf8Map.size(), 0);
// view should be empty
Assert.assertEquals(map.size(), 0);

// insert in view
for (CharSequence key : keys) {
map.put(key, key + val);
}

// view should have 3 elements
for (CharSequence key : keys) {
Assert.assertTrue(map.containsKey(key));
}
// utf8 map should contain the same 3 elements
for (CharSequence key : keys) {
Assert.assertTrue(utf8Map.containsKey(new Utf8(String.valueOf(key))));
}

// remove from view
for (CharSequence key : keys) {
map.remove(key);
}
// view should be empty
Assert.assertEquals(map.size(), 0);
}
}
Loading
Loading