[server] A few WCAA performance improvements

build.gradle

@@ -38,7 +38,7 @@ if (project.hasProperty('overrideBuildEnvironment')) {
 }
 
 def avroVersion = '1.10.2'
-def avroUtilVersion = '0.3.19'
+def avroUtilVersion = '0.3.21'
 def grpcVersion = '1.49.2'
 def kafkaGroup = 'com.linkedin.kafka'
 def kafkaVersion = '2.4.1.65'

clients/da-vinci-client/src/main/java/com/linkedin/davinci/kafka/consumer/ActiveActiveStoreIngestionTask.java

@@ -135,13 +135,17 @@ public ActiveActiveStoreIngestionTask(
     StringAnnotatedStoreSchemaCache annotatedReadOnlySchemaRepository =
         new StringAnnotatedStoreSchemaCache(storeName, schemaRepository);
 
-    this.rmdSerDe = new RmdSerDe(annotatedReadOnlySchemaRepository, rmdProtocolVersionId);
+    this.rmdSerDe = new RmdSerDe(
+        annotatedReadOnlySchemaRepository,
+        rmdProtocolVersionId,
+        getServerConfig().isComputeFastAvroEnabled());
     this.mergeConflictResolver = MergeConflictResolverFactory.getInstance()
         .createMergeConflictResolver(
             annotatedReadOnlySchemaRepository,
             rmdSerDe,
             getStoreName(),
-            isWriteComputationEnabled);
+            isWriteComputationEnabled,
+            getServerConfig().isComputeFastAvroEnabled());
     this.remoteIngestionRepairService = builder.getRemoteIngestionRepairService();
   }
 

clients/da-vinci-client/src/main/java/com/linkedin/davinci/kafka/consumer/StoreWriteComputeProcessor.java

@@ -3,7 +3,7 @@
 import com.linkedin.davinci.schema.merge.MergeRecordHelper;
 import com.linkedin.davinci.schema.writecompute.WriteComputeProcessor;
 import com.linkedin.davinci.schema.writecompute.WriteComputeSchemaValidator;
-import com.linkedin.davinci.serializer.avro.MapOrderingPreservingSerDeFactory;
+import com.linkedin.davinci.serializer.avro.MapOrderPreservingSerDeFactory;
 import com.linkedin.venice.exceptions.VeniceException;
 import com.linkedin.venice.meta.ReadOnlySchemaRepository;
 import com.linkedin.venice.serializer.AvroSerializer;
