You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by el...@apache.org on 2016/03/10 02:49:40 UTC

[01/10] calcite git commit: [CALCITE-1064] maven-remote-resources-plugin cleanup for Calcite [Forced Update!]

Repository: calcite
Updated Branches:
  refs/heads/branch-avatica-1.7 18c7dfff8 -> 39b30bd11 (forced update)


[CALCITE-1064] maven-remote-resources-plugin cleanup for Calcite

Same changes that I made to Avatica, apply them to Calcite.


Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/48415a80
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/48415a80
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/48415a80

Branch: refs/heads/branch-avatica-1.7
Commit: 48415a80b8f7f5763cbc3ba4e90c59e3dbeca389
Parents: 83a8e88
Author: Josh Elser <el...@apache.org>
Authored: Wed Mar 9 10:49:04 2016 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Mar 9 16:12:24 2016 -0500

----------------------------------------------------------------------
 cassandra/pom.xml        | 11 -----------
 core/pom.xml             | 11 -----------
 example/csv/pom.xml      | 11 -----------
 example/function/pom.xml | 11 -----------
 linq4j/pom.xml           | 11 -----------
 mongodb/pom.xml          | 11 -----------
 plus/pom.xml             | 11 -----------
 pom.xml                  | 43 +++++++++++++++++--------------------------
 spark/pom.xml            | 11 -----------
 splunk/pom.xml           | 11 -----------
 ubenchmark/pom.xml       | 11 -----------
 11 files changed, 17 insertions(+), 136 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/calcite/blob/48415a80/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/cassandra/pom.xml b/cassandra/pom.xml
index 42fc6bf..d99fb16 100644
--- a/cassandra/pom.xml
+++ b/cassandra/pom.xml
@@ -132,17 +132,6 @@ limitations under the License.
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <artifactId>maven-remote-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>non-root-resources</id>
-            <goals>
-              <goal>process</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 

http://git-wip-us.apache.org/repos/asf/calcite/blob/48415a80/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 00be69a..086374f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -262,17 +262,6 @@ limitations under the License.
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <artifactId>maven-remote-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>non-root-resources</id>
-            <goals>
-              <goal>process</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
 
     <resources>

http://git-wip-us.apache.org/repos/asf/calcite/blob/48415a80/example/csv/pom.xml
----------------------------------------------------------------------
diff --git a/example/csv/pom.xml b/example/csv/pom.xml
index 444367c..b3645ca 100644
--- a/example/csv/pom.xml
+++ b/example/csv/pom.xml
@@ -101,17 +101,6 @@ limitations under the License.
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <artifactId>maven-remote-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>non-root-resources</id>
-            <goals>
-              <goal>process</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>

http://git-wip-us.apache.org/repos/asf/calcite/blob/48415a80/example/function/pom.xml
----------------------------------------------------------------------
diff --git a/example/function/pom.xml b/example/function/pom.xml
index 2c6c85d..bfbbe9f 100644
--- a/example/function/pom.xml
+++ b/example/function/pom.xml
@@ -85,17 +85,6 @@ limitations under the License.
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <artifactId>maven-remote-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>non-root-resources</id>
-            <goals>
-              <goal>process</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>

http://git-wip-us.apache.org/repos/asf/calcite/blob/48415a80/linq4j/pom.xml
----------------------------------------------------------------------
diff --git a/linq4j/pom.xml b/linq4j/pom.xml
index 5859013..2d02895 100644
--- a/linq4j/pom.xml
+++ b/linq4j/pom.xml
@@ -80,17 +80,6 @@ limitations under the License.
           </includes>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-remote-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>non-root-resources</id>
-            <goals>
-              <goal>process</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>

http://git-wip-us.apache.org/repos/asf/calcite/blob/48415a80/mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/mongodb/pom.xml b/mongodb/pom.xml
index 5680476..38b872f 100644
--- a/mongodb/pom.xml
+++ b/mongodb/pom.xml
@@ -142,17 +142,6 @@ limitations under the License.
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <artifactId>maven-remote-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>non-root-resources</id>
-            <goals>
-              <goal>process</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 

http://git-wip-us.apache.org/repos/asf/calcite/blob/48415a80/plus/pom.xml
----------------------------------------------------------------------
diff --git a/plus/pom.xml b/plus/pom.xml
index 38c5a39..2a56929 100644
--- a/plus/pom.xml
+++ b/plus/pom.xml
@@ -126,17 +126,6 @@ limitations under the License.
           </includes>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-remote-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>non-root-resources</id>
-            <goals>
-              <goal>process</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 

http://git-wip-us.apache.org/repos/asf/calcite/blob/48415a80/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 72e7124..febf18d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -429,32 +429,6 @@ limitations under the License.
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-remote-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>root-resources</id>
-            <goals>
-              <goal>process</goal>
-            </goals>
-            <configuration>
-              <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
-              <resourceBundles>
-                <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
-              </resourceBundles>
-            </configuration>
-          </execution>
-          <execution>
-            <id>non-root-resources</id>
-            <configuration>
-              <resourceBundles>
-                <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
-              </resourceBundles>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>
@@ -858,6 +832,23 @@ limitations under the License.
               </execution>
             </executions>
           </plugin>
+          <plugin>
+            <artifactId>maven-remote-resources-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>root-resources</id>
+                <goals>
+                  <goal>process</goal>
+                </goals>
+                <configuration>
+                  <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+                  <resourceBundles>
+                    <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+                  </resourceBundles>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
       </build>
     </profile>

