horizonzy commented on code in PR #2581:
URL: https://github.com/apache/avro/pull/2581#discussion_r1391288030
##########
lang/java/avro/src/main/java/org/apache/avro/reflect/ReflectData.java:
##########
@@ -845,20 +859,25 @@ public static Schema makeNullable(Schema schema) {
private static final ConcurrentMap<Class<?>, Field[]> FIELDS_CACHE = new
ConcurrentHashMap<>();
+ private static final ConcurrentMap<Class<?>, Field[]> NATIVE_FIELDS_CACHE =
new ConcurrentHashMap<>();
+
// Return of this class and its superclasses to serialize.
- private static Field[] getCachedFields(Class<?> recordClass) {
- return MapUtil.computeIfAbsent(FIELDS_CACHE, recordClass, rc ->
getFields(rc, true));
+ private static Field[] getCachedFields(Class<?> recordClass, boolean
orderBy) {
+ return MapUtil.computeIfAbsent(orderBy ? FIELDS_CACHE :
NATIVE_FIELDS_CACHE, recordClass,
+ rc -> getFields(rc, true, orderBy));
}
- private static Field[] getFields(Class<?> recordClass, boolean excludeJava) {
+ private static Field[] getFields(Class<?> recordClass, boolean excludeJava,
boolean orderBy) {
Review Comment:
addressed.
##########
lang/java/avro/src/test/java/org/apache/avro/reflect/TestReflectData.java:
##########
@@ -76,6 +78,25 @@ void genericProtocol() {
assertThat(existsArgument.schema(),
equalTo(Schema.create(Schema.Type.STRING)));
}
+ @Test
+ void fieldsOrder() {
+ Schema schema = ReflectData.get().getSchema(Meta.class);
+ List<Schema.Field> fields = schema.getFields();
+ assertEquals(fields.size(), 4);
+ assertEquals(fields.get(0).name(), "f1");
+ assertEquals(fields.get(1).name(), "f2");
+ assertEquals(fields.get(2).name(), "f3");
+ assertEquals(fields.get(3).name(), "f4");
+
+ schema = new ReflectData(false).getSchema(Meta.class);
+ fields = schema.getFields();
+ assertEquals(fields.size(), 4);
+ assertEquals(fields.get(0).name(), "f1");
+ assertEquals(fields.get(1).name(), "f4");
+ assertEquals(fields.get(2).name(), "f2");
+ assertEquals(fields.get(3).name(), "f3");
Review Comment:
addressed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
