You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ja...@apache.org on 2019/07/24 13:16:39 UTC
[flink] branch release-1.9 updated: [FLINK-13402][table] Copy
RelOptCluster to flink planner to fix "RelOptCluster's constructor can not
be accessed when connector depends on both planners"
This is an automated email from the ASF dual-hosted git repository.
jark pushed a commit to branch release-1.9
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.9 by this push:
new 1d962c7 [FLINK-13402][table] Copy RelOptCluster to flink planner to fix "RelOptCluster's constructor can not be accessed when connector depends on both planners"
1d962c7 is described below
commit 1d962c7e2b97426772af246965fcbd62603baa91
Author: godfreyhe <go...@163.com>
AuthorDate: Wed Jul 24 17:14:59 2019 +0800
[FLINK-13402][table] Copy RelOptCluster to flink planner to fix "RelOptCluster's constructor can not be accessed when connector depends on both planners"
This closes #9215
---
.../main/java/org/apache/calcite/plan/RelOptCluster.java | 1 +
.../main/java/org/apache/calcite/plan/RelOptCluster.java | 16 +++++++++-------
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/flink-table/flink-table-planner-blink/src/main/java/org/apache/calcite/plan/RelOptCluster.java b/flink-table/flink-table-planner-blink/src/main/java/org/apache/calcite/plan/RelOptCluster.java
index 987d1eb..e32a597 100644
--- a/flink-table/flink-table-planner-blink/src/main/java/org/apache/calcite/plan/RelOptCluster.java
+++ b/flink-table/flink-table-planner-blink/src/main/java/org/apache/calcite/plan/RelOptCluster.java
@@ -35,6 +35,7 @@ import java.util.concurrent.atomic.AtomicInteger;
/**
* This class is copied from Calcite's {@link org.apache.calcite.plan.RelOptCluster},
* can be removed after https://issues.apache.org/jira/browse/CALCITE-2855 is accepted.
+ * NOTES: please make sure to synchronize with RelDecorrelator in flink planner when changing this class.
*
* Modification:
* - Make non-deprecated constructor public
diff --git a/flink-table/flink-table-planner-blink/src/main/java/org/apache/calcite/plan/RelOptCluster.java b/flink-table/flink-table-planner/src/main/java/org/apache/calcite/plan/RelOptCluster.java
similarity index 91%
copy from flink-table/flink-table-planner-blink/src/main/java/org/apache/calcite/plan/RelOptCluster.java
copy to flink-table/flink-table-planner/src/main/java/org/apache/calcite/plan/RelOptCluster.java
index 987d1eb..82a2bd6d 100644
--- a/flink-table/flink-table-planner-blink/src/main/java/org/apache/calcite/plan/RelOptCluster.java
+++ b/flink-table/flink-table-planner/src/main/java/org/apache/calcite/plan/RelOptCluster.java
@@ -1,12 +1,13 @@
/*
- * 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
+ * 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
+ * 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,
@@ -35,6 +36,7 @@ import java.util.concurrent.atomic.AtomicInteger;
/**
* This class is copied from Calcite's {@link org.apache.calcite.plan.RelOptCluster},
* can be removed after https://issues.apache.org/jira/browse/CALCITE-2855 is accepted.
+ * NOTES: please make sure to synchronize with RelDecorrelator in blink planner when changing this class.
*
* Modification:
* - Make non-deprecated constructor public