http://git-wip-us.apache.org/repos/asf/calcite/blob/48415a80/spark/pom.xml
----------------------------------------------------------------------
diff --git a/spark/pom.xml b/spark/pom.xml
index d2a7a25..84ac74e 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -154,17 +154,6 @@ limitations under the License.
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <artifactId>maven-remote-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>non-root-resources</id>
-            <goals>
-              <goal>process</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 

http://git-wip-us.apache.org/repos/asf/calcite/blob/48415a80/splunk/pom.xml
----------------------------------------------------------------------
diff --git a/splunk/pom.xml b/splunk/pom.xml
index a253d98..f67afde 100644
--- a/splunk/pom.xml
+++ b/splunk/pom.xml
@@ -132,17 +132,6 @@ limitations under the License.
           </includes>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-remote-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>non-root-resources</id>
-            <goals>
-              <goal>process</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>

http://git-wip-us.apache.org/repos/asf/calcite/blob/48415a80/ubenchmark/pom.xml
----------------------------------------------------------------------
diff --git a/ubenchmark/pom.xml b/ubenchmark/pom.xml
index b1b3f33..4d391c0 100644
--- a/ubenchmark/pom.xml
+++ b/ubenchmark/pom.xml
@@ -145,17 +145,6 @@ limitations under the License.
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <artifactId>maven-remote-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>non-root-resources</id>
-            <goals>
-              <goal>process</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>


[06/10] calcite git commit: [CALCITE-1141] Bump version.minor for Avatica

Posted by el...@apache.org.
[CALCITE-1141] Bump version.minor for Avatica


Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/47369e33
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/47369e33
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/47369e33

Branch: refs/heads/branch-avatica-1.7
Commit: 47369e33dead25b5530696554cd9d1d7dbb7fb80
Parents: 816adb1
Author: Josh Elser <el...@apache.org>
Authored: Wed Mar 9 20:27:01 2016 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Mar 9 20:27:01 2016 -0500

----------------------------------------------------------------------
 avatica/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/calcite/blob/47369e33/avatica/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/pom.xml b/avatica/pom.xml
index 698c2c4..aac390c 100644
--- a/avatica/pom.xml
+++ b/avatica/pom.xml
@@ -51,7 +51,7 @@ limitations under the License.
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <top.dir>${project.basedir}</top.dir>
     <version.major>1</version.major>
-    <version.minor>6</version.minor>
+    <version.minor>7</version.minor>
 
     <!-- This list is in alphabetical order. -->
     <build-helper-maven-plugin.version>1.9</build-helper-maven-plugin.version>


[03/10] calcite git commit: [CALCITE-1136] Update RAT exclusions for avatica directory

Posted by el...@apache.org.
[CALCITE-1136] Update RAT exclusions for avatica directory


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

Branch: refs/heads/branch-avatica-1.7
Commit: d1bbc0abba482986cf27da3d981fe4e37058db70
Parents: 48415a8
Author: Josh Elser <el...@apache.org>
Authored: Wed Mar 9 10:55:31 2016 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Mar 9 16:12:29 2016 -0500

----------------------------------------------------------------------
 pom.xml | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/calcite/blob/d1bbc0ab/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index febf18d..c45df4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -744,6 +744,8 @@ limitations under the License.
                 <exclude>src/main/resources/META-INF/services/java.sql.Driver</exclude>
                 <exclude>**/src/test/resources/**/*.csv</exclude>
                 <exclude>**/src/test/resources/bug/archers.json</exclude>
