Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
76 changes: 76 additions & 0 deletions .github/workflows/prestocpp-linux-build-and-unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,82 @@ jobs:
-Duser.timezone=America/Bahia_Banderas \
-T1C

prestocpp-linux-presto-on-spark-e2e-tests:
needs: prestocpp-linux-build-for-test
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
storage-format: [ "PARQUET", "DWRF" ]
enable-sidecar: [ "true", "false" ]
container:
image: prestodb/presto-native-dependency:0.293-20250522140509-484b00e
env:
MAVEN_OPTS: "-Xmx4G -XX:+ExitOnOutOfMemoryError"
MAVEN_FAST_INSTALL: "-B -V --quiet -T 1C -DskipTests -Dair.check.skip-all -Dmaven.javadoc.skip=true"
MAVEN_TEST: "-B -Dair.check.skip-all -Dmaven.javadoc.skip=true -DLogTestDurationListener.enabled=true --fail-at-end"
steps:
- uses: actions/checkout@v4

- name: Fix git permissions
# Usually actions/checkout does this but as we run in a container
# it doesn't work
run: git config --global --add safe.directory ${GITHUB_WORKSPACE}

- name: Download artifacts
uses: actions/download-artifact@v4
with:
name: presto-native-build
path: presto-native-execution/_build/release

# Permissions are lost when uploading. Details here: https://github.com/actions/upload-artifact/issues/38
- name: Restore execute permissions and library path
run: |
chmod +x ${GITHUB_WORKSPACE}/presto-native-execution/_build/release/presto_cpp/main/presto_server
chmod +x ${GITHUB_WORKSPACE}/presto-native-execution/_build/release/velox/velox/functions/remote/server/velox_functions_remote_server_main
# Ensure transitive dependency libboost-iostreams is found.
ldconfig /usr/local/lib

- name: Install OpenJDK8
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 17.0.15
cache: 'maven'
- name: Download nodejs to maven cache
run: .github/bin/download_nodejs

- name: Maven install
env:
# Use different Maven options to install.
MAVEN_OPTS: "-Xmx2G -XX:+ExitOnOutOfMemoryError"
run: |
for i in $(seq 1 3); do ./mvnw clean install $MAVEN_FAST_INSTALL -pl 'presto-spark-base,presto-native-execution,presto-spark-classloader-interface,presto-spark-launcher,presto-spark-common,presto-hive' -am && s=0 && break || s=$? && sleep 10; done; (exit $s)

- name: Run presto-on-spark native tests
run: |
export PRESTO_SERVER_PATH="${GITHUB_WORKSPACE}/presto-native-execution/_build/release/presto_cpp/main/presto_server"
export TESTFILES=`find ./presto-spark-base/src/test -type f -name 'TestPrestoSparkNativeSimple*.java'`
for test_file in $TESTFILES
do
tmp=${test_file##*/}
test_class=${tmp%%\.*}
export TESTCLASSES="${TESTCLASSES},$test_class"
done
export TESTCLASSES=${TESTCLASSES#,}
echo "TESTCLASSES = $TESTCLASSES"

mvn test \
${MAVEN_TEST} \
-pl 'presto-spark-base' \
-DstorageFormat=${{ matrix.storage-format }} \
-DsidecarEnabled=${{ matrix.enable-sidecar }} \
-Dtest="${TESTCLASSES}" \
-DPRESTO_SERVER=${PRESTO_SERVER_PATH} \
-DDATA_DIR=${RUNNER_TEMP} \
-Duser.timezone=America/Bahia_Banderas \
-T1C

prestocpp-linux-presto-sidecar-tests:
needs: [changes, prestocpp-linux-build-for-test]
runs-on: ubuntu-22.04
Expand Down
11 changes: 11 additions & 0 deletions presto-hive/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -538,6 +538,17 @@
</ignoredNonTestScopedDependencies>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down
90 changes: 42 additions & 48 deletions presto-native-execution/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
<properties>
<air.main.basedir>${project.parent.basedir}</air.main.basedir>
<air.checkstyle.config-file>src/checkstyle/presto-checks.xml</air.checkstyle.config-file>
<project.build.targetJdk>17</project.build.targetJdk>
<air.check.skip-modernizer>true</air.check.skip-modernizer>
</properties>

Expand Down Expand Up @@ -48,12 +47,6 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
Expand Down Expand Up @@ -91,6 +84,13 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-spark-classloader-interface</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-tests</artifactId>
Expand Down Expand Up @@ -226,47 +226,6 @@
</exclusions>
</dependency>

<dependency>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-spark-classloader-interface</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-spark-base</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>com.facebook.drift</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>com.facebook.presto.spark</groupId>
<artifactId>spark-core</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>com.facebook.drift</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-spark-base</artifactId>
<type>test-jar</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>com.facebook.drift</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.facebook.airlift</groupId>
<artifactId>log</artifactId>
Expand Down Expand Up @@ -300,6 +259,30 @@
<artifactId>presto-jdbc</artifactId>
<scope>test</scope>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.facebook.presto</groupId>-->
<!-- <artifactId>presto-spark-classloader-interface</artifactId>-->
<!-- <scope>test</scope>-->
<!-- </dependency>-->

<!-- <dependency>-->
<!-- <groupId>com.facebook.presto</groupId>-->
<!-- <artifactId>presto-spark-base</artifactId>-->
<!-- <scope>test</scope>-->
<!-- </dependency>-->

<!-- <dependency>-->
<!-- <groupId>com.facebook.presto.spark</groupId>-->
<!-- <artifactId>spark-core</artifactId>-->
<!-- <scope>test</scope>-->
<!-- </dependency>-->

<!-- <dependency>-->
<!-- <groupId>com.facebook.presto</groupId>-->
<!-- <artifactId>presto-spark-base</artifactId>-->
<!-- <type>test-jar</type>-->
<!-- <scope>test</scope>-->
<!-- </dependency>-->
</dependencies>

<build>
Expand Down Expand Up @@ -348,6 +331,17 @@
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,62 @@ public void testNestedColumnFilter()

@Override
@Ignore
public void testBinaryOperatorsBigintDecimal()
{
}

@Override
@Ignore
public void testBinaryOperatorsBoolean()
{
}

@Override
@Ignore
public void testBinaryOperatorsDoubleDecimal()
{
}

@Override
@Ignore
public void testBinaryOperatorsDoubleDouble()
{
}

public void testTernaryOperatorsLongLong()
{
}

@Override
@Ignore
public void testBinaryOperatorsDoubleIntegral()
{
}

@Override
@Ignore
public void testBinaryOperatorsIntegralDouble()
{
}

@Override
@Ignore
public void testBinaryOperatorsIntegralIntegral()
{
}

@Override
@Ignore
public void testBinaryOperatorsString()
{
}

@Override
@Ignore
public void testNullif()
{
}

@Override
@Ignore
public void testTernaryOperatorsLongDouble()
Expand Down
Loading
Loading