Skip to content

Commit a42da1d

Browse files
committed
rebase conflict
1 parent d750081 commit a42da1d

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

sql/pipelines/src/main/scala/org/apache/spark/sql/pipelines/autocdc/Scd1BatchProcessor.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ case class Scd1BatchProcessor(
124124
* [[ChangeArgs.columnSelection]] + the CDC metadata column.
125125
*/
126126
def projectTargetColumnsOntoMicrobatch(microbatchWithCdcMetadataDf: DataFrame): DataFrame = {
127-
val ignoreColumnNameCase =
128-
!microbatchWithCdcMetadataDf.sparkSession.sessionState.conf.caseSensitiveAnalysis
127+
val caseSensitiveColumnComparison =
128+
microbatchWithCdcMetadataDf.sparkSession.sessionState.conf.caseSensitiveAnalysis
129129

130130
// Calculate the schema of the microbatch less the system-projected CDC metadata column, i.e.
131131
// the The user schema is the microbatch's schema after dropping the system columns - i.e the
@@ -142,15 +142,15 @@ case class Scd1BatchProcessor(
142142
Seq(UnqualifiedColumnName(Scd1BatchProcessor.cdcMetadataColName))
143143
)
144144
),
145-
ignoreCase = ignoreColumnNameCase
145+
caseSensitive = caseSensitiveColumnComparison
146146
)
147147

148148
val userSelectedColumnsInMicrobatchSchema =
149149
ColumnSelection.applyToSchema(
150150
schemaName = "microbatch",
151151
schema = userColumnsInMicrobatchSchema,
152152
columnSelection = changeArgs.columnSelection,
153-
ignoreCase = ignoreColumnNameCase
153+
caseSensitive = caseSensitiveColumnComparison
154154
)
155155

156156
// In addition to the explicit user-selected columns, re-project the operational CDC metadata

0 commit comments

Comments
 (0)