+                <!-- Exclude all of avatica, RAT is run in Avatica -->
+                <exclude>avatica/**</exclude>
 
                 <!-- Files generated by Jekyll. -->
                 <exclude>site/.sass-cache/**</exclude>


[10/10] calcite git commit: [CALCITE-1142] Create a README for Avatica

Posted by el...@apache.org.
[CALCITE-1142] Create a README for Avatica


Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/39b30bd1
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/39b30bd1
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/39b30bd1

Branch: refs/heads/branch-avatica-1.7
Commit: 39b30bd111154b4b28489a5940e2c88ec4588d3f
Parents: 6c9c3d6
Author: Josh Elser <el...@apache.org>
Authored: Wed Mar 9 20:35:40 2016 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Mar 9 20:39:00 2016 -0500

----------------------------------------------------------------------
 avatica/README.md | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/calcite/blob/39b30bd1/avatica/README.md
----------------------------------------------------------------------
diff --git a/avatica/README.md b/avatica/README.md
new file mode 100644
index 0000000..1d2cf28
--- /dev/null
+++ b/avatica/README.md
@@ -0,0 +1,27 @@
+<!--
+{% comment %}
+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.
+{% endcomment %}
+-->
+[![Build Status](https://travis-ci.org/julianhyde/calcite.svg?branch=master)](https://travis-ci.org/julianhyde/calcite)
+
+# Apache Calcite -- Avatica
+
+Apache Calcite's Avatica is a framework for building database drivers.
+
+Avatica is a sub-project of [Apache Calcite](https://calcite.apache.org).
+
+For more details, see the [home page](https://calcite.apache.org/avatica).


[02/10] calcite git commit: [CALCITE-1137] Exclude Avatica from Calcite source release

Posted by el...@apache.org.
[CALCITE-1137] Exclude Avatica from Calcite source release


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

Branch: refs/heads/branch-avatica-1.7
Commit: b58200bcfe1eda02c7c73f59adc1ddcc6495075e
Parents: d1bbc0a
Author: Josh Elser <el...@apache.org>
Authored: Wed Mar 9 10:58:51 2016 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Mar 9 16:12:29 2016 -0500

----------------------------------------------------------------------
 src/main/config/assemblies/source-assembly.xml | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/calcite/blob/b58200bc/src/main/config/assemblies/source-assembly.xml
----------------------------------------------------------------------
diff --git a/src/main/config/assemblies/source-assembly.xml b/src/main/config/assemblies/source-assembly.xml
index 2b1f930..bb38693 100644
--- a/src/main/config/assemblies/source-assembly.xml
+++ b/src/main/config/assemblies/source-assembly.xml
@@ -84,6 +84,9 @@ limitations under the License.
         </exclude>
         <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]
         </exclude>
+
+        <!-- Avatica -->
+        <exclude>avatica/**</exclude>
       </excludes>
     </fileSet>
     <!-- LICENSE, NOTICE, DEPENDENCIES, git.properties, etc. calculated at build time -->


[08/10] calcite git commit: [CALCITE-1143] Remove unnecessary NOTICE for Avatica

Posted by el...@apache.org.
[CALCITE-1143] Remove unnecessary NOTICE for Avatica


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

Branch: refs/heads/branch-avatica-1.7
Commit: b30e570fa0f250e0bcaef9cf680af0fa335d3855
Parents: 67d23ba
Author: Josh Elser <el...@apache.org>
Authored: Wed Mar 9 20:29:17 2016 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Mar 9 20:29:17 2016 -0500

----------------------------------------------------------------------
 avatica/NOTICE | 5 -----
 1 file changed, 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/calcite/blob/b30e570f/avatica/NOTICE
----------------------------------------------------------------------
diff --git a/avatica/NOTICE b/avatica/NOTICE
index 989c480..506738b 100644
--- a/avatica/NOTICE
+++ b/avatica/NOTICE
@@ -3,8 +3,3 @@ Copyright 2012-2016 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
-
-This product is based on source code originally developed
-by DynamoBI Corporation, LucidEra Inc., SQLstream Inc. and others
-under the auspices of the Eigenbase Foundation
-and released as the LucidDB project.


[07/10] calcite git commit: [CALCITE-1139] Update Calcite's KEYS and add a copy for Avatica

Posted by el...@apache.org.
[CALCITE-1139] Update Calcite's KEYS and add a copy for Avatica


Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/67d23ba8
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/67d23ba8
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/67d23ba8

Branch: refs/heads/branch-avatica-1.7
Commit: 67d23ba81e57ce2aca86d7d995ed44bddc5f8cc3
Parents: 47369e3
Author: Josh Elser <el...@apache.org>
Authored: Wed Mar 9 20:28:18 2016 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Mar 9 20:28:18 2016 -0500

----------------------------------------------------------------------
 KEYS         |  82 ++++++++++++++++
 avatica/KEYS | 285 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 367 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/calcite/blob/67d23ba8/KEYS
----------------------------------------------------------------------
diff --git a/KEYS b/KEYS
index ea0cda2..61ee69c 100644
--- a/KEYS
+++ b/KEYS
@@ -201,3 +201,85 @@ L2aEg774OgoVaPar0oMVE5cwD+Ozu97LbgNQdY++JWZ+L7Lz9cTXHdOQFl1UDS1I
 QLsX85oVrQIIqFPL
 =owGw
 -----END PGP PUBLIC KEY BLOCK-----
+
+pub   4096R/4677D66C 2013-05-04
+uid                  Josh Elser <jo...@gmail.com>
+sig 3        4677D66C 2013-05-04  Josh Elser <jo...@gmail.com>
+sig          00B6899D 2013-05-04  Christopher L Tubbs II (Christopher) <ct...@gmail.com>
+sig    R     ABBA8A49 2013-05-04  Eric Newton <er...@gmail.com>
+sub   4096R/99D5F66C 2013-05-04
+sig          4677D66C 2013-05-04  Josh Elser <jo...@gmail.com>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=6T6u
+-----END PGP PUBLIC KEY BLOCK-----

http://git-wip-us.apache.org/repos/asf/calcite/blob/67d23ba8/avatica/KEYS
----------------------------------------------------------------------
diff --git a/avatica/KEYS b/avatica/KEYS
new file mode 100644
index 0000000..61ee69c
--- /dev/null
+++ b/avatica/KEYS
@@ -0,0 +1,285 @@
+This file contains the PGP keys of various developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Examples of importing this file in your keystore:
+ gpg --import KEYS.txt
+ (need pgp and other examples here)
+
+Examples of adding your key to this file:
+ pgp -kxa <your name> and append it to this file.
+ (pgpk -ll <your name> && pgpk -xa <your name>) >> this file.
+ (gpg --list-sigs <your name>
+     && gpg --armor --export <your name>) >> this file.
+
+-----------------------------------------------------------------------------------
+
+pub   4096R/2AD3FAE3 2014-07-24
+uid                  Julian Hyde (CODE SIGNING KEY) <jh...@apache.org>
+sig 3        2AD3FAE3 2014-07-24  Julian Hyde (CODE SIGNING KEY) <jh...@apache.org>
+sub   4096R/B9E5F68D 2014-07-24
+sig          2AD3FAE3 2014-07-24  Julian Hyde (CODE SIGNING KEY) <jh...@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+HFfYzFyXcqX3BhXdDWg/XQ==
+=9tCp
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub   4096R/AB10D143 2013-09-01 [expires: 2017-09-01]
+uid                  Jacques Nadeau <ja...@apache.org>
+sig 3        AB10D143 2013-09-01  Jacques Nadeau <ja...@apache.org>
+sub   4096R/6B5FA695 2013-09-01 [expires: 2017-09-01]
+sig          AB10D143 2013-09-01  Jacques Nadeau <ja...@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.13 (Darwin)
+
+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
+P5iIjn4zOZYYd6Fobkpw3vi03ifusAeOzwpCmw==
+=6NWa
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub   4096R/C516B444 2015-10-06
+uid                  Jesus Camacho Rodriguez <jc...@apache.org>
+sig 3        C516B444 2015-10-06  Jesus Camacho Rodriguez <jc...@apache.org>
+sub   4096R/141820C7 2015-10-06
+sig          C516B444 2015-10-06  Jesus Camacho Rodriguez <jc...@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+QLsX85oVrQIIqFPL
+=owGw
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub   4096R/4677D66C 2013-05-04
+uid                  Josh Elser <jo...@gmail.com>
+sig 3        4677D66C 2013-05-04  Josh Elser <jo...@gmail.com>
+sig          00B6899D 2013-05-04  Christopher L Tubbs II (Christopher) <ct...@gmail.com>
+sig    R     ABBA8A49 2013-05-04  Eric Newton <er...@gmail.com>
+sub   4096R/99D5F66C 2013-05-04
+sig          4677D66C 2013-05-04  Josh Elser <jo...@gmail.com>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=6T6u
+-----END PGP PUBLIC KEY BLOCK-----


[09/10] calcite git commit: [CALCITE-1144] Fix LICENSE for Avatica

Posted by el...@apache.org.
[CALCITE-1144] Fix LICENSE for Avatica


Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/6c9c3d66
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/6c9c3d66
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/6c9c3d66

Branch: refs/heads/branch-avatica-1.7
Commit: 6c9c3d66f0bf849096d9cf18e348c7369db07eb3
Parents: b30e570
Author: Josh Elser <el...@apache.org>
Authored: Wed Mar 9 20:30:40 2016 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Mar 9 20:30:40 2016 -0500

----------------------------------------------------------------------
 avatica/LICENSE                                  | 4 ++--
 avatica/core/src/main/resources/META-INF/LICENSE | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/calcite/blob/6c9c3d66/avatica/LICENSE
----------------------------------------------------------------------
diff --git a/avatica/LICENSE b/avatica/LICENSE
index f7b9863..f409fd8 100644
--- a/avatica/LICENSE
+++ b/avatica/LICENSE
@@ -207,9 +207,9 @@
 
 -----------------------------------------------------------------------
 
-APACHE CALCITE SUBCOMPONENTS:
+APACHE CALCITE AVATICA SUBCOMPONENTS:
 
-The Apache Calcite project contains subcomponents with separate copyright
+The Apache Calcite Avatica project contains subcomponents with separate copyright
 notices and license terms. Your use of the source code for the these
 subcomponents is subject to the terms and conditions of the following
 licenses.

http://git-wip-us.apache.org/repos/asf/calcite/blob/6c9c3d66/avatica/core/src/main/resources/META-INF/LICENSE
----------------------------------------------------------------------
diff --git a/avatica/core/src/main/resources/META-INF/LICENSE b/avatica/core/src/main/resources/META-INF/LICENSE
index 7764d41..e7e81b8 100644
--- a/avatica/core/src/main/resources/META-INF/LICENSE
+++ b/avatica/core/src/main/resources/META-INF/LICENSE
@@ -207,9 +207,9 @@
 
 -----------------------------------------------------------------------
 
-APACHE CALCITE SUBCOMPONENTS:
+APACHE CALCITE AVATICA SUBCOMPONENTS:
 
-The Apache Calcite project contains subcomponents with separate copyright
+The Apache Calcite Avatica project contains subcomponents with separate copyright
 notices and license terms. Your use of the source code for the these
 subcomponents is subject to the terms and conditions of the following
 licenses.


[05/10] calcite git commit: [CALCITE-1140] Release notes and website updates for Avatica 1.7.0

Posted by el...@apache.org.
[CALCITE-1140] Release notes and website updates for Avatica 1.7.0


Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/816adb1f
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/816adb1f
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/816adb1f

Branch: refs/heads/branch-avatica-1.7
Commit: 816adb1f5b90508d132f9f22941d33a9bc5436bd
Parents: aacb237
Author: Julian Hyde <jh...@apache.org>
Authored: Tue Mar 8 18:02:58 2016 -0800
Committer: Josh Elser <el...@apache.org>
Committed: Wed Mar 9 20:26:30 2016 -0500

----------------------------------------------------------------------
 avatica/site/_docs/history.md                   | 85 +++++++++++++++++---
 .../site/_posts/2016-03-03-separate-project.md  |  6 +-
 avatica/site/_posts/2016-03-03-tbd-release.md   | 30 -------
 3 files changed, 80 insertions(+), 41 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/calcite/blob/816adb1f/avatica/site/_docs/history.md
----------------------------------------------------------------------
diff --git a/avatica/site/_docs/history.md b/avatica/site/_docs/history.md
index f5e249e..896e6b0 100644
--- a/avatica/site/_docs/history.md
+++ b/avatica/site/_docs/history.md
@@ -31,18 +31,85 @@ Downloads are available on the
 ## 1.7.0 / (Under Development)
 {: #v1-7-0}
 
-One notable change is that the use of JUL (java.util.logging) has been replaced
-with [SLF4J](http://slf4j.org/). SLF4J provides an API which Calcite can use
-independent of the logging implementation. This ultimately provides additional
-flexibility to users, allowing them to configure Calcite's logging within their
-own chosen logging framework. This work was done in [CALCITE-669](https://issues.apache.org/jira/browse/CALCITE-669).
+This is the first release of Avatica as an independent project. (It
+is still governed by Apache Calcite's PMC, and stored in the same git
+repository as Calcite, but releases are no longer synchronized, and
+Avatica does not depend on any Calcite modules.)
 
-For users experienced with configuring JUL in Calcite previously, there are some
-differences as some the JUL logging levels do not exist in SLF4J: `FINE`,
-`FINER`, and `FINEST`, specifically. To deal with this, `FINE` was mapped
-to SLF4J's `DEBUG` level, while `FINER` and `FINEST` were mapped to SLF4J's `TRACE`.
+One notable technical change is that we have replaced JUL (`java.util.logging`)
+with [SLF4J](http://slf4j.org/). SLF4J provides an API that Avatica can use
+independent of the logging implementation. This is more
+flexible for users: they can configure Avatica's logging within their
+own chosen logging framework. This work was done in
+[CALCITE-669](https://issues.apache.org/jira/browse/CALCITE-669).
+
+If you have configured JUL in Calcite/Avatica previously, you'll
+notice some differences, because JUL's `FINE`, `FINER` and `FINEST`
+logging levels do not exist in SLF4J. To deal with this, we mapped
+`FINE` to SLF4J's `DEBUG` level, and mapped `FINER` and `FINEST` to
+SLF4J's `TRACE`.
+
+The performance of Avatica was an important focus for this release as well.
+Numerous improvements aimed at reducing the overall latency of Avatica RPCs
+was reduced. Some general testing showed an overall reduction of latency
+by approximately 15% over the previous release.
+
+Compatibility: This release is tested on Linux, Mac OS X, Microsoft
+Windows; using Oracle JDK 1.7, 1.8; Guava versions 12.0.1 to 19.0;
+other software versions as specified in `pom.xml`.
+
+Features and bug fixes
+
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1132">CALCITE-1132</a>]
+  Update `artifactId`, `groupId` and `name` for Avatica
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1064">CALCITE-1064</a>]
+  Address problematic `maven-remote-resources-plugin`
+* In `TimeUnit` add `WEEK`, `QUARTER`, `MICROSECOND` values, and change type of
+  `multiplier`
+* Update `groupId` when Calcite POMs reference Avatica modules
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1078">CALCITE-1078</a>]
+  Detach avatica from the core calcite Maven project
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1117">CALCITE-1117</a>]
+  Default to a `commons-httpclient` implementation
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1118">CALCITE-1118</a>]
+  Add a noop-JDBC driver for testing Avatica server
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1119">CALCITE-1119</a>]
+  Additional metrics instrumentation for request processing
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1094">CALCITE-1094</a>]
+  Replace `ByteArrayOutputStream` to avoid synchronized writes
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1092">CALCITE-1092</a>]
+  Use singleton descriptor instances for protobuf field presence checks
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1093">CALCITE-1093</a>]
+  Reduce impact of `ArrayList` performance
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1086">CALCITE-1086</a>]
+  Avoid sending `Signature` on `Execute` for updates
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1031">CALCITE-1031</a>]
+  In prepared statement, `CsvScannableTable.scan` is called twice
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1085">CALCITE-1085</a>]
+  Use a `NoopContext` singleton in `NoopTimer`
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-642">CALCITE-642</a>]
+  Add an avatica-metrics API
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1071">CALCITE-1071</a>]
+  Improve hash functions
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-669">CALCITE-669</a>]
+  Mass removal of Java Logging for SLF4J
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1067">CALCITE-1067</a>]
+  Test failures due to clashing temporary table names
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-999">CALCITE-999</a>]
+  Clean up maven POM files
+
+Web site and documentation
+
+* Instructions for Avatica site
+* New logo and color scheme for Avatica site
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1079">CALCITE-1079</a>]
+  Split out an Avatica website, made to slot into the Calcite site at `/avatica`
 
 ## Past releases
 
+Prior to release 1.7.0, Avatica was released as part of Calcite. Maven
+modules had groupId 'org.apache.calcite' and module names
+'calcite-avatica', 'calcite-avatica-server' etc.
+
 Please refer to the [Calcite release page](https://calcite.apache.org/docs/history.html)
 for information about previous Avatica releases.

http://git-wip-us.apache.org/repos/asf/calcite/blob/816adb1f/avatica/site/_posts/2016-03-03-separate-project.md
----------------------------------------------------------------------
diff --git a/avatica/site/_posts/2016-03-03-separate-project.md b/avatica/site/_posts/2016-03-03-separate-project.md
index 6fee099..518c69e 100644
--- a/avatica/site/_posts/2016-03-03-separate-project.md
+++ b/avatica/site/_posts/2016-03-03-separate-project.md
@@ -24,8 +24,10 @@ limitations under the License.
 {% endcomment %}
 -->
 
-This marks the separation of Avatica from it's previous location as a sub-module
-of Apache Calcite's Maven build. This separation is not to remove Avatica from
+This marks the separation of Avatica from its previous location as a sub-module
+of Apache Calcite's Maven build.
+
+This separation is not to remove Avatica from
 the governance of the Apache Calcite project, but to allow for even more rapid
 releases from both the Avatica and Calcite projects. We can confidently make new
 releases of each without having to worry about the current state of development

http://git-wip-us.apache.org/repos/asf/calcite/blob/816adb1f/avatica/site/_posts/2016-03-03-tbd-release.md
----------------------------------------------------------------------
diff --git a/avatica/site/_posts/2016-03-03-tbd-release.md b/avatica/site/_posts/2016-03-03-tbd-release.md
deleted file mode 100644
index f6ec926..0000000
--- a/avatica/site/_posts/2016-03-03-tbd-release.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-layout: news_item
-title: "Avatica x.y.z"
-date: "2016-03-03 23:57:33 -0500"
-author: elserj
-version: 9.9.9
-tag: v9-9-9
-sha: abcdef
-categories: [release]
----
-<!--
-{% comment %}
-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.
-{% endcomment %}
--->
-
-Apache Calcite is happy to release Avatica x.y.z.


[04/10] calcite git commit: [CALCITE-1104] Materialized views in Cassandra (Michael Mior)

Posted by el...@apache.org.
[CALCITE-1104] Materialized views in Cassandra (Michael Mior)

Close apache/calcite#200


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

Branch: refs/heads/branch-avatica-1.7
Commit: aacb2375e2e65249d300c847c712f342d93e6d9e
Parents: b58200b
Author: Michael Mior <mm...@uwaterloo.ca>
Authored: Wed Feb 24 15:56:06 2016 -0500
Committer: Julian Hyde <jh...@apache.org>
Committed: Wed Mar 9 14:23:54 2016 -0800

----------------------------------------------------------------------
 cassandra/pom.xml                               |   4 +
 .../adapter/cassandra/CassandraSchema.java      | 126 +++++++++++++++++--
 .../cassandra/CassandraSchemaFactory.java       |   2 +-
 .../adapter/cassandra/CassandraTable.java       |  14 ++-
 .../apache/calcite/test/CassandraAdapterIT.java |   9 ++
 pom.xml                                         |   2 +-
 6 files changed, 142 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/calcite/blob/aacb2375/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/cassandra/pom.xml b/cassandra/pom.xml
index d99fb16..1231c1d 100644
--- a/cassandra/pom.xml
+++ b/cassandra/pom.xml
@@ -37,6 +37,10 @@ limitations under the License.
     <!-- Sorted by groupId, artifactId; calcite dependencies first. Put versions
          in dependencyManagement in the root POM, not here. -->
     <dependency>
+      <groupId>org.apache.calcite.avatica</groupId>
+      <artifactId>avatica</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.calcite</groupId>
       <artifactId>calcite-core</artifactId>
       <type>jar</type>

http://git-wip-us.apache.org/repos/asf/calcite/blob/aacb2375/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraSchema.java
----------------------------------------------------------------------
diff --git a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraSchema.java b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraSchema.java
index 4745aa1..47312bf 100644
--- a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraSchema.java
+++ b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraSchema.java
@@ -16,26 +16,48 @@
  */
 package org.apache.calcite.adapter.cassandra;
 
