Skip to content
Merged
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
49 changes: 49 additions & 0 deletions .circleci/continue_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ workflows:
run_linux_tests: << pipeline.parameters.run_linux_tests >>
requires:
- linux-build-and-unit-test
- linux-presto-native-sidecar-tests:
run_linux_tests: << pipeline.parameters.run_linux_tests >>
requires:
- linux-build-and-unit-test

conditionals:
when: << pipeline.parameters.run_native_specific_jobs >>
Expand Down Expand Up @@ -193,6 +197,51 @@ jobs:
- store_artifacts:
path: '/tmp/PrestoNativeQueryRunnerUtils'

linux-presto-native-sidecar-tests:
executor: build
parameters:
run_linux_tests:
type: boolean
default: false
parallelism: 5
steps:
- run: echo "Run Linux tests is << parameters.run_linux_tests >>"
- when:
condition: << parameters.run_linux_tests >>
steps:
- checkout
- attach_workspace:
at: presto-native-execution
- maven_install:
maven_install_opts: ${MAVEN_INSTALL_OPTS}
maven_fast_install: ${MAVEN_FAST_INSTALL}
- run:
name: 'Run Presto native sidecar tests'
command: |
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/lib:/usr/local/lib64"
export PRESTO_SERVER_PATH="${HOME}/project/presto-native-execution/_build/debug/presto_cpp/main/presto_server"
export TEMP_PATH="/tmp"
TESTFILES=$(circleci tests glob "presto-native-sidecar-plugin/src/test/**/Test*.java" | circleci tests split --split-by=timings)
# Convert file paths to comma separated class names
export TESTCLASSES=
for test_file in $TESTFILES
do
tmp=${test_file##*/}
test_class=${tmp%%\.*}
export TESTCLASSES="${TESTCLASSES},$test_class"
done
export TESTCLASSES=${TESTCLASSES#,}
if [ ! -z $TESTCLASSES ]; then
mvn test \
${MAVEN_TEST} \
-pl 'presto-native-sidecar-plugin' \
-Dtest="${TESTCLASSES}" \
-DPRESTO_SERVER=${PRESTO_SERVER_PATH} \
-DDATA_DIR=${TEMP_PATH} \
-Duser.timezone=America/Bahia_Banderas \
-T1C
fi

linux-spark-e2e-tests:
executor: build
parameters:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/test-other-modules.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,5 @@ jobs:
!presto-native-execution,
!presto-test-coverage,
!presto-iceberg,
!presto-singlestore'
!presto-singlestore,
!presto-native-sidecar-plugin'
7 changes: 7 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@
<module>presto-singlestore</module>
<module>presto-hana</module>
<module>presto-openapi</module>
<module>presto-native-sidecar-plugin</module>
</modules>

<dependencyManagement>
Expand Down Expand Up @@ -450,6 +451,12 @@
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-session-property-providers</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-bigquery</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import com.facebook.presto.metadata.FunctionAndTypeManager;
import com.facebook.presto.metadata.Metadata;
import com.facebook.presto.metadata.MetadataManager;
import com.facebook.presto.metadata.SessionPropertyManager;
import com.facebook.presto.spi.ColumnHandle;
import com.facebook.presto.spi.ConnectorId;
import com.facebook.presto.spi.ConnectorSession;
Expand Down Expand Up @@ -62,6 +61,7 @@
import static com.facebook.presto.druid.DruidQueryGeneratorContext.Origin.DERIVED;
import static com.facebook.presto.druid.DruidQueryGeneratorContext.Origin.TABLE_COLUMN;
import static com.facebook.presto.metadata.FunctionAndTypeManager.createTestFunctionAndTypeManager;
import static com.facebook.presto.metadata.SessionPropertyManager.createTestingSessionPropertyManager;
import static com.facebook.presto.spi.plan.LimitNode.Step.FINAL;
import static com.facebook.presto.sql.analyzer.ExpressionAnalyzer.getExpressionTypes;
import static com.facebook.presto.testing.TestingConnectorSession.SESSION;
Expand Down Expand Up @@ -109,7 +109,7 @@ protected static class SessionHolder
public SessionHolder()
{
connectorSession = SESSION;
session = TestingSession.testSessionBuilder(new SessionPropertyManager(new SystemSessionProperties().getSessionProperties())).build();
session = TestingSession.testSessionBuilder(createTestingSessionPropertyManager(new SystemSessionProperties().getSessionProperties())).build();
}

public ConnectorSession getConnectorSession()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
import static com.facebook.presto.iceberg.IcebergAbstractMetadata.toIcebergSchema;
import static com.facebook.presto.iceberg.IcebergQueryRunner.ICEBERG_CATALOG;
import static com.facebook.presto.iceberg.IcebergSessionProperties.dataSizeSessionProperty;
import static com.facebook.presto.metadata.SessionPropertyManager.createTestingSessionPropertyManager;
import static com.facebook.presto.testing.TestingSession.testSessionBuilder;
import static com.google.common.io.Files.createTempDir;
import static org.apache.iceberg.parquet.ParquetSchemaUtil.convert;
Expand All @@ -78,7 +79,7 @@ public class TestIcebergFileWriter
public void setup() throws Exception
{
ConnectorId connectorId = new ConnectorId("iceberg");
SessionPropertyManager sessionPropertyManager = new SessionPropertyManager();
SessionPropertyManager sessionPropertyManager = createTestingSessionPropertyManager();

sessionPropertyManager.addConnectorSessionProperties(
connectorId,
Expand Down
Loading