[FLINK-8866] [table] Merge table source/sink/format factories

- Rename to TableFactory and move it to org.apache.flink.table.factories package - Unify source/sink/format factories with same logic and exceptions
tongcheng-elong · Jul 15, 2018 · abbb890 · abbb890
1 parent 9597248
commit abbb890
Show file tree

Hide file tree

Showing 50 changed files with 621 additions and 741 deletions.
diff --git a/...table.connectors.DiscoverableTableFactory → ...apache.flink.table.factories.TableFactory b/...table.connectors.DiscoverableTableFactory → ...apache.flink.table.factories.TableFactory
diff --git a/...table.connectors.DiscoverableTableFactory → ...apache.flink.table.factories.TableFactory b/...table.connectors.DiscoverableTableFactory → ...apache.flink.table.factories.TableFactory
diff --git a/...table.connectors.DiscoverableTableFactory → ...apache.flink.table.factories.TableFactory b/...table.connectors.DiscoverableTableFactory → ...apache.flink.table.factories.TableFactory
diff --git a/...table.connectors.DiscoverableTableFactory → ...apache.flink.table.factories.TableFactory b/...table.connectors.DiscoverableTableFactory → ...apache.flink.table.factories.TableFactory
diff --git a/...se/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaTableSourceFactory.java b/...se/src/main/java/org/apache/flink/streaming/connectors/kafka/KafkaTableSourceFactory.java
@@ -23,13 +23,13 @@
 import org.apache.flink.streaming.connectors.kafka.internals.KafkaTopicPartition;
 import org.apache.flink.table.api.TableException;
 import org.apache.flink.table.api.TableSchema;
-import org.apache.flink.table.connectors.DiscoverableTableFactory;
-import org.apache.flink.table.connectors.TableSourceFactory;
 import org.apache.flink.table.descriptors.DescriptorProperties;
 import org.apache.flink.table.descriptors.KafkaValidator;
 import org.apache.flink.table.descriptors.SchemaValidator;
-import org.apache.flink.table.formats.DeserializationSchemaFactory;
-import org.apache.flink.table.formats.TableFormatFactoryService;
+import org.apache.flink.table.factories.DeserializationSchemaFactory;
+import org.apache.flink.table.factories.TableFactory;
+import org.apache.flink.table.factories.TableFactoryService;
+import org.apache.flink.table.factories.TableSourceFactory;
 import org.apache.flink.table.sources.RowtimeAttributeDescriptor;
 import org.apache.flink.table.sources.TableSource;
 import org.apache.flink.types.Row;
@@ -72,7 +72,7 @@
 /**
  * Factory for creating configured instances of {@link KafkaTableSource}.
  */