@@ -132,7 +132,7 @@ RecordDeserializer<GenericRecord> getValueDeserializer(Schema writerSchema, Sche
     // Map in write compute needs to have consistent ordering. On the sender side, users may not care about ordering
     // in their maps. However, on the receiver side, we still want to make sure that the same serialized map bytes
     // always get deserialized into maps with the same entry ordering.
-    return MapOrderingPreservingSerDeFactory.getDeserializer(writerSchema, readerSchema);
+    return MapOrderPreservingSerDeFactory.getDeserializer(writerSchema, readerSchema);
   }
 
   private RecordSerializer<GenericRecord> getValueSerializer(int valueSchemaId) {

clients/da-vinci-client/src/main/java/com/linkedin/davinci/replication/merge/MergeConflictResolver.java

@@ -11,7 +11,8 @@
 
 import com.linkedin.davinci.replication.RmdWithValueSchemaId;
 import com.linkedin.davinci.schema.merge.ValueAndRmd;
-import com.linkedin.davinci.serializer.avro.MapOrderingPreservingSerDeFactory;
+import com.linkedin.davinci.serializer.avro.MapOrderPreservingSerDeFactory;
+import com.linkedin.davinci.serializer.avro.fast.MapOrderPreservingFastSerDeFactory;
 import com.linkedin.davinci.store.record.ValueRecord;
 import com.linkedin.venice.annotation.Threadsafe;
 import com.linkedin.venice.exceptions.VeniceException;
@@ -20,7 +21,12 @@
 import com.linkedin.venice.schema.rmd.RmdTimestampType;
 import com.linkedin.venice.schema.rmd.RmdUtils;
 import com.linkedin.venice.schema.writecompute.WriteComputeOperation;
+import com.linkedin.venice.serializer.RecordDeserializer;
+import com.linkedin.venice.serializer.RecordSerializer;
 import com.linkedin.venice.utils.AvroSchemaUtils;
+import com.linkedin.venice.utils.SparseConcurrentList;
+import com.linkedin.venice.utils.collections.BiIntKeyCache;
+import com.linkedin.venice.utils.concurrent.VeniceConcurrentHashMap;
 import com.linkedin.venice.utils.lazy.Lazy;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -52,6 +58,11 @@ public class MergeConflictResolver {
   private final MergeResultValueSchemaResolver mergeResultValueSchemaResolver;
   private final RmdSerDe rmdSerde;
   private final boolean useFieldLevelTimestamp;
+  private final boolean fastAvroEnabled;
+
+  private final SparseConcurrentList<RecordSerializer<GenericRecord>> serializerIndexedByValueSchemaId;
+  private final BiIntKeyCache<RecordDeserializer<GenericRecord>> deserializerCacheForFullValue;
+  private final Map<String, RecordDeserializer<GenericRecord>> deserializerCacheForUpdateValue;
 
   MergeConflictResolver(
       StringAnnotatedStoreSchemaCache storeSchemaCache,
@@ -61,7 +72,8 @@ public class MergeConflictResolver {
       MergeByteBuffer mergeByteBuffer,
       MergeResultValueSchemaResolver mergeResultValueSchemaResolver,
       RmdSerDe rmdSerde,
-      boolean useFieldLevelTimestamp) {
+      boolean useFieldLevelTimestamp,
+      boolean fastAvroEnabled) {
     this.storeSchemaCache = Validate.notNull(storeSchemaCache);
     this.storeName = Validate.notNull(storeName);
     this.newRmdCreator = Validate.notNull(newRmdCreator);
@@ -70,6 +82,17 @@ public class MergeConflictResolver {
     this.mergeByteBuffer = Validate.notNull(mergeByteBuffer);
     this.rmdSerde = Validate.notNull(rmdSerde);
     this.useFieldLevelTimestamp = useFieldLevelTimestamp;
+    this.fastAvroEnabled = fastAvroEnabled;
+
+    this.serializerIndexedByValueSchemaId = new SparseConcurrentList<>();
+    this.deserializerCacheForFullValue = new BiIntKeyCache<>((writerSchemaId, readerSchemaId) -> {
+      Schema writerSchema = getValueSchema(writerSchemaId);
+      Schema readerSchema = getValueSchema(readerSchemaId);
+      return this.fastAvroEnabled
+          ? MapOrderPreservingFastSerDeFactory.getDeserializer(writerSchema, readerSchema)
+          : MapOrderPreservingSerDeFactory.getDeserializer(writerSchema, readerSchema);
+    });
+    this.deserializerCacheForUpdateValue = new VeniceConcurrentHashMap<>();
   }
 
   /**
@@ -247,7 +270,7 @@ public MergeConflictResult update(
     }
     final ByteBuffer updatedValueBytes = updatedValueAndRmd.getValue() == null
         ? null
-        : serializeMergedValueRecord(oldValueSchema, updatedValueAndRmd.getValue());
+        : serializeMergedValueRecord(oldValueSchemaID, updatedValueAndRmd.getValue());
     return new MergeConflictResult(updatedValueBytes, oldValueSchemaID, false, updatedValueAndRmd.getRmd());
   }
 
@@ -300,14 +323,13 @@ private MergeConflictResult mergePutWithFieldLevelTimestamp(
     }
     final SchemaEntry mergeResultValueSchemaEntry =
         mergeResultValueSchemaResolver.getMergeResultValueSchema(oldValueSchemaID, newValueSchemaID);
-    final Schema mergeResultValueSchema = mergeResultValueSchemaEntry.getSchema();
-    final Schema newValueWriterSchema = getValueSchema(newValueSchemaID);
     /**
      * Note that it is important that the new value record should NOT use {@link mergeResultValueSchema}.
      * {@link newValueWriterSchema} is either the same as {@link mergeResultValueSchema} or it is a subset of
      * {@link mergeResultValueSchema}.
      */
-    GenericRecord newValueRecord = deserializeValue(newValueBytes, newValueWriterSchema, newValueWriterSchema);
+    GenericRecord newValueRecord =
+        deserializerCacheForFullValue.get(newValueSchemaID, newValueSchemaID).deserialize(newValueBytes);
     ValueAndRmd<GenericRecord> oldValueAndRmd = createOldValueAndRmd(
         mergeResultValueSchemaEntry.getSchema(),
         mergeResultValueSchemaEntry.getId(),
@@ -325,7 +347,8 @@ private MergeConflictResult mergePutWithFieldLevelTimestamp(
     if (mergedValueAndRmd.isUpdateIgnored()) {
       return MergeConflictResult.getIgnoredResult();
     }
-    ByteBuffer mergedValueBytes = serializeMergedValueRecord(mergeResultValueSchema, mergedValueAndRmd.getValue());
+    ByteBuffer mergedValueBytes =
+        serializeMergedValueRecord(mergeResultValueSchemaEntry.getId(), mergedValueAndRmd.getValue());
     return new MergeConflictResult(mergedValueBytes, newValueSchemaID, false, mergedValueAndRmd.getRmd());
   }
 
@@ -380,7 +403,7 @@ private MergeConflictResult mergeDeleteWithFieldLevelTimestamp(
     }
     final ByteBuffer mergedValueBytes = mergedValueAndRmd.getValue() == null
         ? null
-        : serializeMergedValueRecord(oldValueSchema, mergedValueAndRmd.getValue());
+        : serializeMergedValueRecord(oldValueSchemaID, mergedValueAndRmd.getValue());
     return new MergeConflictResult(mergedValueBytes, oldValueSchemaID, false, mergedValueAndRmd.getRmd());
   }
 
@@ -402,8 +425,11 @@ private ValueAndRmd<GenericRecord> createOldValueAndRmd(
       int oldValueWriterSchemaID,
       Lazy<ByteBuffer> oldValueBytesProvider,
       GenericRecord oldRmdRecord) {
-    final GenericRecord oldValueRecord =
-        createValueRecordFromByteBuffer(readerValueSchema, oldValueWriterSchemaID, oldValueBytesProvider.get());
+    final GenericRecord oldValueRecord = createValueRecordFromByteBuffer(
+        readerValueSchema,
+        readerValueSchemaID,
+        oldValueWriterSchemaID,
+        oldValueBytesProvider.get());
 
     // RMD record should contain a per-field timestamp and it should use the RMD schema generated from
     // mergeResultValueSchema.
@@ -418,13 +444,13 @@ private ValueAndRmd<GenericRecord> createOldValueAndRmd(
 
   private GenericRecord createValueRecordFromByteBuffer(
       Schema readerValueSchema,
+      int readerValueSchemaID,
       int oldValueWriterSchemaID,
       ByteBuffer oldValueBytes) {
     if (oldValueBytes == null) {
       return AvroSchemaUtils.createGenericRecord(readerValueSchema);
     }
-    final Schema oldValueWriterSchema = getValueSchema(oldValueWriterSchemaID);
-    return deserializeValue(oldValueBytes, oldValueWriterSchema, readerValueSchema);
+    return deserializerCacheForFullValue.get(oldValueWriterSchemaID, readerValueSchemaID).deserialize(oldValueBytes);
   }
 
   private GenericRecord convertRmdToUseReaderValueSchema(
@@ -439,13 +465,6 @@ private GenericRecord convertRmdToUseReaderValueSchema(
     return rmdSerde.deserializeRmdBytes(writerValueSchemaID, readerValueSchemaID, rmdBytes);
   }
 
-  private GenericRecord deserializeValue(ByteBuffer bytes, Schema writerSchema, Schema readerSchema) {
-    /**
-     * TODO: Refactor this to use {@link com.linkedin.venice.serialization.StoreDeserializerCache}
-     */
-    return MapOrderingPreservingSerDeFactory.getDeserializer(writerSchema, readerSchema).deserialize(bytes);
-  }
-
   private boolean ignoreNewPut(
       final int oldValueSchemaID,
       GenericRecord oldValueFieldTimestampsRecord,
@@ -582,9 +601,21 @@ private GenericRecord deserializeWriteComputeBytes(
       int readerValueSchemaId,
       int updateProtocolVersion,
       ByteBuffer updateBytes) {
-    Schema writerSchema = getWriteComputeSchema(writerValueSchemaId, updateProtocolVersion);
-    Schema readerSchema = getWriteComputeSchema(readerValueSchemaId, updateProtocolVersion);
-    return deserializeValue(updateBytes, writerSchema, readerSchema);
+    String combinedKey = new StringBuilder().append(writerValueSchemaId)
+        .append("-")
+        .append(readerValueSchemaId)
+        .append("-")
+        .append(updateProtocolVersion)
+        .toString();
+    RecordDeserializer<GenericRecord> deserializer =
+        deserializerCacheForUpdateValue.computeIfAbsent(combinedKey, ignored -> {
+          Schema writerSchema = getWriteComputeSchema(writerValueSchemaId, updateProtocolVersion);
+          Schema readerSchema = getWriteComputeSchema(readerValueSchemaId, updateProtocolVersion);
+          return this.fastAvroEnabled
+              ? MapOrderPreservingFastSerDeFactory.getDeserializer(writerSchema, readerSchema)
+              : MapOrderPreservingSerDeFactory.getDeserializer(writerSchema, readerSchema);
+        });
+    return deserializer.deserialize(updateBytes);
   }
 
   private ValueAndRmd<GenericRecord> prepareValueAndRmdForUpdate(
@@ -603,8 +634,8 @@ private ValueAndRmd<GenericRecord> prepareValueAndRmdForUpdate(
          * case, the value must be retrieved from storage engine, and is prepended with schema ID.
          */
         int schemaId = ValueRecord.parseSchemaId(oldValueBytes.array());
-        Schema writerSchema = getValueSchema(schemaId);
-        newValue = deserializeValue(oldValueBytes, writerSchema, readerValueSchemaEntry.getSchema());
+        newValue =
+            deserializerCacheForFullValue.get(schemaId, readerValueSchemaEntry.getId()).deserialize(oldValueBytes);
       }
       GenericRecord newRmd = newRmdCreator.apply(readerValueSchemaEntry.getId());
       newRmd.put(TIMESTAMP_FIELD_POS, createPerFieldTimestampRecord(newRmd.getSchema(), 0L, newValue));
@@ -741,10 +772,16 @@ private boolean ignoreNewUpdate(
     }
   }
 
-  private ByteBuffer serializeMergedValueRecord(Schema mergedValueSchema, GenericRecord mergedValue) {
+  private ByteBuffer serializeMergedValueRecord(int mergedValueSchemaId, GenericRecord mergedValue) {
     // TODO: avoid serializing the merged value result here and instead serializing it before persisting it. The goal
     // is to avoid back-and-forth ser/de. Because when the merged result is read before it is persisted, we may need
     // to deserialize it.
-    return ByteBuffer.wrap(MapOrderingPreservingSerDeFactory.getSerializer(mergedValueSchema).serialize(mergedValue));
+    RecordSerializer serializer = serializerIndexedByValueSchemaId.computeIfAbsent(mergedValueSchemaId, ignored -> {
+      Schema mergedValueSchema = getValueSchema(mergedValueSchemaId);
+      return fastAvroEnabled
+          ? MapOrderPreservingFastSerDeFactory.getSerializer(mergedValueSchema)
+          : MapOrderPreservingSerDeFactory.getSerializer(mergedValueSchema);
+    });
+    return ByteBuffer.wrap(serializer.serialize(mergedValue));
   }
 }

clients/da-vinci-client/src/main/java/com/linkedin/davinci/replication/merge/MergeConflictResolverFactory.java

@@ -21,7 +21,8 @@ public MergeConflictResolver createMergeConflictResolver(
       StringAnnotatedStoreSchemaCache annotatedReadOnlySchemaRepository,
       RmdSerDe rmdSerDe,
       String storeName,
-      boolean rmdUseFieldLevelTs) {
+      boolean rmdUseFieldLevelTs,
+      boolean fastAvroEnabled) {
     MergeRecordHelper mergeRecordHelper = new CollectionTimestampMergeRecordHelper();
     return new MergeConflictResolver(
         annotatedReadOnlySchemaRepository,
@@ -31,13 +32,14 @@ public MergeConflictResolver createMergeConflictResolver(
         new MergeByteBuffer(),
         new MergeResultValueSchemaResolverImpl(annotatedReadOnlySchemaRepository, storeName),
         rmdSerDe,
-        rmdUseFieldLevelTs);
+        rmdUseFieldLevelTs,
+        fastAvroEnabled);
   }
 
   public MergeConflictResolver createMergeConflictResolver(
       StringAnnotatedStoreSchemaCache annotatedReadOnlySchemaRepository,
       RmdSerDe rmdSerDe,
       String storeName) {
-    return createMergeConflictResolver(annotatedReadOnlySchemaRepository, rmdSerDe, storeName, false);
+    return createMergeConflictResolver(annotatedReadOnlySchemaRepository, rmdSerDe, storeName, false, true);
   }
 }

clients/da-vinci-client/src/main/java/com/linkedin/davinci/replication/merge/RmdSerDe.java

@@ -1,7 +1,8 @@
 package com.linkedin.davinci.replication.merge;
 
 import com.linkedin.davinci.replication.RmdWithValueSchemaId;
-import com.linkedin.davinci.serializer.avro.MapOrderingPreservingSerDeFactory;
+import com.linkedin.davinci.serializer.avro.MapOrderPreservingSerDeFactory;
+import com.linkedin.davinci.serializer.avro.fast.MapOrderPreservingFastSerDeFactory;
 import com.linkedin.venice.annotation.Threadsafe;
 import com.linkedin.venice.exceptions.VeniceException;
 import com.linkedin.venice.schema.rmd.RmdSchemaEntry;
@@ -30,16 +31,27 @@ public class RmdSerDe {
   private final SparseConcurrentList<Schema> rmdSchemaIndexedByValueSchemaId;
   private final SparseConcurrentList<RecordSerializer<GenericRecord>> rmdSerializerIndexedByValueSchemaId;
   private final BiIntKeyCache<RecordDeserializer<GenericRecord>> deserializerCache;
+  private final boolean fastAvroEnabled;
 
   public RmdSerDe(StringAnnotatedStoreSchemaCache annotatedStoreSchemaCache, int rmdVersionId) {
+    this(annotatedStoreSchemaCache, rmdVersionId, true);
+  }
+
+  public RmdSerDe(
+      StringAnnotatedStoreSchemaCache annotatedStoreSchemaCache,
+      int rmdVersionId,
+      boolean fastAvroEnabled) {
     this.annotatedStoreSchemaCache = annotatedStoreSchemaCache;
     this.rmdVersionId = rmdVersionId;
     this.rmdSchemaIndexedByValueSchemaId = new SparseConcurrentList<>();
     this.rmdSerializerIndexedByValueSchemaId = new SparseConcurrentList<>();
+    this.fastAvroEnabled = fastAvroEnabled;
     this.deserializerCache = new BiIntKeyCache<>((writerSchemaId, readerSchemaId) -> {
       Schema rmdWriterSchema = getRmdSchema(writerSchemaId);
       Schema rmdReaderSchema = getRmdSchema(readerSchemaId);
-      return MapOrderingPreservingSerDeFactory.getDeserializer(rmdWriterSchema, rmdReaderSchema);
+      return this.fastAvroEnabled
+          ? MapOrderPreservingFastSerDeFactory.getDeserializer(rmdWriterSchema, rmdReaderSchema)
+          : MapOrderPreservingSerDeFactory.getDeserializer(rmdWriterSchema, rmdReaderSchema);
     });
   }
 
@@ -98,6 +110,8 @@ private RecordDeserializer<GenericRecord> getRmdDeserializer(final int writerSch
 
   private RecordSerializer<GenericRecord> generateRmdSerializer(int valueSchemaId) {
     Schema replicationMetadataSchema = getRmdSchema(valueSchemaId);
-    return MapOrderingPreservingSerDeFactory.getSerializer(replicationMetadataSchema);
+    return fastAvroEnabled
+        ? MapOrderPreservingFastSerDeFactory.getSerializer(replicationMetadataSchema)
+        : MapOrderPreservingSerDeFactory.getSerializer(replicationMetadataSchema);
   }
 }

clients/da-vinci-client/src/main/java/com/linkedin/davinci/schema/merge/SortBasedCollectionFieldOpHandler.java

@@ -51,6 +51,12 @@ public UpdateResultStatus handlePutList(
       toPutList = Collections.emptyList();
     } else {
       toPutList = newFieldValue;
+      /**
+       * LinkedList is more efficient for the following add/remove operations.
+       */
+      if (!(toPutList instanceof LinkedList)) {
+        toPutList = new LinkedList<>((toPutList));
+      }
     }
 
     if (collectionFieldRmd.isInPutOnlyState()) {

clients/da-vinci-client/src/main/java/com/linkedin/davinci/schema/merge/Utils.java

@@ -1,6 +1,8 @@
 package com.linkedin.davinci.schema.merge;
 
 import com.linkedin.davinci.utils.IndexedHashMap;
+import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;
 
 
@@ -18,6 +20,12 @@ static <T> IndexedHashMap<T, Long> createElementToActiveTsMap(
       final int putOnlyPartLength) {
     IndexedHashMap<T, Long> activeElementToTsMap = new IndexedHashMap<>(existingElements.size());
     int idx = 0;
+    if (!existingElements.isEmpty() && activeTimestamps instanceof LinkedList) {
+      /**
+       * LinkedList is not efficient for get operation
+       */
+      activeTimestamps = new ArrayList<>(activeTimestamps);
+    }
     for (T existingElement: existingElements) {
       final long activeTimestamp;
       if (idx < putOnlyPartLength) {
@@ -41,6 +49,12 @@ static <T> IndexedHashMap<T, Long> createDeletedElementToTsMap(
   ) {
     IndexedHashMap<T, Long> elementToTimestampMap = new IndexedHashMap<>();
     int idx = 0;
+    if (!deletedTimestamps.isEmpty() && deletedElements instanceof LinkedList) {
+      /**
+       * LinkedList is not efficient for get operation
+       */
+      deletedElements = new ArrayList<>(deletedElements);
+    }
     for (long deletedTimestamp: deletedTimestamps) {
       if (deletedTimestamp >= minTimestamp) {
         elementToTimestampMap.put(deletedElements.get(idx), deletedTimestamp);