You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by xx...@apache.org on 2021/11/05 02:48:08 UTC

[kylin] branch main updated (d9a5c70 -> 929014c)

This is an automated email from the ASF dual-hosted git repository.

xxyu pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/kylin.git.


    from d9a5c70  KYLIN-5111 Record the time spent for each stage of query in kylin4's log
     new 01cc8f0  [KYLIN-4864] Enable running Kylin tests on ARM64 platform (#1558)
     new 529bb28  Modify branch name for travis ci
     new 929014c  KYLIN-4864 Fix .travis.yml syntax (#1700)

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/maven.yml |  4 ++--
 .travis.yml                 | 39 +++++++++++++++++++++++++++------------
 pom.xml                     |  2 +-
 3 files changed, 30 insertions(+), 15 deletions(-)

[kylin] 01/03: [KYLIN-4864] Enable running Kylin tests on ARM64 platform (#1558)

Posted by xx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

xxyu pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/kylin.git

commit 01cc8f00316e5334b500596785eeef0ed21af2d5
Author: Liu sheng <li...@gmail.com>
AuthorDate: Tue Jul 27 10:38:10 2021 +0800

    [KYLIN-4864] Enable running Kylin tests on ARM64 platform (#1558)
    
    * [KYLIN-4864] Enable running Kylin tests on ARM64 platform
    
    This change modify the Travis CI configurations to enable the Kylin testing on ARM64 server.
    
    * Use openjdk11 for ARM64 test
---
 .travis.yml | 13 ++++++++++---
 pom.xml     |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 46236bc..2f24032 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,10 +27,16 @@ cache:
   directories:
     - $HOME/.m2
 
-jdk:
-  - openjdk8
+matrix:
+  include:
+    - arch: arm64
+      addons:
+        apt:
+          packages: openjdk-8-jdk
+    - arch: amd64
+      jdk: openjdk8
 
-before_script:
+before_install:
   - echo "Downloading Maven 3.5.3"
       && wget https://archive.apache.org/dist/maven/maven-3/3.5.3/binaries/apache-maven-3.5.3-bin.zip
       && unzip -qq apache-maven-3.5.3-bin.zip
@@ -42,6 +48,7 @@ before_script:
   - sed -i 's/log4j.logger.org.apache.kylin=INFO/log4j.logger.org.apache.kylin=WARN/g' build/conf/kylin-tools-log4j.properties
   - sed -i 's/log4j.logger.org.apache.kylin=INFO/log4j.logger.org.apache.kylin=WARN/g' kylin-spark-project/build/conf/kylin-tools-log4j.properties
 
+  - if [[ $(uname -m) == 'aarch64' ]];then export JAVA_HOME="/usr/lib/jvm/java-8-openjdk-arm64";fi
 
 script:
   # mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent test coveralls:report -e
diff --git a/pom.xml b/pom.xml
index 1b794fd..8b5ae85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,7 +157,7 @@
     <tomcat.version>7.0.100</tomcat.version>
     <t-digest.version>3.1</t-digest.version>
     <freemarker.version>2.3.23</freemarker.version>
-    <rocksdb.version>5.9.2</rocksdb.version>
+    <rocksdb.version>5.18.4</rocksdb.version>
     <lz4.version>1.4.0</lz4.version>
     <mssql-jdbc.version>6.2.2.jre8</mssql-jdbc.version>
     <!--metric-->

[kylin] 03/03: KYLIN-4864 Fix .travis.yml syntax (#1700)

Posted by xx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

xxyu pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/kylin.git

commit 929014c70467eb7f90a72e2906826bed6c462201
Author: Martin Grigorov <ma...@users.noreply.github.com>
AuthorDate: Mon Aug 2 16:47:48 2021 +0800

    KYLIN-4864 Fix .travis.yml syntax (#1700)
    
    * KYLIN-4864 Fix .travis.yml syntax
    
    The commented line about `# mvn sonar:sonar -e -Dsonar.host.url=https://sonarcloud.io ...` has broken the YAML and because of this TravisCI didn't execute any jobs.
    I wasn't able to find a way to preserve the commented line and fix the syntax, so I removed the line. Later it could be get from Git history to re-enable Sonar.
    
    While here I've improved few more things:
    - install OpenJDK and unzip for both AMD64 and ARM64. This way it uses latest JDK 8 (1.8.0_292) for both CPU architectures
    - fix more YAML warnings
    
    * KYLIN-4864 Use Graviton2 ARM64 node
    
    There is some problem with resolving the local address on the arm64 node (non-graviton2) - https://travis-ci.community/t/sudo-unable-to-resolve-host/8841
---
 .travis.yml | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2f24032..95a6fe9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,9 +15,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-language: java
+---
+language: generic
 
 addons:
+  apt:
+    packages:
+      - openjdk-8-jdk
+      - unzip
   sonarcloud:
     organization: "kylin"
     token:
@@ -27,22 +32,25 @@ cache:
   directories:
     - $HOME/.m2
 
-matrix:
+jobs:
   include:
-    - arch: arm64
-      addons:
-        apt:
-          packages: openjdk-8-jdk
-    - arch: amd64
-      jdk: openjdk8
+    - name: Linux ARM64
+      arch: arm64-graviton2
+      dist: focal
+      virt: vm
+      group: edge
+    - name: Linux x86
+      arch: amd64
 
 before_install:
-  - echo "Downloading Maven 3.5.3"
-      && wget https://archive.apache.org/dist/maven/maven-3/3.5.3/binaries/apache-maven-3.5.3-bin.zip
-      && unzip -qq apache-maven-3.5.3-bin.zip
-      && export M2_HOME=$PWD/apache-maven-3.5.3
-      && export PATH=$M2_HOME/bin:$PATH
-      && mvn -version
+  - export JAVA_HOME="/usr/lib/jvm/java-8-openjdk-${TRAVIS_CPU_ARCH}";
+  - export PATH="$JAVA_HOME/bin:$PATH";
+  - echo "Downloading Maven 3.8.1"
+  - wget --quiet https://archive.apache.org/dist/maven/maven-3/3.8.1/binaries/apache-maven-3.8.1-bin.zip
+  - unzip -qq -o apache-maven-3.8.1-bin.zip
+  - export M2_HOME=$PWD/apache-maven-3.8.1
+  - export PATH=$M2_HOME/bin:$PATH
+  - mvn -version
   - echo "MAVEN_OPTS='-Xms1024m -Xmx3072m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=384m'" > ~/.mavenrc
   - sed -i 's/log4j.logger.org.apache.kylin=DEBUG/log4j.logger.org.apache.kylin=WARN/g' build/conf/kylin-server-log4j.properties
   - sed -i 's/log4j.logger.org.apache.kylin=INFO/log4j.logger.org.apache.kylin=WARN/g' build/conf/kylin-tools-log4j.properties
@@ -70,7 +78,7 @@ notification:
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)
-  
+
 before_cache:
   # Remove project's local artifacts to force maven reactor resolve
   - rm -rf $HOME/.m2/repository/org/apache/kylin
@@ -78,4 +86,4 @@ before_cache:
 # blocklist
 branches:
   except:
-  - document
+    - document

[kylin] 02/03: Modify branch name for travis ci

Posted by xx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

xxyu pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/kylin.git

commit 529bb281d11133176f10bb37d12a343bee713b7c
Author: yaqian.zhang <59...@qq.com>
AuthorDate: Thu Nov 4 09:58:53 2021 +0800

    Modify branch name for travis ci
---
 .github/workflows/maven.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 3bec681..d8b027e 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -22,9 +22,9 @@ name: Java CI with Maven
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build: