Skip to content

chore: fix pr_build*.yml #2434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
comphead merged 3 commits into from
Sep 21, 2025
Merged

chore: fix pr_build*.yml #2434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71a79eb
chore: fix pr_build*.yml
comphead Sep 21, 2025
1e05ff4
clippy
comphead Sep 21, 2025
12f4c9e
chore: fix pr_build*.yml
comphead Sep 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/pr_build_linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ jobs:
org.apache.comet.objectstore.NativeConfigSuite
- name: "sql"
value: |
${{ matrix.profile.maven_opts != 'Spark 3.4, JDK 11, Scala 2.12' && 'org.apache.spark.sql.CometToPrettyStringSuite' || ''}}
org.apache.spark.sql.CometToPrettyStringSuite
fail-fast: false
name: ${{ matrix.os }}/${{ matrix.profile.name }} [${{ matrix.suite.name }}]
runs-on: ${{ matrix.os }}
Expand All @@ -171,7 +171,7 @@ jobs:
uses: ./.github/actions/java-test
with:
artifact_name: ${{ matrix.os }}-${{ matrix.profile.name }}-${{ matrix.suite.name }}-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
suites: ${{ matrix.suite.value }}
suites: ${{ matrix.suite.name == 'sql' && matrix.profile.name == 'Spark 3.4, JDK 11, Scala 2.12' && '' || matrix.suite.value }}
maven_opts: ${{ matrix.profile.maven_opts }}
scan_impl: ${{ matrix.profile.scan_impl }}
upload-test-reports: true
4 changes: 2 additions & 2 deletions .github/workflows/pr_build_macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ jobs:
org.apache.comet.objectstore.NativeConfigSuite
- name: "sql"
value: |
${{ matrix.profile.maven_opts != 'Spark 3.4, JDK 11, Scala 2.12' && 'org.apache.spark.sql.CometToPrettyStringSuite' || ''}}
org.apache.spark.sql.CometToPrettyStringSuite
fail-fast: false
name: ${{ matrix.os }}/${{ matrix.profile.name }} [${{ matrix.suite.name }}]
runs-on: ${{ matrix.os }}
Expand All @@ -133,5 +133,5 @@ jobs:
uses: ./.github/actions/java-test
with:
artifact_name: ${{ matrix.os }}-${{ matrix.profile.name }}-${{ matrix.suite.name }}-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
suites: ${{ matrix.suite.value }}
suites: ${{ matrix.suite.name == 'sql' && matrix.profile.name == 'Spark 3.4, JDK 11, Scala 2.12' && '' || matrix.suite.value }}
maven_opts: ${{ matrix.profile.maven_opts }}
4 changes: 2 additions & 2 deletions native/spark-expr/src/conversion_funcs/cast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ fn can_cast_from_string(to_type: &DataType, options: &SparkCastOptions) -> bool
}
}

fn can_cast_to_string(from_type: &DataType, options: &SparkCastOptions) -> bool {
fn can_cast_to_string(from_type: &DataType, _options: &SparkCastOptions) -> bool {
use DataType::*;
match from_type {
Boolean | Int8 | Int16 | Int32 | Int64 | Date32 | Date64 | Timestamp(_, _) => true,
Expand All @@ -267,7 +267,7 @@ fn can_cast_to_string(from_type: &DataType, options: &SparkCastOptions) -> bool
Binary => true,
Struct(fields) => fields
.iter()
.all(|f| can_cast_to_string(f.data_type(), options)),
.all(|f| can_cast_to_string(f.data_type(), _options)),
Copy link
Copy Markdown
Contributor Author

@comphead comphead Sep 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clippy

Copy link
Copy Markdown
Contributor

@coderfender coderfender Sep 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for this. I was working on fixing this clippy warning myself

_ => false,
}
}
Expand Down
4 changes: 3 additions & 1 deletion spark/src/main/scala/org/apache/comet/serde/literals.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,9 @@ object CometLiteral extends CometExpressionSerde[Literal] with Logging {
case ByteType =>
array.foreach(v => {
val casted = v.asInstanceOf[lang.Byte]
listLiteralBuilder.addByteValues(casted.intValue())
listLiteralBuilder.addByteValues(
Copy link
Copy Markdown
Contributor Author

@comphead comphead Sep 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixing the test as the build was not running the test suite was totally ignored

if (casted != null) casted.intValue()
else null.asInstanceOf[Integer])
listLiteralBuilder.addNullMask(casted != null)
})
case ShortType =>
Expand Down
Loading