Skip to content

Subscription: display the now value as the actual timestamp when showing the topic #13020

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

Merged
SteveYurongSu merged 2 commits into from
Jul 25, 2024
Merged

Subscription: display the now value as the actual timestamp when showing the topic #13020

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
c0f8248
setup
VGalaxies Jul 24, 2024
a10e6e6
fixup! setup
VGalaxies Jul 24, 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
26 changes: 8 additions & 18 deletions ...lient/service-rpc/src/main/java/org/apache/iotdb/rpc/subscription/config/TopicConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,26 +88,16 @@ public Map<String, String> getAttributesWithPathOrPattern() {
attributes.getOrDefault(TopicConstant.PATH_KEY, TopicConstant.PATH_DEFAULT_VALUE));
}

public Map<String, String> getAttributesWithTimeRange(final long creationTime) {
public Map<String, String> getAttributesWithTimeRange() {
final Map<String, String> attributesWithTimeRange = new HashMap<>();

// parse start time
final String startTime =
attributes.getOrDefault(TopicConstant.START_TIME_KEY, String.valueOf(Long.MIN_VALUE));
if (TopicConstant.NOW_TIME_VALUE.equalsIgnoreCase(startTime)) {
attributesWithTimeRange.put(TopicConstant.START_TIME_KEY, String.valueOf(creationTime));
} else {
attributesWithTimeRange.put(TopicConstant.START_TIME_KEY, startTime);
}

// parse end time
final String endTime =
attributes.getOrDefault(TopicConstant.END_TIME_KEY, String.valueOf(Long.MAX_VALUE));
if (TopicConstant.NOW_TIME_VALUE.equalsIgnoreCase(endTime)) {
attributesWithTimeRange.put(TopicConstant.END_TIME_KEY, String.valueOf(creationTime));
} else {
attributesWithTimeRange.put(TopicConstant.END_TIME_KEY, endTime);
}
// there should be no TopicConstant.NOW_TIME_VALUE here
attributesWithTimeRange.put(
TopicConstant.START_TIME_KEY,
attributes.getOrDefault(TopicConstant.START_TIME_KEY, String.valueOf(Long.MIN_VALUE)));
attributesWithTimeRange.put(
TopicConstant.END_TIME_KEY,
attributes.getOrDefault(TopicConstant.END_TIME_KEY, String.valueOf(Long.MAX_VALUE)));

return attributesWithTimeRange;
}
Expand Down
6 changes: 1 addition & 5 deletions ...a/org/apache/iotdb/confignode/procedure/impl/subscription/topic/CreateTopicProcedure.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@
package org.apache.iotdb.confignode.procedure.impl.subscription.topic;

import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.subscription.meta.topic.TopicMeta;
import org.apache.iotdb.commons.utils.CommonDateTimeUtils;
import org.apache.iotdb.confignode.consensus.request.write.subscription.topic.CreateTopicPlan;
import org.apache.iotdb.confignode.consensus.request.write.subscription.topic.DropTopicPlan;
import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv;
Expand Down Expand Up @@ -78,9 +76,7 @@ protected void executeFromValidate(ConfigNodeProcedureEnv env) throws Subscripti
topicMeta =
new TopicMeta(
createTopicReq.getTopicName(),
CommonDateTimeUtils.convertMilliTimeWithPrecision(
System.currentTimeMillis(),
CommonDescriptor.getInstance().getConfig().getTimestampPrecision()),
System.currentTimeMillis(),
createTopicReq.getTopicAttributes());
}

Expand Down
30 changes: 24 additions & 6 deletions ...apache/iotdb/db/queryengine/plan/execution/config/executor/ClusterConfigTaskExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.StatementExecutionException;
import org.apache.iotdb.rpc.TSStatusCode;
import org.apache.iotdb.rpc.subscription.config.TopicConstant;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferResp;
import org.apache.iotdb.trigger.api.Trigger;
Expand Down Expand Up @@ -1991,14 +1992,31 @@ public SettableFuture<ConfigTaskResult> createTopic(CreateTopicStatement createT
final String topicName = createTopicStatement.getTopicName();
final Map<String, String> topicAttributes = createTopicStatement.getTopicAttributes();

// Replace now value with current time (raw timestamp based on system timestamp precision)
final long currentTime =
CommonDateTimeUtils.convertMilliTimeWithPrecision(
System.currentTimeMillis(),
CommonDescriptor.getInstance().getConfig().getTimestampPrecision());
topicAttributes.computeIfPresent(
TopicConstant.START_TIME_KEY,
(k, v) -> {
if (TopicConstant.NOW_TIME_VALUE.equals(v)) {
return String.valueOf(currentTime);
}
return v;
});
topicAttributes.computeIfPresent(
TopicConstant.END_TIME_KEY,
(k, v) -> {
if (TopicConstant.NOW_TIME_VALUE.equals(v)) {
return String.valueOf(currentTime);
}
return v;
});

// Validate topic config
final TopicMeta temporaryTopicMeta =
new TopicMeta(
topicName,
CommonDateTimeUtils.convertMilliTimeWithPrecision(
System.currentTimeMillis(),
CommonDescriptor.getInstance().getConfig().getTimestampPrecision()),
topicAttributes);
new TopicMeta(topicName, System.currentTimeMillis(), topicAttributes);
try {
PipeDataNodeAgent.plugin()
.validateExtractor(temporaryTopicMeta.generateExtractorAttributes());
Expand Down
4 changes: 2 additions & 2 deletions ...ode-commons/src/main/java/org/apache/iotdb/commons/subscription/meta/topic/TopicMeta.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
public class TopicMeta {

private String topicName;
private long creationTime; // raw timestamp based on system timestamp precision
private long creationTime; // unit in ms
private TopicConfig config;

private Set<String> subscribedConsumerGroupIds;
Expand Down Expand Up @@ -182,7 +182,7 @@ public Map<String, String> generateExtractorAttributes() {
// path
extractorAttributes.putAll(config.getAttributesWithPathOrPattern());
// time
extractorAttributes.putAll(config.getAttributesWithTimeRange(creationTime));
extractorAttributes.putAll(config.getAttributesWithTimeRange());
// realtime mode
extractorAttributes.putAll(config.getAttributesWithRealtimeMode());
// source mode
Expand Down