[FLINK-23755][table] Modify the default value of table.dynamic-table-…

…options.enabled to true This closes apache#16887
tongcheng-elong · Aug 25, 2021 · d6484b9 · d6484b9
1 parent cd52056
commit d6484b9
Show file tree

Hide file tree

Showing 15 changed files with 2 additions and 43 deletions.
diff --git a/docs/content.zh/docs/dev/table/sql/queries/hints.md b/docs/content.zh/docs/dev/table/sql/queries/hints.md
@@ -43,8 +43,6 @@ SQL hints 一般可以用于以下：
 
 因此，它非常适合用于交互式终端中的特定查询，例如，在 SQL-CLI 中，你可以通过添加动态选项`/*+ OPTIONS('csv.ignore-parse-errors'='true') */`来指定忽略 CSV 源的解析错误。
 
-<b>注意：</b>动态表选项默认值禁止使用，因为它可能会更改查询的语义。你需要将配置项 `table.dynamic-table-options.enabled` 显式设置为 `true`（默认值为 false），请参阅 [Configuration]({{< ref "docs/dev/table/config" >}}) 了解有关如何设置配置选项的详细信息。
-
 <a name="syntax"></a>
 ### 语法
 为了不破坏 SQL 兼容性，我们使用 Oracle 风格的 SQL hints 语法：

diff --git a/docs/content/docs/dev/table/sql/queries/hints.md b/docs/content/docs/dev/table/sql/queries/hints.md
@@ -50,10 +50,6 @@ these options can be specified flexibly in per-table scope within each query.
 Thus it is very suitable to use for the ad-hoc queries in interactive terminal, for example, in the SQL-CLI,
 you can specify to ignore the parse error for a CSV source just by adding a dynamic option `/*+ OPTIONS('csv.ignore-parse-errors'='true') */`.
 
