Make Environment.dataFiles singular #72327
Merged
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
The path.data setting is now a singular string, but the method dataFiles() that gives access to the path is still an array. This commit renames the method and makes the return type a single Path. relates elastic#71205
rjernst
added
:Core/Infra/Core
|
Pinging @elastic/es-core-infra (Team:Core/Infra) |
jasontedor
approved these changes
Apr 28, 2021
| nodePaths = new NodePath[environment.dataFiles().length]; | ||
| locks = new Lock[nodePaths.length]; | ||
| nodePaths = new NodePath[1]; | ||
| locks = new Lock[1]; |
There was a problem hiding this comment.
I am assuming these are follow ups.
| @@ -566,7 +566,8 @@ public void testResolvePath() throws Exception { | |||
| for (String nodeName : nodeNames) { | |||
| final Path indexPath = indexPathByNodeName.get(nodeName); | |||
| final OptionSet options = parser.parse("--dir", indexPath.toAbsolutePath().toString()); | |||
| command.findAndProcessShardPath(options, environmentByNodeName.get(nodeName), environmentByNodeName.get(nodeName).dataFiles(), | |||
| command.findAndProcessShardPath(options, environmentByNodeName.get(nodeName), | |||
| new Path[] { environmentByNodeName.get(nodeName).dataFile() }, | |||
There was a problem hiding this comment.
Is there potential for a follow up here to make this method parameter be single-valued?
There was a problem hiding this comment.
Yes. I'm working through essentially anything in the entire codebase that uses Path[].
17 tasks
rjernst
added a commit
to rjernst/elasticsearch
that referenced
this pull request
Oct 13, 2021
This reverts commit b1eab79. This revert was conflict free. relates elastic#78525 relates elastic#71205
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.
The path.data setting is now a singular string, but the method
dataFiles() that gives access to the path is still an array. This commit
renames the method and makes the return type a single Path.
relates #71205