You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by ch...@apache.org on 2022/06/21 01:56:48 UTC
[calcite] branch main updated (1226d1a339 -> 0ae65494d3)
This is an automated email from the ASF dual-hosted git repository.
chunwei pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/calcite.git
from 1226d1a339 [CALCITE-5191] Allow ORDER BY alias in BigQuery
new 2584f03d19 Remove unreachable condition in CsvTableScan
new 0ae65494d3 Remove other instance of JsonTable
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/apache/calcite/adapter/csv/CsvTableScan.java | 8 --------
.../main/java/org/apache/calcite/adapter/file/CsvTableScan.java | 7 -------
2 files changed, 15 deletions(-)
[calcite] 02/02: Remove other instance of JsonTable
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chunwei pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/calcite.git
commit 0ae65494d3b20964a779bcb2b2600fda332b1162
Author: Daniel Henneberger <gi...@danielhenneberger.com>
AuthorDate: Tue Jun 14 12:14:47 2022 -0700
Remove other instance of JsonTable
Signed-off-by: Daniel Henneberger <gi...@danielhenneberger.com>
---
.../main/java/org/apache/calcite/adapter/csv/CsvTableScan.java | 8 --------
1 file changed, 8 deletions(-)
diff --git a/example/csv/src/main/java/org/apache/calcite/adapter/csv/CsvTableScan.java b/example/csv/src/main/java/org/apache/calcite/adapter/csv/CsvTableScan.java
index fbf3b9fe6a..6de7542834 100644
--- a/example/csv/src/main/java/org/apache/calcite/adapter/csv/CsvTableScan.java
+++ b/example/csv/src/main/java/org/apache/calcite/adapter/csv/CsvTableScan.java
@@ -21,7 +21,6 @@ import org.apache.calcite.adapter.enumerable.EnumerableRel;
import org.apache.calcite.adapter.enumerable.EnumerableRelImplementor;
import org.apache.calcite.adapter.enumerable.PhysType;
import org.apache.calcite.adapter.enumerable.PhysTypeImpl;
-import org.apache.calcite.adapter.file.JsonTable;
import org.apache.calcite.linq4j.tree.Blocks;
import org.apache.calcite.linq4j.tree.Expressions;
import org.apache.calcite.linq4j.tree.Primitive;
@@ -107,13 +106,6 @@ public class CsvTableScan extends TableScan implements EnumerableRel {
getRowType(),
pref.preferArray());
- if (table instanceof JsonTable) {
- return implementor.result(
- physType,
- Blocks.toBlock(
- Expressions.call(table.getExpression(JsonTable.class),
- "enumerable")));
- }
return implementor.result(
physType,
Blocks.toBlock(
[calcite] 01/02: Remove unreachable condition in CsvTableScan
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chunwei pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/calcite.git
commit 2584f03d195b5a117c832f56a827a4848bdd45f5
Author: henneberger <me...@danielhenneberger.com>
AuthorDate: Tue Jun 14 12:03:39 2022 -0700
Remove unreachable condition in CsvTableScan
This removes an unreachable condition in CsvTableScan when checking if a table is a JsonTable. The table object can only take the form of a RelOptTable and not a Table.
---
.../main/java/org/apache/calcite/adapter/file/CsvTableScan.java | 7 -------
1 file changed, 7 deletions(-)
diff --git a/file/src/main/java/org/apache/calcite/adapter/file/CsvTableScan.java b/file/src/main/java/org/apache/calcite/adapter/file/CsvTableScan.java
index d0157094ad..c446b16c8a 100644
--- a/file/src/main/java/org/apache/calcite/adapter/file/CsvTableScan.java
+++ b/file/src/main/java/org/apache/calcite/adapter/file/CsvTableScan.java
@@ -106,13 +106,6 @@ public class CsvTableScan extends TableScan implements EnumerableRel {
getRowType(),
pref.preferArray());
- if (table instanceof JsonTable) {
- return implementor.result(
- physType,
- Blocks.toBlock(
- Expressions.call(table.getExpression(JsonTable.class),
- "enumerable")));
- }
return implementor.result(
physType,
Blocks.toBlock(