+import org.apache.calcite.avatica.util.Casing;
+import org.apache.calcite.jdbc.CalciteSchema;
 import org.apache.calcite.rel.RelFieldCollation;
+import org.apache.calcite.rel.RelNode;
 import org.apache.calcite.rel.type.RelDataTypeFactory;
 import org.apache.calcite.rel.type.RelDataTypeImpl;
 import org.apache.calcite.rel.type.RelDataTypeSystem;
 import org.apache.calcite.rel.type.RelProtoDataType;
+import org.apache.calcite.runtime.Hook;
+import org.apache.calcite.schema.SchemaPlus;
 import org.apache.calcite.schema.Table;
 import org.apache.calcite.schema.impl.AbstractSchema;
+import org.apache.calcite.schema.impl.MaterializedViewTable;
+import org.apache.calcite.sql.SqlDialect;
+import org.apache.calcite.sql.SqlSelect;
+import org.apache.calcite.sql.SqlWriter;
+import org.apache.calcite.sql.parser.SqlParseException;
+import org.apache.calcite.sql.parser.SqlParser;
+import org.apache.calcite.sql.pretty.SqlPrettyWriter;
 import org.apache.calcite.sql.type.SqlTypeFactoryImpl;
 import org.apache.calcite.sql.type.SqlTypeName;
 import org.apache.calcite.util.Pair;
