This is an automated email from the ASF dual-hosted git repository.
liuzhi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/carbondata.git
The following commit(s) were added to refs/heads/master by this push:
new cd81837 [HOTFIX] Fix all flink test case failure and enable UT in CI
cd81837 is described below
commit cd8183700c28ce47782c67e6ad44c5cfdef72a51
Author: ajantha-bhat <[email protected]>
AuthorDate: Fri Mar 27 17:41:18 2020 +0530
[HOTFIX] Fix all flink test case failure and enable UT in CI
Why is this PR needed?
After #3628, default BATCH_FILE_ORDER is wrong [it is not ASC or DSC].
so, all the test case in flink module failed due as no order is set in
stage command.
Also flink UT is not running in CI, hence it is not caught
What changes were proposed in this PR?
Fix the default value to Ascending order.
Enable UT running for flink module.
Does this PR introduce any user interface change?
No
Is any new testcase added?
No
This closes #3685
---
integration/flink/pom.xml | 60 +++++++++++++++++++++-
integration/spark/pom.xml | 16 ++++++
.../management/CarbonInsertFromStageCommand.scala | 5 +-
3 files changed, 79 insertions(+), 2 deletions(-)
diff --git a/integration/flink/pom.xml b/integration/flink/pom.xml
index d832385..de69f41 100644
--- a/integration/flink/pom.xml
+++ b/integration/flink/pom.xml
@@ -230,9 +230,16 @@
</dependency>
</dependencies>
</profile>
+ <profile>
+ <id>sdvtest</id>
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+ </profile>
</profiles>
<build>
+ <testSourceDirectory>src/test/scala</testSourceDirectory>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
@@ -268,7 +275,58 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.18</version>
+ <!-- Note config is repeated in scalatest config -->
+ <configuration>
+ <skip>false</skip>
+
<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
+ <argLine>-Xmx3g -XX:MaxPermSize=512m
-XX:ReservedCodeCacheSize=512m</argLine>
+ <systemProperties>
+ <java.awt.headless>true</java.awt.headless>
+ </systemProperties>
+ <!-- testFailureIgnore>false</testFailureIgnore -->
+ <failIfNoTests>false</failIfNoTests>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.17</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.scalatest</groupId>
+ <artifactId>scalatest-maven-plugin</artifactId>
+ <version>1.0</version>
+ <!-- Note config is repeated in surefire config -->
+ <configuration>
+
<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
+ <junitxml>.</junitxml>
+ <testFailureIgnore>false</testFailureIgnore>
+ <filereports>CarbonTestSuite.txt</filereports>
+ <argLine>-ea -Xmx3g -XX:MaxPermSize=512m
-XX:ReservedCodeCacheSize=512m
+ </argLine>
+ <stderr/>
+ <environmentVariables>
+ </environmentVariables>
+ <systemProperties>
+ <java.awt.headless>true</java.awt.headless>
+ </systemProperties>
+ </configuration>
+ <executions>
+ <execution>
+ <id>test</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
-
</project>
\ No newline at end of file
diff --git a/integration/spark/pom.xml b/integration/spark/pom.xml
index eb84bb3..1e5158e 100644
--- a/integration/spark/pom.xml
+++ b/integration/spark/pom.xml
@@ -141,10 +141,22 @@
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-hive-thriftserver_${scala.binary.version}</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.twitter</groupId>
+ <artifactId>chill-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-repl_${scala.binary.version}</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.twitter</groupId>
+ <artifactId>chill-java</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
@@ -154,6 +166,10 @@
<groupId>net.jpountz.lz4</groupId>
<artifactId>lz4</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.twitter</groupId>
+ <artifactId>chill-java</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git
a/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/management/CarbonInsertFromStageCommand.scala
b/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/management/CarbonInsertFromStageCommand.scala
index c1888cb..300dcd3 100644
---
a/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/management/CarbonInsertFromStageCommand.scala
+++
b/integration/spark/src/main/scala/org/apache/spark/sql/execution/command/management/CarbonInsertFromStageCommand.scala
@@ -606,6 +606,9 @@ object CarbonInsertFromStageCommand {
*/
val BATCH_FILE_ORDER_DESC = "DESC"
- val BATCH_FILE_ORDER_DEFAULT: String = BATCH_FILE_ORDER_KEY
+ /*
+ * Keep default ascending order. (Earliest first)
+ */
+ val BATCH_FILE_ORDER_DEFAULT: String = BATCH_FILE_ORDER_ASC
}
