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-9246][Sort] Pulsar source support audit when the deserialized type is not InlongMsg #9255

Merged
merged 5 commits into from
Nov 13, 2023
Merged

[INLONG-9246][Sort] Pulsar source support audit when the deserialized type is not InlongMsg #9255

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e3e50b8
[INLONG-9246][Sort] Pulsar source support audit when the deserialized…
vernedeng Nov 10, 2023
0f334cf
fix
vernedeng Nov 10, 2023
7154bbc
fix
vernedeng Nov 10, 2023
a473c5a
fix
vernedeng Nov 10, 2023
e181cba
fix
vernedeng Nov 13, 2023
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
7 changes: 6 additions & 1 deletion ...-common/src/main/java/org/apache/inlong/sort/protocol/node/extract/PulsarExtractNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.apache.inlong.sort.protocol.Metadata;
import org.apache.inlong.sort.protocol.node.ExtractNode;
import org.apache.inlong.sort.protocol.node.format.Format;
import org.apache.inlong.sort.protocol.node.format.InLongMsgFormat;
import org.apache.inlong.sort.protocol.transformation.WatermarkField;

import com.google.common.base.Preconditions;
Expand Down Expand Up @@ -146,7 +147,11 @@ public String getMetadataKey(MetaField metaField) {
String metadataKey;
switch (metaField) {
case AUDIT_DATA_TIME:
metadataKey = "value.data-time";
if (format instanceof InLongMsgFormat) {
metadataKey = "value.data-time";
} else {
metadataKey = "consume_time";
}
break;
default:
throw new UnsupportedOperationException(String.format("Unsupport meta field for %s: %s",
Expand Down
7 changes: 7 additions & 0 deletions ...ort-connectors/pulsar/src/main/java/org/apache/inlong/sort/pulsar/PulsarTableFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import static org.apache.flink.connector.pulsar.common.config.PulsarOptions.PULSAR_ADMIN_URL;
import static org.apache.flink.connector.pulsar.common.config.PulsarOptions.PULSAR_SERVICE_URL;
import static org.apache.flink.connector.pulsar.source.PulsarSourceOptions.PULSAR_SUBSCRIPTION_NAME;
import static org.apache.flink.table.factories.FactoryUtil.FORMAT;
import static org.apache.flink.table.factories.FactoryUtil.SINK_PARALLELISM;
import static org.apache.inlong.sort.base.Constants.AUDIT_KEYS;
import static org.apache.inlong.sort.base.Constants.INLONG_AUDIT;
Expand Down Expand Up @@ -93,6 +94,9 @@ public class PulsarTableFactory implements DynamicTableSourceFactory {

public static final boolean UPSERT_DISABLED = false;

public static final String INNER_FORMAT_TYPE = "inlong-msg";
public static boolean innerFormat = false;

@Override
public DynamicTableSource createDynamicTableSource(Context context) {
FactoryUtil.TableFactoryHelper helper = FactoryUtil.createTableFactoryHelper(this, context);
Expand All @@ -103,6 +107,8 @@ public DynamicTableSource createDynamicTableSource(Context context) {
getValueDecodingFormat(helper);
ReadableConfig tableOptions = helper.getOptions();

innerFormat = INNER_FORMAT_TYPE.equals(tableOptions.get(FORMAT));

// Validate configs are not conflict; each options is consumed; no unwanted configs
// PulsarOptions, PulsarSourceOptions and PulsarSinkOptions is not part of the validation.
helper.validateExcept(
Expand Down Expand Up @@ -154,6 +160,7 @@ public DynamicTableSource createDynamicTableSource(Context context) {
valueDecodingFormat,
valueProjection,
UPSERT_DISABLED,
innerFormat,
inlongMetric,
auditHostAndPorts,
auditKeys);
Expand Down
5 changes: 5 additions & 0 deletions ...tors/pulsar/src/main/java/org/apache/inlong/sort/pulsar/table/PulsarReadableMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,11 @@ public enum ReadableMetadata {
DataTypes.TIMESTAMP_WITH_LOCAL_TIME_ZONE(3).notNull(),
message -> TimestampData.fromEpochMillis(message.getEventTime())),

CONSUME_TIME(
"consume_time",
DataTypes.BIGINT().notNull(),
message -> System.currentTimeMillis()),

PROPERTIES(
"properties",
// key and value of the map are nullable to make handling easier in queries
Expand Down
15 changes: 13 additions & 2 deletions ...r/src/main/java/org/apache/inlong/sort/pulsar/table/PulsarTableDeserializationSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ public class PulsarTableDeserializationSchema implements PulsarDeserializationSc

private final boolean upsertMode;

private final boolean innerFormat;

private SourceMetricData sourceMetricData;

private MetricOption metricOption;
Expand All @@ -67,6 +69,7 @@ public PulsarTableDeserializationSchema(
TypeInformation<RowData> producedTypeInfo,
PulsarRowDataConverter rowDataConverter,
boolean upsertMode,
boolean innerFormat,
MetricOption metricOption) {
if (upsertMode) {
checkNotNull(keyDeserialization, "upsert mode must specify a key format");
Expand All @@ -76,6 +79,7 @@ public PulsarTableDeserializationSchema(
this.rowDataConverter = checkNotNull(rowDataConverter);
this.producedTypeInfo = checkNotNull(producedTypeInfo);
this.upsertMode = upsertMode;
this.innerFormat = innerFormat;
this.metricOption = metricOption;
}

Expand Down Expand Up @@ -109,8 +113,15 @@ public void deserialize(Message<byte[]> message, Collector<RowData> collector)
return;
}

valueDeserialization.deserialize(message.getData(),
new MetricsCollector<>(new ListCollector<>(valueRowData), sourceMetricData));
MetricsCollector<RowData> metricsCollector =
new MetricsCollector<>(new ListCollector<>(valueRowData), sourceMetricData);

// reset time stamp if the deserialize schema has not inner format
vernedeng marked this conversation as resolved.
Show resolved Hide resolved
if (!innerFormat) {
metricsCollector.resetTimestamp(message.getEventTime());
}

valueDeserialization.deserialize(message.getData(), metricsCollector);

rowDataConverter.projectToProducedRowAndCollect(
message, keyRowData, valueRowData, collector);
Expand Down
5 changes: 5 additions & 0 deletions ...ain/java/org/apache/inlong/sort/pulsar/table/PulsarTableDeserializationSchemaFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ public class PulsarTableDeserializationSchemaFactory implements Serializable {

private final int[] valueProjection;

private final boolean innerFormat;

// --------------------------------------------------------------------------------------------
// Mutable attributes. Will be updated after the applyReadableMetadata()
// --------------------------------------------------------------------------------------------
Expand All @@ -101,6 +103,7 @@ public PulsarTableDeserializationSchemaFactory(
DecodingFormat<DeserializationSchema<RowData>> valueDecodingFormat,
int[] valueProjection,
boolean upsertMode,
boolean innerFormat,
String inlongMetric,
String auditHostAndPorts,
String auditKeys) {
Expand All @@ -116,6 +119,7 @@ public PulsarTableDeserializationSchemaFactory(
this.producedDataType = physicalDataType;
this.connectorMetadataKeys = Collections.emptyList();
this.upsertMode = upsertMode;
this.innerFormat = innerFormat;

this.inlongMetric = inlongMetric;
this.auditHostAndPorts = auditHostAndPorts;
Expand Down Expand Up @@ -178,6 +182,7 @@ public PulsarDeserializationSchema<RowData> createPulsarDeserialization(
producedTypeInfo,
rowDataConverter,
upsertMode,
innerFormat,
metricOption);
}

Expand Down