Skip to content

Commit ad9db03

Browse files
committed
[hotfix][sqlgateway] Do not introduce new method in SqlGatewayEndpointFactory#Context
1 parent a5efed2 commit ad9db03

File tree

4 files changed

+2
-16
lines changed

4 files changed

+2
-16
lines changed

Diff for: flink-table/flink-sql-gateway-api/src/main/java/org/apache/flink/table/gateway/api/endpoint/SqlGatewayEndpointFactory.java

-9
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,6 @@ interface Context {
4949

5050
/** Gives read-only access to the configuration of the current session. */
5151
ReadableConfig getFlinkConfiguration();
52-
53-
/**
54-
* Get a map contains all flink configurations.
55-
*
56-
* @return The copy of flink configurations in the form of map, modifying this map will not
57-
* influence the original configuration object.
58-
*/
59-
Map<String, String> getFlinkConfigurationOptions();
60-
6152
/**
6253
* Returns the options with which the endpoint is created. All options that are prefixed
6354
* with the endpoint identifier are included in the map.

Diff for: flink-table/flink-sql-gateway-api/src/main/java/org/apache/flink/table/gateway/api/endpoint/SqlGatewayEndpointFactoryUtils.java

-5
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,6 @@ public ReadableConfig getFlinkConfiguration() {
141141
return flinkConfiguration;
142142
}
143143

144-
@Override
145-
public Map<String, String> getFlinkConfigurationOptions() {
146-
return flinkConfiguration.toMap();
147-
}
148-
149144
@Override
150145
public Map<String, String> getEndpointOptions() {
151146
return endpointConfig;

Diff for: flink-table/flink-sql-gateway/src/main/java/org/apache/flink/table/gateway/rest/SqlGatewayRestEndpointFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public SqlGatewayEndpoint createSqlGatewayEndpoint(Context context) {
4949
endpointFactoryHelper.validate();
5050
Configuration config =
5151
rebuildRestEndpointOptions(
52-
context.getEndpointOptions(), context.getFlinkConfigurationOptions());
52+
context.getEndpointOptions(), context.getFlinkConfiguration().toMap());
5353
try {
5454
return new SqlGatewayRestEndpoint(config, context.getSqlGatewayService());
5555
} catch (Exception e) {

Diff for: flink-table/flink-sql-gateway/src/test/java/org/apache/flink/table/gateway/rest/util/SqlGatewayRestEndpointTestUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public static Configuration getBaseConfig(Configuration flinkConf) {
4141
null, flinkConf, getEndpointConfig(flinkConf, IDENTIFIER));
4242

4343
return rebuildRestEndpointOptions(
44-
context.getEndpointOptions(), context.getFlinkConfigurationOptions());
44+
context.getEndpointOptions(), context.getFlinkConfiguration().toMap());
4545
}
4646

4747
/** Create the configuration generated from config.yaml. */

0 commit comments

Comments
 (0)