Rav 6507

.asf.yaml

@@ -0,0 +1,32 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+github:
+  description: "Apache Calcite"
+  homepage: https://calcite.apache.org/
+  features:
+    wiki: false
+    issues: false
+    projects: false
+  enabled_merge_buttons:
+    squash:  false
+    merge:   false
+    rebase:  true
+notifications:
+    commits:      commits@calcite.apache.org
+    issues:       issues@calcite.apache.org
+    pullrequests: commits@calcite.apache.org
+    jira_options: link label worklog

.editorconfig

@@ -20,6 +20,9 @@ ij_java_use_single_class_imports = true
 max_line_length = 100
 ij_any_wrap_long_lines = true
 
+[*.astub]
+indent_size = 2
+
 [*.java]
 # Doc: https://youtrack.jetbrains.com/issue/IDEA-170643#focus=streamItem-27-3708697.0-0
 # $ means "static"
@@ -44,3 +47,4 @@ ij_java_space_before_colon = true
 ij_java_ternary_operation_signs_on_next_line = true
 ij_java_use_single_class_imports = true
 ij_java_wrap_long_lines = true
+ij_java_align_multiline_parameters = false

.gitattributes

@@ -6,10 +6,11 @@
 *.html   text diff=html
 *.kt     text diff=kotlin
 *.kts    text diff=kotlin
+*.md     text diff=markdown
 *.py     text diff=python executable
 *.pl     text diff=perl executable
 *.pm     text diff=perl
-*.css    text
+*.css    text diff=css
 *.js     text
 *.sql    text
 *.q      text