-public abstract class KafkaTableSourceFactory implements TableSourceFactory<Row>, DiscoverableTableFactory {
+public abstract class KafkaTableSourceFactory implements TableSourceFactory<Row>, TableFactory {
 
  @Override
  public Map<String, String> requiredContext() {
@@ -129,7 +129,7 @@ public TableSource<Row> createTableSource(Map<String, String> properties) {
  new KafkaValidator().validate(params);
 
  // deserialization schema using format discovery
- final DeserializationSchemaFactory<?> formatFactory = TableFormatFactoryService.find(
+ final DeserializationSchemaFactory<?> formatFactory = TableFactoryService.find(
  DeserializationSchemaFactory.class,
  properties,
  this.getClass().getClassLoader());

diff --git a/...java/org/apache/flink/streaming/connectors/kafka/KafkaJsonTableSourceFactoryTestBase.java b/...java/org/apache/flink/streaming/connectors/kafka/KafkaJsonTableSourceFactoryTestBase.java
@@ -22,8 +22,8 @@
 import org.apache.flink.formats.json.JsonRowSchemaConverter;
 import org.apache.flink.streaming.connectors.kafka.internals.KafkaTopicPartition;
 import org.apache.flink.table.api.TableSchema;
-import org.apache.flink.table.connectors.TableFactoryService;
-import org.apache.flink.table.connectors.TableSourceFactory;
+import org.apache.flink.table.factories.TableFactoryService;
+import org.apache.flink.table.factories.TableSourceFactory;
 import org.apache.flink.table.descriptors.DescriptorProperties;
 import org.apache.flink.table.descriptors.FormatDescriptor;
 import org.apache.flink.table.descriptors.Json;

diff --git a/...est/java/org/apache/flink/streaming/connectors/kafka/KafkaTableSourceFactoryTestBase.java b/...est/java/org/apache/flink/streaming/connectors/kafka/KafkaTableSourceFactoryTestBase.java
@@ -27,15 +27,17 @@
 import org.apache.flink.streaming.connectors.kafka.internals.KafkaTopicPartition;
 import org.apache.flink.table.api.TableSchema;
 import org.apache.flink.table.api.Types;
+import org.apache.flink.table.descriptors.DescriptorProperties;
 import org.apache.flink.table.descriptors.Kafka;
 import org.apache.flink.table.descriptors.Rowtime;
 import org.apache.flink.table.descriptors.Schema;
 import org.apache.flink.table.descriptors.TestTableSourceDescriptor;
-import org.apache.flink.table.formats.utils.TestDeserializationSchema;
-import org.apache.flink.table.formats.utils.TestTableFormat;
+import org.apache.flink.table.factories.TableFactoryService;
+import org.apache.flink.table.factories.TableSourceFactory;
+import org.apache.flink.table.factories.utils.TestDeserializationSchema;
+import org.apache.flink.table.factories.utils.TestTableFormat;
 import org.apache.flink.table.sources.RowtimeAttributeDescriptor;
 import org.apache.flink.table.sources.TableSource;
-import org.apache.flink.table.sources.TableSourceFactoryService;
 import org.apache.flink.table.sources.tsextractors.ExistingField;
 import org.apache.flink.table.sources.wmstrategies.AscendingTimestamps;
 import org.apache.flink.types.Row;
@@ -141,8 +143,12 @@ public void testTableSource() {
  .field(EVENT_TIME, Types.SQL_TIMESTAMP()).rowtime(
  new Rowtime().timestampsFromField(TIME).watermarksPeriodicAscending())
  .field(PROC_TIME, Types.SQL_TIMESTAMP()).proctime());
+ final DescriptorProperties descriptorProperties = new DescriptorProperties(true);
+ testDesc.addProperties(descriptorProperties);
+ final Map<String, String> propertiesMap = descriptorProperties.asMap();
 
- final TableSource<?> actualSource = TableSourceFactoryService.findAndCreateTableSource(testDesc);
+ final TableSource<?> actualSource = TableFactoryService.find(TableSourceFactory.class, testDesc)
+ .createTableSource(propertiesMap);
 
  assertEquals(expected, actualSource);
 

diff --git a/...-formats/flink-avro/src/main/java/org/apache/flink/formats/avro/AvroRowFormatFactory.java b/...-formats/flink-avro/src/main/java/org/apache/flink/formats/avro/AvroRowFormatFactory.java
@@ -23,8 +23,8 @@
 import org.apache.flink.table.descriptors.AvroValidator;
 import org.apache.flink.table.descriptors.DescriptorProperties;
 import org.apache.flink.table.descriptors.FormatDescriptorValidator;
-import org.apache.flink.table.formats.DeserializationSchemaFactory;
-import org.apache.flink.table.formats.SerializationSchemaFactory;
+import org.apache.flink.table.factories.DeserializationSchemaFactory;
+import org.apache.flink.table.factories.SerializationSchemaFactory;
 import org.apache.flink.types.Row;
 
 import org.apache.avro.specific.SpecificRecord;

diff --git a/...he.flink.table.formats.TableFormatFactory → ....flink.table.factories.TableFormatFactory b/...he.flink.table.formats.TableFormatFactory → ....flink.table.factories.TableFormatFactory
diff --git a/...mats/flink-avro/src/test/java/org/apache/flink/formats/avro/AvroRowFormatFactoryTest.java b/...mats/flink-avro/src/test/java/org/apache/flink/formats/avro/AvroRowFormatFactoryTest.java
@@ -24,9 +24,9 @@
 import org.apache.flink.table.descriptors.Avro;
 import org.apache.flink.table.descriptors.Descriptor;
 import org.apache.flink.table.descriptors.DescriptorProperties;
-import org.apache.flink.table.formats.DeserializationSchemaFactory;
-import org.apache.flink.table.formats.SerializationSchemaFactory;
-import org.apache.flink.table.formats.TableFormatFactoryService;
+import org.apache.flink.table.factories.DeserializationSchemaFactory;
+import org.apache.flink.table.factories.SerializationSchemaFactory;
+import org.apache.flink.table.factories.TableFactoryService;
 import org.apache.flink.util.TestLogger;
 
 import org.junit.Test;
@@ -63,31 +63,31 @@ public void testAvroSchema() {
  }
 
  private void testRecordClassSerializationSchema(Map<String, String> properties) {
- final DeserializationSchema<?> actual2 = TableFormatFactoryService
+ final DeserializationSchema<?> actual2 = TableFactoryService
  .find(DeserializationSchemaFactory.class, properties)
  .createDeserializationSchema(properties);
  final AvroRowDeserializationSchema expected2 = new AvroRowDeserializationSchema(AVRO_SPECIFIC_RECORD);
  assertEquals(expected2, actual2);
  }
 
  private void testRecordClassDeserializationSchema(Map<String, String> properties) {
- final SerializationSchema<?> actual1 = TableFormatFactoryService
+ final SerializationSchema<?> actual1 = TableFactoryService
  .find(SerializationSchemaFactory.class, properties)
  .createSerializationSchema(properties);
  final SerializationSchema<?> expected1 = new AvroRowSerializationSchema(AVRO_SPECIFIC_RECORD);
  assertEquals(expected1, actual1);
  }
 
  private void testAvroSchemaDeserializationSchema(Map<String, String> properties) {
- final DeserializationSchema<?> actual2 = TableFormatFactoryService
+ final DeserializationSchema<?> actual2 = TableFactoryService
  .find(DeserializationSchemaFactory.class, properties)
  .createDeserializationSchema(properties);
  final AvroRowDeserializationSchema expected2 = new AvroRowDeserializationSchema(AVRO_SCHEMA);
  assertEquals(expected2, actual2);
  }
 
  private void testAvroSchemaSerializationSchema(Map<String, String> properties) {
- final SerializationSchema<?> actual1 = TableFormatFactoryService
+ final SerializationSchema<?> actual1 = TableFactoryService
  .find(SerializationSchemaFactory.class, properties)
  .createSerializationSchema(properties);
  final SerializationSchema<?> expected1 = new AvroRowSerializationSchema(AVRO_SCHEMA);

diff --git a/...-formats/flink-json/src/main/java/org/apache/flink/formats/json/JsonRowFormatFactory.java b/...-formats/flink-json/src/main/java/org/apache/flink/formats/json/JsonRowFormatFactory.java
@@ -26,8 +26,8 @@
 import org.apache.flink.table.descriptors.FormatDescriptorValidator;
 import org.apache.flink.table.descriptors.JsonValidator;
 import org.apache.flink.table.descriptors.SchemaValidator;
-import org.apache.flink.table.formats.DeserializationSchemaFactory;
-import org.apache.flink.table.formats.SerializationSchemaFactory;
+import org.apache.flink.table.factories.DeserializationSchemaFactory;
+import org.apache.flink.table.factories.SerializationSchemaFactory;
 import org.apache.flink.types.Row;
 
 import java.util.ArrayList;

diff --git a/...he.flink.table.formats.TableFormatFactory → ....flink.table.factories.TableFormatFactory b/...he.flink.table.formats.TableFormatFactory → ....flink.table.factories.TableFormatFactory
diff --git a/...mats/flink-json/src/test/java/org/apache/flink/formats/json/JsonRowFormatFactoryTest.java b/...mats/flink-json/src/test/java/org/apache/flink/formats/json/JsonRowFormatFactoryTest.java
@@ -26,9 +26,9 @@
 import org.apache.flink.table.descriptors.DescriptorProperties;
 import org.apache.flink.table.descriptors.Json;
 import org.apache.flink.table.descriptors.Schema;
-import org.apache.flink.table.formats.DeserializationSchemaFactory;
-import org.apache.flink.table.formats.SerializationSchemaFactory;
-import org.apache.flink.table.formats.TableFormatFactoryService;
+import org.apache.flink.table.factories.DeserializationSchemaFactory;
+import org.apache.flink.table.factories.SerializationSchemaFactory;
+import org.apache.flink.table.factories.TableFactoryService;
 import org.apache.flink.types.Row;
 import org.apache.flink.util.TestLogger;
 
@@ -107,7 +107,7 @@ public void testSchemaDerivation() {
  }
 
  private void testSchemaDeserializationSchema(Map<String, String> properties) {
- final DeserializationSchema<?> actual2 = TableFormatFactoryService
+ final DeserializationSchema<?> actual2 = TableFactoryService
  .find(DeserializationSchemaFactory.class, properties)
  .createDeserializationSchema(properties);
  final JsonRowDeserializationSchema expected2 = new JsonRowDeserializationSchema(SCHEMA);
@@ -116,15 +116,15 @@ private void testSchemaDeserializationSchema(Map<String, String> properties) {
  }
 
  private void testSchemaSerializationSchema(Map<String, String> properties) {
- final SerializationSchema<?> actual1 = TableFormatFactoryService
+ final SerializationSchema<?> actual1 = TableFactoryService
  .find(SerializationSchemaFactory.class, properties)
  .createSerializationSchema(properties);
  final SerializationSchema expected1 = new JsonRowSerializationSchema(SCHEMA);
  assertEquals(expected1, actual1);
  }
 
  private void testJsonSchemaDeserializationSchema(Map<String, String> properties) {
- final DeserializationSchema<?> actual2 = TableFormatFactoryService
+ final DeserializationSchema<?> actual2 = TableFactoryService
  .find(DeserializationSchemaFactory.class, properties)
  .createDeserializationSchema(properties);
  final JsonRowDeserializationSchema expected2 = new JsonRowDeserializationSchema(JSON_SCHEMA);
@@ -133,7 +133,7 @@ private void testJsonSchemaDeserializationSchema(Map<String, String> properties)
  }
 
  private void testJsonSchemaSerializationSchema(Map<String, String> properties) {
- final SerializationSchema<?> actual1 = TableFormatFactoryService
+ final SerializationSchema<?> actual1 = TableFactoryService
  .find(SerializationSchemaFactory.class, properties)
  .createSerializationSchema(properties);
  final SerializationSchema<?> expected1 = new JsonRowSerializationSchema(JSON_SCHEMA);

diff --git a/flink-libraries/flink-sql-client/pom.xml b/flink-libraries/flink-sql-client/pom.xml
@@ -159,7 +159,7 @@ under the License.
  <include>org.codehaus.commons.compiler.properties</include>
  <include>org/codehaus/janino/**</include>
  <include>org/codehaus/commons/**</include>
- <include>META-INF/services/org.apache.flink.table.connectors.DiscoverableTableFactory</include>
+ <include>META-INF/services/org.apache.flink.table.factories.TableFactory</include>
  <!-- flink-sql-client -->
  <include>org/jline/**</include>
  <include>com/fasterxml/jackson/**</include>

diff --git a/...ries/flink-sql-client/src/main/java/org/apache/flink/table/client/config/Environment.java b/...ries/flink-sql-client/src/main/java/org/apache/flink/table/client/config/Environment.java
@@ -48,7 +48,8 @@ public class Environment {
 
  private Deployment deployment;
 
- private static final String NAME = "name";
+ private static final String TABLE_NAME = "name";
+ private static final String TABLE_TYPE = "type";
 
  public Environment() {
  this.tables = Collections.emptyMap();
@@ -64,16 +65,16 @@ public Map<String, TableDescriptor> getTables() {
  public void setTables(List<Map<String, Object>> tables) {
  this.tables = new HashMap<>(tables.size());
  tables.forEach(config -> {
- if (!config.containsKey(NAME)) {
+ if (!config.containsKey(TABLE_NAME)) {
  throw new SqlClientException("The 'name' attribute of a table is missing.");
  }
- final Object nameObject = config.get(NAME);
+ final Object nameObject = config.get(TABLE_NAME);
  if (nameObject == null || !(nameObject instanceof String) || ((String) nameObject).length() <= 0) {
  throw new SqlClientException("Invalid table name '" + nameObject + "'.");
  }
  final String name = (String) nameObject;
  final Map<String, Object> properties = new HashMap<>(config);
- properties.remove(NAME);
+ properties.remove(TABLE_NAME);
 
  if (this.tables.containsKey(name)) {
  throw new SqlClientException("Duplicate table name '" + name + "'.");
@@ -209,11 +210,12 @@ public static Environment enrich(Environment env, Map<String, String> properties
  * @return table descriptor describing a source, sink, or both
  */
  private static TableDescriptor createTableDescriptor(String name, Map<String, Object> config) {
- final Object typeObject = config.get(TableDescriptorValidator.TABLE_TYPE());
+ final Object typeObject = config.get(TABLE_TYPE);
  if (typeObject == null || !(typeObject instanceof String)) {
  throw new SqlClientException("Invalid 'type' attribute for table '" + name + "'.");
  }
- final String type = (String) config.get(TableDescriptorValidator.TABLE_TYPE());
+ final String type = (String) config.get(TABLE_TYPE);
+ config.remove(TABLE_TYPE);
  final Map<String, String> normalizedConfig = ConfigUtil.normalizeYaml(config);
  if (type.equals(TableDescriptorValidator.TABLE_TYPE_VALUE_SOURCE())) {
  return new Source(name, normalizedConfig);

diff --git a/...ql-client/src/main/java/org/apache/flink/table/client/gateway/local/ExecutionContext.java b/...ql-client/src/main/java/org/apache/flink/table/client/gateway/local/ExecutionContext.java
@@ -51,9 +51,9 @@
 import org.apache.flink.table.client.config.SourceSink;
 import org.apache.flink.table.client.gateway.SessionContext;
 import org.apache.flink.table.client.gateway.SqlExecutionException;
-import org.apache.flink.table.connectors.TableFactoryService;
-import org.apache.flink.table.connectors.TableSinkFactory;
-import org.apache.flink.table.connectors.TableSourceFactory;
+import org.apache.flink.table.factories.TableFactoryService;
+import org.apache.flink.table.factories.TableSinkFactory;
+import org.apache.flink.table.factories.TableSourceFactory;
 import org.apache.flink.table.descriptors.DescriptorProperties;
 import org.apache.flink.table.functions.AggregateFunction;
 import org.apache.flink.table.functions.FunctionService;

diff --git a/flink-libraries/flink-sql-client/src/test/assembly/test-table-source-factory.xml b/flink-libraries/flink-sql-client/src/test/assembly/test-table-source-factory.xml
@@ -40,7 +40,7 @@ under the License.
  <file>
  <source>src/test/resources/test-factory-services-file</source>
  <outputDirectory>META-INF/services</outputDirectory>
- <destName>org.apache.flink.table.connectors.DiscoverableTableFactory</destName>
+ <destName>org.apache.flink.table.factories.TableFactory</destName>
  <fileMode>0755</fileMode>
  </file>
  </files>

diff --git a/...ent/src/test/java/org/apache/flink/table/client/gateway/utils/TestTableSourceFactory.java b/...ent/src/test/java/org/apache/flink/table/client/gateway/utils/TestTableSourceFactory.java
@@ -24,8 +24,8 @@
 import org.apache.flink.table.api.TableSchema;
 import org.apache.flink.table.api.Types;
 import org.apache.flink.table.client.gateway.local.DependencyTest;
-import org.apache.flink.table.connectors.DiscoverableTableFactory;
-import org.apache.flink.table.connectors.TableSourceFactory;
+import org.apache.flink.table.factories.TableFactory;
+import org.apache.flink.table.factories.TableSourceFactory;
 import org.apache.flink.table.descriptors.DescriptorProperties;
 import org.apache.flink.table.descriptors.SchemaValidator;
 import org.apache.flink.table.sources.DefinedProctimeAttribute;
@@ -51,7 +51,7 @@
 /**
  * Table source factory for testing the classloading in {@link DependencyTest}.
  */
-public class TestTableSourceFactory implements TableSourceFactory<Row>, DiscoverableTableFactory {
+public class TestTableSourceFactory implements TableSourceFactory<Row>, TableFactory {
 
  @Override
  public Map<String, String> requiredContext() {

diff --git a/...table.connectors.DiscoverableTableFactory → ...apache.flink.table.factories.TableFactory b/...table.connectors.DiscoverableTableFactory → ...apache.flink.table.factories.TableFactory