[MINOR] NullPointerException when reading action state of old archived timelines (apache#13579)

Author: the-other-tim-brown

hudi-common/src/main/java/org/apache/hudi/common/table/timeline/versioning/v1/ArchivedTimelineV1.java

@@ -271,7 +271,8 @@ private Option<HoodieInstant> readCommit(String instantTime, GenericRecord recor
                                            TimeRangeFilter timeRangeFilter) {
     final String action = record.get(ACTION_TYPE_KEY).toString();
     final String stateTransitionTime = (String) record.get(STATE_TRANSITION_TIME);
-    final HoodieInstant hoodieInstant = new HoodieInstant(HoodieInstant.State.valueOf(record.get(ACTION_STATE).toString()), action,
+    final HoodieInstant.State actionState = Option.ofNullable(record.get(ACTION_STATE)).map(state -> HoodieInstant.State.valueOf(state.toString())).orElse(HoodieInstant.State.COMPLETED);
+    final HoodieInstant hoodieInstant = new HoodieInstant(actionState, action,
         instantTime, stateTransitionTime, InstantComparatorV1.REQUESTED_TIME_BASED_COMPARATOR);
     if (timeRangeFilter != null && !timeRangeFilter.isInRange(hoodieInstant.requestedTime())) {
       return Option.empty();

hudi-hadoop-common/src/test/java/org/apache/hudi/common/table/timeline/TestArchivedTimelineV1.java

@@ -35,6 +35,7 @@
 import org.apache.hudi.common.model.HoodieRecord;
 import org.apache.hudi.common.model.HoodieRollingStatMetadata;
 import org.apache.hudi.common.model.WriteOperationType;
+import org.apache.hudi.common.table.HoodieTableMetaClient;
 import org.apache.hudi.common.table.log.HoodieLogFormat;
 import org.apache.hudi.common.table.log.HoodieLogFormat.Writer;
 import org.apache.hudi.common.table.log.block.HoodieAvroDataBlock;
@@ -71,6 +72,7 @@
 import static org.apache.hudi.common.table.timeline.HoodieInstant.State.COMPLETED;
 import static org.apache.hudi.common.table.timeline.HoodieInstant.State.INFLIGHT;
 import static org.apache.hudi.common.table.timeline.HoodieInstant.State.REQUESTED;
+import static org.apache.hudi.common.testutils.HoodieTestUtils.getDefaultStorageConf;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -419,6 +421,19 @@ public void testLoadArchivedInstantsForAdditionalActions() throws Exception {
     assertEquals(instants, timeline.getInstants());
   }
 
+  @Test
+  void readLegacyArchivedTimelineWithNullFields() {
+    String samplePath = this.getClass().getClassLoader().getResource("archived_timeline").getPath();
+    metaClient = HoodieTableMetaClient.builder()
+        .setBasePath(samplePath)
+        .setConf(getDefaultStorageConf())
+        .setLoadActiveTimelineOnLoad(false)
+        .build();
+    HoodieArchivedTimeline timeline = new ArchivedTimelineV1(metaClient);
+    timeline.loadCompletedInstantDetailsInMemory();
+    assertEquals(3, timeline.getInstants().size());
+  }
+
   /**
    * Validate whether the instants of given timestamps of the hudi archived timeline are loaded to memory or not.
    * @param hoodieArchivedTimeline archived timeline to test against

hudi-hadoop-common/src/test/resources/archived_timeline/.hoodie/archived/.commits_.archive.1_1-0-1

@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+hoodie.table.name=raw_trips
+hoodie.archivelog.folder=archived
+hoodie.table.type=COPY_ON_WRITE
+hoodie.table.version=6
+hoodie.table.partition.fields=some_nonexistent_field
+hoodie.timeline.layout.version=1
+hoodie.datasource.write.drop.partition.columns=false
+hoodie.table.checksum=3360473891