Skip to content

D
dlink
Unverified Commit 9df3898e authored by Licho's avatar Licho Committed by GitHub
Browse files
Options

refactor: improve readability, add log, fix iterator exception after miniCluster close (#1148) 

* refactor: improve readability, add log, fix iterator exception after miniCluster close.

* chore: format
parent c1c99aa5
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 61 deletions
dlink-core/src/main/java/com/dlink/result/ResultRunnable.java
View file @ 9df3898e
......@@ -22,6 +22,7 @@ package com.dlink.result;
import com.dlink.constant.FlinkConstant;
import com.dlink.utils.FlinkUtil;
import org.apache.flink.core.execution.JobClient;
import org.apache.flink.table.api.TableResult;
import org.apache.flink.types.Row;
import org.apache.flink.types.RowKind;
......@@ -29,12 +30,15 @@ import org.apache.flink.types.RowKind;
import java.time.Instant;
import java.time.ZoneId;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import com.google.common.collect.Streams;
import lombok.extern.slf4j.Slf4j;
/**
* ResultRunnable
......@@ -42,14 +46,15 @@ import java.util.Set;
* @author wenmo
* @since 2021/7/1 22:50
*/
@Slf4j
public class ResultRunnable implements Runnable {
private TableResult tableResult;
private Integer maxRowNum;
private boolean isChangeLog;
private boolean isAutoCancel;
private String timeZone = ZoneId.systemDefault().getId();
private String nullColumn = "";
private static final String nullColumn = "";
private final TableResult tableResult;
private final Integer maxRowNum;
private final boolean isChangeLog;
private final boolean isAutoCancel;
private final String timeZone;
public ResultRunnable(TableResult tableResult, Integer maxRowNum, boolean isChangeLog, boolean isAutoCancel, String timeZone) {
this.tableResult = tableResult;
......@@ -61,11 +66,12 @@ public class ResultRunnable implements Runnable {
@Override
public void run() {
if (tableResult.getJobClient().isPresent()) {
String jobId = tableResult.getJobClient().get().getJobID().toHexString();
tableResult.getJobClient().ifPresent(jobClient -> {
String jobId = jobClient.getJobID().toHexString();
if (!ResultPool.containsKey(jobId)) {
ResultPool.put(new SelectResult(jobId, new ArrayList<>(), new LinkedHashSet<>()));
}
try {
if (isChangeLog) {
catchChangLog(ResultPool.get(jobId));
......@@ -73,73 +79,58 @@ public class ResultRunnable implements Runnable {
catchData(ResultPool.get(jobId));
}
} catch (Exception e) {
e.printStackTrace();
log.error(String.format(e.toString()));
}
}
});
}
private void catchChangLog(SelectResult selectResult) {
List<String> columns = FlinkUtil.catchColumn(tableResult);
columns.add(0, FlinkConstant.OP);
Set<String> column = new LinkedHashSet(columns);
selectResult.setColumns(column);
List<Map<String, Object>> rows = selectResult.getRowData();
Iterator<Row> it = tableResult.collect();
while (it.hasNext()) {
if (rows.size() >= maxRowNum) {
if (isAutoCancel && tableResult.getJobClient().isPresent()) {
tableResult.getJobClient().get().cancel();
}
break;
}
Map<String, Object> map = new LinkedHashMap<>();
Row row = it.next();
map.put(columns.get(0), row.getKind().shortString());
for (int i = 0; i < row.getArity(); ++i) {
Object field = row.getField(i);
if (field == null) {
map.put(columns.get(i + 1), nullColumn);
} else {
if (field instanceof Instant) {
map.put(columns.get(i + 1), ((Instant) field).atZone(ZoneId.of(timeZone)).toLocalDateTime().toString());
} else {
map.put(columns.get(i + 1), field);
}
}
}
List<String> columns = FlinkUtil.catchColumn(tableResult);
Streams.stream(tableResult.collect()).limit(maxRowNum).forEach(row -> {
Map<String, Object> map = getFieldMap(columns, row);
map.put(FlinkConstant.OP, row.getKind().shortString());
rows.add(map);
});
columns.add(0, FlinkConstant.OP);
selectResult.setColumns(new LinkedHashSet<>(columns));
if (isAutoCancel) {
tableResult.getJobClient().ifPresent(JobClient::cancel);
}
}
private void catchData(SelectResult selectResult) {
List<String> columns = FlinkUtil.catchColumn(tableResult);
Set<String> column = new LinkedHashSet(columns);
selectResult.setColumns(column);
List<Map<String, Object>> rows = selectResult.getRowData();
Iterator<Row> it = tableResult.collect();
while (it.hasNext()) {
if (rows.size() >= maxRowNum) {
break;
}
Map<String, Object> map = new LinkedHashMap<>();
Row row = it.next();
for (int i = 0; i < row.getArity(); ++i) {
Object field = row.getField(i);
if (field == null) {
map.put(columns.get(i), nullColumn);
} else {
if (field instanceof Instant) {
map.put(columns.get(i), ((Instant) field).atZone(ZoneId.of(timeZone)).toLocalDateTime().toString());
} else {
map.put(columns.get(i), field);
}
}
}
List<String> columns = FlinkUtil.catchColumn(tableResult);
Streams.stream(tableResult.collect()).limit(maxRowNum).forEach(row -> {
Map<String, Object> map = getFieldMap(columns, row);
if (RowKind.UPDATE_BEFORE == row.getKind() || RowKind.DELETE == row.getKind()) {
rows.remove(map);
} else {
rows.add(map);
}
});
selectResult.setColumns(new LinkedHashSet<>(columns));
}
private Map<String, Object> getFieldMap(List<String> columns, Row row) {
Map<String, Object> map = new LinkedHashMap<>();
for (int i = 0; i < row.getArity(); ++i) {
Object field = row.getField(i);
String column = columns.get(i);
if (field == null) {
map.put(column, nullColumn);
} else if (field instanceof Instant) {
map.put(column, ((Instant) field).atZone(ZoneId.of(timeZone)).toLocalDateTime().toString());
} else {
map.put(column, field);
}
}
return map;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment