Skip to content

Commit 48cd373

Browse files
committed
fix ut for spark 35
1 parent 6763354 commit 48cd373

File tree

1 file changed

+17
-4
lines changed

1 file changed

+17
-4
lines changed

backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseMergeTreeWriteOnS3Suite.scala

+17-4
Original file line numberDiff line numberDiff line change
@@ -188,20 +188,33 @@ class GlutenClickHouseMergeTreeWriteOnS3Suite
188188
var metadataGlutenExist: Boolean = false
189189
var metadataBinExist: Boolean = false
190190
var dataBinExist: Boolean = false
191+
var hasCommits = false
191192
client
192193
.listObjects(args)
193194
.forEach(
194195
obj => {
195196
objectCount += 1
196-
if (obj.get().objectName().contains("metadata.gluten")) {
197+
val objectName = obj.get().objectName()
198+
if (objectName.contains("metadata.gluten")) {
197199
metadataGlutenExist = true
198-
} else if (obj.get().objectName().contains("meta.bin")) {
200+
} else if (objectName.contains("meta.bin")) {
199201
metadataBinExist = true
200-
} else if (obj.get().objectName().contains("data.bin")) {
202+
} else if (objectName.contains("data.bin")) {
201203
dataBinExist = true
204+
} else if (objectName.contains("_commits")) {
205+
// Spark 35 has _commits directory
206+
// table/_delta_log/_commits/
207+
hasCommits = true
202208
}
203209
})
204-
assertResult(5)(objectCount)
210+
211+
if (isSparkVersionGE("3.5")) {
212+
assertResult(6)(objectCount)
213+
assert(hasCommits)
214+
} else {
215+
assertResult(5)(objectCount)
216+
}
217+
205218
assert(metadataGlutenExist)
206219
assert(metadataBinExist)
207220
assert(dataBinExist)

0 commit comments

Comments
 (0)