Fix compilation error after rebase

Author: yihua

hudi-common/src/main/java/org/apache/hudi/common/model/SerializableMetadataIndexedRecord.java

@@ -19,6 +19,8 @@
 
 package org.apache.hudi.common.model;
 
+import org.apache.hudi.common.schema.HoodieSchema;
+import org.apache.hudi.common.schema.HoodieSchemaField;
 import org.apache.hudi.common.util.ValidationUtils;
 import org.apache.hudi.common.util.VisibleForTesting;
 import org.apache.hudi.exception.HoodieIOException;
@@ -46,8 +48,8 @@
 
 public class SerializableMetadataIndexedRecord implements GenericRecord, KryoSerializable, Serializable {
   private static final long serialVersionUID = 1L;
-  private static final ConcurrentHashMap<Schema, GenericDatumReader<GenericRecord>> CACHED_DATUM_READER_MAP = new ConcurrentHashMap<>();
-  private static final ConcurrentHashMap<Schema, Schema.Field> CACHED_KEY_SCHEMA_MAP = new ConcurrentHashMap<>();
+  private static final ConcurrentHashMap<HoodieSchema, GenericDatumReader<GenericRecord>> CACHED_DATUM_READER_MAP = new ConcurrentHashMap<>();
+  private static final ConcurrentHashMap<Schema, HoodieSchemaField> CACHED_KEY_SCHEMA_MAP = new ConcurrentHashMap<>();
   private IndexedRecord record;
   private Schema schema;
   // TODO(yihua): need to have a better way of referencing this reader
@@ -74,7 +76,7 @@ private SerializableMetadataIndexedRecord(Schema schema,
 
   public static SerializableMetadataIndexedRecord fromHFileKeyValueBytes(Schema schema,
                                                                          GenericDatumReader<GenericRecord> datumReader,
-                                                                         Schema.Field keyFieldSchema,
+                                                                         HoodieSchemaField keyFieldSchema,
                                                                          KeyValue hfileKeyValue) {
     CACHED_KEY_SCHEMA_MAP.computeIfAbsent(schema, k -> keyFieldSchema);
     return new SerializableMetadataIndexedRecord(

hudi-common/src/main/java/org/apache/hudi/io/storage/HoodieAvroHFileReaderImplBase.java

@@ -86,7 +86,7 @@ public static List<IndexedRecord> readRecords(HoodieAvroHFileReaderImplBase read
     }
   }
 
-  protected static GenericRecord deserialize(String key,
+  public static GenericRecord deserialize(String key,
                                              final byte[] valueBytes, int valueOffset, int valueLength,
                                              GenericDatumReader<GenericRecord> datumReader,
                                              HoodieSchemaField keyFieldSchema) throws IOException {

hudi-common/src/main/java/org/apache/hudi/io/storage/HoodieNativeAvroHFileReader.java

@@ -43,6 +43,7 @@
 import org.apache.hudi.storage.StoragePath;
 import org.apache.hudi.util.Lazy;
 
+import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericDatumReader;
 import org.apache.avro.generic.GenericRecord;
 import org.apache.avro.generic.IndexedRecord;
@@ -599,7 +600,7 @@ public boolean hasNext() {
             if (!isPrefixOfKey(lookUpKeyPrefix, keyValue.getKey())) {
               return false;
             }
-            next = SerializableMetadataIndexedRecord.fromHFileKeyValueBytes(writerSchema, datumReader, keyFieldSchema, keyValue);
+            next = SerializableMetadataIndexedRecord.fromHFileKeyValueBytes(writerSchema.getAvroSchema(), datumReader, keyFieldSchema, keyValue);
             // In case scanner is not able to advance, it means we reached EOF
             eof = !reader.next();
           } catch (IOException e) {