@@ -26,3 +27,9 @@ data/files/*.dat    text eol=lf
 *.cmd    text eol=crlf
 *.csproj text merge=union eol=crlf
 *.sln    text merge=union eol=crlf
+
+# Take the union of the lines during merge
+# It avoids false merge conflicts when different lines are added close to each other
+# However, it might result in duplicate lines if two commits edit the same line differently.
+# If different commits add exactly the same line, then merge produces only one line.
+/core/src/main/resources/org/apache/calcite/runtime/CalciteResource.properties text merge=union

.github/workflows/main.yml

@@ -34,6 +34,11 @@ on:
     branches:
       - '*'
 
+# Throw OutOfMemoryError in case less than 35% is free after full GC
+# This avoids never-ending GC trashing if memory gets too low in case of a memory leak
+env:
+  _JAVA_OPTIONS: '-XX:GCTimeLimit=90 -XX:GCHeapFreeLimit=35'
+
 jobs:
   windows:
     if: github.event.action != 'labeled'
@@ -47,10 +52,21 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 8
-    - name: 'Test'
+    - uses: burrunan/gradle-cache-action@v1
+      name: Test
+      with:
+        job-id: jdk${{ matrix.jdk }}
+        arguments: --scan --no-parallel --no-daemon build javadoc
+    - name: 'sqlline and sqllsh'
       shell: cmd
       run: |
-        ./gradlew --no-parallel --no-daemon build javadoc
+        call sqlline.bat -e '!quit'
+        echo.
+        echo Sqlline example/csv
+        call example/csv/sqlline.bat --verbose -u jdbc:calcite:model=example/csv/src/test/resources/model.json -n admin -p admin -f example/csv/src/test/resources/smoke_test.sql
+        echo.
+        echo sqlsh
+        call sqlsh.bat -o headers "select count(*) commits, author from (select substring(author, 1, position(' <' in author)-1) author from git_commits) group by author order by count(*) desc, author limit 20"
 
   linux-avatica:
     if: github.event.action != 'labeled'
@@ -61,33 +77,120 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 11
-    - name: 'Install Avatica to Maven Local repository'
+    - name: 'Clone Avatica to Maven Local repository'
       run: |
         git clone --branch master --depth 100 https://github.com/apache/calcite-avatica.git ../calcite-avatica
-        cd ../calcite-avatica
-        ./gradlew publishToMavenLocal -Pcalcite.avatica.version=1.0.0-dev-master -PskipJavadoc
+    - uses: burrunan/gradle-cache-action@v1
+      name: Build Avatica
+      with:
+        job-id: avatica-jdk${{ matrix.jdk }}
+        build-root-directory: ../calcite-avatica
+        arguments: publishToMavenLocal
+        properties: |
+          calcite.avatica.version=1.0.0-dev-master
+          skipJavadoc=
     - uses: actions/checkout@v2
       with:
         fetch-depth: 50
-    - name: 'Test'
-      run: |
-        ./gradlew --no-parallel --no-daemon build javadoc -Pcalcite.avatica.version=1.0.0-dev-master-SNAPSHOT -PenableMavenLocal
+    - uses: burrunan/gradle-cache-action@v1
+      name: Test
+      with:
+        job-id: jdk${{ matrix.jdk }}
+        execution-only-caches: true
+        arguments: --scan --no-parallel --no-daemon build javadoc
+        properties: |
+          calcite.avatica.version=1.0.0-dev-master-SNAPSHOT
+          enableMavenLocal=
+
+  linux-openj9:
+    if: github.event.action != 'labeled'
+    name: 'Linux (OpenJ9 8)'
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 50
+      - uses: AdoptOpenJDK/install-jdk@v1
+        with:
+          impl: openj9
+          version: '8'
+          architecture: x64
+      - uses: burrunan/gradle-cache-action@v1
+        name: Test
+        with:
+          job-id: jdk8-openj9
+          arguments: --scan --no-parallel --no-daemon build javadoc
+      - name: 'sqlline and sqllsh'
+        run: |
+          ./sqlline -e '!quit'
+          echo
+          echo Sqlline example/csv
+          ./example/csv/sqlline --verbose -u jdbc:calcite:model=example/csv/src/test/resources/model.json -n admin -p admin -f example/csv/src/test/resources/smoke_test.sql
+          echo
+          echo sqlsh
+          ./sqlsh -o headers "select count(*) commits, author from (select substring(author, 1, position(' <' in author)-1) author from git_commits) group by author order by count(*) desc, author limit 20"
 
   mac:
     if: github.event.action != 'labeled'
-    name: 'macOS (JDK 13)'
+    name: 'macOS (JDK 15)'
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 50
-      - name: 'Set up JDK 13'
+      - name: 'Set up JDK 15'
         uses: actions/setup-java@v1
         with:
-          java-version: 13
-      - name: 'Test'
+          java-version: 15
+      - uses: burrunan/gradle-cache-action@v1
+        name: Test
+        with:
+          job-id: jdk15
+          arguments: --scan --no-parallel --no-daemon build javadoc
+      - name: 'sqlline and sqllsh'
         run: |
-          ./gradlew --no-parallel --no-daemon build javadoc
+          ./sqlline -e '!quit'
+          echo
+          echo Sqlline example/csv
+          ./example/csv/sqlline --verbose -u jdbc:calcite:model=example/csv/src/test/resources/model.json -n admin -p admin -f example/csv/src/test/resources/smoke_test.sql
+          echo
+          echo sqlsh
+          ./sqlsh -o headers "select count(*) commits, author from (select substring(author, 1, position(' <' in author)-1) author from git_commits) group by author order by count(*) desc, author limit 20"
+
+  errorprone:
+    if: github.event.action != 'labeled'
+    name: 'Error Prone (JDK 11)'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 50
+      - name: 'Set up JDK 11'
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - uses: burrunan/gradle-cache-action@v1
+        name: Test
+        with:
+          job-id: errprone
+          arguments: --scan --no-parallel --no-daemon -PenableErrorprone classes
+
+  linux-checkerframework:
+    name: 'CheckerFramework (JDK 11)'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 50
+      - name: 'Set up JDK 11'
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: 'Run CheckerFramework'
+        uses: burrunan/gradle-cache-action@v1
+        with:
+          job-id: checkerframework-jdk11
+          arguments: --scan --no-parallel --no-daemon -PenableCheckerframework :linq4j:classes :core:classes
 
   linux-slow:
     # Run slow tests when the commit is on master or it is requested explicitly by adding an
@@ -103,6 +206,49 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 8
-      - name: 'Test'
-        run: |
-          ./gradlew --no-parallel --no-daemon testSlow
+      - uses: burrunan/gradle-cache-action@v1
+        name: Test
+        with:
+          job-id: jdk8
+          arguments: --scan --no-parallel --no-daemon testSlow
+
+  linux-druid:
+    if: github.event.action != 'labeled'
+    name: 'Linux (JDK 8) Druid Tests'
+    runs-on: ubuntu-latest
+    steps:
+    - name: 'Set up JDK 8'
+      uses: actions/setup-java@v1
+      with:
+        java-version: 8
+    - name: 'Checkout Druid dataset'
+      uses: actions/checkout@master
+      with:
+        repository: zabetak/calcite-druid-dataset
+        fetch-depth: 1
+        path: druid-dataset
+    - name: 'Start Druid containers'
+      working-directory: ./druid-dataset
+      run: |
+        chmod -R 777 storage
+        docker-compose up -d
+    - name: 'Wait Druid nodes to startup'
+      run: |
+        until docker logs coordinator | grep "Successfully started lifecycle \[module\]"; do sleep 1s; done
+        until docker logs router | grep "Successfully started lifecycle \[module\]"; do sleep 1s; done
+        until docker logs historical | grep "Successfully started lifecycle \[module\]"; do sleep 1s; done
+        until docker logs middlemanager | grep "Successfully started lifecycle \[module\]"; do sleep 1s; done
+        until docker logs broker | grep "Successfully started lifecycle \[module\]"; do sleep 1s; done
+    - name: 'Index Foodmart/Wikipedia datasets'
+      working-directory: ./druid-dataset
+      run: ./index.sh 30s
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 1
+        path: calcite
+    - uses: burrunan/gradle-cache-action@v1
+      name: 'Run Druid tests'
+      with:
+        build-root-directory: ./calcite
+        job-id: Druid8
+        arguments: --scan --no-parallel --no-daemon :druid:test -Dcalcite.test.druid=true

.gitignore

@@ -29,7 +29,11 @@
 /out
 /*/out/
 /example/*/out
-.idea
+# The star is required for further !/.idea/ to work, see https://git-scm.com/docs/gitignore
+/.idea/*
+# Icon for JetBrains Toolbox
+!/.idea/icon.png
+!/.idea/vcs.xml
 *.iml
 
 settings.xml

.ratignore

@@ -12,8 +12,8 @@
 **/src/test/resources/*.json
 **/data.txt
 **/data2.txt
