提交 86d32ac8 编写于 作者: J jingzhang 提交者: twalthr

[FLINK-6037] [table] Metadata provider didn't work in SQL

This closes #3559.
上级 ffb05607
......@@ -36,6 +36,7 @@ import org.apache.calcite.sql2rel.{SqlRexConvertletTable, SqlToRelConverter}
import org.apache.calcite.tools.{FrameworkConfig, RelConversionException}
import org.apache.flink.table.api.{SqlParserException, TableException, ValidationException}
import org.apache.flink.table.calcite.sql2rel.FlinkRelDecorrelator
import org.apache.flink.table.plan.cost.FlinkDefaultRelMetadataProvider
import scala.collection.JavaConversions._
......@@ -99,7 +100,7 @@ class FlinkPlannerImpl(
try {
assert(validatedSqlNode != null)
val rexBuilder: RexBuilder = createRexBuilder
val cluster: RelOptCluster = RelOptCluster.create(planner, rexBuilder)
val cluster: RelOptCluster = FlinkRelOptClusterFactory.create(planner, rexBuilder)
val config = SqlToRelConverter.configBuilder()
.withTrimUnusedFields(false).withConvertTableAccess(false).build()
val sqlToRelConverter: SqlToRelConverter = new SqlToRelConverter(
......@@ -140,7 +141,7 @@ class FlinkPlannerImpl(
validator.setIdentifierExpansion(true)
val validatedSqlNode: SqlNode = validator.validate(sqlNode)
val rexBuilder: RexBuilder = createRexBuilder
val cluster: RelOptCluster = RelOptCluster.create(planner, rexBuilder)
val cluster: RelOptCluster = FlinkRelOptClusterFactory.create(planner, rexBuilder)
val config: SqlToRelConverter.Config = SqlToRelConverter.configBuilder
.withTrimUnusedFields(false).withConvertTableAccess(false).build
val sqlToRelConverter: SqlToRelConverter = new SqlToRelConverter(
......
......@@ -84,12 +84,7 @@ object FlinkRelBuilder {
val planner = new VolcanoPlanner(config.getCostFactory, Contexts.empty())
planner.setExecutor(config.getExecutor)
planner.addRelTraitDef(ConventionTraitDef.INSTANCE)
val cluster = RelOptCluster.create(planner, new RexBuilder(typeFactory))
cluster.setMetadataProvider(FlinkDefaultRelMetadataProvider.INSTANCE)
// just set metadataProvider is not enough, see
// https://www.mail-archive.com/dev@calcite.apache.org/msg00930.html
RelMetadataQuery.THREAD_PROVIDERS.set(
JaninoRelMetadataProvider.of(cluster.getMetadataProvider))
val cluster = FlinkRelOptClusterFactory.create(planner, new RexBuilder(typeFactory))
val calciteSchema = CalciteSchema.from(config.getDefaultSchema)
val relOptSchema = new CalciteCatalogReader(
calciteSchema,
......
/*
* 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.flink.table.calcite
import org.apache.calcite.plan.{RelOptCluster, RelOptPlanner}
import org.apache.calcite.rel.metadata.{DefaultRelMetadataProvider, JaninoRelMetadataProvider, RelMetadataQuery}
import org.apache.calcite.rex.RexBuilder
import org.apache.flink.table.plan.cost.FlinkDefaultRelMetadataProvider
/**
* The utility class is to create special [[RelOptCluster]] instance which use
* [[FlinkDefaultRelMetadataProvider]] instead of [[DefaultRelMetadataProvider]].
*/
object FlinkRelOptClusterFactory {
def create(planner: RelOptPlanner, rexBuilder: RexBuilder): RelOptCluster = {
val cluster = RelOptCluster.create(planner, rexBuilder)
cluster.setMetadataProvider(FlinkDefaultRelMetadataProvider.INSTANCE)
// just set metadataProvider is not enough, see
// https://www.mail-archive.com/dev@calcite.apache.org/msg00930.html
RelMetadataQuery.THREAD_PROVIDERS.set(
JaninoRelMetadataProvider.of(cluster.getMetadataProvider))
cluster
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册