tajo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jh...@apache.org
Subject tajo git commit: TAJO-1870: Enable tests of tajo-storage-pgsql module when arch type is 64-bit.
Date Fri, 18 Sep 2015 12:22:56 GMT
Repository: tajo
Updated Branches:
  refs/heads/master 61b6ec8e6 -> 024b3c3dd


TAJO-1870: Enable tests of tajo-storage-pgsql module when arch type is 64-bit.

Closes #770


Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/024b3c3d
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/024b3c3d
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/024b3c3d

Branch: refs/heads/master
Commit: 024b3c3dd4678e95abbf3149fd021b95291dcdf0
Parents: 61b6ec8
Author: Jinho Kim <jhkim@apache.org>
Authored: Fri Sep 18 21:22:06 2015 +0900
Committer: Jinho Kim <jhkim@apache.org>
Committed: Fri Sep 18 21:22:06 2015 +0900

----------------------------------------------------------------------
 .travis.yml                             |  2 +-
 CHANGES                                 |  3 ++
 tajo-dist/pom.xml                       |  6 +---
 tajo-storage/pom.xml                    | 17 ++--------
 tajo-storage/tajo-storage-pgsql/pom.xml | 50 ++++++++++++++++++++++------
 5 files changed, 47 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/024b3c3d/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index b4b1790..671a31f 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
-Pstorage-pgsql
+  mvn clean install -q -ff -Dsurefire.useFile=false -Pparallel-test -DLOG_LEVEL=WARN -Dmaven.fork.count=2

http://git-wip-us.apache.org/repos/asf/tajo/blob/024b3c3d/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 90ad8a2..eacfbe1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -554,6 +554,9 @@ Release 0.11.0 - unreleased
   
   TASKS
 
+    TAJO-1870: Enable tests of tajo-storage-pgsql module when arch type 
+    is 64-bit. (jinho)
+
     TAJO-1682: Write ORC document. (Contributed by Jongyoung Park, 
     Committed by jihoon)
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/024b3c3d/tajo-dist/pom.xml
----------------------------------------------------------------------
diff --git a/tajo-dist/pom.xml b/tajo-dist/pom.xml
index 124adbf..8dabe8f 100644
--- a/tajo-dist/pom.xml
+++ b/tajo-dist/pom.xml
@@ -144,11 +144,7 @@
                       run cp -r $ROOT/tajo-storage/target/tajo-storage-${project.version}/*
.
                       run cp -r $ROOT/tajo-sql-parser/target/tajo-sql-parser-${project.version}/*
.
                       run cp -r $ROOT/tajo-storage/tajo-storage-jdbc/target/tajo-storage-jdbc-${project.version}.jar
.
-                      STORAGE_PGSQL_JAR=$ROOT/tajo-storage/tajo-storage-pgsql/target/tajo-storage-pgsql-${project.version}.jar
-                      if [ -f $STORAGE_PGSQL_JAR ]
-                      then
-                        run cp -r $STORAGE_PGSQL_JAR .
-                      fi
+                      run cp -r $ROOT/tajo-storage/tajo-storage-pgsql/target/tajo-storage-pgsql-${project.version}.jar
                       run cp -r $ROOT/tajo-pullserver/target/tajo-pullserver-${project.version}.jar
.
                       run cp -r $ROOT/tajo-metrics/target/tajo-metrics-${project.version}.jar
.
                       run cp -r $ROOT/tajo-core/target/tajo-core-${project.version}.jar .

http://git-wip-us.apache.org/repos/asf/tajo/blob/024b3c3d/tajo-storage/pom.xml
----------------------------------------------------------------------
diff --git a/tajo-storage/pom.xml b/tajo-storage/pom.xml
index cc99aff..a6b9b8a 100644
--- a/tajo-storage/pom.xml
+++ b/tajo-storage/pom.xml
@@ -38,6 +38,7 @@
     <module>tajo-storage-hdfs</module>
     <module>tajo-storage-hbase</module>
     <module>tajo-storage-jdbc</module>
+    <module>tajo-storage-pgsql</module>
   </modules>
 
   <build>
@@ -45,11 +46,6 @@
       <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>tajo-storage-pgsql/**</exclude>
-          </excludes>
-        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -93,16 +89,7 @@
         </plugins>
       </build>
     </profile>
-    <!-- User Documentation -->
-    <profile>
-      <id>storage-pgsql</id>
-      <modules>
-        <module>tajo-storage-pgsql</module>
-      </modules>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-    </profile>
+
     <profile>
       <id>dist</id>
       <activation>

http://git-wip-us.apache.org/repos/asf/tajo/blob/024b3c3d/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 c36d9bf..2e6e61d 100644
--- a/tajo-storage/tajo-storage-pgsql/pom.xml
+++ b/tajo-storage/tajo-storage-pgsql/pom.xml
@@ -70,16 +70,6 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <systemProperties>
-            <tajo.test>TRUE</tajo.test>
-          </systemProperties>
-          <argLine>-Xms512m -Xmx1024m -XX:MaxPermSize=128m -Dfile.encoding=UTF-8</argLine>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <version>2.4</version>
         <executions>
@@ -90,6 +80,14 @@
           </execution>
         </executions>
       </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <skipTests>true</skipTests>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 
@@ -162,6 +160,10 @@
           <groupId>com.sun.jersey.jersey-test-framework</groupId>
           <artifactId>jersey-test-framework-grizzly2</artifactId>
         </exclusion>
+        <exclusion>
+          <artifactId>netty-all</artifactId>
+          <groupId>io.netty</groupId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -189,6 +191,10 @@
           <groupId>com.sun.jersey.jersey-test-framework</groupId>
           <artifactId>jersey-test-framework-grizzly2</artifactId>
         </exclusion>
+        <exclusion>
+          <artifactId>netty-all</artifactId>
+          <groupId>io.netty</groupId>
+        </exclusion>
       </exclusions>
     </dependency>
 
@@ -217,6 +223,30 @@
 
   <profiles>
     <profile>
+      <!-- testing-postgresql-server only supports x86-64 -->
+      <id>64bit-tests</id>
+      <activation>
+        <os>
+         <arch>x86_64</arch>
+        </os>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <skipTests>false</skipTests>
+              <systemProperties>
+                <tajo.test>TRUE</tajo.test>
+              </systemProperties>
+              <argLine>-Xms512m -Xmx1024m -XX:MaxPermSize=128m -Dfile.encoding=UTF-8</argLine>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
       <id>docs</id>
       <activation>
         <activeByDefault>false</activeByDefault>


Mime
View raw message