Address comment

Author: jack-moseley

hivelink-core/src/main/java/org/apache/iceberg/hivelink/core/HiveMetadataPreservingTableOperations.java

@@ -36,6 +36,7 @@
 import org.apache.hadoop.hive.metastore.api.EnvironmentContext;
 import org.apache.hadoop.hive.metastore.api.FieldSchema;
 import org.apache.hadoop.hive.metastore.api.NoSuchObjectException;
+import org.apache.hadoop.hive.metastore.api.SerDeInfo;
 import org.apache.hadoop.hive.metastore.api.Table;
 import org.apache.hadoop.hive.serde2.SerDeException;
 import org.apache.hadoop.hive.serde2.avro.AvroObjectInspectorGenerator;
@@ -53,6 +54,7 @@
 import org.apache.iceberg.relocated.com.google.common.base.Strings;
 import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap;
 import org.apache.iceberg.relocated.com.google.common.collect.ImmutableSet;
+import org.apache.iceberg.relocated.com.google.common.collect.Maps;
 import org.apache.thrift.TException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -295,11 +297,16 @@ private static void updateORCStorageDesc(List<FieldSchema> hiveCols, Table table
     String columnsString = hiveCols.stream().map(FieldSchema::getName).collect(Collectors.joining(","));
     String typesString = hiveCols.stream().map(FieldSchema::getType).collect(Collectors.joining(","));
 
-    if (table.getSd().getSerdeInfo() != null && table.getSd().getSerdeInfo().getParameters() != null) {
-      Map<String, String> sdParams = table.getSd().getSerdeInfo().getParameters();
-      sdParams.put(ORC_COLUMNS, columnsString);
-      sdParams.put(ORC_COLUMNS_TYPES, typesString);
+    if (!table.getSd().isSetSerdeInfo()) {
+      table.getSd().setSerdeInfo(new SerDeInfo());
     }
+    if (!table.getSd().getSerdeInfo().isSetParameters()) {
+      table.getSd().getSerdeInfo().setParameters(Maps.newHashMap());
+    }
+
+    Map<String, String> sdParams = table.getSd().getSerdeInfo().getParameters();
+    sdParams.put(ORC_COLUMNS, columnsString);
+    sdParams.put(ORC_COLUMNS_TYPES, typesString);
   }
 
   /**

hivelink-core/src/test/java/org/apache/iceberg/hivelink/core/TestHiveMetadataPreservingTableOperations.java

@@ -55,9 +55,6 @@ public void testFixMismatchedSchema() {
     storageDescriptor.setCols(ImmutableList.of(field1, field2, new FieldSchema("nested", "struct<field1:int," +
         "field2:string>", "")));
     storageDescriptor.setInputFormat("org.apache.hadoop.hive.ql.io.orc.OrcInputFormat");
-    SerDeInfo serDeInfo = new SerDeInfo();
-    serDeInfo.setParameters(ImmutableMap.of("field1", "value1"));
-    storageDescriptor.setSerdeInfo(serDeInfo);
     Map<String, String> parameters = ImmutableMap.of("avro.schema.literal", testSchemaLiteral);
     Table tbl = new Table("tableName",
         "dbName",