-<b>Note:</b> Dynamic table options default is forbidden to use because it may change the semantics of the query.
-You need to set the config option `table.dynamic-table-options.enabled` to be `true` explicitly (default is false),
-See the <a href="{{< ref "docs/dev/table/config" >}}">Configuration</a> for details on how to set up the config options.
-
 ### Syntax
 In order to not break the SQL compatibility, we use the Oracle style SQL hint syntax:
 ```sql

diff --git a/docs/layouts/shortcodes/generated/table_config_configuration.html b/docs/layouts/shortcodes/generated/table_config_configuration.html
@@ -16,7 +16,7 @@
  </tr>
  <tr>
  <td><h5>table.dynamic-table-options.enabled</h5><br> <span class="label label-primary">Batch</span> <span class="label label-primary">Streaming</span></td>
- <td style="word-wrap: break-word;">false</td>
+ <td style="word-wrap: break-word;">true</td>
  <td>Boolean</td>
  <td>Enable or disable the OPTIONS hint used to specify table options dynamically, if disabled, an exception would be thrown if any OPTIONS hint is specified</td>
  </tr>

diff --git a/...nk-table-api-java/src/main/java/org/apache/flink/table/api/config/TableConfigOptions.java b/...nk-table-api-java/src/main/java/org/apache/flink/table/api/config/TableConfigOptions.java
@@ -60,7 +60,7 @@ private TableConfigOptions() {}
  public static final ConfigOption<Boolean> TABLE_DYNAMIC_TABLE_OPTIONS_ENABLED =
  key("table.dynamic-table-options.enabled")
  .booleanType()
- .defaultValue(false)
+ .defaultValue(true)
  .withDescription(
  "Enable or disable the OPTIONS hint used to specify table options "
  + "dynamically, if disabled, an exception would be thrown "

diff --git a/.../src/test/java/org/apache/flink/table/planner/operations/SqlToOperationConverterTest.java b/.../src/test/java/org/apache/flink/table/planner/operations/SqlToOperationConverterTest.java
@@ -28,7 +28,6 @@
 import org.apache.flink.table.api.TableConfig;
 import org.apache.flink.table.api.TableSchema;
 import org.apache.flink.table.api.ValidationException;
-import org.apache.flink.table.api.config.TableConfigOptions;
 import org.apache.flink.table.api.constraints.UniqueConstraint;
 import org.apache.flink.table.catalog.Catalog;
 import org.apache.flink.table.catalog.CatalogDatabaseImpl;
@@ -1321,9 +1320,6 @@ public void testCreateViewWithMatchRecognize() {
 
  @Test
  public void testCreateViewWithDynamicTableOptions() {
- tableConfig
- .getConfiguration()
- .setBoolean(TableConfigOptions.TABLE_DYNAMIC_TABLE_OPTIONS_ENABLED, true);
  Map<String, String> prop = new HashMap<>();
  prop.put("connector", "values");
  prop.put("bounded", "true");

diff --git a/...le-planner/src/test/scala/org/apache/flink/table/planner/catalog/CatalogTableITCase.scala b/...le-planner/src/test/scala/org/apache/flink/table/planner/catalog/CatalogTableITCase.scala
@@ -61,10 +61,6 @@ class CatalogTableITCase(isStreamingMode: Boolean) extends AbstractTestBase {
 
  @Before
  def before(): Unit = {
- tableEnv.getConfig.getConfiguration.setBoolean(
- TableConfigOptions.TABLE_DYNAMIC_TABLE_OPTIONS_ENABLED,
- true)
-
  tableEnv.getConfig
  .getConfiguration
  .setInteger(ExecutionConfigOptions.TABLE_EXEC_RESOURCE_DEFAULT_PARALLELISM, 1)

diff --git a/...ble-planner/src/test/scala/org/apache/flink/table/planner/catalog/CatalogViewITCase.scala b/...ble-planner/src/test/scala/org/apache/flink/table/planner/catalog/CatalogViewITCase.scala
@@ -55,10 +55,6 @@ class CatalogViewITCase(isStreamingMode: Boolean) extends AbstractTestBase {
 
  @Before
  def before(): Unit = {
- tableEnv.getConfig.getConfiguration.setBoolean(
- TableConfigOptions.TABLE_DYNAMIC_TABLE_OPTIONS_ENABLED,
- true)
-
  tableEnv.getConfig
  .getConfiguration
  .setInteger(ExecutionConfigOptions.TABLE_EXEC_RESOURCE_DEFAULT_PARALLELISM, 1)

diff --git a/...planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/LegacySinkTest.scala b/...planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/LegacySinkTest.scala
@@ -78,8 +78,6 @@ class LegacySinkTest extends TableTestBase {
  |)
  """.stripMargin)
 
- util.tableEnv.getConfig.getConfiguration.setBoolean(
- TableConfigOptions.TABLE_DYNAMIC_TABLE_OPTIONS_ENABLED, true)
  util.tableEnv.executeSql(
  s"""
  |CREATE TABLE MySink (

diff --git a/.../src/test/scala/org/apache/flink/table/planner/plan/batch/sql/LegacyTableSourceTest.scala b/.../src/test/scala/org/apache/flink/table/planner/plan/batch/sql/LegacyTableSourceTest.scala
@@ -215,8 +215,6 @@ class LegacyTableSourceTest extends TableTestBase {
 
  @Test
  def testTableHint(): Unit = {
- util.tableEnv.getConfig.getConfiguration.setBoolean(
- TableConfigOptions.TABLE_DYNAMIC_TABLE_OPTIONS_ENABLED, true)
  val ddl =
  s"""
  |CREATE TABLE MyTable1 (

diff --git a/...-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/TableSinkTest.scala b/...-planner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/TableSinkTest.scala
@@ -115,8 +115,6 @@ class TableSinkTest extends TableTestBase {
  |)
  """.stripMargin)
 
- util.tableEnv.getConfig.getConfiguration.setBoolean(
- TableConfigOptions.TABLE_DYNAMIC_TABLE_OPTIONS_ENABLED, true)
  util.tableEnv.executeSql(
  s"""
  |CREATE TABLE MySink (

diff --git a/...lanner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/TableSourceTest.scala b/...lanner/src/test/scala/org/apache/flink/table/planner/plan/batch/sql/TableSourceTest.scala
@@ -160,8 +160,6 @@ class TableSourceTest extends TableTestBase {
 
  @Test
  def testTableHintWithDifferentOptions(): Unit = {
- util.tableEnv.getConfig.getConfiguration.setBoolean(
- TableConfigOptions.TABLE_DYNAMIC_TABLE_OPTIONS_ENABLED, true)
  util.tableEnv.executeSql(
  s"""
  |CREATE TABLE MySink (
@@ -192,8 +190,6 @@ class TableSourceTest extends TableTestBase {
 
  @Test
  def testTableHintWithSameOptions(): Unit = {
- util.tableEnv.getConfig.getConfiguration.setBoolean(
- TableConfigOptions.TABLE_DYNAMIC_TABLE_OPTIONS_ENABLED, true)
  util.tableEnv.executeSql(
  s"""
  |CREATE TABLE MySink (
@@ -224,8 +220,6 @@ class TableSourceTest extends TableTestBase {
 
  @Test
  def testTableHintWithDigestReuseForLogicalTableScan(): Unit = {
- util.tableEnv.getConfig.getConfiguration.setBoolean(
- TableConfigOptions.TABLE_DYNAMIC_TABLE_OPTIONS_ENABLED, true)
  util.tableEnv.getConfig.getConfiguration.setBoolean(
  RelNodeBlockPlanBuilder.TABLE_OPTIMIZER_REUSE_OPTIMIZE_BLOCK_WITH_DIGEST_ENABLED, true)
  util.tableEnv.executeSql(

diff --git a/...ble-planner/src/test/scala/org/apache/flink/table/planner/plan/hint/OptionsHintTest.scala b/...ble-planner/src/test/scala/org/apache/flink/table/planner/plan/hint/OptionsHintTest.scala
@@ -43,9 +43,6 @@ class OptionsHintTest(param: Param)
 
  @Before
  def before(): Unit = {
- util.tableEnv.getConfig.getConfiguration.setBoolean(
- TableConfigOptions.TABLE_DYNAMIC_TABLE_OPTIONS_ENABLED,
- true)
  util.addTable(
  s"""
  |create table t1(

diff --git a/...test/scala/org/apache/flink/table/planner/runtime/batch/sql/LegacyTableSourceITCase.scala b/...test/scala/org/apache/flink/table/planner/runtime/batch/sql/LegacyTableSourceITCase.scala
@@ -336,8 +336,6 @@ class LegacyTableSourceITCase extends BatchTestBase {
 
  @Test
  def testTableHint(): Unit = {
- tEnv.getConfig.getConfiguration.setBoolean(
- TableConfigOptions.TABLE_DYNAMIC_TABLE_OPTIONS_ENABLED, true)
  val ddl =
  s"""
  |CREATE TABLE MyTable1 (

diff --git a/...ner/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/TableSinkITCase.scala b/...ner/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/TableSinkITCase.scala
@@ -49,8 +49,6 @@ class TableSinkITCase extends BatchTestBase {
  |)
  """.stripMargin)
 
- tEnv.getConfig.getConfiguration.setBoolean(
- TableConfigOptions.TABLE_DYNAMIC_TABLE_OPTIONS_ENABLED, true)
  val resultPath = BatchAbstractTestBase.TEMPORARY_FOLDER.newFolder().getAbsolutePath
  tEnv.executeSql(
  s"""

diff --git a/...r/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/TableSourceITCase.scala b/...r/src/test/scala/org/apache/flink/table/planner/runtime/batch/sql/TableSourceITCase.scala
@@ -308,8 +308,6 @@ class TableSourceITCase extends BatchTestBase {
 
  @Test
  def testTableHint(): Unit = {
- tEnv.getConfig.getConfiguration.setBoolean(
- TableConfigOptions.TABLE_DYNAMIC_TABLE_OPTIONS_ENABLED, true)
  val resultPath = TEMPORARY_FOLDER.newFolder().getAbsolutePath
  tEnv.executeSql(
  s"""
@@ -344,8 +342,6 @@ class TableSourceITCase extends BatchTestBase {
 
  @Test
  def testTableHintWithLogicalTableScanReuse(): Unit = {
- tEnv.getConfig.getConfiguration.setBoolean(
- TableConfigOptions.TABLE_DYNAMIC_TABLE_OPTIONS_ENABLED, true)
  tEnv.getConfig.getConfiguration.setBoolean(
  RelNodeBlockPlanBuilder.TABLE_OPTIMIZER_REUSE_OPTIMIZE_BLOCK_WITH_DIGEST_ENABLED, true)
  val resultPath = TEMPORARY_FOLDER.newFolder().getAbsolutePath