Miscellaneous lint cleanup #7747
Conversation
mark-rushakoff
commented
Dec 19, 2016
•
mark-rushakoff
commented
- Rebased/mergable
- Tests pass
| var out io.Writer = &e.LogOutput | ||
| if testing.Verbose() { | ||
| out = io.MultiWriter(out, os.Stderr) | ||
| } | ||
| e.QueryExecutor.WithLogger(zap.New( | ||
| zap.NewTextEncoder(), | ||
| zap.Output(os.Stderr), |
There was a problem hiding this comment.
What this supposed to be out from L199?
There was a problem hiding this comment.
Probably. I'll amend the commit.
| @@ -1208,7 +1208,7 @@ func (k *tsmKeyIterator) combine(dedup bool) blocks { | |||
| } | |||
|
|
|||
| func (k *tsmKeyIterator) chunk(dst blocks) blocks { | |||
| for len(k.mergedValues) > k.size { | |||
| if len(k.mergedValues) > k.size { | |||
There was a problem hiding this comment.
This should be for since we are slicing values off on L1225 within the loop.
There was a problem hiding this comment.
There's no loop. There's a hardcoded return on the last line.
There was a problem hiding this comment.
Hmm. I'll have to look at when that changed. That may be a bug.
There was a problem hiding this comment.
This should be an if as you have it. When the return was added, I forgot to switch it from a loop.
mark-rushakoff
force-pushed
the
mr-lint-cleanup
branch
from
0b073d9
to
d4d5c91
Compare
| @@ -87,7 +87,7 @@ func (c *MetaClientMock) Databases() []meta.DatabaseInfo { | |||
| } | |||
|
|
|||
| func (c *MetaClientMock) DeleteShardGroup(database string, policy string, id uint64) error { | |||
| return c.DeleteShardGroup(database, policy, id) | |||
| return c.DeleteShardGroupFn(database, policy, id) | |||
There was a problem hiding this comment.
Clearly this was never being called in a test 🤦♂️
mark-rushakoff
force-pushed
the
mr-lint-cleanup
branch
from
d4d5c91
to
07b87f2
Compare
|
We should try and get this merged soon given it touches a lot of the code-base. |
|
Waiting on @jwilder to make a decision on the (non-)loop in |
