addressing minor feedback

apache · May 10, 2022 · 842f311 · 842f311
1 parent b4fa0ff
commit 842f311
Showing 1 changed file with 16 additions and 17 deletions.
diff --git a/hudi-common/src/main/java/org/apache/hudi/common/table/TableSchemaResolver.java b/hudi-common/src/main/java/org/apache/hudi/common/table/TableSchemaResolver.java
@@ -100,12 +100,7 @@ private MessageType getTableParquetSchemaFromDataFile() {
           if (instantAndCommitMetadata.isPresent()) {
             HoodieCommitMetadata commitMetadata = instantAndCommitMetadata.get().getRight();
             Iterator<String> filePaths = commitMetadata.getFileIdAndFullPaths(metaClient.getBasePath()).values().iterator();
-            MessageType type = null;
-            while (filePaths.hasNext() && type == null) {
-              String filePath = filePaths.next();
-              type = readSchemaFromBaseFile(filePath);
-            }
-            return type;
+            return fetchSchemaFromFiles(filePaths);
           } else {
             throw new IllegalArgumentException("Could not find any data file written for commit, "
                 + "so could not get schema for table " + metaClient.getBasePath());
@@ -116,17 +111,7 @@ private MessageType getTableParquetSchemaFromDataFile() {
           if (instantAndCommitMetadata.isPresent()) {
             HoodieCommitMetadata commitMetadata = instantAndCommitMetadata.get().getRight();
             Iterator<String> filePaths = commitMetadata.getFileIdAndFullPaths(metaClient.getBasePath()).values().iterator();
-            MessageType type = null;
-            while (filePaths.hasNext() && type == null) {
-              String filePath = filePaths.next();
-              if (filePath.contains(HoodieFileFormat.HOODIE_LOG.getFileExtension())) {
-                // this is a log file
-                type = readSchemaFromLogFile(new Path(filePath));
-              } else {
-                type = readSchemaFromBaseFile(filePath);
-              }
-            }
-            return type;
+            return fetchSchemaFromFiles(filePaths);
           } else {
             throw new IllegalArgumentException("Could not find any data file written for commit, "
                 + "so could not get schema for table " + metaClient.getBasePath());
@@ -140,6 +125,20 @@ private MessageType getTableParquetSchemaFromDataFile() {
     }
   }
 
+  private MessageType fetchSchemaFromFiles(Iterator<String> filePaths) throws IOException {
+    MessageType type = null;
+    while (filePaths.hasNext() && type == null) {
+      String filePath = filePaths.next();
+      if (filePath.contains(HoodieFileFormat.HOODIE_LOG.getFileExtension())) {
+        // this is a log file
+        type = readSchemaFromLogFile(new Path(filePath));
+      } else {
+        type = readSchemaFromBaseFile(filePath);
+      }
+    }
+    return type;
+  }
+
   private MessageType readSchemaFromBaseFile(String filePath) throws IOException {
     if (filePath.contains(HoodieFileFormat.PARQUET.getFileExtension())) {
       // this is a parquet file