Skip to content

Commit cc529cb

Browse files
committed
rebase
1 parent 7211891 commit cc529cb

4 files changed

Lines changed: 3 additions & 8 deletions

File tree

.github/workflows/pr_build_linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,6 @@ jobs:
206206
with:
207207
artifact_name: ${{ matrix.os }}-java-${{ matrix.java_version }}-features-${{ matrix.features.value }}-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
208208
features: ${{ matrix.features.value }}
209-
maven_opts: "-Dtest=none -Dfeatures=${{ matrix.features.value }}"
209+
maven_opts: "-Dtest=none"
210210
suites: ${{ matrix.features.suites }}
211211
upload-test-reports: true

.github/workflows/pr_build_macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,6 @@ jobs:
164164
with:
165165
artifact_name: ${{ matrix.os }}-java-${{ matrix.java_version }}-features-${{ matrix.features.value }}-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}
166166
features: ${{ matrix.features.value }}
167-
maven_opts: "-Dtest=none -Dfeatures=${{ matrix.features.value }}"
167+
maven_opts: "-Dtest=none"
168168
suites: ${{ matrix.features.suites }}
169169
upload-test-reports: true

spark/src/test/scala/org/apache/comet/parquet/ParquetReadFromHdfsSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class ParquetReadFromHdfsSuite
6767
}
6868

6969
test("test native_datafusion scan on hdfs") {
70-
assume(featureEnabled("hdfs") || featureEnabled("hdfs-opendal"))
70+
assume(isFeatureEnabled("hdfs") || isFeatureEnabled("hdfs-opendal"))
7171

7272
withTmpHdfsDir { dir =>
7373
{

spark/src/test/scala/org/apache/spark/sql/CometTestBase.scala

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,9 +1147,4 @@ abstract class CometTestBase
11471147
usingDataSourceExec(conf) &&
11481148
!CometConf.COMET_SCAN_ALLOW_INCOMPATIBLE.get(conf)
11491149
}
1150-
1151-
def featureEnabled(feature: String): Boolean = {
1152-
System.getProperty("feature", "").split(",").contains(feature)
1153-
}
1154-
11551150
}

0 commit comments

Comments
 (0)