refactor(pageserver): better pageservice command parsing #9597
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Alex Chi Z <chi@neon.tech>
skyzh
force-pushed
the
skyzh/pageservice-cmd-handle
branch
from
6d2a5ba
to
9daae35
Compare
5328 tests run: 5106 passed, 0 failed, 222 skipped (full report)Code coverage* (full report)
* collected from Rust tests only The comment gets automatically updated with the latest test results
60791a6 at 2024-10-31T20:29:54.727Z :recycle: |
Signed-off-by: Alex Chi Z <chi@neon.tech>
arpad-m
reviewed
Oct 31, 2024
| fn parse(query: &str) -> anyhow::Result<Self> { | ||
| let query = query.trim(); | ||
| let Some((cmd, other)) = query.split_once(' ') else { | ||
| bail!("cannot parse query: {}", query) |
There was a problem hiding this comment.
Suggested change
| bail!("cannot parse query: {}", query) | |
| bail!("cannot parse query: {query}") |
| if cmd2 == "lsn" { | ||
| Ok(Self::LeaseLsn(LeaseLsnCmd::parse(other)?)) | ||
| } else { | ||
| bail!("invalid lease command: {}", cmd); |
There was a problem hiding this comment.
Suggested change
| bail!("invalid lease command: {}", cmd); | |
| bail!("invalid lease command: {cmd}"); |
| } | ||
| } | ||
| "set" => Ok(Self::Set), | ||
| _ => Err(anyhow::anyhow!("unsupported command {} in {}", cmd, query)), |
There was a problem hiding this comment.
Suggested change
| _ => Err(anyhow::anyhow!("unsupported command {} in {}", cmd, query)), | |
| _ => Err(anyhow::anyhow!("unsupported command {cmd} in {query}")), |
| match param { | ||
| "--gzip" => { | ||
| if gzip { | ||
| bail!("duplicate parameter for basebackup command: {}", param) |
There was a problem hiding this comment.
Suggested change
| bail!("duplicate parameter for basebackup command: {}", param) | |
| bail!("duplicate parameter for basebackup command: {param}") |
| } | ||
| "--replica" => { | ||
| if replica { | ||
| bail!("duplicate parameter for basebackup command: {}", param) |
There was a problem hiding this comment.
Suggested change
| bail!("duplicate parameter for basebackup command: {}", param) | |
| bail!("duplicate parameter for basebackup command: {param}") |
| } | ||
| replica = true | ||
| } | ||
| _ => bail!("invalid parameter for basebackup command: {}", param), |
There was a problem hiding this comment.
Suggested change
| _ => bail!("invalid parameter for basebackup command: {}", param), | |
| _ => bail!("invalid parameter for basebackup command: {param}"), |
| } else { | ||
| lsn = Some( | ||
| Lsn::from_str(maybe_lsn) | ||
| .with_context(|| format!("Failed to parse lsn from {}", maybe_lsn))?, |
There was a problem hiding this comment.
Suggested change
| .with_context(|| format!("Failed to parse lsn from {}", maybe_lsn))?, | |
| .with_context(|| format!("Failed to parse lsn from {maybe_lsn}"))?, |
| "fullbackup" => Ok(Self::FullBackup(FullBackupCmd::parse(other)?)), | ||
| "lease" => { | ||
| let Some((cmd2, other)) = other.split_once(' ') else { | ||
| bail!("invalid lease command: {}", cmd); |
There was a problem hiding this comment.
Suggested change
| bail!("invalid lease command: {}", cmd); | |
| bail!("invalid lease command: {cmd}"); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
close #9460
Summary of changes
A full rewrite of pagestream cmdline parsing to make it more robust and readable.
Checklist before requesting a review
Checklist before merging