Skip to content

Commit 0b0bbf6

Browse files
committed
[fix] fix code style
1 parent 9c37330 commit 0b0bbf6

8 files changed

Lines changed: 28 additions & 24 deletions

File tree

flink-doris-connector/src/main/java/org/apache/doris/flink/cfg/ConfigurationOptions.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,4 @@ public interface ConfigurationOptions {
6363

6464
String SINK_HTTP_UTF8_CHARSET = "sink.http-utf8-charset";
6565
Boolean SINK_HTTP_UTF8_CHARSET_DEFAULT = false;
66-
6766
}

flink-doris-connector/src/main/java/org/apache/doris/flink/sink/HttpUtil.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,12 @@ public HttpUtil(DorisReadOptions readOptions, boolean httpUtf8Charset) {
5858
private void settingStreamHttpClientBuilder() {
5959
ConnectionConfig connectionConfig = ConnectionConfig.DEFAULT;
6060
if (httpUtf8Charset) {
61-
connectionConfig = ConnectionConfig.custom()
62-
.setCharset(StandardCharsets.UTF_8)
63-
.setMalformedInputAction(CodingErrorAction.REPLACE)
64-
.setUnmappableInputAction(CodingErrorAction.REPLACE)
65-
.build();
61+
connectionConfig =
62+
ConnectionConfig.custom()
63+
.setCharset(StandardCharsets.UTF_8)
64+
.setMalformedInputAction(CodingErrorAction.REPLACE)
65+
.setUnmappableInputAction(CodingErrorAction.REPLACE)
66+
.build();
6667
}
6768
this.httpClientBuilder =
6869
HttpClients.custom()
@@ -103,11 +104,12 @@ public CloseableHttpClient getHttpClient() {
103104
public HttpClientBuilder getHttpClientBuilderForBatch() {
104105
ConnectionConfig connectionConfig = ConnectionConfig.DEFAULT;
105106
if (httpUtf8Charset) {
106-
connectionConfig = ConnectionConfig.custom()
107-
.setCharset(StandardCharsets.UTF_8)
108-
.setMalformedInputAction(CodingErrorAction.REPLACE)
109-
.setUnmappableInputAction(CodingErrorAction.REPLACE)
110-
.build();
107+
connectionConfig =
108+
ConnectionConfig.custom()
109+
.setCharset(StandardCharsets.UTF_8)
110+
.setMalformedInputAction(CodingErrorAction.REPLACE)
111+
.setUnmappableInputAction(CodingErrorAction.REPLACE)
112+
.build();
111113
}
112114
return HttpClients.custom()
113115
.setDefaultConnectionConfig(connectionConfig)

flink-doris-connector/src/main/java/org/apache/doris/flink/sink/batch/DorisBatchStreamLoad.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,9 @@ public DorisBatchStreamLoad(
172172
this.started = new AtomicBoolean(true);
173173
this.loadExecutorService.execute(loadAsyncExecutor);
174174
this.subTaskId = subTaskId;
175-
this.httpClientBuilder = new HttpUtil(dorisReadOptions, executionOptions.isHttpUtf8Charset()).getHttpClientBuilderForBatch();
175+
this.httpClientBuilder =
176+
new HttpUtil(dorisReadOptions, executionOptions.isHttpUtf8Charset())
177+
.getHttpClientBuilderForBatch();
176178
}
177179

178180
/**

flink-doris-connector/src/main/java/org/apache/doris/flink/sink/committer/DorisCommitter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ public DorisCommitter(
7070
dorisOptions,
7171
dorisReadOptions,
7272
executionOptions,
73-
new HttpUtil(dorisReadOptions, executionOptions.isHttpUtf8Charset()).getHttpClient());
73+
new HttpUtil(dorisReadOptions, executionOptions.isHttpUtf8Charset())
74+
.getHttpClient());
7475
}
7576

7677
public DorisCommitter(

flink-doris-connector/src/main/java/org/apache/doris/flink/sink/writer/DorisWriter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,8 @@ public DorisStreamLoad getStreamLoader(String tableKey) {
310310
dorisOptions,
311311
executionOptions,
312312
labelGenerator,
313-
new HttpUtil(dorisReadOptions, executionOptions.isHttpUtf8Charset()).getHttpClient()));
313+
new HttpUtil(dorisReadOptions, executionOptions.isHttpUtf8Charset())
314+
.getHttpClient()));
314315
}
315316

316317
/** Http throws an exception actively, there is no need to check regularly. */

flink-doris-connector/src/main/java/org/apache/doris/flink/table/DorisConfigOptions.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@
4040
import static org.apache.doris.flink.cfg.ConfigurationOptions.DORIS_TABLET_SIZE_DEFAULT;
4141
import static org.apache.doris.flink.cfg.ConfigurationOptions.DORIS_THRIFT_MAX_MESSAGE_SIZE_DEFAULT;
4242

43-
/**
44-
* Options for the Doris connector.
45-
*/
43+
/** Options for the Doris connector. */
4644
@PublicEvolving
4745
public class DorisConfigOptions {
4846

@@ -347,6 +345,6 @@ public static Properties getStreamLoadProp(Map<String, String> tableOptions) {
347345
ConfigOptions.key("sink.http-utf8-charset")
348346
.booleanType()
349347
.defaultValue(false)
350-
.withDescription("Set sink http client default charset to utf8 for support unicode characters in header, the default value is false");
351-
348+
.withDescription(
349+
"Set sink http client default charset to utf8 for support unicode characters in header, the default value is false");
352350
}

flink-doris-connector/src/main/java/org/apache/doris/flink/table/DorisDynamicTableFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
import static org.apache.doris.flink.table.DorisConfigOptions.SINK_ENABLE_BATCH_MODE;
7575
import static org.apache.doris.flink.table.DorisConfigOptions.SINK_ENABLE_DELETE;
7676
import static org.apache.doris.flink.table.DorisConfigOptions.SINK_FLUSH_QUEUE_SIZE;
77+
import static org.apache.doris.flink.table.DorisConfigOptions.SINK_HTTP_UTF8_CHARSET;
7778
import static org.apache.doris.flink.table.DorisConfigOptions.SINK_IGNORE_COMMIT_ERROR;
7879
import static org.apache.doris.flink.table.DorisConfigOptions.SINK_IGNORE_UPDATE_BEFORE;
7980
import static org.apache.doris.flink.table.DorisConfigOptions.SINK_LABEL_PREFIX;
@@ -86,7 +87,6 @@
8687
import static org.apache.doris.flink.table.DorisConfigOptions.TABLE_IDENTIFIER;
8788
import static org.apache.doris.flink.table.DorisConfigOptions.USERNAME;
8889
import static org.apache.doris.flink.table.DorisConfigOptions.USE_FLIGHT_SQL;
89-
import static org.apache.doris.flink.table.DorisConfigOptions.SINK_HTTP_UTF8_CHARSET;
9090

9191
/**
9292
* The {@link DorisDynamicTableFactory} translates the catalog table to a table source.

flink-doris-connector/src/test/java/org/apache/doris/flink/sink/DorisSinkITCase.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -801,14 +801,15 @@ public void testSinkUnicodeColumn() throws Exception {
801801
dorisBuilder.build(),
802802
executionBuilder.build(),
803803
new String[] {
804-
new ObjectMapper().writeValueAsString(row1),
805-
new ObjectMapper().writeValueAsString(row2)
804+
new ObjectMapper().writeValueAsString(row1),
805+
new ObjectMapper().writeValueAsString(row2)
806806
});
807807

808808
Thread.sleep(10000);
809809
List<String> expected = Arrays.asList("doris1,1", "doris2,2");
810-
String query = String.format("select `名称`,`年龄` from %s.%s order by 1", DATABASE, TABLE_UNICODE_COLUMN);
810+
String query =
811+
String.format(
812+
"select `名称`,`年龄` from %s.%s order by 1", DATABASE, TABLE_UNICODE_COLUMN);
811813
ContainerUtils.checkResult(getDorisQueryConnection(), LOG, expected, query, 2);
812814
}
813-
814815
}

0 commit comments

Comments
 (0)