purging

Author: ericm-db

sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/state/SchemaHelper.scala

@@ -72,18 +72,11 @@ object ColumnFamilySchemaV1 {
     assert(colFamilyMap.isInstanceOf[Map[_, _]],
       s"Expected Map but got ${colFamilyMap.getClass}")
     val keySchema = StructType.fromString(colFamilyMap("keySchema").asInstanceOf[String])
-<<<<<<< HEAD
     val valueSchema = StructType.fromString(colFamilyMap("valueSchema").asInstanceOf[String])
     ColumnFamilySchemaV1(
       colFamilyMap("columnFamilyName").asInstanceOf[String],
       keySchema,
       valueSchema,
-=======
-    new ColumnFamilySchemaV1(
-      colFamilyMap("columnFamilyName").asInstanceOf[String],
-      keySchema,
-      StructType.fromString(colFamilyMap("valueSchema").asInstanceOf[String]),
->>>>>>> 6768eea5a98 (Feedback)
       KeyStateEncoderSpec.fromJson(keySchema, colFamilyMap("keyStateEncoderSpec")
         .asInstanceOf[Map[String, Any]]),
       colFamilyMap.get("userKeyEncoder").map(_.asInstanceOf[String]).map(StructType.fromString)

sql/core/src/test/scala/org/apache/spark/sql/streaming/TransformWithStateSuite.scala

@@ -844,16 +844,12 @@ class TransformWithStateSuite extends StateStoreMetricsTest
   private def fetchColumnFamilySchemas(
       checkpointDir: String,
       operatorId: Int): List[ColumnFamilySchema] = {
-<<<<<<< HEAD
     val operatorStateMetadataLog = fetchOperatorStateMetadataLog(checkpointDir, operatorId)
     val stateSchemaFilePath = operatorStateMetadataLog.
       getLatest().get._2.
       asInstanceOf[OperatorStateMetadataV2].
       stateStoreInfo.head.stateSchemaFilePath
     fetchStateSchemaV3File(checkpointDir, operatorId).getWithPath(new Path(stateSchemaFilePath))
-=======
-    fetchStateSchemaV3File(checkpointDir, operatorId).getLatest().get._2
->>>>>>> 6768eea5a98 (Feedback)
   }
 
   private def fetchStateSchemaV3File(