Repository: tajo Updated Branches: refs/heads/master dd16f119c -> 356c48efa
TAJO-1895: Add a maven profile to skip the unit tests of tajo-storage-pgsql. Closes #804 Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/356c48ef Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/356c48ef Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/356c48ef Branch: refs/heads/master Commit: 356c48efa21a1e6b0c98791ccc3578393d96f5ff Parents: dd16f11 Author: Hyunsik Choi <[email protected]> Authored: Mon Oct 5 20:51:32 2015 -0700 Committer: Hyunsik Choi <[email protected]> Committed: Mon Oct 5 20:51:32 2015 -0700 ---------------------------------------------------------------------- .travis.yml | 2 +- CHANGES | 3 + tajo-project/pom.xml | 2 +- tajo-storage/tajo-storage-pgsql/pom.xml | 58 +------------------- .../tajo/storage/pgsql/PgSQLTablespace.java | 5 ++ 5 files changed, 12 insertions(+), 58 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/356c48ef/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 59e2b7e..f8a6772 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,4 +37,4 @@ before_install: ulimit -t 514029 -u 2048 -n 3000 install: ./dev-support/travis-install-dependencies.sh script: - mvn clean install -q -ff -Dsurefire.useFile=false -Pparallel-test -DLOG_LEVEL=WARN -Dmaven.fork.count=2 + mvn clean install -q -ff -Dsurefire.useFile=false -Pparallel-test -DLOG_LEVEL=WARN -Dmaven.fork.count=2 -Ptest-storage-pgsql http://git-wip-us.apache.org/repos/asf/tajo/blob/356c48ef/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index baf216a..f6f03d8 100644 --- a/CHANGES +++ b/CHANGES @@ -16,6 +16,9 @@ Release 0.12.0 - unreleased BUG FIXES + TAJO-1895: Add a maven profile to skip the unit tests of + tajo-storage-pgsql. (hyunsik) + TAJO-1886: Set compilerSourceVM and compilerTargetVM to web.xml. (hyunsik) TASKS http://git-wip-us.apache.org/repos/asf/tajo/blob/356c48ef/tajo-project/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-project/pom.xml b/tajo-project/pom.xml index ef6435f..99c56c4 100644 --- a/tajo-project/pom.xml +++ b/tajo-project/pom.xml @@ -481,7 +481,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId> - <version>2.5.3</version> + <version>3.0.1</version> <configuration> <findbugsXmlOutput>true</findbugsXmlOutput> <xmlOutput>true</xmlOutput> http://git-wip-us.apache.org/repos/asf/tajo/blob/356c48ef/tajo-storage/tajo-storage-pgsql/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-pgsql/pom.xml b/tajo-storage/tajo-storage-pgsql/pom.xml index f36f350..6f04420 100644 --- a/tajo-storage/tajo-storage-pgsql/pom.xml +++ b/tajo-storage/tajo-storage-pgsql/pom.xml @@ -223,62 +223,8 @@ <profiles> <profile> - <!-- testing-postgresql-server only supports x86-64 on linux environment --> - <id>linux-x86_64-tests</id> - <activation> - <os> - <name>linux</name> - <arch>x86_64</arch> - </os> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration combine.self="override"> - <systemProperties> - <tajo.test.enabled>TRUE</tajo.test.enabled> - </systemProperties> - <argLine>-Xms512m -Xmx1024m -XX:MaxPermSize=128m -Dfile.encoding=UTF-8</argLine> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <!-- testing-postgresql-server only supports amd64 on linux environment --> - <id>linux-amd64-tests</id> - <activation> - <os> - <name>linux</name> - <arch>amd64</arch> - </os> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration combine.self="override"> - <systemProperties> - <tajo.test.enabled>TRUE</tajo.test.enabled> - </systemProperties> - <argLine>-Xms512m -Xmx1024m -XX:MaxPermSize=128m -Dfile.encoding=UTF-8</argLine> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <!-- testing-postgresql-server only supports x86-64 on mac os environment --> - <id>macos-x86_64-tests</id> - <activation> - <os> - <name>mac os x</name> - <arch>x86_64</arch> - </os> - </activation> + <!-- Run unit tests in tajo-storage-pgsql, whereas it is disabled as by default. --> + <id>test-storage-pgsql</id> <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/tajo/blob/356c48ef/tajo-storage/tajo-storage-pgsql/src/main/java/org/apache/tajo/storage/pgsql/PgSQLTablespace.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-pgsql/src/main/java/org/apache/tajo/storage/pgsql/PgSQLTablespace.java b/tajo-storage/tajo-storage-pgsql/src/main/java/org/apache/tajo/storage/pgsql/PgSQLTablespace.java index 1969d13..f44c85d 100644 --- a/tajo-storage/tajo-storage-pgsql/src/main/java/org/apache/tajo/storage/pgsql/PgSQLTablespace.java +++ b/tajo-storage/tajo-storage-pgsql/src/main/java/org/apache/tajo/storage/pgsql/PgSQLTablespace.java @@ -68,4 +68,9 @@ public class PgSQLTablespace extends JdbcTablespace { scanner.setTarget(target.toArray()); return scanner; } + + @Override + public int hashCode() { + throw new UnsupportedOperationException(); + } }
