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 2015/02/06 20:26:55 UTC
[1/5] incubator-calcite git commit: [CALCITE-582] EnumerableTableScan
broken when table has single column
Repository: incubator-calcite
Updated Branches:
refs/heads/master 341bdd8e2 -> ff2dfef9b
[CALCITE-582] EnumerableTableScan broken when table has single column
Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/6c5dd431
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/6c5dd431
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/6c5dd431
Branch: refs/heads/master
Commit: 6c5dd43113a8695a9fd0c12f564e6c87516ca3b9
Parents: 341bdd8
Author: Vladimir Sitnikov <si...@gmail.com>
Authored: Sat Jan 31 00:02:58 2015 +0300
Committer: Julian Hyde <jh...@apache.org>
Committed: Sat Jan 31 16:37:50 2015 -0800
----------------------------------------------------------------------
.../adapter/enumerable/EnumerableTableScan.java | 21 +++++++++++++----
.../calcite/adapter/generate/RangeTable.java | 24 ++++++++++++++++----
.../java/org/apache/calcite/test/JdbcTest.java | 19 +++++++++++++++-
3 files changed, 53 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/6c5dd431/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableScan.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableScan.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableScan.java
index 641d9cf..bd11411 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableScan.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableTableScan.java
@@ -31,6 +31,9 @@ import org.apache.calcite.plan.RelOptTable;
import org.apache.calcite.plan.RelTraitSet;
import org.apache.calcite.rel.RelNode;
import org.apache.calcite.rel.core.TableScan;
+import org.apache.calcite.schema.FilterableTable;
+import org.apache.calcite.schema.ProjectableFilterableTable;
+import org.apache.calcite.schema.ScannableTable;
import org.apache.calcite.util.BuiltInMethod;
import java.lang.reflect.Type;
@@ -82,6 +85,14 @@ public class EnumerableTableScan
}
private Expression toRows(PhysType physType, Expression expression) {
+ if (physType.getFormat() == JavaRowFormat.SCALAR
+ && Object[].class.isAssignableFrom(elementType)
+ && getRowType().getFieldCount() == 1
+ && (table.unwrap(ScannableTable.class) != null
+ || table.unwrap(FilterableTable.class) != null
+ || table.unwrap(ProjectableFilterableTable.class) != null)) {
+ return Expressions.call(BuiltInMethod.SLICE0.method, expression);
+ }
JavaRowFormat oldFormat = format();
if (physType.getFormat() == oldFormat) {
return expression;
@@ -101,16 +112,16 @@ public class EnumerableTableScan
}
private JavaRowFormat format() {
+ int fieldCount = getRowType().getFieldCount();
+ if (fieldCount == 0) {
+ return JavaRowFormat.LIST;
+ }
if (Object[].class.isAssignableFrom(elementType)) {
- return JavaRowFormat.ARRAY;
+ return fieldCount == 1 ? JavaRowFormat.SCALAR : JavaRowFormat.ARRAY;
}
if (Row.class.isAssignableFrom(elementType)) {
return JavaRowFormat.ROW;
}
- int fieldCount = getRowType().getFieldCount();
- if (fieldCount == 0) {
- return JavaRowFormat.LIST;
- }
if (fieldCount == 1 && (Object.class == elementType
|| Primitive.is(elementType)
|| Number.class.isAssignableFrom(elementType))) {
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/6c5dd431/core/src/test/java/org/apache/calcite/adapter/generate/RangeTable.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/adapter/generate/RangeTable.java b/core/src/test/java/org/apache/calcite/adapter/generate/RangeTable.java
index 16109a1..7140b01 100644
--- a/core/src/test/java/org/apache/calcite/adapter/generate/RangeTable.java
+++ b/core/src/test/java/org/apache/calcite/adapter/generate/RangeTable.java
@@ -38,16 +38,18 @@ public class RangeTable extends AbstractQueryableTable {
private final int start;
private final int end;
- protected RangeTable(String columnName, int start, int end) {
- super(Object.class);
+ protected RangeTable(Class<?> elementType, String columnName, int start,
+ int end) {
+ super(elementType);
this.columnName = columnName;
this.start = start;
this.end = end;
}
/** Creates a RangeTable. */
- public static RangeTable create(String columnName, int start, int end) {
- return new RangeTable(columnName, start, end);
+ public static RangeTable create(Class<?> elementType, String columnName,
+ int start, int end) {
+ return new RangeTable(elementType, columnName, start, end);
}
public RelDataType getRowType(RelDataTypeFactory typeFactory) {
@@ -104,7 +106,19 @@ public class RangeTable extends AbstractQueryableTable {
final String columnName = (String) operand.get("column");
final int start = (Integer) operand.get("start");
final int end = (Integer) operand.get("end");
- return RangeTable.create(columnName, start, end);
+ final String elementType = (String) operand.get("elementType");
+ Class<?> type;
+ if ("array".equals(elementType)) {
+ type = Object[].class;
+ } else if ("object".equals(elementType)) {
+ type = Object.class;
+ } else if ("integer".equals(elementType)) {
+ type = Integer.class;
+ } else {
+ throw new IllegalArgumentException(
+ "Illegal 'elementType' value: " + elementType);
+ }
+ return RangeTable.create(type, columnName, start, end);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/6c5dd431/core/src/test/java/org/apache/calcite/test/JdbcTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/JdbcTest.java b/core/src/test/java/org/apache/calcite/test/JdbcTest.java
index 7bb566e..89c3b47 100644
--- a/core/src/test/java/org/apache/calcite/test/JdbcTest.java
+++ b/core/src/test/java/org/apache/calcite/test/JdbcTest.java
@@ -4666,6 +4666,22 @@ public class JdbcTest {
/** Tests a JDBC connection that provides a model that contains custom
* tables. */
@Test public void testModelCustomTable2() {
+ testRangeTable("object");
+ }
+
+ /** Tests a JDBC connection that provides a model that contains custom
+ * tables. */
+ @Test public void testModelCustomTableArrayRowSingleColumn() {
+ testRangeTable("array");
+ }
+
+ /** Tests a JDBC connection that provides a model that contains custom
+ * tables. */
+ @Test public void testModelCustomTableIntegerRowSingleColumn() {
+ testRangeTable("integer");
+ }
+
+ private void testRangeTable(String elementType) {
CalciteAssert.model("{\n"
+ " version: '1.0',\n"
+ " schemas: [\n"
@@ -4677,7 +4693,8 @@ public class JdbcTest {
+ " type: 'custom',\n"
+ " factory: '"
+ RangeTable.Factory.class.getName() + "',\n"
- + " operand: {'column': 'N', 'start': 3, 'end': 7 }\n"
+ + " operand: {'column': 'N', 'start': 3, 'end': 7, "
+ + " 'elementType': '" + elementType + "'}\n"
+ " }\n"
+ " ]\n"
+ " }\n"
[3/5] incubator-calcite git commit: Enable Travis on release branches
Posted by jh...@apache.org.
Enable Travis on release branches
Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/20506d18
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/20506d18
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/20506d18
Branch: refs/heads/master
Commit: 20506d18f97c96cef45b897c86903c93de24eb8d
Parents: ef53306
Author: Julian Hyde <jh...@apache.org>
Authored: Wed Jan 28 20:31:32 2015 -0800
Committer: Julian Hyde <jh...@apache.org>
Committed: Sat Jan 31 16:43:44 2015 -0800
----------------------------------------------------------------------
.travis.yml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/20506d18/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 040893f..fb6a765 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,7 @@ branches:
only:
- master
- javadoc
+ - /^branch-.*$/
script:
mvn test site
git:
[2/5] incubator-calcite git commit: Update history
Posted by jh...@apache.org.
Update history
Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/ef533061
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/ef533061
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/ef533061
Branch: refs/heads/master
Commit: ef5330613ce0feae7b817f9383b77dbd5cf9c29b
Parents: 6c5dd43
Author: Julian Hyde <jh...@apache.org>
Authored: Wed Jan 28 14:50:27 2015 -0800
Committer: Julian Hyde <jh...@apache.org>
Committed: Sat Jan 31 16:43:38 2015 -0800
----------------------------------------------------------------------
doc/HISTORY.md | 17 ++++++++++++++++-
doc/HOWTO.md | 4 ++--
pom.xml | 2 +-
3 files changed, 19 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/ef533061/doc/HISTORY.md
----------------------------------------------------------------------
diff --git a/doc/HISTORY.md b/doc/HISTORY.md
index ab7bd0a..36222ab 100644
--- a/doc/HISTORY.md
+++ b/doc/HISTORY.md
@@ -3,7 +3,7 @@
For a full list of releases, see
<a href="https://github.com/apache/incubator-calcite/releases">github</a>.
-## <a href="https://github.com/apache/incubator-calcite/releases/tag/calcite-1.0.0-incubating">1.0.0-incubating</a> / 2015-01-22
+## <a href="https://github.com/apache/incubator-calcite/releases/tag/calcite-1.0.0-incubating">1.0.0-incubating</a> / 2015-01-31
Calcite's first major release.
@@ -143,6 +143,21 @@ Bug-fixes and internal changes
compilation when the sources are unchanged
* [<a href="https://issues.apache.org/jira/browse/CALCITE-535">CALCITE-535</a>]
Support skip overwrite in hydromatic-resource
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-582">CALCITE-582</a>]
+ `EnumerableTableScan` broken when table has single column
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-575">CALCITE-575</a>]
+ Variant of `ProjectRemoveRule` that considers a project trivial only if its
+ field names are identical (John Pullokkaran)
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-571">CALCITE-571</a>]
+ `ReduceExpressionsRule` tries to reduce `SemiJoin` condition to non-equi
+ condition
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-568">CALCITE-568</a>]
+ Upgrade to a version of `pentaho-aggdesigner` that does not pull in
+ `servlet-api`
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-567">CALCITE-567</a>]
+ Make `quidem` dependency have scope "test"
+* [<a href="https://issues.apache.org/jira/browse/CALCITE-570">CALCITE-570</a>]
+ `ReduceExpressionsRule` throws "duplicate key" exception
* [<a href="https://issues.apache.org/jira/browse/CALCITE-561">CALCITE-561</a>]
Upgrade parent POM
* [<a href="https://issues.apache.org/jira/browse/CALCITE-458">CALCITE-458</a>]
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/ef533061/doc/HOWTO.md
----------------------------------------------------------------------
diff --git a/doc/HOWTO.md b/doc/HOWTO.md
index a8f3563..1e113ec 100644
--- a/doc/HOWTO.md
+++ b/doc/HOWTO.md
@@ -304,7 +304,7 @@ When the dry-run has succeeded, change `install` to `deploy`.
Before you start:
* Set up signing keys as described above.
* Make sure you are using JDK 1.7 (not 1.6 or 1.8).
-* Check that README, README.md and HOWTO.md have the correct version number.
+* Check that `README`, `README.md` and `HOWTO.md` have the correct version number.
* Make sure build and tests succeed, including with
-Dcalcite.test.db={mysql,hsqldb}, -Dcalcite.test.slow=true,
-Dcalcite.test.mongodb=true, -Dcalcite.test.splunk=true.
@@ -353,7 +353,7 @@ Check the artifacts:
* In the two source distros `.tar.gz` and `.zip` (currently there is
no binary distro), check that all files belong to a directory called
`apache-calcite-X.Y.Z-incubating-src`.
-* That directory must contain files `DISCLAIMER, `NOTICE`, `LICENSE`,
+* That directory must contain files `DISCLAIMER`, `NOTICE`, `LICENSE`,
`README`, `README.md`, `git.properties`
* Check that the version in `README` is correct
* Check that `git.properties` is current
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/ef533061/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 75ece87..19ca9df 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>1</version.minor>
+ <version.minor>0</version.minor>
</properties>
<issueManagement>
[4/5] incubator-calcite git commit: [maven-release-plugin] prepare
release calcite-1.0.0-incubating
Posted by jh...@apache.org.
[maven-release-plugin] prepare release calcite-1.0.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/2dd83f21
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/2dd83f21
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/2dd83f21
Branch: refs/heads/master
Commit: 2dd83f21784c4366df84a3aaa62a8b7b0e36d443
Parents: 20506d1
Author: Julian Hyde <jh...@apache.org>
Authored: Sat Jan 31 17:11:43 2015 -0800
Committer: Julian Hyde <jh...@apache.org>
Committed: Sat Jan 31 17:11:43 2015 -0800
----------------------------------------------------------------------
avatica-server/pom.xml | 4 ++--
avatica/pom.xml | 4 ++--
core/pom.xml | 4 ++--
example/csv/pom.xml | 4 ++--
example/pom.xml | 4 ++--
linq4j/pom.xml | 4 ++--
mongodb/pom.xml | 4 ++--
plus/pom.xml | 4 ++--
pom.xml | 4 ++--
spark/pom.xml | 4 ++--
splunk/pom.xml | 4 ++--
ubenchmark/pom.xml | 2 +-
12 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/2dd83f21/avatica-server/pom.xml
----------------------------------------------------------------------
diff --git a/avatica-server/pom.xml b/avatica-server/pom.xml
index 4321b92..b7b6417 100644
--- a/avatica-server/pom.xml
+++ b/avatica-server/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.0-incubating</version>
</parent>
<artifactId>calcite-avatica-server</artifactId>
<packaging>jar</packaging>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.0-incubating</version>
<name>Calcite Avatica Server</name>
<description>JDBC server.</description>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/2dd83f21/avatica/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/pom.xml b/avatica/pom.xml
index 0fc0f28..a0bc7e4 100644
--- a/avatica/pom.xml
+++ b/avatica/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.0-incubating</version>
</parent>
<artifactId>calcite-avatica</artifactId>
<packaging>jar</packaging>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.0-incubating</version>
<name>Calcite Avatica</name>
<description>JDBC driver framework.</description>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/2dd83f21/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 89f222e..ae0ec67 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.1-incubating-SNAPSHOT</version>
+ <version>1.0.0-incubating</version>
</parent>
<artifactId>calcite-core</artifactId>
<packaging>jar</packaging>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.0-incubating</version>
<name>Calcite Core</name>
<description>Core Calcite APIs and engine.</description>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/2dd83f21/example/csv/pom.xml
----------------------------------------------------------------------
diff --git a/example/csv/pom.xml b/example/csv/pom.xml
index f86d01c..11e8ea4 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.1-incubating-SNAPSHOT</version>
+ <version>1.0.0-incubating</version>
</parent>
<artifactId>calcite-example-csv</artifactId>
<packaging>jar</packaging>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.0-incubating</version>
<name>Calcite Example CSV</name>
<description>An example Calcite provider that reads CSV files</description>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/2dd83f21/example/pom.xml
----------------------------------------------------------------------
diff --git a/example/pom.xml b/example/pom.xml
index ffb38f5..2e41607 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.1-incubating-SNAPSHOT</version>
+ <version>1.0.0-incubating</version>
</parent>
<!-- The basics. -->
<artifactId>calcite-example</artifactId>
<packaging>pom</packaging>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.0-incubating</version>
<name>Calcite Examples</name>
<description>Calcite examples</description>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/2dd83f21/linq4j/pom.xml
----------------------------------------------------------------------
diff --git a/linq4j/pom.xml b/linq4j/pom.xml
index 27df6e9..14c5e81 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.1-incubating-SNAPSHOT</version>
+ <version>1.0.0-incubating</version>
</parent>
<artifactId>calcite-linq4j</artifactId>
<packaging>jar</packaging>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.0-incubating</version>
<name>Calcite Linq4j</name>
<description>Calcite APIs for LINQ (Language-Integrated Query) in Java</description>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/2dd83f21/mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/mongodb/pom.xml b/mongodb/pom.xml
index 37b6e1e..bc38b0d 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.1-incubating-SNAPSHOT</version>
+ <version>1.0.0-incubating</version>
</parent>
<artifactId>calcite-mongodb</artifactId>
<packaging>jar</packaging>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.0-incubating</version>
<name>Calcite MongoDB</name>
<description>MongoDB adapter for Calcite</description>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/2dd83f21/plus/pom.xml
----------------------------------------------------------------------
diff --git a/plus/pom.xml b/plus/pom.xml
index fd85904..2c604a5 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.1-incubating-SNAPSHOT</version>
+ <version>1.0.0-incubating</version>
</parent>
<artifactId>calcite-plus</artifactId>
<packaging>jar</packaging>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.0-incubating</version>
<name>Calcite Plus</name>
<description>Miscellaneous extras for Calcite</description>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/2dd83f21/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 19ca9df..44a3fcd 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.1-incubating-SNAPSHOT</version>
+ <version>1.0.0-incubating</version>
<!-- More project information. -->
<name>Calcite</name>
@@ -61,7 +61,7 @@ limitations under the License.
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-calcite.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-calcite.git</developerConnection>
<url>https://github.com/apache/incubator-calcite</url>
- <tag>HEAD</tag>
+ <tag>calcite-1.0.0-incubating</tag>
</scm>
<modules>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/2dd83f21/spark/pom.xml
----------------------------------------------------------------------
diff --git a/spark/pom.xml b/spark/pom.xml
index 3314c97..810e4b7 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.1-incubating-SNAPSHOT</version>
+ <version>1.0.0-incubating</version>
</parent>
<artifactId>calcite-spark</artifactId>
<packaging>jar</packaging>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.0-incubating</version>
<name>Calcite Spark</name>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/2dd83f21/splunk/pom.xml
----------------------------------------------------------------------
diff --git a/splunk/pom.xml b/splunk/pom.xml
index 68f88b7..b643b73 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.1-incubating-SNAPSHOT</version>
+ <version>1.0.0-incubating</version>
</parent>
<artifactId>calcite-splunk</artifactId>
<packaging>jar</packaging>
- <version>1.1-incubating-SNAPSHOT</version>
+ <version>1.0.0-incubating</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/incubator-calcite/blob/2dd83f21/ubenchmark/pom.xml
----------------------------------------------------------------------
diff --git a/ubenchmark/pom.xml b/ubenchmark/pom.xml
index f36bc05..be445ea 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.1-incubating-SNAPSHOT</version>
+ <version>1.0.0-incubating</version>
</parent>
<properties>
[5/5] incubator-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/incubator-calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-calcite/commit/ff2dfef9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-calcite/tree/ff2dfef9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-calcite/diff/ff2dfef9
Branch: refs/heads/master
Commit: ff2dfef9b39c8e4e410985bcfca0ea8264a80221
Parents: 2dd83f2
Author: Julian Hyde <jh...@apache.org>
Authored: Sat Jan 31 17:12:10 2015 -0800
Committer: Julian Hyde <jh...@apache.org>
Committed: Sat Jan 31 17:12:10 2015 -0800
----------------------------------------------------------------------
avatica-server/pom.xml | 4 ++--
avatica/pom.xml | 4 ++--
core/pom.xml | 4 ++--
example/csv/pom.xml | 4 ++--
example/pom.xml | 4 ++--
linq4j/pom.xml | 4 ++--
mongodb/pom.xml | 4 ++--
plus/pom.xml | 4 ++--
pom.xml | 4 ++--
spark/pom.xml | 4 ++--
splunk/pom.xml | 4 ++--
ubenchmark/pom.xml | 2 +-
12 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/ff2dfef9/avatica-server/pom.xml
----------------------------------------------------------------------
diff --git a/avatica-server/pom.xml b/avatica-server/pom.xml
index b7b6417..26955e4 100644
--- a/avatica-server/pom.xml
+++ b/avatica-server/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
- <version>1.0.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>calcite-avatica-server</artifactId>
<packaging>jar</packaging>
- <version>1.0.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<name>Calcite Avatica Server</name>
<description>JDBC server.</description>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/ff2dfef9/avatica/pom.xml
----------------------------------------------------------------------
diff --git a/avatica/pom.xml b/avatica/pom.xml
index a0bc7e4..b786e5a 100644
--- a/avatica/pom.xml
+++ b/avatica/pom.xml
@@ -20,12 +20,12 @@ limitations under the License.
<parent>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite</artifactId>
- <version>1.0.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>calcite-avatica</artifactId>
<packaging>jar</packaging>
- <version>1.0.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<name>Calcite Avatica</name>
<description>JDBC driver framework.</description>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/ff2dfef9/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index ae0ec67..0395a61 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.0.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>calcite-core</artifactId>
<packaging>jar</packaging>
- <version>1.0.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<name>Calcite Core</name>
<description>Core Calcite APIs and engine.</description>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/ff2dfef9/example/csv/pom.xml
----------------------------------------------------------------------
diff --git a/example/csv/pom.xml b/example/csv/pom.xml
index 11e8ea4..6f4fe16 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.0.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>calcite-example-csv</artifactId>
<packaging>jar</packaging>
- <version>1.0.0-incubating</version>
+ <version>1.1.0-incubating-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/incubator-calcite/blob/ff2dfef9/example/pom.xml
----------------------------------------------------------------------
diff --git a/example/pom.xml b/example/pom.xml
index 2e41607..c37c11e 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.0.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<!-- The basics. -->
<artifactId>calcite-example</artifactId>
<packaging>pom</packaging>
- <version>1.0.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<name>Calcite Examples</name>
<description>Calcite examples</description>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/ff2dfef9/linq4j/pom.xml
----------------------------------------------------------------------
diff --git a/linq4j/pom.xml b/linq4j/pom.xml
index 14c5e81..9e20c1b 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.0.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>calcite-linq4j</artifactId>
<packaging>jar</packaging>
- <version>1.0.0-incubating</version>
+ <version>1.1.0-incubating-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/incubator-calcite/blob/ff2dfef9/mongodb/pom.xml
----------------------------------------------------------------------
diff --git a/mongodb/pom.xml b/mongodb/pom.xml
index bc38b0d..f0e1800 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.0.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>calcite-mongodb</artifactId>
<packaging>jar</packaging>
- <version>1.0.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<name>Calcite MongoDB</name>
<description>MongoDB adapter for Calcite</description>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/ff2dfef9/plus/pom.xml
----------------------------------------------------------------------
diff --git a/plus/pom.xml b/plus/pom.xml
index 2c604a5..e27f41f 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.0.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>calcite-plus</artifactId>
<packaging>jar</packaging>
- <version>1.0.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<name>Calcite Plus</name>
<description>Miscellaneous extras for Calcite</description>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/ff2dfef9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 44a3fcd..c849a42 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.0.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<!-- More project information. -->
<name>Calcite</name>
@@ -61,7 +61,7 @@ limitations under the License.
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-calcite.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-calcite.git</developerConnection>
<url>https://github.com/apache/incubator-calcite</url>
- <tag>calcite-1.0.0-incubating</tag>
+ <tag>HEAD</tag>
</scm>
<modules>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/ff2dfef9/spark/pom.xml
----------------------------------------------------------------------
diff --git a/spark/pom.xml b/spark/pom.xml
index 810e4b7..b0c21a2 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.0.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>calcite-spark</artifactId>
<packaging>jar</packaging>
- <version>1.0.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
<name>Calcite Spark</name>
<properties>
http://git-wip-us.apache.org/repos/asf/incubator-calcite/blob/ff2dfef9/splunk/pom.xml
----------------------------------------------------------------------
diff --git a/splunk/pom.xml b/splunk/pom.xml
index b643b73..d8546b2 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.0.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>calcite-splunk</artifactId>
<packaging>jar</packaging>
- <version>1.0.0-incubating</version>
+ <version>1.1.0-incubating-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/incubator-calcite/blob/ff2dfef9/ubenchmark/pom.xml
----------------------------------------------------------------------
diff --git a/ubenchmark/pom.xml b/ubenchmark/pom.xml
index be445ea..cc5859f 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.0.0-incubating</version>
+ <version>1.1.0-incubating-SNAPSHOT</version>
</parent>
<properties>