Merge pull request #8922 from cockroachdb/master

master -> develop

acceptance/reference_test.go

@@ -52,6 +52,7 @@ trap finish EXIT
 
 export PGHOST=localhost
 export PGPORT=""
+export COCKROACH_SKIP_UPDATE_CHECK=1
 
 bin=/%s/cockroach
 # TODO(bdarnell): when --background is in referenceBinPath, use it here and below.
@@ -142,6 +143,7 @@ function finish() {
 }
 trap finish EXIT
 
+export COCKROACH_SKIP_UPDATE_CHECK=1
 $bin start --alsologtostderr=INFO --background --store=/cockroach-data-reference-7429 &> out
 $bin debug kv scan
 $bin quit

build/circle-test.sh

@@ -82,7 +82,7 @@ prepare_artifacts() {
 
   if [ "${ret}" -ne 0 ] &&
      [ -n "${GITHUB_API_TOKEN-}" ] &&
-     [ "${CIRCLE_BRANCH-}" = "master" ] || [ "${CIRCLE_BRANCH-}" = "develop" ]
+     ([ "${CIRCLE_BRANCH-}" = "master" ] || [ "${CIRCLE_BRANCH-}" = "develop" ])
   then
       function post() {
         curl -X POST -H "Authorization: token ${GITHUB_API_TOKEN}" \

cli/cliflags/flags.go

@@ -316,14 +316,17 @@ database, insecure, certs).`,
 	From = FlagInfo{
 		Name: "from",
 		Description: `
-Start key and format as [<format>:]<key>. Supported formats: raw, human, rangeID.`,
+Start key and format as [<format>:]<key>. Supported formats: raw, human,
+rangeID. The raw format supports escaped text. For example, "raw:\x01k" is the
+prefix for range local keys.`,
 	}
 
 	To = FlagInfo{
 		Name: "to",
 		Description: `
-Exclusive end key and format as [<format>:]<key>. Supported formats: raw, human, rangeID.`,
-	}
+Exclusive end key and format as [<format>:]<key>. Supported formats: raw,
+human, rangeID. The raw format supports escaped text. For example, "raw:\x01k"
+is the prefix for range local keys.`}
 
 	Values = FlagInfo{
 		Name:        "values",

cli/context.go

@@ -116,7 +116,7 @@ func (k *mvccKey) Set(value string) error {
 
 	switch typ {
 	case raw:
-		*k = mvccKey(engine.MakeMVCCMetadataKey(roachpb.Key(keyStr)))
+		*k = mvccKey(engine.MakeMVCCMetadataKey(roachpb.Key(unquoteArg(keyStr, false))))
 	case human:
 		key, err := keys.UglyPrint(keyStr)
 		if err != nil {