Skip to content

[ISSUE #6108] Optimize command line tools QueryMsgByKey& QueryMsgTraceById #6115

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
merged 12 commits into from
Feb 27, 2023
Merged

[ISSUE #6108] Optimize command line tools QueryMsgByKey& QueryMsgTraceById #6115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ef3573a
Merge pull request #1 from apache/develop
socutes Jan 30, 2023
ea9056b
Merge pull request #2 from apache/develop
socutes Feb 2, 2023
8f1ae0f
Merge pull request #3 from apache/develop
socutes Feb 3, 2023
c29d339
Merge pull request #4 from apache/develop
socutes Feb 6, 2023
9d197c3
Merge pull request #5 from apache/develop
socutes Feb 13, 2023
1e0ed74
Merge remote-tracking branch 'rocketmq/develop' into develop
loboxu Feb 16, 2023
5abf2fe
Command line tool QueryMsgByKey& QueryMsgTraceById：time range and num…
loboxu Feb 18, 2023
b859730
Optimize command line tools QueryMsgByKey& QueryMsgTraceById
loboxu Feb 19, 2023
ea3f654
Optimize command line tools QueryMsgByKey& QueryMsgTraceById
loboxu Feb 20, 2023
441d1cf
Merge remote-tracking branch 'rocketmq/develop' into develop
loboxu Feb 20, 2023
f1eb88e
Merge pull request #6 from apache/develop
socutes Feb 24, 2023
c5432ac
Merge remote-tracking branch 'origin/develop' into dev/issue-6108
loboxu Feb 25, 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
31 changes: 28 additions & 3 deletions tools/src/main/java/org/apache/rocketmq/tools/command/message/QueryMsgByKeySubCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,18 @@ public Options buildCommandlineOptions(Options options) {
opt.setRequired(true);
options.addOption(opt);

opt = new Option("b", "beginTimestamp", true, "Begin timestamp(ms). default:0, eg:1676730526212");
opt.setRequired(false);
options.addOption(opt);

opt = new Option("e", "endTimestamp", true, "End timestamp(ms). default:Long.MAX_VALUE, eg:1676730526212");
opt.setRequired(false);
options.addOption(opt);

opt = new Option("c", "maxNum", true, "The maximum number of messages returned by the query, default:64");
opt.setRequired(false);
options.addOption(opt);

return options;
}

Expand All @@ -62,19 +74,32 @@ public void execute(CommandLine commandLine, Options options, RPCHook rpcHook) t
final String topic = commandLine.getOptionValue('t').trim();
final String key = commandLine.getOptionValue('k').trim();

this.queryByKey(defaultMQAdminExt, topic, key);
long beginTimestamp = 0;
long endTimestamp = Long.MAX_VALUE;
int maxNum = 64;
if (commandLine.hasOption("b")) {
beginTimestamp = Long.parseLong(commandLine.getOptionValue("b").trim());
}
if (commandLine.hasOption("e")) {
endTimestamp = Long.parseLong(commandLine.getOptionValue("e").trim());
}
if (commandLine.hasOption("c")) {
maxNum = Integer.parseInt(commandLine.getOptionValue("c").trim());
}
this.queryByKey(defaultMQAdminExt, topic, key, maxNum, beginTimestamp, endTimestamp);
} catch (Exception e) {
throw new SubCommandException(this.getClass().getSimpleName() + " command failed", e);
} finally {
defaultMQAdminExt.shutdown();
}
}

private void queryByKey(final DefaultMQAdminExt admin, final String topic, final String key)
private void queryByKey(final DefaultMQAdminExt admin, final String topic, final String key, int maxNum, long begin,
long end)
throws MQClientException, InterruptedException {
admin.start();

QueryResult queryResult = admin.queryMessage(topic, key, 64, 0, Long.MAX_VALUE);
QueryResult queryResult = admin.queryMessage(topic, key, maxNum, begin, end);
System.out.printf("%-50s %4s %40s%n",
"#Message ID",
"#QID",
Expand Down
34 changes: 31 additions & 3 deletions .../src/main/java/org/apache/rocketmq/tools/command/message/QueryMsgTraceByIdSubCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,19 @@ public Options buildCommandlineOptions(Options options) {
opt = new Option("t", "traceTopic", true, "The name value of message trace topic");
opt.setRequired(false);
options.addOption(opt);

opt = new Option("b", "beginTimestamp", true, "Begin timestamp(ms). default:0, eg:1676730526212");
opt.setRequired(false);
options.addOption(opt);

opt = new Option("e", "endTimestamp", true, "End timestamp(ms). default:Long.MAX_VALUE, eg:1676730526212");
opt.setRequired(false);
options.addOption(opt);

opt = new Option("c", "maxNum", true, "The maximum number of messages returned by the query, default:64");
opt.setRequired(false);
options.addOption(opt);

return options;
}

Expand Down Expand Up @@ -78,18 +91,33 @@ public void execute(CommandLine commandLine, Options options, RPCHook rpcHook) t
if (commandLine.hasOption('n')) {
defaultMQAdminExt.setNamesrvAddr(commandLine.getOptionValue('n').trim());
}
this.queryTraceByMsgId(defaultMQAdminExt, traceTopic, msgId);

long beginTimestamp = 0;
long endTimestamp = Long.MAX_VALUE;
int maxNum = 64;
if (commandLine.hasOption("b")) {
beginTimestamp = Long.parseLong(commandLine.getOptionValue("b").trim());
}
if (commandLine.hasOption("e")) {
endTimestamp = Long.parseLong(commandLine.getOptionValue("e").trim());
}
if (commandLine.hasOption("c")) {
maxNum = Integer.parseInt(commandLine.getOptionValue("c").trim());
}

this.queryTraceByMsgId(defaultMQAdminExt, traceTopic, msgId, maxNum, beginTimestamp, endTimestamp);
} catch (Exception e) {
throw new SubCommandException(this.getClass().getSimpleName() + "command failed", e);
} finally {
defaultMQAdminExt.shutdown();
}
}

private void queryTraceByMsgId(final DefaultMQAdminExt admin, String traceTopic, String msgId)
private void queryTraceByMsgId(final DefaultMQAdminExt admin, String traceTopic, String msgId, int maxNum,
long begin, long end)
throws MQClientException, InterruptedException {
admin.start();
QueryResult queryResult = admin.queryMessage(traceTopic, msgId, 64, 0, System.currentTimeMillis());
QueryResult queryResult = admin.queryMessage(traceTopic, msgId, maxNum, begin, end);
List<MessageExt> messageList = queryResult.getMessageList();
List<TraceView> traceViews = new ArrayList<>();
for (MessageExt message : messageList) {
Expand Down