diff --git a/spark/src/main/scala/org/apache/spark/sql/delta/DeltaColumnMapping.scala b/spark/src/main/scala/org/apache/spark/sql/delta/DeltaColumnMapping.scala index 04d42621ed6..3729af5bf14 100644 --- a/spark/src/main/scala/org/apache/spark/sql/delta/DeltaColumnMapping.scala +++ b/spark/src/main/scala/org/apache/spark/sql/delta/DeltaColumnMapping.scala @@ -86,7 +86,6 @@ trait DeltaColumnMappingBase extends DeltaLogging { RowIdMetadataStructField.isRowIdColumn(field) || RowCommitVersion.MetadataStructField.isRowCommitVersionColumn(field) - /** * Allow NameMapping -> NoMapping transition behind a feature flag. * Otherwise only NoMapping -> NameMapping is allowed. diff --git a/spark/src/main/scala/org/apache/spark/sql/delta/actions/TableFeatureSupport.scala b/spark/src/main/scala/org/apache/spark/sql/delta/actions/TableFeatureSupport.scala index 3fbff2dacb6..b9065499084 100644 --- a/spark/src/main/scala/org/apache/spark/sql/delta/actions/TableFeatureSupport.scala +++ b/spark/src/main/scala/org/apache/spark/sql/delta/actions/TableFeatureSupport.scala @@ -26,7 +26,6 @@ import org.apache.spark.sql.delta.actions.TableFeatureProtocolUtils.TABLE_FEATUR import org.apache.spark.sql.delta.sources.DeltaSQLConf import com.fasterxml.jackson.annotation.JsonIgnore - /** * Trait to be mixed into the [[Protocol]] case class to enable Table Features. * @@ -330,7 +329,6 @@ trait TableFeatureSupport { this: Protocol => case f => throw DeltaErrors.dropTableFeatureNonRemovableFeature(f.name) } - newProtocol.normalized } diff --git a/spark/src/main/scala/org/apache/spark/sql/delta/actions/actions.scala b/spark/src/main/scala/org/apache/spark/sql/delta/actions/actions.scala index 76ea77fb2fd..1d76f3eb818 100644 --- a/spark/src/main/scala/org/apache/spark/sql/delta/actions/actions.scala +++ b/spark/src/main/scala/org/apache/spark/sql/delta/actions/actions.scala @@ -510,7 +510,8 @@ object Protocol { // Increment the reader and writer version to accurately add enabled legacy table features // either to the implicitly enabled table features or the table feature lists. - val required = Protocol(finalReaderVersion, finalWriterVersion).withFeatures(minRequiredFeatures) + val required = + Protocol(finalReaderVersion, finalWriterVersion).withFeatures(minRequiredFeatures) if (!required.canUpgradeTo(current)) { // When the current protocol does not satisfy metadata requirement, some additional features // must be supported by the protocol. We assert those features can actually perform the