You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tw...@apache.org on 2019/05/16 08:48:19 UTC

[flink] branch master updated: [hotfix][table-common] Remove depecated methods in TableSchema

This is an automated email from the ASF dual-hosted git repository.

twalthr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/master by this push:
     new 23602d6  [hotfix][table-common] Remove depecated methods in TableSchema
23602d6 is described below

commit 23602d68d5d8f7c80955775cab0a9e006254db82
Author: Timo Walther <tw...@apache.org>
AuthorDate: Mon May 13 16:29:56 2019 +0200

    [hotfix][table-common] Remove depecated methods in TableSchema
---
 .../java/org/apache/flink/table/api/TableSchema.java     | 16 ----------------
 .../plan/nodes/logical/FlinkLogicalTableSourceScan.scala |  2 +-
 .../table/runtime/batch/sql/agg/GroupWindowITCase.scala  |  2 +-
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/api/TableSchema.java b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/api/TableSchema.java
index 2e95223..385f9a0 100644
--- a/flink-table/flink-table-common/src/main/java/org/apache/flink/table/api/TableSchema.java
+++ b/flink-table/flink-table-common/src/main/java/org/apache/flink/table/api/TableSchema.java
@@ -152,22 +152,6 @@ public class TableSchema {
 	}
 
 	/**
-	 * @deprecated Use {@link TableSchema#getFieldTypes()} instead. Can be dropped after 1.7.
-	 */
-	@Deprecated
-	public TypeInformation<?>[] getTypes() {
-		return getFieldTypes();
-	}
-
-	/**
-	 * @deprecated Use {@link TableSchema#getFieldNames()} instead. Can be dropped after 1.7.
-	 */
-	@Deprecated
-	public String[] getColumnNames() {
-		return getFieldNames();
-	}
-
-	/**
 	 * Converts a table schema into a (nested) type information describing a {@link Row}.
 	 */
 	public TypeInformation<Row> toRowType() {
diff --git a/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalTableSourceScan.scala b/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalTableSourceScan.scala
index 7b2b7a3..a6eba29 100644
--- a/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalTableSourceScan.scala
+++ b/flink-table/flink-table-planner-blink/src/main/scala/org/apache/flink/table/plan/nodes/logical/FlinkLogicalTableSourceScan.scala
@@ -75,7 +75,7 @@ class FlinkLogicalTableSourceScan(
 
   override def explainTerms(pw: RelWriter): RelWriter = {
     super.explainTerms(pw)
-      .item("fields", tableSource.getTableSchema.getColumnNames.mkString(", "))
+      .item("fields", tableSource.getTableSchema.getFieldNames.mkString(", "))
   }
 
 }
diff --git a/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/runtime/batch/sql/agg/GroupWindowITCase.scala b/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/runtime/batch/sql/agg/GroupWindowITCase.scala
index fa5522f..43b5bfe 100644
--- a/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/runtime/batch/sql/agg/GroupWindowITCase.scala
+++ b/flink-table/flink-table-planner-blink/src/test/scala/org/apache/flink/table/runtime/batch/sql/agg/GroupWindowITCase.scala
@@ -400,7 +400,7 @@ class GroupWindowITCase extends BatchTestBase {
     //      "c" -> new ColumnStats(9000000L, 0L, 1024D, 32, 6.1D, 0D))
     val table = new BatchTableSource[Row] {
       override def getReturnType: TypeInformation[Row] =
-        new RowTypeInfo(tableSchema.getTypes, tableSchema.getColumnNames)
+        new RowTypeInfo(tableSchema.getFieldTypes, tableSchema.getFieldNames)
 
       //      override def getTableStats: TableStats = new TableStats(10000000L, colStats)