Resolved conflicts in aws-samples#38

Author: manabery

utilities/Hive_metastore_migration/src/hive_metastore_migration.py

@@ -511,6 +511,14 @@ def transform_ms_bucketing_cols(self, ms_bucketing_cols):
         )
 
     def transform_ms_columns(self, ms_columns):
+        def extract_row(row):
+            def truncate(x):
+                return x[:255] if hasattr(x,"__getitem__") else x
+            return (
+                row['COLUMN_NAME'],
+                row['TYPE_NAME'],
+                truncate(row['COMMENT'])
+            )
         return self.transform_df_with_idx(
             df=ms_columns,
             id_col="CD_ID",
@@ -523,7 +531,7 @@ def transform_ms_columns(self, ms_columns):
                     StructField(name="comment", dataType=StringType()),
                 ]
             ),
-            payload_func=lambda row: (row["COLUMN_NAME"], row["TYPE_NAME"], row["COMMENT"]),
+            payload_func=extract_row,
         )
 
     def transform_ms_skewed_col_names(self, ms_skewed_col_names):