You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jh...@apache.org on 2017/03/24 03:13:33 UTC
[1/4] calcite git commit: Add file headers;
fix rat, assembly and checkstyle warnings
Repository: calcite
Updated Branches:
refs/heads/master 9c8b59797 -> 0f9225108
Add file headers; fix rat, assembly and checkstyle warnings
Rename a few private Druid rule classes to be consistent with naming
convention, and fix javadoc.
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/a89c62cd
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/a89c62cd
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/a89c62cd
Branch: refs/heads/master
Commit: a89c62cd6d6cc181c90881afa0bf099746739a91
Parents: 9c8b597
Author: Julian Hyde <jh...@apache.org>
Authored: Wed Mar 15 11:36:20 2017 -0700
Committer: Julian Hyde <jh...@apache.org>
Committed: Mon Mar 20 18:25:55 2017 -0700
----------------------------------------------------------------------
.../calcite/adapter/druid/DruidRules.java | 132 +++++++++++--------
pom.xml | 3 +
site/_docs/avatica_json_reference.md | 18 +++
site/_docs/avatica_overview.md | 19 +++
site/_docs/avatica_protobuf_reference.md | 19 +++
site/_docs/avatica_roadmap.md | 19 +++
src/main/config/assemblies/source-assembly.xml | 6 +-
7 files changed, 160 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/a89c62cd/druid/src/main/java/org/apache/calcite/adapter/druid/DruidRules.java
----------------------------------------------------------------------
diff --git a/druid/src/main/java/org/apache/calcite/adapter/druid/DruidRules.java b/druid/src/main/java/org/apache/calcite/adapter/druid/DruidRules.java
index b22809c..2054c11 100644
--- a/druid/src/main/java/org/apache/calcite/adapter/druid/DruidRules.java
+++ b/druid/src/main/java/org/apache/calcite/adapter/druid/DruidRules.java
@@ -75,35 +75,37 @@ public class DruidRules {
public static final DruidFilterRule FILTER = new DruidFilterRule();
public static final DruidProjectRule PROJECT = new DruidProjectRule();
public static final DruidAggregateRule AGGREGATE = new DruidAggregateRule();
- public static final DruidProjectAggregateRule PROJECT_AGGREGATE = new DruidProjectAggregateRule();
+ public static final DruidAggregateProjectRule AGGREGATE_PROJECT =
+ new DruidAggregateProjectRule();
public static final DruidSortRule SORT = new DruidSortRule();
- public static final DruidProjectSortRule PROJECT_SORT = new DruidProjectSortRule();
- public static final DruidSortProjectRule SORT_PROJECT = new DruidSortProjectRule();
-
- public static final DruidProjectFilterTransposeRule PROJECT_FILTER_TRANSPOSE_RULE =
+ public static final DruidSortProjectTransposeRule SORT_PROJECT_TRANSPOSE =
+ new DruidSortProjectTransposeRule();
+ public static final DruidProjectSortTransposeRule PROJECT_SORT_TRANSPOSE =
+ new DruidProjectSortTransposeRule();
+ public static final DruidProjectFilterTransposeRule PROJECT_FILTER_TRANSPOSE =
new DruidProjectFilterTransposeRule();
-
- public static final DruidFilterProjectTransposeRule FILTER_PROJECT_TRANSPOSE_RULE =
+ public static final DruidFilterProjectTransposeRule FILTER_PROJECT_TRANSPOSE =
new DruidFilterProjectTransposeRule();
-
- public static final DruidAggregateFilterTransposeRule AGGREGATE_FILTER_TRANSPOSE_RULE =
+ public static final DruidAggregateFilterTransposeRule AGGREGATE_FILTER_TRANSPOSE =
new DruidAggregateFilterTransposeRule();
-
- public static final DruidFilterAggregateTransposeRule FILTER_AGGREGATE_TRANSPOSE_RULE =
+ public static final DruidFilterAggregateTransposeRule FILTER_AGGREGATE_TRANSPOSE =
new DruidFilterAggregateTransposeRule();
public static final List<RelOptRule> RULES =
ImmutableList.of(FILTER,
- PROJECT_FILTER_TRANSPOSE_RULE,
+ PROJECT_FILTER_TRANSPOSE,
// Disabled, per
// [CALCITE-1706] DruidAggregateFilterTransposeRule
// causes very fine-grained aggregations to be pushed to Druid
- // AGGREGATE_FILTER_TRANSPOSE_RULE,
- PROJECT_AGGREGATE,
- PROJECT, AGGREGATE,
- FILTER_AGGREGATE_TRANSPOSE_RULE,
- FILTER_PROJECT_TRANSPOSE_RULE,
- PROJECT_SORT, SORT, SORT_PROJECT);
+ // AGGREGATE_FILTER_TRANSPOSE,
+ AGGREGATE_PROJECT,
+ PROJECT,
+ AGGREGATE,
+ FILTER_AGGREGATE_TRANSPOSE,
+ FILTER_PROJECT_TRANSPOSE,
+ PROJECT_SORT_TRANSPOSE,
+ SORT,
+ SORT_PROJECT_TRANSPOSE);
/** Predicate that returns whether Druid can not handle an aggregate. */
private static final Predicate<Aggregate> BAD_AGG =
@@ -201,10 +203,10 @@ public class DruidRules {
call.transformTo(newDruidQuery);
}
- /* Splits the filter condition in two groups: those that filter on the timestamp column
- * and those that filter on other fields */
+ /** Splits the filter condition in two groups: those that filter on the timestamp column
+ * and those that filter on other fields. */
private static Pair<List<RexNode>, List<RexNode>> splitFilters(final RexBuilder rexBuilder,
- final DruidQuery input, RexNode cond, final int timestampFieldIdx) {
+ final DruidQuery input, RexNode cond, final int timestampFieldIdx) {
final List<RexNode> timeRangeNodes = new ArrayList<>();
final List<RexNode> otherNodes = new ArrayList<>();
List<RexNode> conjs = RelOptUtil.conjunctions(cond);
@@ -370,9 +372,12 @@ public class DruidRules {
* Rule to push an {@link org.apache.calcite.rel.core.Aggregate} and
* {@link org.apache.calcite.rel.core.Project} into a {@link DruidQuery}.
*/
- private static class DruidProjectAggregateRule extends RelOptRule {
- private DruidProjectAggregateRule() {
- super(operand(Aggregate.class, operand(Project.class, operand(DruidQuery.class, none()))));
+ private static class DruidAggregateProjectRule extends RelOptRule {
+ private DruidAggregateProjectRule() {
+ super(
+ operand(Aggregate.class,
+ operand(Project.class,
+ operand(DruidQuery.class, none()))));
}
public void onMatch(RelOptRuleCall call) {
@@ -465,9 +470,12 @@ public class DruidRules {
* {@link org.apache.calcite.rel.core.Project}. Useful to transform
* to complex Druid queries.
*/
- private static class DruidProjectSortRule extends SortProjectTransposeRule {
- private DruidProjectSortRule() {
- super(operand(Sort.class, operand(Project.class, operand(DruidQuery.class, none()))));
+ private static class DruidSortProjectTransposeRule
+ extends SortProjectTransposeRule {
+ private DruidSortProjectTransposeRule() {
+ super(
+ operand(Sort.class,
+ operand(Project.class, operand(DruidQuery.class, none()))));
}
}
@@ -476,14 +484,18 @@ public class DruidRules {
* {@link org.apache.calcite.rel.core.Sort}. Useful if after pushing Sort,
* we could not push it inside DruidQuery.
*/
- private static class DruidSortProjectRule extends ProjectSortTransposeRule {
- private DruidSortProjectRule() {
- super(operand(Project.class, operand(Sort.class, operand(DruidQuery.class, none()))));
+ private static class DruidProjectSortTransposeRule
+ extends ProjectSortTransposeRule {
+ private DruidProjectSortTransposeRule() {
+ super(
+ operand(Project.class,
+ operand(Sort.class, operand(DruidQuery.class, none()))));
}
}
/**
- * Rule to push an {@link org.apache.calcite.rel.core.Aggregate} into a {@link DruidQuery}.
+ * Rule to push a {@link org.apache.calcite.rel.core.Sort}
+ * into a {@link DruidQuery}.
*/
private static class DruidSortRule extends RelOptRule {
private DruidSortRule() {
@@ -510,7 +522,7 @@ public class DruidRules {
call.transformTo(DruidQuery.extendQuery(query, newSort));
}
- /* Check sort valid */
+ /** Checks whether sort is valid. */
private static boolean validSortLimit(Sort sort, DruidQuery query) {
if (sort.offset != null && RexLiteral.intValue(sort.offset) != 0) {
// offset not supported by Druid
@@ -557,7 +569,7 @@ public class DruidRules {
}
}
- /* Check if any of the references leads to the timestamp column */
+ /** Checks whether any of the references leads to the timestamp column. */
private static boolean checkTimestampRefOnQuery(ImmutableBitSet set, RelNode top,
DruidQuery query) {
if (top instanceof Project) {
@@ -589,52 +601,66 @@ public class DruidRules {
}
/**
- * Rule to push an {@link org.apache.calcite.rel.core.Project} past a
- * {@link org.apache.calcite.rel.core.Filter} when filter is on top of {@link org.apache.calcite.adapter.druid.DruidQuery}
+ * Rule to push a {@link org.apache.calcite.rel.core.Project}
+ * past a {@link org.apache.calcite.rel.core.Filter}
+ * when {@code Filter} is on top of a {@link DruidQuery}.
*/
- private static class DruidProjectFilterTransposeRule extends ProjectFilterTransposeRule {
+ private static class DruidProjectFilterTransposeRule
+ extends ProjectFilterTransposeRule {
private DruidProjectFilterTransposeRule() {
super(
- operand(Project.class, operand(Filter.class, any())), PushProjector.ExprCondition.FALSE,
+ operand(Project.class,
+ operand(Filter.class, any())),
+ PushProjector.ExprCondition.FALSE,
RelFactories.LOGICAL_BUILDER);
}
}
/**
- * Rule to push an {@link org.apache.calcite.rel.core.Filter} past a
- * {@link org.apache.calcite.rel.core.Project} when project is on top of {@link org.apache.calcite.adapter.druid.DruidQuery}
+ * Rule to push a {@link org.apache.calcite.rel.core.Filter}
+ * past a {@link org.apache.calcite.rel.core.Project}
+ * when {@code Project} is on top of a {@link DruidQuery}.
*/
- private static class DruidFilterProjectTransposeRule extends FilterProjectTransposeRule {
+ private static class DruidFilterProjectTransposeRule
+ extends FilterProjectTransposeRule {
private DruidFilterProjectTransposeRule() {
super(
- operand(Filter.class, operand(Project.class, operand(DruidQuery.class, none()))), true,
- true, RelFactories.LOGICAL_BUILDER
- );
+ operand(Filter.class,
+ operand(Project.class,
+ operand(DruidQuery.class, none()))),
+ true, true, RelFactories.LOGICAL_BUILDER);
}
}
/**
- * Rule to push an {@link org.apache.calcite.rel.core.Filter} past a
- * {@link org.apache.calcite.rel.core.Project} when project is on top of {@link org.apache.calcite.adapter.druid.DruidQuery}
+ * Rule to push an {@link org.apache.calcite.rel.core.Aggregate}
+ * past a {@link org.apache.calcite.rel.core.Filter}
+ * when {@code Filter} is on top of a {@link DruidQuery}.
*/
- private static class DruidAggregateFilterTransposeRule extends AggregateFilterTransposeRule {
+ private static class DruidAggregateFilterTransposeRule
+ extends AggregateFilterTransposeRule {
private DruidAggregateFilterTransposeRule() {
super(
- operand(Aggregate.class, operand(Filter.class, operand(DruidQuery.class, none()))),
+ operand(Aggregate.class,
+ operand(Filter.class,
+ operand(DruidQuery.class, none()))),
RelFactories.LOGICAL_BUILDER);
}
}
/**
- * Rule to push an {@link org.apache.calcite.rel.core.Aggregate} past a
- * {@link org.apache.calcite.rel.core.Filter} when filter is on top of {@link org.apache.calcite.adapter.druid.DruidQuery}
+ * Rule to push an {@link org.apache.calcite.rel.core.Filter}
+ * past an {@link org.apache.calcite.rel.core.Aggregate}
+ * when {@code Aggregate} is on top of a {@link DruidQuery}.
*/
- private static class DruidFilterAggregateTransposeRule extends FilterAggregateTransposeRule {
+ private static class DruidFilterAggregateTransposeRule
+ extends FilterAggregateTransposeRule {
private DruidFilterAggregateTransposeRule() {
super(
- operand(Filter.class, operand(Aggregate.class, operand(DruidQuery.class, none()))),
- RelFactories.LOGICAL_BUILDER
- );
+ operand(Filter.class,
+ operand(Aggregate.class,
+ operand(DruidQuery.class, none()))),
+ RelFactories.LOGICAL_BUILDER);
}
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/a89c62cd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 51fbab5..827e335 100644
--- a/pom.xml
+++ b/pom.xml
@@ -513,8 +513,11 @@ limitations under the License.
license notices. -->
<exclude>src/main/resources/META-INF/services/java.sql.Driver</exclude>
<exclude>**/src/test/resources/**/*.csv</exclude>
+ <exclude>**/src/test/resources/**/*.txt</exclude>
<exclude>**/src/test/resources/bug/archers.json</exclude>
<exclude>**/src/test/resources/foodmart-schema.spec</exclude>
+ <exclude>**/data.txt</exclude>
+ <exclude>**/data2.txt</exclude>
<!-- Exclude all of avatica, RAT is run in Avatica -->
<exclude>avatica/**</exclude>
http://git-wip-us.apache.org/repos/asf/calcite/blob/a89c62cd/site/_docs/avatica_json_reference.md
----------------------------------------------------------------------
diff --git a/site/_docs/avatica_json_reference.md b/site/_docs/avatica_json_reference.md
index ead7c62..b4d1772 100644
--- a/site/_docs/avatica_json_reference.md
+++ b/site/_docs/avatica_json_reference.md
@@ -6,3 +6,21 @@ redirect_to: /avatica/docs/json_reference.html
permalink: /docs/avatica_json_reference.html
---
+<!--
+{% 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 %}
+-->
http://git-wip-us.apache.org/repos/asf/calcite/blob/a89c62cd/site/_docs/avatica_overview.md
----------------------------------------------------------------------
diff --git a/site/_docs/avatica_overview.md b/site/_docs/avatica_overview.md
index a8f4ea3..f07130f 100644
--- a/site/_docs/avatica_overview.md
+++ b/site/_docs/avatica_overview.md
@@ -5,3 +5,22 @@ sidebar_title: Overview
permalink: /docs/avatica_overview.html
redirect_to: /avatica/docs/index.html
---
+
+<!--
+{% 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 %}
+-->
http://git-wip-us.apache.org/repos/asf/calcite/blob/a89c62cd/site/_docs/avatica_protobuf_reference.md
----------------------------------------------------------------------
diff --git a/site/_docs/avatica_protobuf_reference.md b/site/_docs/avatica_protobuf_reference.md
index 9335558..250b6cd 100644
--- a/site/_docs/avatica_protobuf_reference.md
+++ b/site/_docs/avatica_protobuf_reference.md
@@ -5,3 +5,22 @@ sidebar_title: Protobuf Reference
redirect_to: /avatica/docs/protobuf_reference.html
permalink: /docs/avatica_protobuf_reference.html
---
+
+<!--
+{% 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 %}
+-->
http://git-wip-us.apache.org/repos/asf/calcite/blob/a89c62cd/site/_docs/avatica_roadmap.md
----------------------------------------------------------------------
diff --git a/site/_docs/avatica_roadmap.md b/site/_docs/avatica_roadmap.md
index d98ff02..54d3f18 100644
--- a/site/_docs/avatica_roadmap.md
+++ b/site/_docs/avatica_roadmap.md
@@ -5,3 +5,22 @@ sidebar_title: Roadmap
permalink: /docs/avatica_roadmap.html
redirect_to: /avatica/docs/roadmap.html
---
+
+<!--
+{% 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 %}
+-->
http://git-wip-us.apache.org/repos/asf/calcite/blob/a89c62cd/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 bb38693..d4148de 100644
--- a/src/main/config/assemblies/source-assembly.xml
+++ b/src/main/config/assemblies/source-assembly.xml
@@ -25,7 +25,7 @@ limitations under the License.
<!-- main project directory structure -->
<fileSet>
<directory>.</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory/>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<!-- build output -->
@@ -93,14 +93,14 @@ limitations under the License.
<fileSet>
<directory>${project.build.directory}/maven-shared-archive-resources/META-INF
</directory>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory/>
</fileSet>
<fileSet>
<directory>${project.build.directory}</directory>
<includes>
<include>git.properties</include>
</includes>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory/>
</fileSet>
</fileSets>
</assembly>
[4/4] calcite git commit: [maven-release-plugin] prepare for next
development iteration
Posted by jh...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/0f922510
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/0f922510
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/0f922510
Branch: refs/heads/master
Commit: 0f92251082d6d9ef11480a035ad7ec78d1662295
Parents: ea7ace1
Author: Julian Hyde <jh...@apache.org>
Authored: Mon Mar 20 19:02:35 2017 -0700
Committer: Julian Hyde <jh...@apache.org>
Committed: Mon Mar 20 19:02:35 2017 -0700
----------------------------------------------------------------------
cassandra/pom.xml | 4 ++--
core/pom.xml | 4 ++--
druid/pom.xml | 4 ++--
elasticsearch/pom.xml | 4 ++--
example/csv/pom.xml | 4 ++--
example/function/pom.xml | 4 ++--
example/pom.xml | 4 ++--
file/pom.xml | 4 ++--
linq4j/pom.xml | 4 ++--
mongodb/pom.xml | 4 ++--
pig/pom.xml | 4 ++--
piglet/pom.xml | 4 ++--
plus/pom.xml | 4 ++--
pom.xml | 4 ++--
spark/pom.xml | 4 ++--
splunk/pom.xml | 4 ++--
ubenchmark/pom.xml | 2 +-
17 files changed, 33 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/0f922510/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/cassandra/pom.xml b/cassandra/pom.xml
index e55bb3a..81294e0 100644
--- a/cassandra/pom.xml
+++ b/cassandra/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
- <version>1.12.0</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<artifactId>calcite-cassandra</artifactId>
<packaging>jar</packaging>
- <version>1.12.0</version>
+ <version>1.13.0-SNAPSHOT</version>
<name>Calcite Cassandra</name>
<description>Cassandra adapter for Calcite</description>
http://git-wip-us.apache.org/repos/asf/calcite/blob/0f922510/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index a0e3b9e..c5d6c36 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
- <version>1.12.0</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<artifactId>calcite-core</artifactId>
<packaging>jar</packaging>
- <version>1.12.0</version>
+ <version>1.13.0-SNAPSHOT</version>
<name>Calcite Core</name>
<description>Core Calcite APIs and engine.</description>
http://git-wip-us.apache.org/repos/asf/calcite/blob/0f922510/druid/pom.xml
----------------------------------------------------------------------
diff --git a/druid/pom.xml b/druid/pom.xml
index 27fc4d8..7e433cd 100644
--- a/druid/pom.xml
+++ b/druid/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
- <version>1.12.0</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<artifactId>calcite-druid</artifactId>
<packaging>jar</packaging>
- <version>1.12.0</version>
+ <version>1.13.0-SNAPSHOT</version>
<name>Calcite Druid</name>
<description>Druid adapter for Calcite</description>
http://git-wip-us.apache.org/repos/asf/calcite/blob/0f922510/elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml
index 22a58cf..f546621 100644
--- a/elasticsearch/pom.xml
+++ b/elasticsearch/pom.xml
@@ -21,12 +21,12 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
- <version>1.12.0</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<artifactId>calcite-elasticsearch</artifactId>
<packaging>jar</packaging>
- <version>1.12.0</version>
+ <version>1.13.0-SNAPSHOT</version>
<name>Calcite Elasticsearch</name>
<description>Elasticsearch adapter for Calcite</description>
http://git-wip-us.apache.org/repos/asf/calcite/blob/0f922510/example/csv/pom.xml
----------------------------------------------------------------------
diff --git a/example/csv/pom.xml b/example/csv/pom.xml
index 5e9330e..2a28120 100644
--- a/example/csv/pom.xml
+++ b/example/csv/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-example</artifactId>
- <version>1.12.0</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<artifactId>calcite-example-csv</artifactId>
<packaging>jar</packaging>
- <version>1.12.0</version>
+ <version>1.13.0-SNAPSHOT</version>
<name>Calcite Example CSV</name>
<description>An example Calcite provider that reads CSV files</description>
http://git-wip-us.apache.org/repos/asf/calcite/blob/0f922510/example/function/pom.xml
----------------------------------------------------------------------
diff --git a/example/function/pom.xml b/example/function/pom.xml
index 6f049ae..41bb2e4 100644
--- a/example/function/pom.xml
+++ b/example/function/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-example</artifactId>
- <version>1.12.0</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<artifactId>calcite-example-function</artifactId>
<packaging>jar</packaging>
- <version>1.12.0</version>
+ <version>1.13.0-SNAPSHOT</version>
<name>Calcite Example Function</name>
<description>Examples of user-defined Calcite functions</description>
http://git-wip-us.apache.org/repos/asf/calcite/blob/0f922510/example/pom.xml
----------------------------------------------------------------------
diff --git a/example/pom.xml b/example/pom.xml
index 9409d6e..5d63800 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -20,13 +20,13 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
- <version>1.12.0</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<!-- The basics. -->
<artifactId>calcite-example</artifactId>
<packaging>pom</packaging>
- <version>1.12.0</version>
+ <version>1.13.0-SNAPSHOT</version>
<name>Calcite Examples</name>
<description>Calcite examples</description>
http://git-wip-us.apache.org/repos/asf/calcite/blob/0f922510/file/pom.xml
----------------------------------------------------------------------
diff --git a/file/pom.xml b/file/pom.xml
index 5f706da..1f2dc1a 100644
--- a/file/pom.xml
+++ b/file/pom.xml
@@ -19,13 +19,13 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
- <version>1.12.0</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<!-- The basics. -->
<artifactId>calcite-file</artifactId>
<packaging>jar</packaging>
- <version>1.12.0</version>
+ <version>1.13.0-SNAPSHOT</version>
<name>Calcite File</name>
<description>Calcite provider that reads files and URIs</description>
http://git-wip-us.apache.org/repos/asf/calcite/blob/0f922510/linq4j/pom.xml
----------------------------------------------------------------------
diff --git a/linq4j/pom.xml b/linq4j/pom.xml
index 3e60fdb..8c42e1a 100644
--- a/linq4j/pom.xml
+++ b/linq4j/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
- <version>1.12.0</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<artifactId>calcite-linq4j</artifactId>
<packaging>jar</packaging>
- <version>1.12.0</version>
+ <version>1.13.0-SNAPSHOT</version>
<name>Calcite Linq4j</name>
<description>Calcite APIs for LINQ (Language-Integrated Query) in Java</description>
http://git-wip-us.apache.org/repos/asf/calcite/blob/0f922510/mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/mongodb/pom.xml b/mongodb/pom.xml
index e104f5c..53eadcf 100644
--- a/mongodb/pom.xml
+++ b/mongodb/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
- <version>1.12.0</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<artifactId>calcite-mongodb</artifactId>
<packaging>jar</packaging>
- <version>1.12.0</version>
+ <version>1.13.0-SNAPSHOT</version>
<name>Calcite MongoDB</name>
<description>MongoDB adapter for Calcite</description>
http://git-wip-us.apache.org/repos/asf/calcite/blob/0f922510/pig/pom.xml
----------------------------------------------------------------------
diff --git a/pig/pom.xml b/pig/pom.xml
index 52afdea..fbf5e07 100644
--- a/pig/pom.xml
+++ b/pig/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
- <version>1.12.0</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<artifactId>calcite-pig</artifactId>
<packaging>jar</packaging>
- <version>1.12.0</version>
+ <version>1.13.0-SNAPSHOT</version>
<name>Calcite Pig</name>
<description>Pig adapter for Calcite</description>
http://git-wip-us.apache.org/repos/asf/calcite/blob/0f922510/piglet/pom.xml
----------------------------------------------------------------------
diff --git a/piglet/pom.xml b/piglet/pom.xml
index 6a4a6d0..d6759e6 100644
--- a/piglet/pom.xml
+++ b/piglet/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
- <version>1.12.0</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<artifactId>calcite-piglet</artifactId>
<packaging>jar</packaging>
- <version>1.12.0</version>
+ <version>1.13.0-SNAPSHOT</version>
<name>Calcite Piglet</name>
<description>Pig-like language built on top of Calcite algebra</description>
http://git-wip-us.apache.org/repos/asf/calcite/blob/0f922510/plus/pom.xml
----------------------------------------------------------------------
diff --git a/plus/pom.xml b/plus/pom.xml
index a72a246..003c2b2 100644
--- a/plus/pom.xml
+++ b/plus/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
- <version>1.12.0</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<artifactId>calcite-plus</artifactId>
<packaging>jar</packaging>
- <version>1.12.0</version>
+ <version>1.13.0-SNAPSHOT</version>
<name>Calcite Plus</name>
<description>Miscellaneous extras for Calcite</description>
http://git-wip-us.apache.org/repos/asf/calcite/blob/0f922510/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 47489f1..45025b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@ limitations under the License.
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
<packaging>pom</packaging>
- <version>1.12.0</version>
+ <version>1.13.0-SNAPSHOT</version>
<!-- More project information. -->
<name>Calcite</name>
@@ -132,7 +132,7 @@ limitations under the License.
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/calcite.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/calcite.git</developerConnection>
<url>https://github.com/apache/calcite</url>
- <tag>calcite-1.12.0</tag>
+ <tag>HEAD</tag>
</scm>
<modules>
http://git-wip-us.apache.org/repos/asf/calcite/blob/0f922510/spark/pom.xml
----------------------------------------------------------------------
diff --git a/spark/pom.xml b/spark/pom.xml
index 131dd99..ed82405 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
- <version>1.12.0</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<artifactId>calcite-spark</artifactId>
<packaging>jar</packaging>
- <version>1.12.0</version>
+ <version>1.13.0-SNAPSHOT</version>
<name>Calcite Spark</name>
<properties>
http://git-wip-us.apache.org/repos/asf/calcite/blob/0f922510/splunk/pom.xml
----------------------------------------------------------------------
diff --git a/splunk/pom.xml b/splunk/pom.xml
index bef7c63..8669f2c 100644
--- a/splunk/pom.xml
+++ b/splunk/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
- <version>1.12.0</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<artifactId>calcite-splunk</artifactId>
<packaging>jar</packaging>
- <version>1.12.0</version>
+ <version>1.13.0-SNAPSHOT</version>
<name>Calcite Splunk</name>
<description>Splunk adapter for Calcite; also a JDBC driver for Splunk</description>
http://git-wip-us.apache.org/repos/asf/calcite/blob/0f922510/ubenchmark/pom.xml
----------------------------------------------------------------------
diff --git a/ubenchmark/pom.xml b/ubenchmark/pom.xml
index f039f3a..e9f504f 100644
--- a/ubenchmark/pom.xml
+++ b/ubenchmark/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
- <version>1.12.0</version>
+ <version>1.13.0-SNAPSHOT</version>
</parent>
<properties>
[3/4] calcite git commit: [maven-release-plugin] prepare release
calcite-1.12.0
Posted by jh...@apache.org.
[maven-release-plugin] prepare release calcite-1.12.0
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/ea7ace18
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/ea7ace18
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/ea7ace18
Branch: refs/heads/master
Commit: ea7ace18cdc26027be690b00f1fcc191aaa87e45
Parents: baa13d6
Author: Julian Hyde <jh...@apache.org>
Authored: Mon Mar 20 18:54:36 2017 -0700
Committer: Julian Hyde <jh...@apache.org>
Committed: Mon Mar 20 18:54:36 2017 -0700
----------------------------------------------------------------------
cassandra/pom.xml | 4 ++--
core/pom.xml | 4 ++--
druid/pom.xml | 4 ++--
elasticsearch/pom.xml | 4 ++--
example/csv/pom.xml | 4 ++--
example/function/pom.xml | 4 ++--
example/pom.xml | 4 ++--
file/pom.xml | 4 ++--
linq4j/pom.xml | 4 ++--
mongodb/pom.xml | 4 ++--
pig/pom.xml | 4 ++--
piglet/pom.xml | 4 ++--
plus/pom.xml | 4 ++--
pom.xml | 4 ++--
spark/pom.xml | 4 ++--
splunk/pom.xml | 4 ++--
ubenchmark/pom.xml | 2 +-
17 files changed, 33 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/ea7ace18/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/cassandra/pom.xml b/cassandra/pom.xml
index cda49ec..e55bb3a 100644
--- a/cassandra/pom.xml
+++ b/cassandra/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0</version>
</parent>
<artifactId>calcite-cassandra</artifactId>
<packaging>jar</packaging>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0</version>
<name>Calcite Cassandra</name>
<description>Cassandra adapter for Calcite</description>
http://git-wip-us.apache.org/repos/asf/calcite/blob/ea7ace18/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index b26b58b..a0e3b9e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0</version>
</parent>
<artifactId>calcite-core</artifactId>
<packaging>jar</packaging>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0</version>
<name>Calcite Core</name>
<description>Core Calcite APIs and engine.</description>
http://git-wip-us.apache.org/repos/asf/calcite/blob/ea7ace18/druid/pom.xml
----------------------------------------------------------------------
diff --git a/druid/pom.xml b/druid/pom.xml
index 68e4d92..27fc4d8 100644
--- a/druid/pom.xml
+++ b/druid/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0</version>
</parent>
<artifactId>calcite-druid</artifactId>
<packaging>jar</packaging>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0</version>
<name>Calcite Druid</name>
<description>Druid adapter for Calcite</description>
http://git-wip-us.apache.org/repos/asf/calcite/blob/ea7ace18/elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml
index 72e9561..22a58cf 100644
--- a/elasticsearch/pom.xml
+++ b/elasticsearch/pom.xml
@@ -21,12 +21,12 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0</version>
</parent>
<artifactId>calcite-elasticsearch</artifactId>
<packaging>jar</packaging>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0</version>
<name>Calcite Elasticsearch</name>
<description>Elasticsearch adapter for Calcite</description>
http://git-wip-us.apache.org/repos/asf/calcite/blob/ea7ace18/example/csv/pom.xml
----------------------------------------------------------------------
diff --git a/example/csv/pom.xml b/example/csv/pom.xml
index af78a98..5e9330e 100644
--- a/example/csv/pom.xml
+++ b/example/csv/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-example</artifactId>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0</version>
</parent>
<artifactId>calcite-example-csv</artifactId>
<packaging>jar</packaging>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0</version>
<name>Calcite Example CSV</name>
<description>An example Calcite provider that reads CSV files</description>
http://git-wip-us.apache.org/repos/asf/calcite/blob/ea7ace18/example/function/pom.xml
----------------------------------------------------------------------
diff --git a/example/function/pom.xml b/example/function/pom.xml
index eb61207..6f049ae 100644
--- a/example/function/pom.xml
+++ b/example/function/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-example</artifactId>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0</version>
</parent>
<artifactId>calcite-example-function</artifactId>
<packaging>jar</packaging>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0</version>
<name>Calcite Example Function</name>
<description>Examples of user-defined Calcite functions</description>
http://git-wip-us.apache.org/repos/asf/calcite/blob/ea7ace18/example/pom.xml
----------------------------------------------------------------------
diff --git a/example/pom.xml b/example/pom.xml
index c565935..9409d6e 100644
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -20,13 +20,13 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0</version>
</parent>
<!-- The basics. -->
<artifactId>calcite-example</artifactId>
<packaging>pom</packaging>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0</version>
<name>Calcite Examples</name>
<description>Calcite examples</description>
http://git-wip-us.apache.org/repos/asf/calcite/blob/ea7ace18/file/pom.xml
----------------------------------------------------------------------
diff --git a/file/pom.xml b/file/pom.xml
index 0490e00..5f706da 100644
--- a/file/pom.xml
+++ b/file/pom.xml
@@ -19,13 +19,13 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0</version>
</parent>
<!-- The basics. -->
<artifactId>calcite-file</artifactId>
<packaging>jar</packaging>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0</version>
<name>Calcite File</name>
<description>Calcite provider that reads files and URIs</description>
http://git-wip-us.apache.org/repos/asf/calcite/blob/ea7ace18/linq4j/pom.xml
----------------------------------------------------------------------
diff --git a/linq4j/pom.xml b/linq4j/pom.xml
index 6f50153..3e60fdb 100644
--- a/linq4j/pom.xml
+++ b/linq4j/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0</version>
</parent>
<artifactId>calcite-linq4j</artifactId>
<packaging>jar</packaging>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0</version>
<name>Calcite Linq4j</name>
<description>Calcite APIs for LINQ (Language-Integrated Query) in Java</description>
http://git-wip-us.apache.org/repos/asf/calcite/blob/ea7ace18/mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/mongodb/pom.xml b/mongodb/pom.xml
index 3649746..e104f5c 100644
--- a/mongodb/pom.xml
+++ b/mongodb/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0</version>
</parent>
<artifactId>calcite-mongodb</artifactId>
<packaging>jar</packaging>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0</version>
<name>Calcite MongoDB</name>
<description>MongoDB adapter for Calcite</description>
http://git-wip-us.apache.org/repos/asf/calcite/blob/ea7ace18/pig/pom.xml
----------------------------------------------------------------------
diff --git a/pig/pom.xml b/pig/pom.xml
index 7eef3db..52afdea 100644
--- a/pig/pom.xml
+++ b/pig/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0</version>
</parent>
<artifactId>calcite-pig</artifactId>
<packaging>jar</packaging>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0</version>
<name>Calcite Pig</name>
<description>Pig adapter for Calcite</description>
http://git-wip-us.apache.org/repos/asf/calcite/blob/ea7ace18/piglet/pom.xml
----------------------------------------------------------------------
diff --git a/piglet/pom.xml b/piglet/pom.xml
index 3ebcfe2..6a4a6d0 100644
--- a/piglet/pom.xml
+++ b/piglet/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0</version>
</parent>
<artifactId>calcite-piglet</artifactId>
<packaging>jar</packaging>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0</version>
<name>Calcite Piglet</name>
<description>Pig-like language built on top of Calcite algebra</description>
http://git-wip-us.apache.org/repos/asf/calcite/blob/ea7ace18/plus/pom.xml
----------------------------------------------------------------------
diff --git a/plus/pom.xml b/plus/pom.xml
index 66a5f30..a72a246 100644
--- a/plus/pom.xml
+++ b/plus/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0</version>
</parent>
<artifactId>calcite-plus</artifactId>
<packaging>jar</packaging>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0</version>
<name>Calcite Plus</name>
<description>Miscellaneous extras for Calcite</description>
http://git-wip-us.apache.org/repos/asf/calcite/blob/ea7ace18/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5868c04..47489f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@ limitations under the License.
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
<packaging>pom</packaging>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0</version>
<!-- More project information. -->
<name>Calcite</name>
@@ -132,7 +132,7 @@ limitations under the License.
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/calcite.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/calcite.git</developerConnection>
<url>https://github.com/apache/calcite</url>
- <tag>HEAD</tag>
+ <tag>calcite-1.12.0</tag>
</scm>
<modules>
http://git-wip-us.apache.org/repos/asf/calcite/blob/ea7ace18/spark/pom.xml
----------------------------------------------------------------------
diff --git a/spark/pom.xml b/spark/pom.xml
index 6439e0f..131dd99 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0</version>
</parent>
<artifactId>calcite-spark</artifactId>
<packaging>jar</packaging>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0</version>
<name>Calcite Spark</name>
<properties>
http://git-wip-us.apache.org/repos/asf/calcite/blob/ea7ace18/splunk/pom.xml
----------------------------------------------------------------------
diff --git a/splunk/pom.xml b/splunk/pom.xml
index b91bc6a..bef7c63 100644
--- a/splunk/pom.xml
+++ b/splunk/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0</version>
</parent>
<artifactId>calcite-splunk</artifactId>
<packaging>jar</packaging>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0</version>
<name>Calcite Splunk</name>
<description>Splunk adapter for Calcite; also a JDBC driver for Splunk</description>
http://git-wip-us.apache.org/repos/asf/calcite/blob/ea7ace18/ubenchmark/pom.xml
----------------------------------------------------------------------
diff --git a/ubenchmark/pom.xml b/ubenchmark/pom.xml
index e4ca1f4..f039f3a 100644
--- a/ubenchmark/pom.xml
+++ b/ubenchmark/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
- <version>1.12.0-SNAPSHOT</version>
+ <version>1.12.0</version>
</parent>
<properties>
[2/4] calcite git commit: [CALCITE-1657] Release Calcite 1.12.0
Posted by jh...@apache.org.
[CALCITE-1657] Release Calcite 1.12.0
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/baa13d69
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/baa13d69
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/baa13d69
Branch: refs/heads/master
Commit: baa13d696f98bb4993f9e1a4de7da7ad684be101
Parents: a89c62c
Author: Julian Hyde <jh...@apache.org>
Authored: Fri Feb 24 11:49:46 2017 -0800
Committer: Julian Hyde <jh...@apache.org>
Committed: Mon Mar 20 18:26:43 2017 -0700
----------------------------------------------------------------------
README | 2 +-
pom.xml | 2 +-
site/_docs/history.md | 246 +++++++++++++++++++++++++++++++++++++++++++--
site/_docs/howto.md | 6 +-
4 files changed, 245 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/baa13d69/README
----------------------------------------------------------------------
diff --git a/README b/README
index be0c63b..985f675 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Apache Calcite release 1.11.0
+Apache Calcite release 1.12.0
This is a source or binary distribution of Apache Calcite.
http://git-wip-us.apache.org/repos/asf/calcite/blob/baa13d69/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 827e335..5868c04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,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>11</version.minor>
+ <version.minor>12</version.minor>
<!-- This list is in alphabetical order. -->
<airlift-tpch.version>0.1</airlift-tpch.version>
http://git-wip-us.apache.org/repos/asf/calcite/blob/baa13d69/site/_docs/history.md
----------------------------------------------------------------------
diff --git a/site/_docs/history.md b/site/_docs/history.md
index 2e1a157..52a4f10 100644
--- a/site/_docs/history.md
+++ b/site/_docs/history.md
@@ -28,9 +28,18 @@ For a full list of releases, see
Downloads are available on the
[downloads page]({{ site.baseurl }}/downloads/).
-## <a href="https://github.com/apache/calcite/releases/tag/calcite-1.12.0">1.12.0</a> / under development
+## <a href="https://github.com/apache/calcite/releases/tag/calcite-1.12.0">1.12.0</a> / 2017-03-24
{: #v1-12-0}
+Features of note this release are JDK9 support,
+the new file/web and Apache Pig adapters,
+general improvements to the Druid adapter,
+more helpful error messages if you get a table or column name wrong,
+improved the plans for correlated sub-queries,
+support for `TUMBLE`, `HOP` and `SESSION` window functions in streaming and regular queries,
+experimental support for `MATCH_RECOGNIZE` clause for complex-event processing (CEP),
+several new built-in functions to comply with the ODBC/JDBC standard.
+
Compatibility: This release is tested
on Linux, macOS, Microsoft Windows;
using Oracle JDK 1.7, 1.8, 9;
@@ -40,18 +49,243 @@ other software versions as specified in `pom.xml`.
### New features
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1666">CALCITE-1666</a>]
+ Support for modifiable views with extended columns (Kevin Liew)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1655">CALCITE-1655</a>]
+ Druid adapter: add `IN` filter (Slim Bouguerra)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1641">CALCITE-1641</a>]
+ Add parser and validator support for `MATCH_RECOGNIZE`, a new clause for
+ complex-event processing (CEP) (Zhiqiang-He)
+ * [<a href="https://issues.apache.org/jira/browse/CALCITE-1686">CALCITE-1686</a>]
+ Only allow `FINAL` and other functions inside `MATCH_RECOGNIZE` (Zhiqiang-He)
+ * [<a href="https://issues.apache.org/jira/browse/CALCITE-1689">CALCITE-1689</a>]
+ Remove `PATTERN_DEFINE_AS` in SqlStdOperatorTable; `MATCH_RECOGNIZE` now uses
+ `AS` (Zhiqiang-He)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1668">CALCITE-1668</a>]
+ Simplify `1 = 1` to `TRUE`, `1 > 2` to `FALSE` (Kevin Risden)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1598">CALCITE-1598</a>]
+ Pig adapter (Eli Levine)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1661">CALCITE-1661</a>]
+ Druid adapter: Support aggregation functions on `DECIMAL` columns
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1615">CALCITE-1615</a>]
+ Support `HOP` and `SESSION` functions in the `GROUP BY` clause
+ (Julian Hyde and Haohui Mai)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1494">CALCITE-1494</a>]
+ More efficient plan for correlated sub-queries, omitting value-generating
+ scans where possible
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1638">CALCITE-1638</a>]
+ Simplify `$x = $x` to `$x is not null`
* [<a href="https://issues.apache.org/jira/browse/CALCITE-884">CALCITE-884</a>]
File adapter (Henry Olson)
+ * [<a href="https://issues.apache.org/jira/browse/CALCITE-1704">CALCITE-1704</a>]
+ Execute queries on CSV files using simple `sqlline` command
+ * [<a href="https://issues.apache.org/jira/browse/CALCITE-1676">CALCITE-1676</a>]
+ Scan directory for .csv, .json and .gz files
* Allow multiple Calcite columns to be derived from one HTML column,
e.g. Location → Lat, Lon
* Improved pattern match: added `matchSeq` to allow selection of
<i>n</i>th match
* Add replace patterns to cell parsing logic
- * Add handling for tables without `<TH>` elements
- * Unit tests using local files; URL tests are contingent on network
- access
- * Ability to parse HTML from local files
- * Derived from CSV adapter
+ * Add handling for tables without `<TH>` elements
+ * Unit tests using local files (URL tests are contingent on network
+ access)
+ * Ability to parse HTML, CSV and JSON from local files
+ * Combine the <a href="https://github.com/HenryOlson/optiq-web">optiq-web</a>
+ project with code from the
+ <a href="{{ site.apiroot }}/org/apache/calcite/adapter/csv/package-summary.html">CSV adapter</a>
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1652">CALCITE-1652</a>]
+ Allow `GROUPING` function to have multiple arguments, like `GROUPING_ID`
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1634">CALCITE-1634</a>]
+ Make `RelBuilder.distinct` no-op if input is already distinct; use it in
+ `RelDecorrelator`
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1635">CALCITE-1635</a>]
+ Add `MinRowCount` metadata
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1628">CALCITE-1628</a>]
+ Add an alternative match pattern for `SemiJoinRule`
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1618">CALCITE-1618</a>]
+ `SortProjectTransposeRule` should check for monotonicity preserving `CAST`
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1510">CALCITE-1510</a>]
+ In `INSERT`/`UPSERT` without an explicit target column list, allow fewer source
+ columns than table (Kevin Liew)
+ * Check for default value only when target field is null
+ (Rajeshbabu Chintaguntla)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1603">CALCITE-1603</a>]
+ Support `TUMBLE` window function in the `GROUP BY` clause (Julian Hyde and
+ Haohui Mai)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1606">CALCITE-1606</a>]
+ Add datetime scalar functions (Laurent Goujon)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1604">CALCITE-1604</a>]
+ Add JDBC/ODBC scalar functions `DATABASE`, `IFNULL`, `USER` (Laurent Goujon)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1549">CALCITE-1549</a>]
+ More helpful error message when schema, table or column not found
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-420">CALCITE-420</a>]
+ Add `REPLACE` function, callable with and without JDBC escape syntax (Riccardo
+ Tommasini)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1557">CALCITE-1557</a>]
+ Add numeric scalar functions (Laurent Goujon)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1258">CALCITE-1258</a>]
+ JDK9
+
+#### Bug-fixes, API changes and minor enhancements
+
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1716">CALCITE-1716</a>]
+ Fix Cassandra integration tests
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1715">CALCITE-1715</a>]
+ Downgrade to Guava 19.0 to fix Cassandra incompatibility
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1706">CALCITE-1706</a>]
+ Disable `DruidAggregateFilterTransposeRule`, because it causes fine-grained
+ aggregations to be pushed to Druid
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1695">CALCITE-1695</a>]
+ Add class `RexSimplify`, providing an explicit `RexExecutor` for methods to
+ simplify `RexNode`s
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1694">CALCITE-1694</a>]
+ Pig adapter: Use the shaded Avatica dependency instead
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1561">CALCITE-1561</a>]
+ Make `PigTest` cluster aware of data files; hopefully this will prevent
+ intermittent test failures (Eli Levine)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1696">CALCITE-1696</a>]
+ Support `RexLocalRef` for `EXPLAIN PLAN AS JSON`
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1683">CALCITE-1683</a>]
+ Druid-specific rules to transpose `Filter` with other relations
+ (Nishant Bangarwa)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1684">CALCITE-1684</a>]
+ Change default precision of `VARCHAR` and `VARBINARY` types from 1 to
+ "unspecified" (Kevin Liew)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1691">CALCITE-1691</a>]
+ `ClassCastException` in `RelOptUtil.containsNullableFields`, attempting to
+ convert executor to `RexExecutorImpl`
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1688">CALCITE-1688</a>]
+ Infinite loop during materialization substitution if query contains `Union`,
+ `Minus` or `Intersect`
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1665">CALCITE-1665</a>]
+ `HAVING` support in `RelToSqlConverter` (Zhiqiang He)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1673">CALCITE-1673</a>]
+ In CSV adapter, query with `ORDER BY` or `GROUP BY` on `TIMESTAMP` column
+ throws CompileException (Gangadhar Kairi)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1674">CALCITE-1674</a>]
+ `LIKE` does not match value that contains newline (Mark Payne)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1675">CALCITE-1675</a>]
+ Two-level column name cannot be resolved in `ORDER BY`
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1667">CALCITE-1667</a>]
+ Forbid calls to JDK APIs that use the default locale, time zone or character
+ set
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1656">CALCITE-1656</a>]
+ Improve cost function in `DruidQuery` to encourage early column pruning
+ (Nishant Bangarwa)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1664">CALCITE-1664</a>]
+ `CAST('<string>' as TIMESTAMP)` wrongly adds part of sub-second fraction to the
+ value
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1659">CALCITE-1659</a>]
+ Simplifying `CAST('YYYY-MM-DD hh:mm:ss.SSS' as TIMESTAMP)` should round the
+ sub-second fraction (Remus Rusanu)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1439">CALCITE-1439</a>]
+ Handle errors during constant reduction
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1653">CALCITE-1653</a>]
+ Pass an expression executor to `RexUtil.simplify` for constant reduction (Remus
+ Rusanu)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1601">CALCITE-1601</a>]
+ `DateRangeRules` loses OR filters
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1637">CALCITE-1637</a>]
+ Add mutable equivalents for all relational expressions (e.g. `MutableFilter`)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1621">CALCITE-1621</a>]
+ Add a cast around the NULL literal in aggregate rules (Anton Mushin)
+ * Add `RexBuilder.makeNullLiteral(RelDataType)`
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1649">CALCITE-1649</a>]
+ Data type mismatch in `EnumerableMergeJoin`
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1636">CALCITE-1636</a>]
+ JDBC adapter generates wrong SQL for self join with sub-query (Zhiqiang-He)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1633">CALCITE-1633</a>]
+ In plans, output `Correlate.joinType` attribute in lower-case, same as
+ `Join.joinType`
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1632">CALCITE-1632</a>]
+ Return type of "datetime + interval" expression
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-365">CALCITE-365</a>]
+ `AssertionError` while translating query with `WITH` and correlated sub-query
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1623">CALCITE-1623</a>]
+ Make sure `DATE`, `TIME` and `TIMESTAMP` literals have `Calendar` with GMT
+ timezone
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1619">CALCITE-1619</a>]
+ `CAST` is ignored by rules pushing operators into `DruidQuery`
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1617">CALCITE-1617</a>]
+ Druid adapter: Send timestamp literals to Druid as local time, not UTC
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1500">CALCITE-1500</a>]
+ Decouple materialization and lattice substitution from `VolcanoPlanner`
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1589">CALCITE-1589</a>]
+ Druid adapter: `timeseries` query shows all days, even if no data
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1572">CALCITE-1572</a>]
+ `JdbcSchema` throws exception when detecting nullable columns (Wu Xiang)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1610">CALCITE-1610</a>]
+ `RelBuilder` sort-combining optimization treats aliases incorrectly (Jess
+ Balint)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1595">CALCITE-1595</a>]
+ `RelBuilder.call` throws `NullPointerException` if argument types are invalid
+ (Jess Balint)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1602">CALCITE-1602</a>]
+ Remove uses of deprecated APIs
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1569">CALCITE-1569</a>]
+ Code generation for fields of type `java.sql.Date` (Zhen Wang)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1582">CALCITE-1582</a>]
+ `RelToSqlConverter` doesn't handle cartesian join (Jess Balint)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1597">CALCITE-1597</a>]
+ Obsolete `Util.newInternal`, `.pre`, `.post`, `.permAssert` and
+ `Throwables.propagate`
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1586">CALCITE-1586</a>]
+ JDBC adapter generates wrong SQL if `UNION` has more than two inputs (Zhiqiang
+ He)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1535">CALCITE-1535</a>]
+ Give error if column referenced in `ORDER BY` is ambiguous (Zhen Wang)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1594">CALCITE-1594</a>]
+ `ConventionTraitDef.getConversionData()` is not thread-safe
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1577">CALCITE-1577</a>]
+ Druid adapter: Incorrect result - limit on timestamp disappears
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1587">CALCITE-1587</a>]
+ Druid adapter: `topN` query returns approximate results
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1578">CALCITE-1578</a>]
+ Druid adapter: wrong semantics of `topN` query limit with granularity
+* Druid adapter: Add `enum Granularity`
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1592">CALCITE-1592</a>]
+ `SqlToRelConverter` throws `UnsupportedOperationException` if query has
+ `NOT ... NOT IN`
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1590">CALCITE-1590</a>]
+ Support Guava version 21.0
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1575">CALCITE-1575</a>]
+ Literals may lose precision during expression reduction
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1546">CALCITE-1546</a>]
+ Wrong plan for `NOT IN` sub-queries with disjunction
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1574">CALCITE-1574</a>]
+ Memory leak in maven
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1571">CALCITE-1571</a>]
+ Could not resolve view with `SimpleCalciteSchema`
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1558">CALCITE-1558</a>]
+ `AggregateExpandDistinctAggregatesRule` gets field mapping wrong if group key
+ is used in aggregate function (Zhenghua Gao)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1562">CALCITE-1562</a>]
+ Update jsr305 from 1.3.9 to 3.0.1
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1563">CALCITE-1563</a>]
+ In case-insensitive connection, non-existent tables use alphabetically
+ preceding table
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1544">CALCITE-1544</a>]
+ `AggregateJoinTransposeRule` fails to preserve row type (Kurt Young)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1543">CALCITE-1543</a>]
+ Correlated scalar sub-query with multiple aggregates gives `AssertionError`
+ (Kurt Young)
+
+#### Web site and documentation
+
+* Maryann Xue joins PMC
+* Add 3 new committers (Gian Merlino, Jess Balint, Laurent Goujon)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1657">CALCITE-1657</a>]
+ Release Calcite 1.12.0
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1677">CALCITE-1677</a>]
+ Replace duplicate avatica docs with a redirect
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1685">CALCITE-1685</a>]
+ Site: `defaultNullCollation` key listed as `materializationsEnabled`
+ (Kevin Liew)
+* Add MapD to <a href="{{ site.baseurl }}/docs/powered_by.html">Powered by
+ Calcite</a> page (Todd Mostak)
+* Diagram of logos of projects and products powered by Calcite
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-1622">CALCITE-1622</a>]
+ Bugs in website example code (Damjan Jovanovic)
## <a href="https://github.com/apache/calcite/releases/tag/calcite-1.11.0">1.11.0</a> / 2017-01-09
{: #v1-11-0}
http://git-wip-us.apache.org/repos/asf/calcite/blob/baa13d69/site/_docs/howto.md
----------------------------------------------------------------------
diff --git a/site/_docs/howto.md b/site/_docs/howto.md
index 5a89cc4..9ab75ef 100644
--- a/site/_docs/howto.md
+++ b/site/_docs/howto.md
@@ -39,8 +39,8 @@ Unpack the source distribution `.tar.gz` or `.zip` file,
then build using maven:
{% highlight bash %}
-$ tar xvfz calcite-1.11.0-source.tar.gz
-$ cd calcite-1.11.0
+$ tar xvfz calcite-1.12.0-source.tar.gz
+$ cd calcite-1.12.0
$ mvn install
{% endhighlight %}
@@ -404,7 +404,7 @@ the `KEYS` file.
Before you start:
* Set up signing keys as described above.
-* Make sure you are using JDK 1.7 (not 1.8).
+* Make sure you are using JDK 1.8 (not 1.6 or 9).
* Make sure build and tests succeed with `-Dcalcite.test.db=hsqldb` (the default)
{% highlight bash %}