Fix issue with empty args and workers #245
Merged
Conversation
This file contains hidden or 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
|
added #246 |
ittaiz
suggested changes
Jul 6, 2017
twitter_scrooge/twitter_scrooge.bzl
Outdated
| @@ -140,7 +140,7 @@ def _gen_scrooge_srcjar_impl(ctx): | |||
| # in order to generate code) have targets which will compile them. | |||
| _assert_set_is_subset(only_transitive_thrift_srcs, transitive_owned_srcs) | |||
|
|
|||
| path_content = "\n".join([_colon_paths(ps) for ps in [immediate_thrift_srcs, only_transitive_thrift_srcs, remote_jars, external_jars]]) | |||
| path_content = "\n".join(["_" + _colon_paths(ps) for ps in [immediate_thrift_srcs, only_transitive_thrift_srcs, remote_jars, external_jars]]) | |||
There was a problem hiding this comment.
Can you extract this into a constant with a clear name? Something like PaddingToPreserverAruent or PaddingToSeparateArgumentToOwnLine? Names are different once I'm really not sure I got the point well enough...
| @@ -41,7 +41,7 @@ class ScroogeGenerator extends Processor { | |||
|
|
|||
| def processRequest(args: java.util.List[String]) { | |||
| def getIdx(i: Int): List[String] = | |||
| if (args.size > i) args.get(i).split(':').toList.filter(_.nonEmpty) | |||
| if (args.size > i) args.get(i).drop(1).split(':').toList.filter(_.nonEmpty) | |||
There was a problem hiding this comment.
Can we extract 1 into a constant as well to express why we're dropping it? Something like .drop(PaddingCharacterUsedForArgumentPreservation)
I know the names are long but honestly I fear this will cryptic code really fast
|
Sounds good. Will update and add links to the issue I filed on bazel.
…On Wed, Jul 5, 2017 at 18:08 Ittai Zeidman ***@***.***> wrote:
***@***.**** requested changes on this pull request.
Hey, two really small comments
------------------------------
In twitter_scrooge/twitter_scrooge.bzl
<#245 (comment)>
:
> @@ -140,7 +140,7 @@ def _gen_scrooge_srcjar_impl(ctx):
# in order to generate code) have targets which will compile them.
_assert_set_is_subset(only_transitive_thrift_srcs, transitive_owned_srcs)
- path_content = "\n".join([_colon_paths(ps) for ps in [immediate_thrift_srcs, only_transitive_thrift_srcs, remote_jars, external_jars]])
+ path_content = "\n".join(["_" + _colon_paths(ps) for ps in [immediate_thrift_srcs, only_transitive_thrift_srcs, remote_jars, external_jars]])
Can you extract this into a constant with a clear name? Something like
PaddingToPreserverAruent or PaddingToSeparateArgumentToOwnLine? Names are
different once I'm really not sure I got the point well enough...
------------------------------
In src/scala/scripts/TwitterScroogeGenerator.scala
<#245 (comment)>
:
> @@ -41,7 +41,7 @@ class ScroogeGenerator extends Processor {
def processRequest(args: java.util.List[String]) {
def getIdx(i: Int): List[String] =
- if (args.size > i) args.get(i).split(':').toList.filter(_.nonEmpty)
+ if (args.size > i) args.get(i).drop(1).split(':').toList.filter(_.nonEmpty)
Can we extract 1 into a constant as well to express why we're dropping it?
Something like .drop(PaddingCharacterUsedForArgumentPreservation)
I know the names are long but honestly I fear this will cryptic code
really fast
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#245 (review)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAEJdq1MNQaW6h5hoQeh5tU6L5W9OLEkks5sLF24gaJpZM4OPFCs>
.
|
ittaiz
approved these changes
Jul 6, 2017
|
LGTM. I'd wait for green just to be on the safe side. Going to a company party so you can merge when you want :) |
|
@ittaiz thanks for the review, sir! |
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.
when workers are enabled, it seems empty lines are removed from the arguments list. This PR makes sure to always have 1 line per arg (by padding with a leading
_which is discarded).This is actually currently a blocker for us. I would love to have better tests around this (that exercise everything with and without workers, but I don't want to try to shave that yak before we get this build issue unblocked).