address PR feedback

Author: mccanne

service/ztests/curl-load-error.yaml

@@ -16,7 +16,7 @@ inputs:
 outputs:
   - name: stdout
     data: |
-      {"type":"Error","kind":"invalid operation","error":"format detection error\n\tarrows: schema message length exceeds 1 MiB\n\tbsup: BSUP version mismatch: expected 1 found 0\n\tcsup: auto-detection requires seekable input\n\tcsv: line 1: EOF\n\tjson: invalid character 'T' looking for beginning of value\n\tline: auto-detection not supported\n\tparquet: auto-detection requires seekable input\n\tsup: line 1: syntax error\n\ttsv: line 1: EOF\n\tzeek: line 1: bad types/fields definition in zeek header\n\tjsup: line 1: malformed JSUP: bad type object: \"This is not a detectable format.\": unpacker error parsing JSON: invalid character 'T' looking for beginning of value"}
+      {"type":"Error","kind":"invalid operation","error":"format detection error\n\tarrows: schema message length exceeds 1 MiB\n\tbsup: BSUP version mismatch: expected 1, found 0\n\tcsup: auto-detection requires seekable input\n\tcsv: line 1: EOF\n\tjson: invalid character 'T' looking for beginning of value\n\tline: auto-detection not supported\n\tparquet: auto-detection requires seekable input\n\tsup: line 1: syntax error\n\ttsv: line 1: EOF\n\tzeek: line 1: bad types/fields definition in zeek header\n\tjsup: line 1: malformed JSUP: bad type object: \"This is not a detectable format.\": unpacker error parsing JSON: invalid character 'T' looking for beginning of value"}
       code 400
       {"type":"Error","kind":"invalid operation","error":"unsupported MIME type: unsupported"}
       code 400

service/ztests/load-garbage.yaml

@@ -14,7 +14,7 @@ outputs:
     data: |
       stdio:stdin: format detection error
       	arrows: schema message length exceeds 1 MiB
-      	bsup: BSUP version mismatch: expected 1 found 0
+      	bsup: BSUP version mismatch: expected 1, found 0
       	csup: auto-detection requires seekable input
       	csv: line 1: delimiter ',' not found
       	json: invalid character 'T' looking for beginning of value

sio/anyio/ztests/detector-dev-zero.yaml

@@ -6,7 +6,7 @@ outputs:
     data: |
       /dev/zero: format detection error
       	arrows: arrow/ipc: could not read message schema: EOF
-      	bsup: BSUP version mismatch: expected 1 found 0
+      	bsup: BSUP version mismatch: expected 1, found 0
       	csup: invalid CSUP header
       	csv: line 1: bufio: buffer full
       	json: invalid character '\x00' looking for beginning of value

sio/anyio/ztests/fake-bsup.yaml

@@ -9,4 +9,4 @@ inputs:
 outputs:
   - name: stderr
     data: |
-      stdio:stdin: BSUP version mismatch: expected 1 found 0
+      stdio:stdin: BSUP version mismatch: expected 1, found 0

sio/anyio/ztests/huge.yaml

@@ -12,7 +12,7 @@ outputs:
     data: |
       stdio:stdin: format detection error
       	arrows: schema message length exceeds 1 MiB
-      	bsup: BSUP version mismatch: expected 1 found 0
+      	bsup: BSUP version mismatch: expected 1, found 0
       	csup: auto-detection requires seekable input
       	csv: line 1: delimiter ',' not found
       	json: buffer exceeded max size trying to infer input format

sio/bsupio/parser.go

@@ -21,16 +21,15 @@ type parser struct {
 	maxSize int
 }
 
-const BSUP_VERSION = 1
-const BSUP_MAGIC = "BSUP"
+const BSUPVersion = 1
 
 func CheckVersion(code byte) error {
 	var version int
 	if (code & 0x80) != 0 {
 		version = int(code & 0x7f)
 	}
-	if version != BSUP_VERSION {
-		return fmt.Errorf("BSUP version mismatch: expected %d found %d", BSUP_VERSION, version)
+	if version != BSUPVersion {
+		return fmt.Errorf("BSUP version mismatch: expected %d, found %d", BSUPVersion, version)
 	}
 	return nil
 }

sio/bsupio/writer.go

@@ -166,7 +166,7 @@ func (w *Writer) writeBlock(blockType int, b []byte) error {
 }
 
 func (w *Writer) writeHeader(blockType, size int) error {
-	version := BSUP_VERSION | 0x80
+	version := BSUPVersion | 0x80
 	code := blockType<<4 | (size & 0xf)
 	w.header = append(w.header[:0], byte(version))
 	w.header = append(w.header, byte(code))
@@ -176,7 +176,7 @@ func (w *Writer) writeHeader(blockType, size int) error {
 
 func (w *Writer) writeCompHeader(blockType, size, zlen int) error {
 	zlen += 1 + scode.SizeOfUvarint(uint64(size))
-	version := BSUP_VERSION | 0x80
+	version := BSUPVersion | 0x80
 	code := (blockType << 4) | (zlen & 0xf) | 0x40
 	w.header = append(w.header[:0], byte(version))
 	w.header = append(w.header, byte(code))

sio/bsupio/ztests/dev-zero.yaml

@@ -4,4 +4,4 @@ script: |
 outputs:
   - name: stderr
     data: |
-      /dev/zero: BSUP version mismatch: expected 1 found 0
+      /dev/zero: BSUP version mismatch: expected 1, found 0

sio/bsupio/ztests/issue-4082.yaml

@@ -14,4 +14,4 @@ inputs:
 outputs:
   - name: stderr
     data: |
-      stdio:stdin: BSUP version mismatch: expected 1 found 0
+      stdio:stdin: BSUP version mismatch: expected 1, found 0