Skip to content

Commit

Permalink
Scala style.
Browse files Browse the repository at this point in the history
  • Loading branch information
andreaschat-db committed Jul 16, 2024
1 parent 43b8f73 commit e573cda
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down Expand Up @@ -330,7 +329,6 @@ trait TableFeatureSupport { this: Protocol =>
case f =>
throw DeltaErrors.dropTableFeatureNonRemovableFeature(f.name)
}

newProtocol.normalized
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e573cda

Please sign in to comment.