Skip to content

Commit 02473ba

Browse files
committed
rebase conflicts
1 parent 5338205 commit 02473ba

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

sql/pipelines/src/test/scala/org/apache/spark/sql/pipelines/autocdc/Scd1BatchProcessorSuite.scala

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,8 @@ class Scd1BatchProcessorSuite extends QueryTest with SharedSparkSession {
255255
keys = Seq(UnqualifiedColumnName("id")),
256256
sequencing = F.col("seq"),
257257
storedAsScdType = ScdType.Type1
258-
)
258+
),
259+
resolvedSequencingType = LongType
259260
)
260261

261262
checkAnswer(
@@ -322,7 +323,8 @@ class Scd1BatchProcessorSuite extends QueryTest with SharedSparkSession {
322323
keys = Seq(UnqualifiedColumnName("id")),
323324
sequencing = F.greatest(F.col("seq"), F.col("alt_seq")),
324325
storedAsScdType = ScdType.Type1
325-
)
326+
),
327+
resolvedSequencingType = LongType
326328
)
327329

328330
checkAnswer(
@@ -377,7 +379,8 @@ class Scd1BatchProcessorSuite extends QueryTest with SharedSparkSession {
377379
keys = Seq(UnqualifiedColumnName(reservedColName)),
378380
sequencing = F.col("seq"),
379381
storedAsScdType = ScdType.Type1
380-
)
382+
),
383+
resolvedSequencingType = LongType
381384
)
382385

383386
checkError(

0 commit comments

Comments
 (0)