+import org.apache.calcite.util.Util;
+import org.apache.calcite.util.trace.CalciteTrace;
 
+import com.datastax.driver.core.AbstractTableMetadata;
 import com.datastax.driver.core.Cluster;
+import com.datastax.driver.core.ClusteringOrder;
 import com.datastax.driver.core.ColumnMetadata;
 import com.datastax.driver.core.DataType;
 import com.datastax.driver.core.KeyspaceMetadata;
+import com.datastax.driver.core.MaterializedViewMetadata;
 import com.datastax.driver.core.Session;
 import com.datastax.driver.core.TableMetadata;
+import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 
+import org.slf4j.Logger;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -46,6 +68,10 @@ import java.util.Map;
 public class CassandraSchema extends AbstractSchema {
   final Session session;
   final String keyspace;
+  private final SchemaPlus parentSchema;
+  final String name;
+
+  protected static final Logger LOGGER = CalciteTrace.getPlannerTracer();
 
   /**
    * Creates a Cassandra schema.
@@ -53,7 +79,7 @@ public class CassandraSchema extends AbstractSchema {
    * @param host Cassandra host, e.g. "localhost"
    * @param keyspace Cassandra keyspace name, e.g. "twissandra"
    */
-  public CassandraSchema(String host, String keyspace) {
+  public CassandraSchema(String host, String keyspace, SchemaPlus parentSchema, String name) {
     super();
 
     this.keyspace = keyspace;
@@ -63,10 +89,24 @@ public class CassandraSchema extends AbstractSchema {
     } catch (Exception e) {
       throw new RuntimeException(e);
     }
+    this.parentSchema = parentSchema;
+    this.name = name;
+
+    Hook.TRIMMED.add(new Function<RelNode, Void>() {
+      public Void apply(RelNode node) {
+        CassandraSchema.this.addMaterializedViews();
+        return null;
+      }
+    });
   }
 
-  RelProtoDataType getRelDataType(String columnFamily) {
-    List<ColumnMetadata> columns = getKeyspace().getTable(columnFamily).getColumns();
+  RelProtoDataType getRelDataType(String columnFamily, boolean view) {
+    List<ColumnMetadata> columns;
+    if (view) {
+      columns = getKeyspace().getMaterializedView(columnFamily).getColumns();
+    } else {
+      columns = getKeyspace().getTable(columnFamily).getColumns();
+    }
 
     // Temporary type factory, just for the duration of this method. Allowable
     // because we're creating a proto-type, not a type; before being used, the
@@ -103,8 +143,13 @@ public class CassandraSchema extends AbstractSchema {
    *
    * @return A list of field names that are part of the partition and clustering keys
    */
-  Pair<List<String>, List<String>> getKeyFields(String columnFamily) {
-    TableMetadata table = getKeyspace().getTable(columnFamily);
+  Pair<List<String>, List<String>> getKeyFields(String columnFamily, boolean view) {
+    AbstractTableMetadata table;
+    if (view) {
+      table = getKeyspace().getMaterializedView(columnFamily);
+    } else {
+      table = getKeyspace().getTable(columnFamily);
+    }
 
     List<ColumnMetadata> partitionKey = table.getPartitionKey();
     List<String> pKeyFields = new ArrayList<String>();
@@ -126,13 +171,19 @@ public class CassandraSchema extends AbstractSchema {
    *
    * @return A RelCollations representing the collation of all clustering keys
    */
-  public List<RelFieldCollation> getClusteringOrder(String columnFamily) {
-    TableMetadata table = getKeyspace().getTable(columnFamily);
-    List<TableMetadata.Order> clusteringOrder = table.getClusteringOrder();
+  public List<RelFieldCollation> getClusteringOrder(String columnFamily, boolean view) {
+    AbstractTableMetadata table;
+    if (view) {
+      table = getKeyspace().getMaterializedView(columnFamily);
+    } else {
+      table = getKeyspace().getTable(columnFamily);
+    }
+
+    List<ClusteringOrder> clusteringOrder = table.getClusteringOrder();
     List<RelFieldCollation> keyCollations = new ArrayList<RelFieldCollation>();
 
     int i = 0;
-    for (TableMetadata.Order order : clusteringOrder) {
+    for (ClusteringOrder order : clusteringOrder) {
       RelFieldCollation.Direction direction;
       switch(order) {
       case DESC:
@@ -150,11 +201,68 @@ public class CassandraSchema extends AbstractSchema {
     return keyCollations;
   }
 
+  /** Add all materialized views defined in the schema to this column family
+   */
+  private void addMaterializedViews() {
+    for (MaterializedViewMetadata view : getKeyspace().getMaterializedViews()) {
+      String tableName = view.getBaseTable().getName();
+      StringBuilder queryBuilder = new StringBuilder("SELECT ");
+
+      // Add all the selected columns to the query
+      List<String> columnNames = new ArrayList<String>();
+      for (ColumnMetadata column : view.getColumns()) {
+        columnNames.add("\"" + column.getName() + "\"");
+      }
+      queryBuilder.append(Util.toString(columnNames, "", ", ", ""));
+
+      queryBuilder.append(" FROM \"" + tableName + "\"");
+
+      // Get the where clause from the system schema
+      String whereQuery = "SELECT where_clause from system_schema.views "
+          + "WHERE keyspace_name='" + keyspace + "' AND view_name='" + view.getName() + "'";
+      queryBuilder.append(" WHERE " + session.execute(whereQuery).one().getString(0));
+
+      // Parse and unparse the view query to get properly quoted field names
+      String query = queryBuilder.toString();
+      SqlParser.ConfigBuilder configBuilder = SqlParser.configBuilder();
+      configBuilder.setUnquotedCasing(Casing.UNCHANGED);
+
+      SqlSelect parsedQuery;
+      try {
+        parsedQuery = (SqlSelect) SqlParser.create(query, configBuilder.build()).parseQuery();
+      } catch (SqlParseException e) {
+        LOGGER.warn("Could not parse query {} for CQL view {}.{}",
+            query, keyspace, view.getName());
+        continue;
+      }
+
+      StringWriter stringWriter = new StringWriter(query.length());
+      PrintWriter printWriter = new PrintWriter(stringWriter);
+      SqlWriter writer = new SqlPrettyWriter(SqlDialect.CALCITE, true, printWriter);
+      parsedQuery.unparse(writer, 0, 0);
+      query = stringWriter.toString();
+
+      // Add the view for this query
+      String viewName = "$" + getTableNames().size();
+      SchemaPlus schema = parentSchema.getSubSchema(name);
+      CalciteSchema calciteSchema = CalciteSchema.from(schema);
+
+      schema.add(viewName,
+            MaterializedViewTable.create(calciteSchema, query,
+            null, view.getName(), true));
+    }
+  }
+
   @Override protected Map<String, Table> getTableMap() {
     final ImmutableMap.Builder<String, Table> builder = ImmutableMap.builder();
     for (TableMetadata table : getKeyspace().getTables()) {
       String tableName = table.getName();
       builder.put(tableName, new CassandraTable(this, tableName));
+
+      for (MaterializedViewMetadata view : table.getViews()) {
+        String viewName = view.getName();
+        builder.put(viewName, new CassandraTable(this, viewName, true));
+      }
     }
     return builder.build();
   }

http://git-wip-us.apache.org/repos/asf/calcite/blob/aacb2375/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraSchemaFactory.java
----------------------------------------------------------------------
diff --git a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraSchemaFactory.java b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraSchemaFactory.java
index 7e52717..c380721 100644
--- a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraSchemaFactory.java
+++ b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraSchemaFactory.java
@@ -35,7 +35,7 @@ public class CassandraSchemaFactory implements SchemaFactory {
     Map map = (Map) operand;
     String host = (String) map.get("host");
     String keyspace = (String) map.get("keyspace");
-    return new CassandraSchema(host, keyspace);
+    return new CassandraSchema(host, keyspace, parentSchema, name);
   }
 }
 

http://git-wip-us.apache.org/repos/asf/calcite/blob/aacb2375/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraTable.java
----------------------------------------------------------------------
diff --git a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraTable.java b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraTable.java
index 323d472..80f131e 100644
--- a/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraTable.java
+++ b/cassandra/src/main/java/org/apache/calcite/adapter/cassandra/CassandraTable.java
@@ -57,11 +57,17 @@ public class CassandraTable extends AbstractQueryableTable
   List<RelFieldCollation> clusteringOrder;
   private final CassandraSchema schema;
   private final String columnFamily;
+  private final boolean view;
 
-  public CassandraTable(CassandraSchema schema, String columnFamily) {
+  public CassandraTable(CassandraSchema schema, String columnFamily, boolean view) {
     super(Object[].class);
     this.schema = schema;
     this.columnFamily = columnFamily;
+    this.view = view;
+  }
+
+  public CassandraTable(CassandraSchema schema, String columnFamily) {
+    this(schema, columnFamily, false);
   }
 
   public String toString() {
@@ -70,21 +76,21 @@ public class CassandraTable extends AbstractQueryableTable
 
   public RelDataType getRowType(RelDataTypeFactory typeFactory) {
     if (protoRowType == null) {
-      protoRowType = schema.getRelDataType(columnFamily);
+      protoRowType = schema.getRelDataType(columnFamily, view);
     }
     return protoRowType.apply(typeFactory);
   }
 
   public Pair<List<String>, List<String>> getKeyFields() {
     if (keyFields == null) {
-      keyFields = schema.getKeyFields(columnFamily);
+      keyFields = schema.getKeyFields(columnFamily, view);
     }
     return keyFields;
   }
 
   public List<RelFieldCollation> getClusteringOrder() {
     if (clusteringOrder == null) {
-      clusteringOrder = schema.getClusteringOrder(columnFamily);
+      clusteringOrder = schema.getClusteringOrder(columnFamily, view);
     }
     return clusteringOrder;
   }

http://git-wip-us.apache.org/repos/asf/calcite/blob/aacb2375/cassandra/src/test/java/org/apache/calcite/test/CassandraAdapterIT.java
----------------------------------------------------------------------
diff --git a/cassandra/src/test/java/org/apache/calcite/test/CassandraAdapterIT.java b/cassandra/src/test/java/org/apache/calcite/test/CassandraAdapterIT.java
index 8ef08c5..8cf6673 100644
--- a/cassandra/src/test/java/org/apache/calcite/test/CassandraAdapterIT.java
+++ b/cassandra/src/test/java/org/apache/calcite/test/CassandraAdapterIT.java
@@ -97,6 +97,15 @@ public class CassandraAdapterIT {
                 + "    CassandraSort(fetch=[1])\n"
                 + "      CassandraFilter(condition=[=(CAST($0):CHAR(8) CHARACTER SET \"ISO-8859-1\" COLLATE \"ISO-8859-1$en_US$primary\", '!PUBLIC!')])\n");
   }
+
+  @Test public void testMaterializedView() {
+    CalciteAssert.that()
+        .enable(enabled())
+        .with(TWISSANDRA)
+        .query("select \"tweet_id\" from \"tweets\" where \"username\"='JmuhsAaMdw'")
+        .enableMaterializations(true)
+        .explainContains("CassandraTableScan(table=[[twissandra, tweets_by_user]])");
+  }
 }
 
 // End CassandraAdapterIT.java

http://git-wip-us.apache.org/repos/asf/calcite/blob/aacb2375/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c45df4e..65b4626 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@ limitations under the License.
     <airlift-tpch.version>0.1</airlift-tpch.version>
     <avatica.version>1.7.0-SNAPSHOT</avatica.version>
     <build-helper-maven-plugin.version>1.9</build-helper-maven-plugin.version>
-    <cassandra-driver-core.version>2.1.9</cassandra-driver-core.version>
+    <cassandra-driver-core.version>3.0.0</cassandra-driver-core.version>
     <checksum-maven-plugin.version>1.2</checksum-maven-plugin.version>
     <commons-dbcp.version>1.4</commons-dbcp.version>
     <commons-lang3.version>3.2</commons-lang3.version>