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 2018/02/14 05:46:11 UTC
[1/4] calcite git commit: [CALCITE-2099] Incorrect code generated for
UNION (Zhen Wang)
Repository: calcite
Updated Branches:
refs/heads/master db3794c25 -> 6981778c5
[CALCITE-2099] Incorrect code generated for UNION (Zhen Wang)
Close apache/calcite#625
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/bb57919d
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/bb57919d
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/bb57919d
Branch: refs/heads/master
Commit: bb57919df89cadeac117a966f4e9a74187267887
Parents: db3794c
Author: zhen wang <zi...@gmail.com>
Authored: Mon Feb 12 18:54:06 2018 +0800
Committer: Julian Hyde <jh...@apache.org>
Committed: Tue Feb 13 21:44:47 2018 -0800
----------------------------------------------------------------------
.../adapter/enumerable/EnumerableUnion.java | 4 ---
core/src/test/resources/sql/misc.iq | 36 ++++++++++++++++++++
.../java/org/apache/calcite/test/CsvTest.java | 10 +++++-
3 files changed, 45 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/bb57919d/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableUnion.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableUnion.java b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableUnion.java
index 2df6550..a3fb07c 100644
--- a/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableUnion.java
+++ b/core/src/main/java/org/apache/calcite/adapter/enumerable/EnumerableUnion.java
@@ -62,10 +62,6 @@ public class EnumerableUnion extends Union implements EnumerableRel {
Expressions.list(childExp)
.appendIfNotNull(result.physType.comparer()));
}
-
- // Once the first input has chosen its format, ask for the same for
- // other inputs.
- pref = pref.of(result.format);
}
builder.add(unionExp);
http://git-wip-us.apache.org/repos/asf/calcite/blob/bb57919d/core/src/test/resources/sql/misc.iq
----------------------------------------------------------------------
diff --git a/core/src/test/resources/sql/misc.iq b/core/src/test/resources/sql/misc.iq
index cac239d..b9d64cd 100644
--- a/core/src/test/resources/sql/misc.iq
+++ b/core/src/test/resources/sql/misc.iq
@@ -1030,6 +1030,42 @@ Expression 'DEPTNO' is not being grouped
!use scott
+# [CALCITE-2099] Incorrect code generated for UNION
+select count(*) as c from "scott".emp group by deptno
+union
+select count(*) as c from "scott".emp group by deptno;
++---+
+| C |
++---+
+| 3 |
+| 5 |
+| 6 |
++---+
+(3 rows)
+
+!ok
+
+# Similar
+select count(*) as c from "scott".emp group by job
+union all
+select count(*) as c from "scott".dept group by deptno;
++---+
+| C |
++---+
+| 1 |
+| 1 |
+| 1 |
+| 1 |
+| 1 |
+| 2 |
+| 3 |
+| 4 |
+| 4 |
++---+
+(9 rows)
+
+!ok
+
# [CALCITE-1864] Allow NULL literal as argument
select count(*) as c from "scott".emp where empno > null;
+---+
http://git-wip-us.apache.org/repos/asf/calcite/blob/bb57919d/example/csv/src/test/java/org/apache/calcite/test/CsvTest.java
----------------------------------------------------------------------
diff --git a/example/csv/src/test/java/org/apache/calcite/test/CsvTest.java b/example/csv/src/test/java/org/apache/calcite/test/CsvTest.java
index 8f7f9d8..b739a9d 100644
--- a/example/csv/src/test/java/org/apache/calcite/test/CsvTest.java
+++ b/example/csv/src/test/java/org/apache/calcite/test/CsvTest.java
@@ -483,7 +483,15 @@ public class CsvTest {
"C=1; T=1996-09-03")
.ok();
}
- @Test public void testBoolean() throws SQLException {
+
+ @Test public void testUnionGroupByWithoutGroupKey() {
+ final String sql = "select count(*) as c1 from EMPS group by NAME\n"
+ + "union\n"
+ + "select count(*) as c1 from EMPS group by NAME";
+ sql("model", sql).ok();
+ }
+
+ @Test public void testBoolean() {
sql("smart", "select empno, slacker from emps where slacker")
.returns("EMPNO=100; SLACKER=true").ok();
}
[4/4] calcite git commit: Site: Add Nishant Bangarwa and Edmon Begoli
as committers; update talks
Posted by jh...@apache.org.
Site: Add Nishant Bangarwa and Edmon Begoli as committers; update talks
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/43242251
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/43242251
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/43242251
Branch: refs/heads/master
Commit: 432422516a3c4f3a5c38e6e88850d1826555d48b
Parents: 962c0a5
Author: Julian Hyde <jh...@apache.org>
Authored: Wed Jan 24 12:31:30 2018 -0800
Committer: Julian Hyde <jh...@apache.org>
Committed: Tue Feb 13 21:44:50 2018 -0800
----------------------------------------------------------------------
site/_data/contributors.yml | 10 ++++++++++
site/community/index.md | 4 +---
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/43242251/site/_data/contributors.yml
----------------------------------------------------------------------
diff --git a/site/_data/contributors.yml b/site/_data/contributors.yml
index 5155958..c68b936 100644
--- a/site/_data/contributors.yml
+++ b/site/_data/contributors.yml
@@ -41,6 +41,11 @@
githubId: beikov
org: Blazebit
role: Committer
+- name: Edmon Begoli
+ apacheId: ebegoli
+ githubId: ebegoli
+ org: Oak Ridge National Laboratory
+ role: Committer
- name: Francis Chuang
apacheId: francischuang
githubId: F21
@@ -132,6 +137,11 @@
org:
role: PMC
homepage: http://www.n10k.com
+- name: Nishant Bangarwa
+ apacheId: nishant
+ githubId: nishantmonu51
+ org: Hortonworks
+ role: Committer
- name: Slim Bouguerra
apacheId: bslim
githubId: b-slim
http://git-wip-us.apache.org/repos/asf/calcite/blob/43242251/site/community/index.md
----------------------------------------------------------------------
diff --git a/site/community/index.md b/site/community/index.md
index 9cd0ac5..66e19fe 100644
--- a/site/community/index.md
+++ b/site/community/index.md
@@ -26,10 +26,8 @@ limitations under the License.
# Upcoming talks
-* 2017/10/30 [DataEngConf NYC](http://www.dataengconf.com/) (New York City, USA)
+* 2018/04/17-18 [DataEngConf SF](http://www.dataengconf.com/) (San Francisco, CA)
* [Don't optimize my queries, optimize my data!](http://www.dataengconf.com/dont-optimize-my-queries-optimize-my-data) (Julian Hyde)
-* 2017/11/14 [QCon](https://qconsf.com/) (San Francisco, USA)
- * [AMA: SQL Over Streams, Ask the Experts](https://qconsf.com/sf2017/presentation/ama-sql-over-streams-ask-experts) (Julian Hyde)
# Project Members
[3/4] calcite git commit: Site: Add Uber/AthenaX to powered-by page
(Shuyi Chen)
Posted by jh...@apache.org.
Site: Add Uber/AthenaX to powered-by page (Shuyi Chen)
Add Uber, Apache Geode to logos (Julian Hyde)
Close apache/calcite#626
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/6981778c
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/6981778c
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/6981778c
Branch: refs/heads/master
Commit: 6981778c5f2ff456aceaf10c77ef752ec0643c18
Parents: 4324225
Author: Shuyi Chen <sh...@uber.com>
Authored: Tue Feb 13 15:26:23 2018 -0800
Committer: Julian Hyde <jh...@apache.org>
Committed: Tue Feb 13 21:44:50 2018 -0800
----------------------------------------------------------------------
site/_docs/powered_by.md | 12 +++++++++---
site/img/powered-by.png | Bin 105042 -> 114615 bytes
2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/6981778c/site/_docs/powered_by.md
----------------------------------------------------------------------
diff --git a/site/_docs/powered_by.md b/site/_docs/powered_by.md
index ad557e2..b95ff41 100644
--- a/site/_docs/powered_by.md
+++ b/site/_docs/powered_by.md
@@ -83,10 +83,17 @@ uses Calcite for parsing streaming SQL and query optimization.
<a href="https://storm.apache.org">Apache Storm</a>
uses Calcite for parsing streaming SQL and query optimization.
+### AthenaX
+
+<a href="https://www.uber.com/">Uber</a>'s SQL-based streaming analytics platform
+<a href="https://github.com/uber/AthenaX/">AthenaX</a>
+uses Calcite for SQL parsing and query optimization.
+
### Cascading
<a href="https://github.com/Cascading/lingual">Lingual</a>
-component provides a SQL interface to Cascading.
+component provides a SQL interface to
+<a href="https://www.cascading.org/">Cascading</a>.
### Dremio
@@ -96,7 +103,7 @@ uses Calcite for SQL parsing and cost-based query optimization.
### MapD
<a href="https://www.mapd.com">MapD</a>
-is GPU-powered database and visual analytics platform for
+is a GPU-powered database and visual analytics platform for
interactive exploration of large datasets.
### Qubole Quark
@@ -111,4 +118,3 @@ It uses Calcite to transparently rewrite queries to use materialized views.
is a SQL interface to a
<a href="http://tinkerpop.apache.org/">Apache TinkerPop</a>-enabled
graph database.
-
http://git-wip-us.apache.org/repos/asf/calcite/blob/6981778c/site/img/powered-by.png
----------------------------------------------------------------------
diff --git a/site/img/powered-by.png b/site/img/powered-by.png
index 0e0772b..cc89a38 100644
Binary files a/site/img/powered-by.png and b/site/img/powered-by.png differ
[2/4] calcite git commit: Site: Move from ruby-2.1 to ruby-2.4;
upgrade github-pages, replace jekyll-oembed with jekyll_oembed
Posted by jh...@apache.org.
Site: Move from ruby-2.1 to ruby-2.4; upgrade github-pages, replace jekyll-oembed with jekyll_oembed
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/962c0a58
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/962c0a58
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/962c0a58
Branch: refs/heads/master
Commit: 962c0a585f29fdb8717fc84395d218ffa15d8cba
Parents: bb57919
Author: Julian Hyde <jh...@apache.org>
Authored: Fri Feb 9 15:04:06 2018 -0800
Committer: Julian Hyde <jh...@apache.org>
Committed: Tue Feb 13 21:44:50 2018 -0800
----------------------------------------------------------------------
site/Gemfile | 4 ++--
site/README.md | 2 +-
site/_config.yml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/962c0a58/site/Gemfile
----------------------------------------------------------------------
diff --git a/site/Gemfile b/site/Gemfile
index d608db6..cbd9d22 100644
--- a/site/Gemfile
+++ b/site/Gemfile
@@ -14,8 +14,8 @@
# limitations under the License.
#
source 'https://rubygems.org'
-gem 'github-pages', '67'
+gem 'github-pages', '150'
gem 'rouge'
-gem 'jekyll-oembed', :require => 'jekyll_oembed'
+gem 'jekyll_oembed'
gem 'jekyll-redirect-from'
# End Gemfile
http://git-wip-us.apache.org/repos/asf/calcite/blob/962c0a58/site/README.md
----------------------------------------------------------------------
diff --git a/site/README.md b/site/README.md
index 2cd5503..3f97cc7 100644
--- a/site/README.md
+++ b/site/README.md
@@ -24,7 +24,7 @@ This directory contains the code for the Apache Calcite web site,
## Setup
-Note that the site can currently only be built with Ruby 2.1.x.
+Site generation currently works best with ruby-2.4.1.
1. `cd site`
2. `svn co https://svn.apache.org/repos/asf/calcite/site target`
http://git-wip-us.apache.org/repos/asf/calcite/blob/962c0a58/site/_config.yml
----------------------------------------------------------------------
diff --git a/site/_config.yml b/site/_config.yml
index 799d4cc..08427ff 100644
--- a/site/_config.yml
+++ b/site/_config.yml
@@ -50,7 +50,7 @@ baseurl:
# The base path where the Avatica's website is deployed
avaticaBaseurl: /avatica
-gems:
+plugins:
- jekyll-redirect-from
# End _config.yml