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

[INLONG-10144][Sort] Redis connectors support audit ID #10146

Merged
merged 4 commits into from
May 8, 2024
Merged

[INLONG-10144][Sort] Redis connectors support audit ID #10146

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
64ac7cf
[INLONG-10144][Sort] Redis connector source support audit ID.
May 8, 2024
a7348b9
[INLONG-10144][Sort] Redis connector source support audit ID.
May 8, 2024
2c64392
[INLONG-10144][Sort] Redis connector source support audit ID.
May 8, 2024
d626b54
[INLONG-10144][Sort] fixed defect.
May 8, 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
22 changes: 18 additions & 4 deletions ...tors/redis/src/main/java/org/apache/inlong/sort/redis/source/RedisDynamicTableSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,11 @@

import java.util.Map;

import static org.apache.flink.table.types.logical.LogicalTypeRoot.*;
import static org.apache.flink.table.types.logical.LogicalTypeRoot.BIGINT;
EMsnap marked this conversation as resolved.
Show resolved Hide resolved
import static org.apache.flink.table.types.logical.LogicalTypeRoot.DOUBLE;
XiaoYou201 marked this conversation as resolved.
Show resolved Hide resolved
import static org.apache.flink.table.types.logical.LogicalTypeRoot.VARCHAR;

//import static org.apache.flink.table.types.logical.LogicalTypeRoot.*;

/**
* Redis dynamic table source
Expand All @@ -52,8 +56,13 @@ public class RedisDynamicTableSource implements LookupTableSource {
private final RedisLookupOptions redisLookupOptions;
private final Map<String, String> properties;

private final String inlongMetric;
private final String auditHostAndPorts;
private final String auditKeys;

public RedisDynamicTableSource(Map<String, String> properties, ResolvedSchema tableSchema,
ReadableConfig config, RedisLookupOptions redisLookupOptions) {
ReadableConfig config, RedisLookupOptions redisLookupOptions, String inlongMetric, String auditHostAndPorts,
String auditKeys) {
this.properties = properties;
Preconditions.checkNotNull(properties, "properties should not be null");
this.tableSchema = tableSchema;
Expand All @@ -73,11 +82,15 @@ public RedisDynamicTableSource(Map<String, String> properties, ResolvedSchema ta
flinkJedisConfigBase = RedisHandlerServices
.findRedisHandler(InlongJedisConfigHandler.class, properties).createFlinkJedisConfig(config);
this.redisLookupOptions = redisLookupOptions;
this.inlongMetric = inlongMetric;
this.auditHostAndPorts = auditHostAndPorts;
this.auditKeys = auditKeys;
}

@Override
public DynamicTableSource copy() {
return new RedisDynamicTableSource(properties, tableSchema, config, redisLookupOptions);
return new RedisDynamicTableSource(properties, tableSchema, config, redisLookupOptions, inlongMetric,
auditHostAndPorts, auditKeys);
}

@Override
Expand All @@ -88,6 +101,7 @@ public String asSummaryString() {
@Override
public LookupRuntimeProvider getLookupRuntimeProvider(LookupContext context) {
return TableFunctionProvider.of(new RedisRowDataLookupFunction(
redisMapper.getCommandDescription(), flinkJedisConfigBase, this.redisLookupOptions));
redisMapper.getCommandDescription(), flinkJedisConfigBase, this.redisLookupOptions, inlongMetric,
auditHostAndPorts, auditKeys));
}
}
19 changes: 18 additions & 1 deletion ...s/redis/src/main/java/org/apache/inlong/sort/redis/source/RedisRowDataLookupFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

package org.apache.inlong.sort.redis.source;

import org.apache.inlong.sort.base.metric.MetricOption;
import org.apache.inlong.sort.base.metric.SourceMetricData;
import org.apache.inlong.sort.redis.common.config.RedisLookupOptions;
import org.apache.inlong.sort.redis.common.container.InlongRedisCommandsContainer;
import org.apache.inlong.sort.redis.common.container.RedisCommandsContainerBuilder;
Expand Down Expand Up @@ -55,14 +57,25 @@ public class RedisRowDataLookupFunction extends TableFunction<RowData> {
private transient Cache<RowData, RowData> cache;
private InlongRedisCommandsContainer redisCommandsContainer;

private SourceMetricData sourceMetricData;

RedisRowDataLookupFunction(RedisCommandDescription redisCommandDescription,
FlinkJedisConfigBase flinkJedisConfigBase, RedisLookupOptions redisLookupOptions) {
FlinkJedisConfigBase flinkJedisConfigBase, RedisLookupOptions redisLookupOptions, String inlongMetric,
String auditHostAndPorts, String auditKeys) {
this.flinkJedisConfigBase = flinkJedisConfigBase;
this.redisCommand = redisCommandDescription.getCommand();
this.additionalKey = redisCommandDescription.getAdditionalKey();
this.cacheMaxSize = redisLookupOptions.getCacheMaxSize();
this.cacheExpireMs = redisLookupOptions.getCacheExpireMs();
this.maxRetryTimes = redisLookupOptions.getMaxRetryTimes();
MetricOption metricOption = MetricOption.builder()
.withInlongLabels(inlongMetric)
.withAuditAddress(auditHostAndPorts)
.withAuditKeys(auditKeys)
.build();
if (metricOption != null) {
sourceMetricData = new SourceMetricData(metricOption);
}
}

/**
Expand Down Expand Up @@ -107,6 +120,10 @@ public void eval(Object... keys) {
throw new UnsupportedOperationException(
String.format("Unsupported for redisCommand: %s", redisCommand));
}
if (sourceMetricData != null) {
sourceMetricData.outputMetricsWithEstimate(rowData, System.currentTimeMillis());
XiaoYou201 marked this conversation as resolved.
Show resolved Hide resolved
}
LOG.info("Report audit: {} and time : {}", rowData, System.currentTimeMillis());
XiaoYou201 marked this conversation as resolved.
Show resolved Hide resolved
if (cache == null) {
collect(rowData);
} else {
Expand Down
7 changes: 6 additions & 1 deletion ...tors/redis/src/main/java/org/apache/inlong/sort/redis/table/RedisDynamicTableFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,15 @@ public class RedisDynamicTableFactory implements DynamicTableSourceFactory, Dyna
public DynamicTableSource createDynamicTableSource(Context context) {
FactoryUtil.TableFactoryHelper helper = FactoryUtil.createTableFactoryHelper(this, context);
ReadableConfig config = helper.getOptions();

helper.validate();
validateConfigOptions(config, SUPPORT_SOURCE_COMMANDS);
String inlongMetric = config.getOptional(INLONG_METRIC).orElse(null);
String auditHostAndPorts = config.get(INLONG_AUDIT);
String auditKeys = config.get(AUDIT_KEYS);
return new RedisDynamicTableSource(context.getCatalogTable().getOptions(),
context.getCatalogTable().getResolvedSchema(), config, getJdbcLookupOptions(config));
context.getCatalogTable().getResolvedSchema(), config, getJdbcLookupOptions(config), inlongMetric,
auditHostAndPorts, auditKeys);
}

@Override
Expand Down
Loading