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 2016/12/28 23:17:04 UTC
calcite git commit: Concluding [CALCITE-1555] Enable Join.isValid
Repository: calcite
Updated Branches:
refs/heads/master 1d2067bd0 -> 70b832513
Concluding [CALCITE-1555] Enable Join.isValid
This change corrects the nullability of RexInputRefs used in a Join's
ON clause. Previously, a namespace used in an outer join was made
nullable, but that was incorrect for the ON clause. To fix, we add
class ScopeChild and record that the namespace is nullable when used
from afar, but we don't alter the row type of the namespace.
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/70b83251
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/70b83251
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/70b83251
Branch: refs/heads/master
Commit: 70b8325130bc6be953e5a9a0ce99f9e0c383268b
Parents: 1d2067b
Author: Julian Hyde <jh...@apache.org>
Authored: Mon Dec 26 17:42:18 2016 -0800
Committer: Julian Hyde <jh...@apache.org>
Committed: Wed Dec 28 14:04:47 2016 -0800
----------------------------------------------------------------------
.../java/org/apache/calcite/rel/core/Join.java | 5 +-
.../calcite/sql/validate/AbstractNamespace.java | 12 ---
.../sql/validate/DelegatingNamespace.java | 1 -
.../calcite/sql/validate/DelegatingScope.java | 46 +++++-----
.../apache/calcite/sql/validate/EmptyScope.java | 3 +-
.../apache/calcite/sql/validate/JoinScope.java | 7 +-
.../apache/calcite/sql/validate/ListScope.java | 77 ++++++++++-------
.../apache/calcite/sql/validate/OverScope.java | 2 +-
.../apache/calcite/sql/validate/ScopeChild.java | 63 ++++++++++++++
.../calcite/sql/validate/SelectScope.java | 2 +-
.../calcite/sql/validate/SqlValidatorImpl.java | 91 ++++++++++----------
.../sql/validate/SqlValidatorNamespace.java | 5 +-
.../calcite/sql/validate/SqlValidatorScope.java | 29 +++++--
.../calcite/sql/validate/SqlValidatorUtil.java | 4 +-
.../apache/calcite/sql/validate/TableScope.java | 5 +-
.../apache/calcite/sql/validate/WithScope.java | 5 +-
.../calcite/sql2rel/SqlToRelConverter.java | 8 +-
.../apache/calcite/test/RelOptRulesTest.java | 2 +
18 files changed, 223 insertions(+), 144 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/70b83251/core/src/main/java/org/apache/calcite/rel/core/Join.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/rel/core/Join.java b/core/src/main/java/org/apache/calcite/rel/core/Join.java
index a65ace5..2952fd1 100644
--- a/core/src/main/java/org/apache/calcite/rel/core/Join.java
+++ b/core/src/main/java/org/apache/calcite/rel/core/Join.java
@@ -141,15 +141,14 @@ public abstract class Join extends BiRel {
return joinType;
}
- // TODO: enable
- public boolean isValid_(Litmus litmus, Context context) {
+ @Override public boolean isValid(Litmus litmus, Context context) {
if (!super.isValid(litmus, context)) {
return false;
}
if (getRowType().getFieldCount()
!= getSystemFieldList().size()
+ left.getRowType().getFieldCount()
- + right.getRowType().getFieldCount()) {
+ + (this instanceof SemiJoin ? 0 : right.getRowType().getFieldCount())) {
return litmus.fail("field count mismatch");
}
if (condition != null) {
http://git-wip-us.apache.org/repos/asf/calcite/blob/70b83251/core/src/main/java/org/apache/calcite/sql/validate/AbstractNamespace.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/validate/AbstractNamespace.java b/core/src/main/java/org/apache/calcite/sql/validate/AbstractNamespace.java
index 9ddf257..d5f3c18 100644
--- a/core/src/main/java/org/apache/calcite/sql/validate/AbstractNamespace.java
+++ b/core/src/main/java/org/apache/calcite/sql/validate/AbstractNamespace.java
@@ -50,8 +50,6 @@ abstract class AbstractNamespace implements SqlValidatorNamespace {
/** As {@link #rowType}, but not necessarily a struct. */
protected RelDataType type;
- private boolean forceNullable;
-
protected final SqlNode enclosingNode;
//~ Constructors -----------------------------------------------------------
@@ -87,15 +85,6 @@ abstract class AbstractNamespace implements SqlValidatorNamespace {
Util.permAssert(
type != null,
"validateImpl() returned null");
- if (forceNullable) {
- // REVIEW jvs 10-Oct-2005: This may not be quite right
- // if it means that nullability will be forced in the
- // ON clause where it doesn't belong.
- type =
- validator.getTypeFactory().createTypeWithNullability(
- type,
- true);
- }
setType(type);
} finally {
status = SqlValidatorImpl.Status.VALID;
@@ -172,7 +161,6 @@ abstract class AbstractNamespace implements SqlValidatorNamespace {
}
public void makeNullable() {
- forceNullable = true;
}
public String translate(String name) {
http://git-wip-us.apache.org/repos/asf/calcite/blob/70b83251/core/src/main/java/org/apache/calcite/sql/validate/DelegatingNamespace.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/validate/DelegatingNamespace.java b/core/src/main/java/org/apache/calcite/sql/validate/DelegatingNamespace.java
index 7794002..0aba477 100644
--- a/core/src/main/java/org/apache/calcite/sql/validate/DelegatingNamespace.java
+++ b/core/src/main/java/org/apache/calcite/sql/validate/DelegatingNamespace.java
@@ -98,7 +98,6 @@ public abstract class DelegatingNamespace implements SqlValidatorNamespace {
}
public void makeNullable() {
- namespace.makeNullable();
}
public String translate(String name) {
http://git-wip-us.apache.org/repos/asf/calcite/blob/70b83251/core/src/main/java/org/apache/calcite/sql/validate/DelegatingScope.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/validate/DelegatingScope.java b/core/src/main/java/org/apache/calcite/sql/validate/DelegatingScope.java
index d9fd167..52983d1 100644
--- a/core/src/main/java/org/apache/calcite/sql/validate/DelegatingScope.java
+++ b/core/src/main/java/org/apache/calcite/sql/validate/DelegatingScope.java
@@ -76,7 +76,8 @@ public abstract class DelegatingScope implements SqlValidatorScope {
//~ Methods ----------------------------------------------------------------
- public void addChild(SqlValidatorNamespace ns, String alias) {
+ @Override public void addChild(SqlValidatorNamespace ns, String alias,
+ boolean nullable) {
// By default, you cannot add to a scope. Derived classes can
// override.
throw new UnsupportedOperationException();
@@ -88,10 +89,10 @@ public abstract class DelegatingScope implements SqlValidatorScope {
/** If a record type allows implicit references to fields, recursively looks
* into the fields. Otherwise returns immediately. */
- void resolveInNamespace(SqlValidatorNamespace ns, List<String> names,
- Path path, Resolved resolved) {
+ void resolveInNamespace(SqlValidatorNamespace ns, boolean nullable,
+ List<String> names, Path path, Resolved resolved) {
if (names.isEmpty()) {
- resolved.found(ns, this, path);
+ resolved.found(ns, nullable, this, path);
return;
}
final RelDataType rowType = ns.getRowType();
@@ -110,7 +111,7 @@ public abstract class DelegatingScope implements SqlValidatorScope {
new FieldNamespace(validator, field.getType());
final Step path2 = path.add(rowType, field.getIndex(),
StructKind.FULLY_QUALIFIED);
- resolveInNamespace(ns2, remainder, path2, resolved);
+ resolveInNamespace(ns2, nullable, remainder, path2, resolved);
}
return;
}
@@ -123,8 +124,8 @@ public abstract class DelegatingScope implements SqlValidatorScope {
final SqlValidatorNamespace ns2 = ns.lookupChild(field0.getName());
final Step path2 = path.add(rowType, field0.getIndex(),
StructKind.FULLY_QUALIFIED);
- resolveInNamespace(ns2, names.subList(1, names.size()), path2,
- resolved);
+ resolveInNamespace(ns2, nullable, names.subList(1, names.size()),
+ path2, resolved);
} else {
for (RelDataTypeField field : rowType.getFieldList()) {
switch (field.getType().getStructKind()) {
@@ -133,7 +134,7 @@ public abstract class DelegatingScope implements SqlValidatorScope {
final Step path2 = path.add(rowType, field.getIndex(),
field.getType().getStructKind());
final SqlValidatorNamespace ns2 = ns.lookupChild(field.getName());
- resolveInNamespace(ns2, names, path2, resolved);
+ resolveInNamespace(ns2, nullable, names, path2, resolved);
}
}
}
@@ -172,8 +173,7 @@ public abstract class DelegatingScope implements SqlValidatorScope {
return parent.findQualifyingTableName(columnName, ctx);
}
- protected Map<String, SqlValidatorNamespace>
- findQualifyingTables(String columnName) {
+ protected Map<String, ScopeChild> findQualifyingTables(String columnName) {
return ImmutableMap.of();
}
@@ -223,8 +223,8 @@ public abstract class DelegatingScope implements SqlValidatorScope {
final SqlValidatorNamespace namespace = pair.right;
final ResolvedImpl resolved = new ResolvedImpl();
- resolveInNamespace(namespace,
- identifier.names, resolved.emptyPath(), resolved);
+ resolveInNamespace(namespace, false, identifier.names,
+ resolved.emptyPath(), resolved);
final RelDataTypeField field =
validator.catalogReader.field(namespace.getRowType(), columnName);
if (field != null) {
@@ -246,6 +246,7 @@ public abstract class DelegatingScope implements SqlValidatorScope {
default: {
SqlValidatorNamespace fromNs = null;
Path fromPath = null;
+ RelDataType fromRowType = null;
final ResolvedImpl resolved = new ResolvedImpl();
int size = identifier.names.size();
int i = size - 1;
@@ -257,32 +258,31 @@ public abstract class DelegatingScope implements SqlValidatorScope {
final Resolve resolve = resolved.only();
fromNs = resolve.namespace;
fromPath = resolve.path;
+ fromRowType = resolve.rowType();
break;
}
}
if (fromNs == null || fromNs instanceof SchemaNamespace) {
// Look for a column not qualified by a table alias.
columnName = identifier.names.get(0);
- final Map<String, SqlValidatorNamespace> map =
- findQualifyingTables(columnName);
+ final Map<String, ScopeChild> map = findQualifyingTables(columnName);
switch (map.size()) {
default:
final SqlIdentifier prefix1 = identifier.skipLast(1);
throw validator.newValidationError(prefix1,
RESOURCE.tableNameNotFound(prefix1.toString()));
case 1: {
- final Map.Entry<String, SqlValidatorNamespace> entry =
+ final Map.Entry<String, ScopeChild> entry =
map.entrySet().iterator().next();
final String tableName = entry.getKey();
- final SqlValidatorNamespace namespace = entry.getValue();
- fromNs = namespace;
+ fromNs = entry.getValue().namespace;
fromPath = resolved.emptyPath();
// Adding table name is for RecordType column with StructKind.PEEK_FIELDS or
// StructKind.PEEK_FIELDS only. Access to a field in a RecordType column of
// other StructKind should always be qualified with table name.
final RelDataTypeField field =
- validator.catalogReader.field(namespace.getRowType(), columnName);
+ validator.catalogReader.field(fromNs.getRowType(), columnName);
if (field != null) {
switch (field.getType().getStructKind()) {
case PEEK_FIELDS:
@@ -293,6 +293,7 @@ public abstract class DelegatingScope implements SqlValidatorScope {
final Resolve resolve = resolved.only();
fromNs = resolve.namespace;
fromPath = resolve.path;
+ fromRowType = resolve.rowType();
identifier = identifier
.setName(0, columnName)
.add(0, tableName, SqlParserPos.ZERO);
@@ -329,8 +330,8 @@ public abstract class DelegatingScope implements SqlValidatorScope {
identifier = identifier.setName(i - 1, alias);
}
}
- RelDataType fromRowType = fromNs.getRowType();
if (fromPath.stepCount() > 1) {
+ assert fromRowType != null;
for (Step p : fromPath.steps()) {
fromRowType = fromRowType.getFieldList().get(p.i).getType();
}
@@ -338,7 +339,8 @@ public abstract class DelegatingScope implements SqlValidatorScope {
}
final SqlIdentifier suffix = identifier.getComponent(i, size);
resolved.clear();
- resolveInNamespace(fromNs, suffix.names, resolved.emptyPath(), resolved);
+ resolveInNamespace(fromNs, false, suffix.names, resolved.emptyPath(),
+ resolved);
final Path path;
switch (resolved.count()) {
case 0:
@@ -349,8 +351,8 @@ public abstract class DelegatingScope implements SqlValidatorScope {
for (; k > i; --k) {
SqlIdentifier suffix2 = identifier.getComponent(i, k);
resolved.clear();
- resolveInNamespace(fromNs, suffix2.names, resolved.emptyPath(),
- resolved);
+ resolveInNamespace(fromNs, false, suffix2.names,
+ resolved.emptyPath(), resolved);
if (resolved.count() > 0) {
break;
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/70b83251/core/src/main/java/org/apache/calcite/sql/validate/EmptyScope.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/validate/EmptyScope.java b/core/src/main/java/org/apache/calcite/sql/validate/EmptyScope.java
index e7f0ff8..3e3ce3f 100644
--- a/core/src/main/java/org/apache/calcite/sql/validate/EmptyScope.java
+++ b/core/src/main/java/org/apache/calcite/sql/validate/EmptyScope.java
@@ -105,7 +105,8 @@ class EmptyScope implements SqlValidatorScope {
RESOURCE.columnNotFound(columnName));
}
- public void addChild(SqlValidatorNamespace ns, String alias) {
+ public void addChild(SqlValidatorNamespace ns, String alias,
+ boolean nullable) {
// cannot add to the empty scope
throw new UnsupportedOperationException();
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/70b83251/core/src/main/java/org/apache/calcite/sql/validate/JoinScope.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/validate/JoinScope.java b/core/src/main/java/org/apache/calcite/sql/validate/JoinScope.java
index e8272d5..bf40e7d 100644
--- a/core/src/main/java/org/apache/calcite/sql/validate/JoinScope.java
+++ b/core/src/main/java/org/apache/calcite/sql/validate/JoinScope.java
@@ -59,8 +59,9 @@ public class JoinScope extends ListScope {
return join;
}
- public void addChild(SqlValidatorNamespace ns, String alias) {
- super.addChild(ns, alias);
+ public void addChild(SqlValidatorNamespace ns, String alias,
+ boolean nullable) {
+ super.addChild(ns, alias, nullable);
if ((usingScope != null) && (usingScope != parent)) {
// We're looking at a join within a join. Recursively add this
// child to its parent scope too. Example:
@@ -72,7 +73,7 @@ public class JoinScope extends ListScope {
//
// 'a' is a child namespace of 'a join b' and also of
// 'a join b join c'.
- usingScope.addChild(ns, alias);
+ usingScope.addChild(ns, alias, nullable);
}
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/70b83251/core/src/main/java/org/apache/calcite/sql/validate/ListScope.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/validate/ListScope.java b/core/src/main/java/org/apache/calcite/sql/validate/ListScope.java
index 444da8d..7c869c5 100644
--- a/core/src/main/java/org/apache/calcite/sql/validate/ListScope.java
+++ b/core/src/main/java/org/apache/calcite/sql/validate/ListScope.java
@@ -16,7 +16,6 @@
*/
package org.apache.calcite.sql.validate;
-import org.apache.calcite.linq4j.Ord;
import org.apache.calcite.rel.type.RelDataType;
import org.apache.calcite.rel.type.RelDataTypeField;
import org.apache.calcite.rel.type.StructKind;
@@ -24,7 +23,9 @@ import org.apache.calcite.sql.SqlNode;
import org.apache.calcite.util.Pair;
import org.apache.calcite.util.Util;
+import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
import java.util.ArrayList;
import java.util.Collection;
@@ -44,8 +45,7 @@ public abstract class ListScope extends DelegatingScope {
/**
* List of child {@link SqlValidatorNamespace} objects and their names.
*/
- protected final List<Pair<String, SqlValidatorNamespace>> children =
- new ArrayList<>();
+ public final List<ScopeChild> children = new ArrayList<>();
//~ Constructors -----------------------------------------------------------
@@ -55,9 +55,10 @@ public abstract class ListScope extends DelegatingScope {
//~ Methods ----------------------------------------------------------------
- public void addChild(SqlValidatorNamespace ns, String alias) {
- assert alias != null;
- children.add(Pair.of(alias, ns));
+ @Override public void addChild(SqlValidatorNamespace ns, String alias,
+ boolean nullable) {
+ Preconditions.checkNotNull(alias);
+ children.add(new ScopeChild(children.size(), alias, ns, nullable));
}
/**
@@ -66,33 +67,42 @@ public abstract class ListScope extends DelegatingScope {
* @return list of child namespaces
*/
public List<SqlValidatorNamespace> getChildren() {
- return Pair.right(children);
+ return Lists.transform(children, ScopeChild.NAMESPACE_FN);
+ }
+
+ /**
+ * Returns an immutable list of child names.
+ *
+ * @return list of child namespaces
+ */
+ List<String> getChildNames() {
+ return Lists.transform(children, ScopeChild.NAME_FN);
}
private int findChild(List<String> names) {
- for (Ord<Pair<String, SqlValidatorNamespace>> child : Ord.zip(children)) {
+ for (ScopeChild child : children) {
String lastName = Util.last(names);
- if (child.e.left != null) {
- if (!validator.catalogReader.matches(child.e.left, lastName)) {
+ if (child.name != null) {
+ if (!validator.catalogReader.matches(child.name, lastName)) {
// Alias does not match last segment. Don't consider the
// fully-qualified name. E.g.
// SELECT sales.emp.name FROM sales.emp AS otherAlias
continue;
}
if (names.size() == 1) {
- return child.i;
+ return child.ordinal;
}
}
// Look up the 2 tables independently, in case one is qualified with
// catalog & schema and the other is not.
- final SqlValidatorTable table = child.e.right.getTable();
+ final SqlValidatorTable table = child.namespace.getTable();
if (table != null) {
final SqlValidatorTable table2 =
validator.catalogReader.getTable(names);
if (table2 != null
&& table.getQualifiedName().equals(table2.getQualifiedName())) {
- return child.i;
+ return child.ordinal;
}
}
}
@@ -100,42 +110,43 @@ public abstract class ListScope extends DelegatingScope {
}
public void findAllColumnNames(List<SqlMoniker> result) {
- for (Pair<String, SqlValidatorNamespace> pair : children) {
- addColumnNames(pair.right, result);
+ for (ScopeChild child : children) {
+ addColumnNames(child.namespace, result);
}
parent.findAllColumnNames(result);
}
public void findAliases(Collection<SqlMoniker> result) {
- for (Pair<String, SqlValidatorNamespace> pair : children) {
- result.add(new SqlMonikerImpl(pair.left, SqlMonikerType.TABLE));
+ for (ScopeChild child : children) {
+ result.add(new SqlMonikerImpl(child.name, SqlMonikerType.TABLE));
}
parent.findAliases(result);
}
@Override public Pair<String, SqlValidatorNamespace>
findQualifyingTableName(final String columnName, SqlNode ctx) {
- final Map<String, SqlValidatorNamespace> map =
- findQualifyingTables(columnName);
+ final Map<String, ScopeChild> map = findQualifyingTables(columnName);
switch (map.size()) {
case 0:
return parent.findQualifyingTableName(columnName, ctx);
case 1:
- return Pair.of(map.entrySet().iterator().next());
+ final Map.Entry<String, ScopeChild> entry =
+ map.entrySet().iterator().next();
+ return Pair.of(entry.getKey(), entry.getValue().namespace);
default:
throw validator.newValidationError(ctx,
RESOURCE.columnAmbiguous(columnName));
}
}
- @Override public Map<String, SqlValidatorNamespace>
+ @Override public Map<String, ScopeChild>
findQualifyingTables(String columnName) {
- final Map<String, SqlValidatorNamespace> map = new HashMap<>();
- for (Pair<String, SqlValidatorNamespace> child : children) {
+ final Map<String, ScopeChild> map = new HashMap<>();
+ for (ScopeChild child : children) {
final ResolvedImpl resolved = new ResolvedImpl();
- resolve(ImmutableList.of(child.left, columnName), true, resolved);
+ resolve(ImmutableList.of(child.name, columnName), true, resolved);
if (resolved.count() > 0) {
- map.put(child.getKey(), child.getValue());
+ map.put(child.name, child);
}
}
return map;
@@ -148,21 +159,22 @@ public abstract class ListScope extends DelegatingScope {
if (i >= 0) {
final Step path =
resolved.emptyPath().add(null, i, StructKind.FULLY_QUALIFIED);
- resolved.found(children.get(i).right, this, path);
+ final ScopeChild child = children.get(i);
+ resolved.found(child.namespace, child.nullable, this, path);
return;
}
// Recursively look deeper into the record-valued fields of the namespace,
// if it allows skipping fields.
if (deep) {
- for (Ord<Pair<String, SqlValidatorNamespace>> child : Ord.zip(children)) {
+ for (ScopeChild child : children) {
// If identifier starts with table alias, remove the alias.
final List<String> names2 =
- validator.catalogReader.matches(child.e.left, names.get(0))
+ validator.catalogReader.matches(child.name, names.get(0))
? names.subList(1, names.size())
: names;
- resolveInNamespace(child.e.right, names2, resolved.emptyPath(),
- resolved);
+ resolveInNamespace(child.namespace, child.nullable, names2,
+ resolved.emptyPath(), resolved);
}
if (resolved.count() > 0) {
return;
@@ -177,8 +189,8 @@ public abstract class ListScope extends DelegatingScope {
public RelDataType resolveColumn(String columnName, SqlNode ctx) {
int found = 0;
RelDataType type = null;
- for (Pair<String, SqlValidatorNamespace> pair : children) {
- SqlValidatorNamespace childNs = pair.right;
+ for (ScopeChild child : children) {
+ SqlValidatorNamespace childNs = child.namespace;
final RelDataType childRowType = childNs.getRowType();
final RelDataTypeField field =
validator.catalogReader.field(childRowType, columnName);
@@ -197,6 +209,7 @@ public abstract class ListScope extends DelegatingScope {
RESOURCE.columnAmbiguous(columnName));
}
}
+
}
// End ListScope.java
http://git-wip-us.apache.org/repos/asf/calcite/blob/70b83251/core/src/main/java/org/apache/calcite/sql/validate/OverScope.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/validate/OverScope.java b/core/src/main/java/org/apache/calcite/sql/validate/OverScope.java
index 9d95513..d4a0762 100644
--- a/core/src/main/java/org/apache/calcite/sql/validate/OverScope.java
+++ b/core/src/main/java/org/apache/calcite/sql/validate/OverScope.java
@@ -75,7 +75,7 @@ public class OverScope extends ListScope {
}
if (children.size() == 1) {
- final SqlValidatorNamespace child = children.get(0).right;
+ final SqlValidatorNamespace child = children.get(0).namespace;
final List<Pair<SqlNode, SqlMonotonicity>> monotonicExprs =
child.getMonotonicExprs();
for (Pair<SqlNode, SqlMonotonicity> pair : monotonicExprs) {
http://git-wip-us.apache.org/repos/asf/calcite/blob/70b83251/core/src/main/java/org/apache/calcite/sql/validate/ScopeChild.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/validate/ScopeChild.java b/core/src/main/java/org/apache/calcite/sql/validate/ScopeChild.java
new file mode 100644
index 0000000..2b210b4
--- /dev/null
+++ b/core/src/main/java/org/apache/calcite/sql/validate/ScopeChild.java
@@ -0,0 +1,63 @@
+/*
+ * 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.
+ */
+package org.apache.calcite.sql.validate;
+
+import com.google.common.base.Function;
+
+/** One of the inputs of a {@link SqlValidatorScope}.
+ *
+ * <p>Most commonly, it is an item in a FROM clause, and consists of a namespace
+ * (the columns it provides), and optional name (table alias), and ordinal
+ * within the FROM clause. */
+class ScopeChild {
+ final int ordinal;
+ final String name;
+ final SqlValidatorNamespace namespace;
+ final boolean nullable;
+
+ static final Function<ScopeChild, SqlValidatorNamespace> NAMESPACE_FN =
+ new Function<ScopeChild, SqlValidatorNamespace>() {
+ public SqlValidatorNamespace apply(ScopeChild input) {
+ return input.namespace;
+ }
+ };
+
+ static final Function<ScopeChild, String> NAME_FN =
+ new Function<ScopeChild, String>() {
+ public String apply(ScopeChild input) {
+ return input.name;
+ }
+ };
+
+ /** Creates a ScopeChild.
+ *
+ * @param ordinal Ordinal of child within parent scope
+ * @param name Table alias (may be null)
+ * @param namespace Namespace of child
+ * @param nullable Whether fields of the child are nullable when seen from the
+ * parent, due to outer joins
+ */
+ ScopeChild(int ordinal, String name, SqlValidatorNamespace namespace,
+ boolean nullable) {
+ this.ordinal = ordinal;
+ this.name = name;
+ this.namespace = namespace;
+ this.nullable = nullable;
+ }
+}
+
+// End ScopeChild.java
http://git-wip-us.apache.org/repos/asf/calcite/blob/70b83251/core/src/main/java/org/apache/calcite/sql/validate/SelectScope.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/validate/SelectScope.java b/core/src/main/java/org/apache/calcite/sql/validate/SelectScope.java
index c53cb99..6550e0b 100644
--- a/core/src/main/java/org/apache/calcite/sql/validate/SelectScope.java
+++ b/core/src/main/java/org/apache/calcite/sql/validate/SelectScope.java
@@ -181,7 +181,7 @@ public class SelectScope extends ListScope {
// Compute on demand first call.
orderList = new SqlNodeList(SqlParserPos.ZERO);
if (children.size() == 1) {
- final SqlValidatorNamespace child = children.get(0).right;
+ final SqlValidatorNamespace child = children.get(0).namespace;
final List<Pair<SqlNode, SqlMonotonicity>> monotonicExprs =
child.getMonotonicExprs();
if (monotonicExprs.size() > 0) {
http://git-wip-us.apache.org/repos/asf/calcite/blob/70b83251/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorImpl.java b/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorImpl.java
index eac1b20..790fe48 100644
--- a/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorImpl.java
+++ b/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorImpl.java
@@ -444,13 +444,16 @@ public class SqlValidatorImpl implements SqlValidatorWithHints {
final SqlParserPos startPosition = identifier.getParserPosition();
switch (identifier.names.size()) {
case 1:
- for (Pair<String, SqlValidatorNamespace> p : scope.children) {
- if (p.right.getRowType().isDynamicStruct()) {
+ for (ScopeChild child : scope.children) {
+ final int before = types.size();
+ if (child.namespace.getRowType().isDynamicStruct()) {
// don't expand star if the underneath table is dynamic.
// Treat this star as a special field in validation/conversion and
// wait until execution time to expand this star.
- final SqlNode exp = new SqlIdentifier(
- ImmutableList.of(p.left, DynamicRecordType.DYNAMIC_STAR_PREFIX),
+ final SqlNode exp =
+ new SqlIdentifier(
+ ImmutableList.of(child.name,
+ DynamicRecordType.DYNAMIC_STAR_PREFIX),
startPosition);
addToSelectList(
selectItems,
@@ -460,7 +463,7 @@ public class SqlValidatorImpl implements SqlValidatorWithHints {
scope,
includeSystemVars);
} else {
- final SqlNode from = p.right.getNode();
+ final SqlNode from = child.namespace.getNode();
final SqlValidatorNamespace fromNs = getNamespace(from, scope);
assert fromNs != null;
final RelDataType rowType = fromNs.getRowType();
@@ -470,7 +473,7 @@ public class SqlValidatorImpl implements SqlValidatorWithHints {
// TODO: do real implicit collation here
final SqlIdentifier exp =
new SqlIdentifier(
- ImmutableList.of(p.left, columnName),
+ ImmutableList.of(child.name, columnName),
startPosition);
addOrExpandField(
selectItems,
@@ -482,6 +485,17 @@ public class SqlValidatorImpl implements SqlValidatorWithHints {
field);
}
}
+ if (child.nullable) {
+ for (int i = before; i < types.size(); i++) {
+ final Map.Entry<String, RelDataType> entry = types.get(i);
+ final RelDataType type = entry.getValue();
+ if (!type.isNullable()) {
+ types.set(i,
+ Pair.of(entry.getKey(),
+ typeFactory.createTypeWithNullability(type, true)));
+ }
+ }
+ }
}
return true;
@@ -496,8 +510,7 @@ public class SqlValidatorImpl implements SqlValidatorWithHints {
throw newValidationError(prefixId,
RESOURCE.unknownIdentifier(prefixId.toString()));
}
- final SqlValidatorNamespace fromNs = resolved.only().namespace;
- final RelDataType rowType = fromNs.getRowType();
+ final RelDataType rowType = resolved.only().rowType();
if (rowType.isDynamicStruct()) {
// don't expand star if the underneath table is dynamic.
addToSelectList(
@@ -1786,7 +1799,7 @@ public class SqlValidatorImpl implements SqlValidatorWithHints {
ns.getNode(),
ns);
if (usingScope != null) {
- usingScope.addChild(ns, alias);
+ usingScope.addChild(ns, alias, forceNullable);
}
}
@@ -1990,7 +2003,7 @@ public class SqlValidatorImpl implements SqlValidatorWithHints {
if (tableScope == null) {
tableScope = new TableScope(parentScope, node);
}
- tableScope.addChild(newNs, alias);
+ tableScope.addChild(newNs, alias, forceNullable);
return newNode;
case LATERAL:
@@ -2065,11 +2078,8 @@ public class SqlValidatorImpl implements SqlValidatorWithHints {
call.setOperand(0, newOperand);
}
- for (Pair<String, SqlValidatorNamespace> p : overScope.children) {
- registerNamespace(
- usingScope,
- p.left,
- p.right,
+ for (ScopeChild child : overScope.children) {
+ registerNamespace(usingScope, child.name, child.namespace,
forceNullable);
}
@@ -2877,11 +2887,9 @@ public class SqlValidatorImpl implements SqlValidatorWithHints {
break;
case ON:
Util.permAssert(condition != null, "condition != null");
- if (condition != null) {
- SqlNode expandedCondition = expand(condition, joinScope);
- join.setOperand(5, expandedCondition);
- condition = join.getCondition();
- }
+ SqlNode expandedCondition = expand(condition, joinScope);
+ join.setOperand(5, expandedCondition);
+ condition = join.getCondition();
validateWhereOrOn(joinScope, condition, "ON");
break;
case USING:
@@ -3043,10 +3051,8 @@ public class SqlValidatorImpl implements SqlValidatorWithHints {
}
// Make sure that items in FROM clause have distinct aliases.
- final SqlValidatorScope fromScope = getFromScope(select);
- final List<Pair<String, SqlValidatorNamespace>> children =
- ((SelectScope) fromScope).children;
- List<String> names = Pair.left(children);
+ final SelectScope fromScope = (SelectScope) getFromScope(select);
+ List<String> names = fromScope.getChildNames();
if (!catalogReader.isCaseSensitive()) {
names = Lists.transform(names,
new Function<String, String>() {
@@ -3057,10 +3063,10 @@ public class SqlValidatorImpl implements SqlValidatorWithHints {
}
final int duplicateAliasOrdinal = Util.firstDuplicate(names);
if (duplicateAliasOrdinal >= 0) {
- final Pair<String, SqlValidatorNamespace> child =
- children.get(duplicateAliasOrdinal);
- throw newValidationError(child.right.getEnclosingNode(),
- RESOURCE.fromAliasDuplicate(child.left));
+ final ScopeChild child =
+ fromScope.children.get(duplicateAliasOrdinal);
+ throw newValidationError(child.namespace.getEnclosingNode(),
+ RESOURCE.fromAliasDuplicate(child.name));
}
if (select.getFrom() == null) {
@@ -3137,11 +3143,11 @@ public class SqlValidatorImpl implements SqlValidatorWithHints {
switch (modality) {
case STREAM:
if (scope.children.size() == 1) {
- for (Pair<String, SqlValidatorNamespace> namespace : scope.children) {
- if (!namespace.right.supportsModality(modality)) {
+ for (ScopeChild child : scope.children) {
+ if (!child.namespace.supportsModality(modality)) {
if (fail) {
- throw newValidationError(namespace.right.getNode(),
- Static.RESOURCE.cannotConvertToStream(namespace.left));
+ throw newValidationError(child.namespace.getNode(),
+ Static.RESOURCE.cannotConvertToStream(child.name));
} else {
return false;
}
@@ -3149,20 +3155,15 @@ public class SqlValidatorImpl implements SqlValidatorWithHints {
}
} else {
int supportsModalityCount = 0;
- for (Pair<String, SqlValidatorNamespace> namespace : scope.children) {
- if (namespace.right.supportsModality(modality)) {
+ for (ScopeChild child : scope.children) {
+ if (child.namespace.supportsModality(modality)) {
++supportsModalityCount;
}
}
if (supportsModalityCount == 0) {
if (fail) {
- List<String> inputList = new ArrayList<String>();
- for (Pair<String, SqlValidatorNamespace> namespace : scope.children) {
- inputList.add(namespace.left);
- }
- String inputs = Joiner.on(", ").join(inputList);
-
+ String inputs = Joiner.on(", ").join(scope.getChildNames());
throw newValidationError(select,
Static.RESOURCE.cannotStreamResultsForNonStreamingInputs(inputs));
} else {
@@ -3172,11 +3173,11 @@ public class SqlValidatorImpl implements SqlValidatorWithHints {
}
break;
default:
- for (Pair<String, SqlValidatorNamespace> namespace : scope.children) {
- if (!namespace.right.supportsModality(modality)) {
+ for (ScopeChild child : scope.children) {
+ if (!child.namespace.supportsModality(modality)) {
if (fail) {
- throw newValidationError(namespace.right.getNode(),
- Static.RESOURCE.cannotConvertToRelation(namespace.left));
+ throw newValidationError(child.namespace.getNode(),
+ Static.RESOURCE.cannotConvertToRelation(child.name));
} else {
return false;
}
@@ -4485,7 +4486,7 @@ public class SqlValidatorImpl implements SqlValidatorWithHints {
if (resolved.count() == 1) {
// There's a namespace with the name we seek.
final SqlValidatorScope.Resolve resolve = resolved.only();
- type = resolve.namespace.getRowType();
+ type = resolve.rowType();
for (SqlValidatorScope.Step p : Util.skip(resolve.path.steps())) {
type = type.getFieldList().get(p.i).getType();
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/70b83251/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorNamespace.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorNamespace.java b/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorNamespace.java
index 2e2af29..da8d031 100644
--- a/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorNamespace.java
+++ b/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorNamespace.java
@@ -158,10 +158,7 @@ public interface SqlValidatorNamespace {
*/
SqlMonotonicity getMonotonicity(String columnName);
- /**
- * Makes all fields in this namespace nullable (typically because it is on
- * the outer side of an outer join.
- */
+ @Deprecated // to be removed before 2.0
void makeNullable();
/**
http://git-wip-us.apache.org/repos/asf/calcite/blob/70b83251/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorScope.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorScope.java b/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorScope.java
index c30b9ff..49f109f 100644
--- a/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorScope.java
+++ b/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorScope.java
@@ -111,8 +111,9 @@ public interface SqlValidatorScope {
*
* @param ns Namespace representing the result-columns of the relation
* @param alias Alias with which to reference the relation, must not be null
+ * @param nullable Whether this is a null-generating side of a join
*/
- void addChild(SqlValidatorNamespace ns, String alias);
+ void addChild(SqlValidatorNamespace ns, String alias, boolean nullable);
/**
* Finds a window with a given name. Returns null if not found.
@@ -179,8 +180,8 @@ public interface SqlValidatorScope {
/** Callback from
* {@link SqlValidatorScope#resolve(List, boolean, Resolved)}. */
interface Resolved {
- void found(SqlValidatorNamespace namespace, SqlValidatorScope scope,
- Path path);
+ void found(SqlValidatorNamespace namespace, boolean nullable,
+ SqlValidatorScope scope, Path path);
int count();
Path emptyPath();
}
@@ -242,8 +243,9 @@ public interface SqlValidatorScope {
final List<Resolve> resolves = new ArrayList<>();
private final EmptyPath emptyPath = new EmptyPath();
- public void found(SqlValidatorNamespace namespace, SqlValidatorScope scope, Path path) {
- resolves.add(new Resolve(namespace, scope, path));
+ public void found(SqlValidatorNamespace namespace, boolean nullable,
+ SqlValidatorScope scope, Path path) {
+ resolves.add(new Resolve(namespace, nullable, scope, path));
}
public int count() {
@@ -268,14 +270,23 @@ public interface SqlValidatorScope {
/** A match found when looking up a name. */
class Resolve {
public final SqlValidatorNamespace namespace;
- public final SqlValidatorScope scope;
+ private final boolean nullable;
+ public final SqlValidatorScope scope; // may be null
public final Path path;
- Resolve(SqlValidatorNamespace namespace, SqlValidatorScope scope,
- Path path) {
+ Resolve(SqlValidatorNamespace namespace, boolean nullable,
+ SqlValidatorScope scope, Path path) {
this.namespace = Preconditions.checkNotNull(namespace);
+ this.nullable = nullable;
this.scope = scope;
- this.path = path;
+ this.path = Preconditions.checkNotNull(path);
+ }
+
+ /** The row type of the found namespace, nullable if the lookup has
+ * looked into outer joins. */
+ public RelDataType rowType() {
+ return namespace.getValidator().getTypeFactory()
+ .createTypeWithNullability(namespace.getRowType(), nullable);
}
}
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/70b83251/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorUtil.java b/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorUtil.java
index 954a84b..c4b07f1 100644
--- a/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorUtil.java
+++ b/core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorUtil.java
@@ -695,7 +695,7 @@ public class SqlValidatorUtil {
assert resolved.count() == 1;
final SqlValidatorScope.Resolve resolve = resolved.only();
- final SqlValidatorNamespace foundNs = resolve.namespace;
+ final RelDataType rowType = resolve.rowType();
final int childNamespaceIndex = resolve.path.steps().get(0).i;
int namespaceOffset = 0;
@@ -715,7 +715,7 @@ public class SqlValidatorUtil {
}
RelDataTypeField field =
- scope.getValidator().getCatalogReader().field(foundNs.getRowType(),
+ scope.getValidator().getCatalogReader().field(rowType,
originalFieldName);
int origPos = namespaceOffset + field.getIndex();
http://git-wip-us.apache.org/repos/asf/calcite/blob/70b83251/core/src/main/java/org/apache/calcite/sql/validate/TableScope.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/validate/TableScope.java b/core/src/main/java/org/apache/calcite/sql/validate/TableScope.java
index 657b7de..aa81d41 100644
--- a/core/src/main/java/org/apache/calcite/sql/validate/TableScope.java
+++ b/core/src/main/java/org/apache/calcite/sql/validate/TableScope.java
@@ -49,9 +49,10 @@ class TableScope extends ListScope {
//~ Methods ----------------------------------------------------------------
- @Override public void addChild(SqlValidatorNamespace ns, String alias) {
+ @Override public void addChild(SqlValidatorNamespace ns, String alias,
+ boolean nullable) {
if (beforeLateral) {
- super.addChild(ns, alias);
+ super.addChild(ns, alias, nullable);
}
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/70b83251/core/src/main/java/org/apache/calcite/sql/validate/WithScope.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql/validate/WithScope.java b/core/src/main/java/org/apache/calcite/sql/validate/WithScope.java
index 42c8b99..4d7bd65 100644
--- a/core/src/main/java/org/apache/calcite/sql/validate/WithScope.java
+++ b/core/src/main/java/org/apache/calcite/sql/validate/WithScope.java
@@ -54,13 +54,14 @@ class WithScope extends ListScope {
return super.getTableNamespace(names);
}
- @Override public void resolve(List<String> names, boolean deep, Resolved resolved) {
+ @Override public void resolve(List<String> names, boolean deep,
+ Resolved resolved) {
if (names.size() == 1
&& names.equals(withItem.name.names)) {
final SqlValidatorNamespace ns = validator.getNamespace(withItem);
final Step path = resolved.emptyPath()
.add(ns.getRowType(), 0, StructKind.FULLY_QUALIFIED);
- resolved.found(ns, null, path);
+ resolved.found(ns, false, null, path);
return;
}
super.resolve(names, deep, resolved);
http://git-wip-us.apache.org/repos/asf/calcite/blob/70b83251/core/src/main/java/org/apache/calcite/sql2rel/SqlToRelConverter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/calcite/sql2rel/SqlToRelConverter.java b/core/src/main/java/org/apache/calcite/sql2rel/SqlToRelConverter.java
index a712a7c..78fcac8 100644
--- a/core/src/main/java/org/apache/calcite/sql2rel/SqlToRelConverter.java
+++ b/core/src/main/java/org/apache/calcite/sql2rel/SqlToRelConverter.java
@@ -2210,6 +2210,7 @@ public class SqlToRelConverter {
assert resolved.count() == 1;
final SqlValidatorScope.Resolve resolve = resolved.only();
final SqlValidatorNamespace foundNs = resolve.namespace;
+ final RelDataType rowType = resolve.rowType();
final int childNamespaceIndex = resolve.path.steps().get(0).i;
final SqlValidatorScope ancestorScope = resolve.scope;
boolean correlInCurrentScope = ancestorScope == bb.scope;
@@ -2246,7 +2247,7 @@ public class SqlToRelConverter {
while (topLevelFieldAccess.getReferenceExpr() instanceof RexFieldAccess) {
topLevelFieldAccess = (RexFieldAccess) topLevelFieldAccess.getReferenceExpr();
}
- final RelDataTypeField field = foundNs.getRowType().getFieldList()
+ final RelDataTypeField field = rowType.getFieldList()
.get(topLevelFieldAccess.getField().getIndex() - namespaceOffset);
int pos = namespaceOffset + field.getIndex();
@@ -3910,7 +3911,7 @@ public class SqlToRelConverter {
return null;
}
final SqlValidatorScope.Resolve resolve = resolved.only();
- final SqlValidatorNamespace foundNs = resolve.namespace;
+ final RelDataType rowType = resolve.rowType();
// Found in current query's from list. Find which from item.
// We assume that the order of the from clause items has been
@@ -3936,8 +3937,7 @@ public class SqlToRelConverter {
final CorrelationId correlId = cluster.createCorrel();
mapCorrelToDeferred.put(correlId, lookup);
if (resolve.path.steps().get(0).i < 0) {
- return Pair.of(rexBuilder.makeCorrel(foundNs.getRowType(), correlId),
- null);
+ return Pair.of(rexBuilder.makeCorrel(rowType, correlId), null);
} else {
final RelDataTypeFactory.FieldInfoBuilder builder =
typeFactory.builder();
http://git-wip-us.apache.org/repos/asf/calcite/blob/70b83251/core/src/test/java/org/apache/calcite/test/RelOptRulesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/calcite/test/RelOptRulesTest.java b/core/src/test/java/org/apache/calcite/test/RelOptRulesTest.java
index 72cddd4..b349a7e 100644
--- a/core/src/test/java/org/apache/calcite/test/RelOptRulesTest.java
+++ b/core/src/test/java/org/apache/calcite/test/RelOptRulesTest.java
@@ -2873,6 +2873,7 @@ public class RelOptRulesTest extends RelOptTestBase {
checkSubQuery(sql).check();
}
+ @Ignore("[CALCITE-1045]")
@Test public void testExpandJoinIn() throws Exception {
final String sql = "select empno\n"
+ "from sales.emp left join sales.dept\n"
@@ -2880,6 +2881,7 @@ public class RelOptRulesTest extends RelOptTestBase {
checkSubQuery(sql).check();
}
+ @Ignore("[CALCITE-1045]")
@Test public void testExpandJoinInComposite() throws Exception {
final String sql = "select empno\n"
+ "from sales.emp left join sales.dept\n"