Skip to content

Commit 375f38c

Browse files
authored
Merge branch 'main' into feature/non-identity-transform-residuals
2 parents 3f9b89e + 592bb17 commit 375f38c

4 files changed

Lines changed: 16 additions & 14 deletions

File tree

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ jobs:
4545
persist-credentials: false
4646

4747
- name: Initialize CodeQL
48-
uses: github/codeql-action/init@38697555549f1db7851b81482ff19f1fa5c4fedc # v4
48+
uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v4
4949
with:
5050
languages: actions
5151

5252
- name: Perform CodeQL Analysis
53-
uses: github/codeql-action/analyze@38697555549f1db7851b81482ff19f1fa5c4fedc # v4
53+
uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # v4
5454
with:
5555
category: "/language:actions"

.github/workflows/label_new_issues.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
add-triage-label:
2929
runs-on: ubuntu-latest
3030
steps:
31-
- uses: actions/github-script@v7
31+
- uses: actions/github-script@v8
3232
with:
3333
script: |
3434
await github.rest.issues.addLabels({

native/Cargo.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

spark/src/test/scala/org/apache/comet/exec/CometExecSuite.scala

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2210,9 +2210,11 @@ class CometExecSuite extends CometTestBase {
22102210
}
22112211

22122212
test("Native_datafusion reports correct files and bytes scanned") {
2213+
val inputFiles = 2
2214+
22132215
withTempDir { dir =>
22142216
val path = new java.io.File(dir, "test_metrics").getAbsolutePath
2215-
spark.range(100).repartition(2).write.mode("overwrite").parquet(path)
2217+
spark.range(100).repartition(inputFiles).write.mode("overwrite").parquet(path)
22162218

22172219
withSQLConf(
22182220
CometConf.COMET_ENABLED.key -> "true",
@@ -2236,8 +2238,8 @@ class CometExecSuite extends CometTestBase {
22362238

22372239
val numFiles = scanNode.metrics("numFiles").value
22382240
assert(
2239-
numFiles == 2,
2240-
s"Expected exactly 2 files to be scanned, but got metrics reporting $numFiles")
2241+
numFiles == inputFiles,
2242+
s"Expected exactly $inputFiles files to be scanned, but got metrics reporting $numFiles")
22412243
}
22422244
}
22432245
}

0 commit comments

Comments
 (0)