Skip to content

Commit

Permalink
Merge pull request #98 from dabaitu/upgrade_to_181
Browse files Browse the repository at this point in the history 
Upgrade to 181
  • Loading branch information
@dabaitu
dabaitu committed Jul 27, 2017
2 parents d794e7c + c8a76bb commit 70baf50
Show file tree
Hide file tree
Showing 856 changed files with 29,987 additions and 5,877 deletions.
35 changes: 27 additions & 8 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ env:
- MAVEN_OPTS="-Xmx512M -XX:+ExitOnOutOfMemoryError"
- MAVEN_SKIP_CHECKS_AND_DOCS="-Dair.check.skip-all=true -Dmaven.javadoc.skip=true"
- MAVEN_FAST_INSTALL="-DskipTests $MAVEN_SKIP_CHECKS_AND_DOCS -B -q -T C1"
- ARTIFACTS_UPLOAD_PATH=travis_build_artifacts/${TRAVIS_REPO_SLUG}/${TRAVIS_BRANCH}/${TRAVIS_BUILD_NUMBER}
- ARTIFACTS_UPLOAD_PATH_BRANCH=travis_build_artifacts/${TRAVIS_REPO_SLUG}/${TRAVIS_BRANCH}/${TRAVIS_BUILD_NUMBER}
- ARTIFACTS_UPLOAD_PATH_PR=travis_build_artifacts_pr/${TRAVIS_REPO_SLUG}/${TRAVIS_BRANCH}/${TRAVIS_BUILD_NUMBER}
- TEST_FLAGS=""
matrix:
- MAVEN_CHECKS=true
Expand All @@ -16,11 +17,17 @@ env:
- TEST_SPECIFIC_MODULES=presto-cassandra
- TEST_SPECIFIC_MODULES=presto-hive
- TEST_OTHER_MODULES=!presto-tests,!presto-raptor,!presto-accumulo,!presto-cassandra,!presto-hive,!presto-docs,!presto-server,!presto-server-rpm
- PRODUCT_TESTS=true
- PRODUCT_TESTS_BASIC_ENVIRONMENT=true
- PRODUCT_TESTS_SPECIFIC_ENVIRONMENT=true
- HIVE_TESTS=true

sudo: required
dist: trusty
group: deprecated-2017Q2
addons:
apt:
packages:
- oracle-java8-installer

