-
Notifications
You must be signed in to change notification settings - Fork 3.9k
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.
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
engine: fix RocksDBBatchReader example comment #27348
Merged
craig
merged 1 commit into
cockroachdb:master
from
nvanbenschoten:nvanbenschoten/fixCmt
Jul 10, 2018
Merged
engine: fix RocksDBBatchReader example comment #27348
craig
merged 1 commit into
cockroachdb:master
from
nvanbenschoten:nvanbenschoten/fixCmt
Jul 10, 2018
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
Release note: None
bdarnell
approved these changes
Jul 10, 2018
petermattis
reviewed
Jul 10, 2018
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewable status:
complete! 0 of 0 LGTMs obtained (and 1 stale)
Wow, that was a quick review. bors r+ |
craig bot
pushed a commit
that referenced
this pull request
Jul 10, 2018
27262: ui: require yarn >= 1.7.0 r=benesch,vilterp a=tschottdorf Builds before the upgrade failed mysteriously. @benesch (cc) suspects a bug in older versions of yarn. ``` $ make build Running make with -j8 GOPATH set to /Users/tschottdorf/go build/node-run.sh -C pkg/ui yarn install --offline (echo "// Code generated by goyacc. DO NOT EDIT."; \ echo "// GENERATED FILE DO NOT EDIT"; \ cat pkg/sql/parser/gen/sql.go.tmp | \ sed -E 's/^const ([A-Z][_A-Z0-9]*) =.*$/const \1 = lex.\1/g') > pkg/sql/parser/sql.go.tmp || rm pkg/sql/parser/sql.go.tmp (echo "// Code generated by make. DO NOT EDIT."; \ echo "// GENERATED FILE DO NOT EDIT"; \ echo; \ echo "package lex"; \ echo; \ grep '^const [A-Z][_A-Z0-9]* ' pkg/sql/parser/gen/sql.go.tmp) > pkg/sql/lex/tokens.go.tmp || rm pkg/sql/lex/tokens.go.tmp mv -f pkg/sql/lex/tokens.go.tmp pkg/sql/lex/tokens.go mv -f pkg/sql/parser/sql.go.tmp pkg/sql/parser/sql.go yarn install v1.6.0 (node:50064) [DEP0005] DeprecationWarning: Buffer() is deprecated due to security and usability issues. Please use the Buffer.alloc(), Buffer.allocUnsafe(), or Buffer.from() methods instead. [1/5] Validating package.json... go install -v docgen bin/prereqs ./pkg/cmd/docgen > bin/docgen.d.tmp [2/5] Resolving packages... mv -f bin/docgen.d.tmp bin/docgen.d [3/5] Fetching packages... build/node-run.sh pkg/ui/bin/gen-protobuf-cli-deps.js > pkg/ui/node_modules/protobufjs/cli/package.json bash: pkg/ui/node_modules/protobufjs/cli/package.json: No such file or directory make: *** [pkg/ui/yarn.installed] Error 1 make: *** Waiting for unfinished jobs.... ``` Release note (general change): the build now requires yarn at version 1.7.0 or above, to work around yarnpkg/yarn#5761. 27307: storage: return TransactionRetryError from QueryIntent on pushed intent r=nvanbenschoten a=nvanbenschoten Extracted from #26599. This change adjusts how QueryIntent handles pushed intents. First, it changes how pushed intents interact with SNAPSHOT transactions. Next, it makes sure to update the response transaction in the case of pushed intents. Finally, it returns a RETRY_SERIALIZABLE TransactionRetryError for SERIALIZABLE transactions who observe a pushed intent with the RETURN_ERROR behavior. Release note: None 27329: log: use fake stacktrace when test-exiting r=benesch a=tschottdorf Having stack traces littered across tests has been a long-standing pet peeve of mine (and presumably others). We search through logs more often than we would like to admit, and having to skip a number of intentional stack traces is annoying. Make it so that whenever the logging exit func is mocked, the stack trace indicates that. Release note: None 27348: engine: fix RocksDBBatchReader example comment r=nvanbenschoten a=nvanbenschoten Release note: None Co-authored-by: Tobias Schottdorf <[email protected]> Co-authored-by: Nathan VanBenschoten <[email protected]>
Build succeeded |
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.
Release note: None