-#bu ildSrc/build
-#b uildSrc/subprojects/*/build
+.idea/vcs.xml
+example/csv/src/test/resources/smoke_test.sql
 
 # TODO: remove when pom.xml files are removed
 src/main/config/licenses

.travis.yml

@@ -23,6 +23,7 @@ matrix:
   include:
     - jdk: openjdk8
     - jdk: openjdk11
+    - jdk: openjdk15
 branches:
   only:
     - master
@@ -32,6 +33,9 @@ branches:
     - /^[0-9]+-.*$/
 install: true
 script:
+  # Throw OutOfMemoryError in case less than 35% is free after full GC
+  # This avoids never-ending GC trashing if memory gets too low in case of a memory leak
+  - export _JAVA_OPTIONS="-XX:GCTimeLimit=90 -XX:GCHeapFreeLimit=35"
   - ./gradlew --no-daemon build
 git:
   depth: 100
@@ -41,7 +45,5 @@ cache:
     - $HOME/.gradle/wrapper/
 
 before_cache:
-  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
-  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
-
-# End .travis.yml
+  - ./gradlew --stop
+  - F=CleanupGradleCache sh -x -c 'curl -O https://raw.githubusercontent.com/vlsi/cleanup-gradle-cache/v1.x/$F.java && javac -J-Xmx128m $F.java && java -Xmx128m $F'

LICENSE

@@ -175,3 +175,15 @@
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
+
+Additional License files can be found in the 'licenses' folder located in the same directory as the LICENSE file (i.e. this file)
+
+- Software produced outside the ASF which is available under other licenses (not Apache-2.0)
+
+MIT
+* cobyism:html5shiv:3.7.2
+* font-awesome:font-awesome-code:4.2.0
+* gridsim:gridsim:
+* jekyll:jekyll:
+* normalize:normalize:3.0.2
+* respond:respond:1.4.2

NOTICE

@@ -1,5 +1,5 @@
 Apache Calcite
-Copyright 2012-2019 The Apache Software Foundation
+Copyright 2012-2020 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

README

@@ -1,4 +1,4 @@
-Apache Calcite release 1.21.0
+Apache Calcite release 1.26.0
 
 This is a source or binary distribution of Apache Calcite.
 

README.md

@@ -16,8 +16,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 {% endcomment %}
 -->
+
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.calcite/calcite-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.apache.calcite/calcite-core)
 [![Travis Build Status](https://travis-ci.org/apache/calcite.svg?branch=master)](https://travis-ci.org/apache/calcite)
-[![CI Status](https://github.com/apache/calcite/workflows/CI/badge.svg)](https://github.com/apache/calcite/actions)
+[![CI Status](https://github.com/apache/calcite/workflows/CI/badge.svg?branch=master)](https://github.com/apache/calcite/actions?query=branch%3Amaster)
 [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/apache/calcite?svg=true&branch=master)](https://ci.appveyor.com/project/ApacheSoftwareFoundation/calcite)
 
 # Apache Calcite