cache:
directories:
Expand All @@ -40,14 +47,21 @@ install:
./mvnw install $MAVEN_FAST_INSTALL -pl '!presto-docs,!presto-server,!presto-server-rpm'
fi
- |
if [[ -v PRODUCT_TESTS ]]; then
if [[ -v PRODUCT_TESTS_BASIC_ENVIRONMENT || -v PRODUCT_TESTS_SPECIFIC_ENVIRONMENT ]]; then
./mvnw install $MAVEN_FAST_INSTALL -pl '!presto-docs,!presto-server-rpm'
fi
- |
if [[ -v HIVE_TESTS ]]; then
./mvnw install $MAVEN_FAST_INSTALL -pl presto-hive-hadoop2 -am
fi
before_script:
- |
export ARTIFACTS_UPLOAD_PATH=${ARTIFACTS_UPLOAD_PATH_BRANCH}
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
export ARTIFACTS_UPLOAD_PATH=${ARTIFACTS_UPLOAD_PATH_PR}
fi
script:
- |
if [[ -v MAVEN_CHECKS ]]; then
Expand All @@ -62,28 +76,33 @@ script:
./mvnw test $MAVEN_SKIP_CHECKS_AND_DOCS -B -pl $TEST_OTHER_MODULES
fi
- |
if [[ -v PRODUCT_TESTS ]]; then
if [[ -v PRODUCT_TESTS_BASIC_ENVIRONMENT ]]; then
presto-product-tests/bin/run_on_docker.sh \
multinode -x quarantine,big_query,storage_formats,profile_specific_tests,tpcds
fi
- |
if [[ -v PRODUCT_TESTS ]]; then
if [[ -v PRODUCT_TESTS_SPECIFIC_ENVIRONMENT ]]; then
presto-product-tests/bin/run_on_docker.sh \
singlenode-kerberos-hdfs-impersonation -g storage_formats,cli,hdfs_impersonation,authorization
fi
- |
if [[ -v PRODUCT_TESTS ]]; then
if [[ -v PRODUCT_TESTS_SPECIFIC_ENVIRONMENT ]]; then
presto-product-tests/bin/run_on_docker.sh \
singlenode-ldap -g ldap_cli
singlenode-ldap -g ldap -x simba_jdbc
fi
# SQL server image sporadically hangs during the startup
# TODO: Uncomment it once issue is fixed
# https://github.com/Microsoft/mssql-docker/issues/76
# - |
# if [[ -v PRODUCT_TESTS ]]; then
# if [[ -v PRODUCT_TESTS_SPECIFIC_ENVIRONMENT ]]; then
# presto-product-tests/bin/run_on_docker.sh \
# singlenode-sqlserver -g sqlserver
# fi
- |
if [[ -v PRODUCT_TESTS_SPECIFIC_ENVIRONMENT ]]; then
presto-product-tests/bin/run_on_docker.sh \
multinode-tls -g smoke,cli,group-by,join,tls
fi
- |
if [[ -v HIVE_TESTS ]]; then
presto-hive-hadoop2/bin/run_on_docker.sh
Expand Down
5 changes: 3 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ See the [User Manual](https://prestodb.io/docs/current/) for deployment instruct

Presto is a standard Maven project. Simply run the following command from the project root directory:

mvn clean install
./mvnw clean install

On the first build, Maven will download all the dependencies from the internet and cache them in the local repository (`~/.m2/repository`), which can take a considerable amount of time. Subsequent builds will be faster.

Presto has a comprehensive set of unit tests that can take several minutes to run. You can disable the tests when building:

mvn clean install -DskipTests
./mvnw clean install -DskipTests

## Running Presto in your IDE

Expand Down Expand Up @@ -83,3 +83,4 @@ We recommend you use IntelliJ as your IDE. The code style template for the proje
* Consider using String formatting (printf style formatting using the Java `Formatter` class): `format("Session property %s is invalid: %s", name, value)` (note that `format()` should always be statically imported). Sometimes, if you only need to append something, consider using the `+` operator.
* Avoid using the ternary operator except for trivial expressions.
* Use an assertion from Airlift's `Assertions` class if there is one that covers your case rather than writing the assertion by hand. Over time we may move over to more fluent assertions like AssertJ.
* When writing a Git commit message, follow these [guidelines](https://chris.beams.io/posts/git-commit/).
134 changes: 106 additions & 28 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<groupId>com.facebook.presto</groupId>
<artifactId>presto-root</artifactId>
<version>0.179-tw-0.36</version>
<version>0.181-tw-0.37</version>
<packaging>pom</packaging>

<name>presto-root</name>
Expand All @@ -30,7 +30,7 @@
<scm>
<connection>scm:git:git://github.com/twitter-forks/presto.git</connection>
<url>https://github.com/twitter-forks/presto</url>
<tag>0.179-tw-0.36</tag>
<tag>0.181-tw-0.37</tag>
</scm>

<properties>
Expand All @@ -51,11 +51,11 @@
<dep.packaging.version>${dep.airlift.version}</dep.packaging.version>
<dep.slice.version>0.29</dep.slice.version>
<dep.aws-sdk.version>1.11.30</dep.aws-sdk.version>
<dep.okhttp.version>3.8.1</dep.okhttp.version>
<dep.tempto.version>1.31</dep.tempto.version>
<dep.testng.version>6.10</dep.testng.version>

<cli.skip-execute>true</cli.skip-execute>
<cli.main-class>None</cli.main-class>
<dep.nifty.version>0.15.1</dep.nifty.version>
<dep.swift.version>0.15.2</dep.swift.version>

<!-- use a fractional hour timezone offset for tests -->
<air.test.timezone>Asia/Katmandu</air.test.timezone>
Expand Down Expand Up @@ -112,6 +112,9 @@
<module>presto-plugin-toolkit</module>
<module>presto-resource-group-managers</module>
<module>presto-benchto-benchmarks</module>
<module>presto-thrift-connector-api</module>
<module>presto-thrift-testing-server</module>
<module>presto-thrift-connector</module>
</modules>

<dependencyManagement>
Expand Down Expand Up @@ -344,6 +347,32 @@
<version>3</version>
</dependency>

<dependency>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-thrift-connector-api</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-thrift-connector-api</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
</dependency>

<dependency>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-thrift-testing-server</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-thrift-connector</artifactId>
<version>${project.version}</version>
<type>zip</type>
</dependency>

<dependency>
<groupId>com.facebook.hive</groupId>
<artifactId>hive-dwrf</artifactId>
Expand All @@ -353,7 +382,7 @@
<dependency>
<groupId>io.airlift</groupId>
<artifactId>aircompressor</artifactId>
<version>0.7</version>
<version>0.8</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -604,6 +633,54 @@
<version>2.78</version>
</dependency>

<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>${dep.okhttp.version}</version>
</dependency>

<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>mockwebserver</artifactId>
<version>${dep.okhttp.version}</version>
</dependency>

<dependency>
<groupId>com.facebook.swift</groupId>
<artifactId>swift-annotations</artifactId>
<version>${dep.swift.version}</version>
</dependency>

<dependency>
<groupId>com.facebook.swift</groupId>
<artifactId>swift-codec</artifactId>
<version>${dep.swift.version}</version>
</dependency>

<dependency>
<groupId>com.facebook.swift</groupId>
<artifactId>swift-service</artifactId>
<version>${dep.swift.version}</version>
</dependency>

<dependency>
<groupId>com.facebook.swift</groupId>
<artifactId>swift-javadoc</artifactId>
<version>${dep.swift.version}</version>
</dependency>

<dependency>
<groupId>com.facebook.nifty</groupId>
<artifactId>nifty-core</artifactId>
<version>${dep.nifty.version}</version>
</dependency>

<dependency>
<groupId>com.facebook.nifty</groupId>
<artifactId>nifty-client</artifactId>
<version>${dep.nifty.version}</version>
</dependency>

<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
Expand Down Expand Up @@ -693,7 +770,7 @@
<dependency>
<groupId>io.airlift</groupId>
<artifactId>testing-postgresql-server</artifactId>
<version>9.6.1-1</version>
<version>9.6.3-1</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -890,7 +967,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<version>1.6.0</version>
</plugin>

<plugin>
Expand All @@ -912,6 +989,27 @@
</configuration>
</plugin>

<plugin>
<groupId>com.ning.maven.plugins</groupId>
<artifactId>maven-dependency-versions-check-plugin</artifactId>
<configuration>
<exceptions>
<exception>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<expectedVersion>4.0-beta5</expectedVersion>
<resolvedVersion>4.0</resolvedVersion>
</exception>
<exception>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-multibindings</artifactId>
<expectedVersion>4.0-beta5</expectedVersion>
<resolvedVersion>4.0</resolvedVersion>
</exception>
</exceptions>
</configuration>
</plugin>

<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<!--suppress MavenModelInspection -->
Expand Down Expand Up @@ -1087,26 +1185,6 @@
</build>

<profiles>
<!-- run cli for development: mvn -am -pl presto-cli -P cli compile exec:java -->
<profile>
<id>cli</id>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<configuration>
<skip>${cli.skip-execute}</skip>
<executable>${java.home}/bin/java</executable>
<mainClass>${cli.main-class}</mainClass>
<arguments>
<argument>--debug</argument>
</arguments>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>eclipse-compiler</id>
<build>
Expand Down
2 changes: 1 addition & 1 deletion presto-accumulo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.facebook.presto</groupId>
<artifactId>presto-root</artifactId>
<version>0.179-tw-0.36</version>
<version>0.181-tw-0.37</version>
</parent>

<artifactId>presto-accumulo</artifactId>
Expand Down
Loading

0 comments on commit 70baf50

Please sign in to comment.