Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Improve] revert pr 479 to remove resolvedFilterQuery in DorisSource #497

Merged
merged 2 commits into from
Oct 11, 2024
Merged

[Improve] revert pr 479 to remove resolvedFilterQuery in DorisSource #497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1c2895
revert 479
JNSimba Oct 11, 2024
f1f3b98
Merge branch 'master' into revert479
JNSimba Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 1 addition & 22 deletions flink-doris-connector/src/main/java/org/apache/doris/flink/source/DorisSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import org.apache.flink.api.connector.source.SplitEnumeratorContext;
import org.apache.flink.api.java.typeutils.ResultTypeQueryable;
import org.apache.flink.core.io.SimpleVersionedSerializer;
import org.apache.flink.util.StringUtils;

import org.apache.doris.flink.cfg.DorisOptions;
import org.apache.doris.flink.cfg.DorisReadOptions;
Expand Down Expand Up @@ -65,18 +64,14 @@ public class DorisSource<OUT>
private final Boundedness boundedness;
private final DorisDeserializationSchema<OUT> deserializer;

private final List<String> resolvedFilterQuery;

public DorisSource(
DorisOptions options,
DorisReadOptions readOptions,
Boundedness boundedness,
List<String> resolvedFilterQuery,
DorisDeserializationSchema<OUT> deserializer) {
this.options = options;
this.readOptions = readOptions;
this.boundedness = boundedness;
this.resolvedFilterQuery = resolvedFilterQuery;
this.deserializer = deserializer;
}

Expand All @@ -100,15 +95,6 @@ public SourceReader<OUT, DorisSourceSplit> createReader(SourceReaderContext read
public SplitEnumerator<DorisSourceSplit, PendingSplitsCheckpoint> createEnumerator(
SplitEnumeratorContext<DorisSourceSplit> context) throws Exception {
List<DorisSourceSplit> dorisSourceSplits = new ArrayList<>();
if (!resolvedFilterQuery.isEmpty()) {
String filterQuery = String.join(" AND ", resolvedFilterQuery);
if (StringUtils.isNullOrWhitespaceOnly(readOptions.getFilterQuery())) {
readOptions.setFilterQuery(filterQuery);
} else {
readOptions.setFilterQuery(
String.join(" AND ", readOptions.getFilterQuery(), filterQuery));
}
}
List<PartitionDefinition> partitions =
RestService.findPartitions(options, readOptions, LOG);
for (int index = 0; index < partitions.size(); index++) {
Expand Down Expand Up @@ -162,7 +148,6 @@ public static class DorisSourceBuilder<OUT> {
// Boundedness
private Boundedness boundedness;
private DorisDeserializationSchema<OUT> deserializer;
private List<String> resolvedFilterQuery = new ArrayList<>();

DorisSourceBuilder() {
boundedness = Boundedness.BOUNDED;
Expand Down Expand Up @@ -208,11 +193,6 @@ public DorisSourceBuilder<OUT> setDeserializer(
return this;
}

public DorisSourceBuilder<OUT> setResolvedFilterQuery(List<String> resolvedFilterQuery) {
this.resolvedFilterQuery = resolvedFilterQuery;
return this;
}

/**
* Build the {@link DorisSource}.
*
Expand All @@ -222,8 +202,7 @@ public DorisSource<OUT> build() {
if (readOptions == null) {
readOptions = DorisReadOptions.builder().build();
}
return new DorisSource<>(
options, readOptions, boundedness, resolvedFilterQuery, deserializer);
return new DorisSource<>(options, readOptions, boundedness, deserializer);
}
}
}
6 changes: 5 additions & 1 deletion ...k-doris-connector/src/main/java/org/apache/doris/flink/table/DorisDynamicTableSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@ public ChangelogMode getChangelogMode() {

@Override
public ScanRuntimeProvider getScanRuntimeProvider(ScanContext runtimeProviderContext) {
if (StringUtils.isNullOrWhitespaceOnly(readOptions.getFilterQuery())) {
String filterQuery = resolvedFilterQuery.stream().collect(Collectors.joining(" AND "));
readOptions.setFilterQuery(filterQuery);
}

if (StringUtils.isNullOrWhitespaceOnly(readOptions.getReadFields())) {
String[] selectFields =
DataType.getFieldNames(physicalRowDataType).toArray(new String[0]);
Expand Down Expand Up @@ -123,7 +128,6 @@ public ScanRuntimeProvider getScanRuntimeProvider(ScanContext runtimeProviderCon
DorisSource.<RowData>builder()
.setDorisReadOptions(readOptions)
.setDorisOptions(options)
.setResolvedFilterQuery(resolvedFilterQuery)
.setDeserializer(
new RowDataDeserializationSchema(
(RowType) physicalRowDataType.getLogicalType()))
Expand Down
Loading