update protoc to 21.7; also adds go 1.19 to CI (#534)

jhump · Oct 3, 2022 · ac1361c · ac1361c
1 parent 101791c
commit ac1361c
Show file tree

Hide file tree

Showing 33 changed files with 210 additions and 103 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -56,6 +56,12 @@ jobs:
     working_directory: ~/repo
     docker:
       - image: cimg/go:1.18
+    steps: *simple_job_steps
+
+  build-1-19:
+    working_directory: ~/repo
+    docker:
+      - image: cimg/go:1.19
     steps:
       - checkout
       - restore_cache:
@@ -77,10 +83,10 @@ jobs:
     #- store_test_results:
     #    path: /tmp/test-reports
 
-  build-1-18-u:
+  build-1-19-u:
     working_directory: ~/repo
     docker:
-      - image: cimg/go:1.18
+      - image: cimg/go:1.19
     steps:
       - checkout
       - run:
@@ -102,4 +108,5 @@ workflows:
       - build-1-17
       - build-windows
       - build-1-18
-      - build-1-18-u
+      - build-1-19
+      - build-1-19-u
diff --git a/desc/protoprint/testfiles/descriptor-compact.proto b/desc/protoprint/testfiles/descriptor-compact.proto
@@ -166,7 +166,6 @@ message FieldDescriptorProto {
   // For booleans, "true" or "false".
   // For strings, contains the default text contents (not escaped in any way).
   // For bytes, contains the C escaped value.  All bytes >= 128 are escaped.
-  // TODO(kenton):  Base-64 encode?
   optional string default_value = 7;
   // If set, gives the index of a oneof in the containing type's oneof_decl
   // list.  This field is a member of that oneof.
@@ -501,7 +500,17 @@ message FieldOptions {
   // implementation must either *always* check its required fields, or *never*
   // check its required fields, regardless of whether or not the message has
   // been parsed.
+  //
+  // As of 2021, lazy does no correctness checks on the byte stream during
+  // parsing.  This may lead to crashes if and when an invalid byte stream is
+  // finally parsed upon access.
+  //
+  // TODO(b/211906113):  Enable validation on lazy fields.
   optional bool lazy = 5 [default = false];
+  // unverified_lazy does no correctness checks on the byte stream. This should
+  // only be used where lazy with verification is prohibitive for performance
+  // reasons.
+  optional bool unverified_lazy = 15 [default = false];
   // Is this field deprecated?
   // Depending on the target platform, this can emit Deprecated annotations
   // for accessors, or it will be completely ignored; in the very least, this
@@ -590,8 +599,8 @@ message UninterpretedOption {
   // The name of the uninterpreted option.  Each string represents a segment in
   // a dot-separated name.  is_extension is true iff a segment represents an
   // extension (denoted with parentheses in options specs in .proto files).
-  // E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents
-  // "foo.(bar.baz).qux".
+  // E.g.,{ ["foo", false], ["bar.baz", true], ["moo", false] } represents
+  // "foo.(bar.baz).moo".
   message NamePart {
     required string name_part = 1;
     required bool is_extension = 2;
@@ -660,8 +669,8 @@ message SourceCodeInfo {
     // location.
     //
     // Each element is a field number or an index.  They form a path from
-    // the root FileDescriptorProto to the place where the definition.  For
-    // example, this path:
+    // the root FileDescriptorProto to the place where the definition occurs.
+    // For example, this path:
     //   [ 4, 3, 2, 7, 1 ]
     // refers to:
     //   file.message_type(3)  // 4, 3
@@ -713,13 +722,13 @@ message SourceCodeInfo {
     //   // Comment attached to baz.
     //   // Another line attached to baz.
     //
-    //   // Comment attached to qux.
+    //   // Comment attached to moo.
     //   //
-    //   // Another line attached to qux.
-    //   optional double qux = 4;
+    //   // Another line attached to moo.
+    //   optional double moo = 4;
     //
     //   // Detached comment for corge. This is not leading or trailing comments
-    //   // to qux or corge because there are blank lines separating it from
+    //   // to moo or corge because there are blank lines separating it from
     //   // both.
     //
     //   // Detached comment for corge paragraph 2.

diff --git a/desc/protoprint/testfiles/descriptor-custom-sort.proto b/desc/protoprint/testfiles/descriptor-custom-sort.proto
@@ -48,8 +48,8 @@ message UninterpretedOption {
   // The name of the uninterpreted option.  Each string represents a segment in
   // a dot-separated name.  is_extension is true iff a segment represents an
   // extension (denoted with parentheses in options specs in .proto files).
-  // E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents
-  // "foo.(bar.baz).qux".
+  // E.g.,{ ["foo", false], ["bar.baz", true], ["moo", false] } represents
+  // "foo.(bar.baz).moo".
   message NamePart {
     required string name_part = 1;
 
@@ -93,8 +93,8 @@ message SourceCodeInfo {
     // location.
     //
     // Each element is a field number or an index.  They form a path from
-    // the root FileDescriptorProto to the place where the definition.  For
-    // example, this path:
+    // the root FileDescriptorProto to the place where the definition occurs.
+    // For example, this path:
     //   [ 4, 3, 2, 7, 1 ]
     // refers to:
     //   file.message_type(3)  // 4, 3
@@ -143,13 +143,13 @@ message SourceCodeInfo {
     //   // Comment attached to baz.
     //   // Another line attached to baz.
     //
-    //   // Comment attached to qux.
+    //   // Comment attached to moo.
     //   //
-    //   // Another line attached to qux.
-    //   optional double qux = 4;
+    //   // Another line attached to moo.
+    //   optional double moo = 4;
     //
     //   // Detached comment for corge. This is not leading or trailing comments
-    //   // to qux or corge because there are blank lines separating it from
+    //   // to moo or corge because there are blank lines separating it from
     //   // both.
     //
     //   // Detached comment for corge paragraph 2.
@@ -618,6 +618,11 @@ message FieldOptions {
   // For Google-internal migration only. Do not use.
   optional bool weak = 10 [default = false];
 
+  // unverified_lazy does no correctness checks on the byte stream. This should
+  // only be used where lazy with verification is prohibitive for performance
+  // reasons.
+  optional bool unverified_lazy = 15 [default = false];
+
   // The parser stores options it doesn't recognize here. See above.
   repeated UninterpretedOption uninterpreted_option = 999;
 
@@ -656,6 +661,12 @@ message FieldOptions {
   // implementation must either *always* check its required fields, or *never*
   // check its required fields, regardless of whether or not the message has
   // been parsed.
+  //
+  // As of 2021, lazy does no correctness checks on the byte stream during
+  // parsing.  This may lead to crashes if and when an invalid byte stream is
+  // finally parsed upon access.
+  //
+  // TODO(b/211906113):  Enable validation on lazy fields.
   optional bool lazy = 5 [default = false];
 
   // The jstype option determines the JavaScript type used for values of the
@@ -804,7 +815,6 @@ message FieldDescriptorProto {
   // For booleans, "true" or "false".
   // For strings, contains the default text contents (not escaped in any way).
   // For bytes, contains the C escaped value.  All bytes >= 128 are escaped.
-  // TODO(kenton):  Base-64 encode?
   optional string default_value = 7;
 }
 

diff --git a/desc/protoprint/testfiles/descriptor-default.proto b/desc/protoprint/testfiles/descriptor-default.proto
@@ -234,7 +234,6 @@ message FieldDescriptorProto {
   // For booleans, "true" or "false".
   // For strings, contains the default text contents (not escaped in any way).
   // For bytes, contains the C escaped value.  All bytes >= 128 are escaped.
-  // TODO(kenton):  Base-64 encode?
   optional string default_value = 7;
 
   // If set, gives the index of a oneof in the containing type's oneof_decl
@@ -640,8 +639,19 @@ message FieldOptions {
   // implementation must either *always* check its required fields, or *never*
   // check its required fields, regardless of whether or not the message has
   // been parsed.
+  //
+  // As of 2021, lazy does no correctness checks on the byte stream during
+  // parsing.  This may lead to crashes if and when an invalid byte stream is
+  // finally parsed upon access.
+  //
+  // TODO(b/211906113):  Enable validation on lazy fields.
   optional bool lazy = 5 [default = false];
 
+  // unverified_lazy does no correctness checks on the byte stream. This should
+  // only be used where lazy with verification is prohibitive for performance
+  // reasons.
+  optional bool unverified_lazy = 15 [default = false];
+
   // Is this field deprecated?
   // Depending on the target platform, this can emit Deprecated annotations
   // for accessors, or it will be completely ignored; in the very least, this
@@ -757,8 +767,8 @@ message UninterpretedOption {
   // The name of the uninterpreted option.  Each string represents a segment in
   // a dot-separated name.  is_extension is true iff a segment represents an
   // extension (denoted with parentheses in options specs in .proto files).
-  // E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents
-  // "foo.(bar.baz).qux".
+  // E.g.,{ ["foo", false], ["bar.baz", true], ["moo", false] } represents
+  // "foo.(bar.baz).moo".
   message NamePart {
     required string name_part = 1;
 
@@ -838,8 +848,8 @@ message SourceCodeInfo {
     // location.
     //
     // Each element is a field number or an index.  They form a path from
-    // the root FileDescriptorProto to the place where the definition.  For
-    // example, this path:
+    // the root FileDescriptorProto to the place where the definition occurs.
+    // For example, this path:
     //   [ 4, 3, 2, 7, 1 ]
     // refers to:
     //   file.message_type(3)  // 4, 3
@@ -893,13 +903,13 @@ message SourceCodeInfo {
     //   // Comment attached to baz.
     //   // Another line attached to baz.
     //
-    //   // Comment attached to qux.
+    //   // Comment attached to moo.
     //   //
-    //   // Another line attached to qux.
-    //   optional double qux = 4;
+    //   // Another line attached to moo.
+    //   optional double moo = 4;
     //
     //   // Detached comment for corge. This is not leading or trailing comments
-    //   // to qux or corge because there are blank lines separating it from
+    //   // to moo or corge because there are blank lines separating it from
     //   // both.
     //
     //   // Detached comment for corge paragraph 2.

diff --git a/desc/protoprint/testfiles/descriptor-multiline-style-comments.proto b/desc/protoprint/testfiles/descriptor-multiline-style-comments.proto
@@ -267,7 +267,6 @@ message FieldDescriptorProto {
 	 * For booleans, "true" or "false".
 	 * For strings, contains the default text contents (not escaped in any way).
 	 * For bytes, contains the C escaped value.  All bytes >= 128 are escaped.
-	 * TODO(kenton):  Base-64 encode?
 	 */
 	optional string default_value = 7;
 
@@ -737,9 +736,22 @@ message FieldOptions {
 	 * implementation must either *always* check its required fields, or *never*
 	 * check its required fields, regardless of whether or not the message has
 	 * been parsed.
+	 *
+	 * As of 2021, lazy does no correctness checks on the byte stream during
+	 * parsing.  This may lead to crashes if and when an invalid byte stream is
+	 * finally parsed upon access.
+	 *
+	 * TODO(b/211906113):  Enable validation on lazy fields.
 	 */
 	optional bool lazy = 5 [default = false];
 
+	/*
+	 * unverified_lazy does no correctness checks on the byte stream. This should
+	 * only be used where lazy with verification is prohibitive for performance
+	 * reasons.
+	 */
+	optional bool unverified_lazy = 15 [default = false];
+
 	/*
 	 * Is this field deprecated?
 	 * Depending on the target platform, this can emit Deprecated annotations
@@ -876,8 +888,8 @@ message UninterpretedOption {
 	 * The name of the uninterpreted option.  Each string represents a segment in
 	 * a dot-separated name.  is_extension is true iff a segment represents an
 	 * extension (denoted with parentheses in options specs in .proto files).
-	 * E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents
-	 * "foo.(bar.baz).qux".
+	 * E.g.,{ ["foo", false], ["bar.baz", true], ["moo", false] } represents
+	 * "foo.(bar.baz).moo".
 	 */
 	message NamePart {
 		required string name_part = 1;
@@ -967,8 +979,8 @@ message SourceCodeInfo {
 		 * location.
 		 *
 		 * Each element is a field number or an index.  They form a path from
-		 * the root FileDescriptorProto to the place where the definition.  For
-		 * example, this path:
+		 * the root FileDescriptorProto to the place where the definition occurs.
+		 * For example, this path:
 		 *   [ 4, 3, 2, 7, 1 ]
 		 * refers to:
 		 *   file.message_type(3)  // 4, 3
@@ -1025,13 +1037,13 @@ message SourceCodeInfo {
 		//   // Comment attached to baz.
 		//   // Another line attached to baz.
 		//
-		//   // Comment attached to qux.
+		//   // Comment attached to moo.
 		//   //
-		//   // Another line attached to qux.
-		//   optional double qux = 4;
+		//   // Another line attached to moo.
+		//   optional double moo = 4;
 		//
 		//   // Detached comment for corge. This is not leading or trailing comments
-		//   // to qux or corge because there are blank lines separating it from
+		//   // to moo or corge because there are blank lines separating it from
 		//   // both.
 		//
 		//   // Detached comment for corge paragraph 2.

diff --git a/desc/protoprint/testfiles/descriptor-no-trailing-comments.proto b/desc/protoprint/testfiles/descriptor-no-trailing-comments.proto
@@ -234,7 +234,6 @@ message FieldDescriptorProto {
   // For booleans, "true" or "false".
   // For strings, contains the default text contents (not escaped in any way).
   // For bytes, contains the C escaped value.  All bytes >= 128 are escaped.
-  // TODO(kenton):  Base-64 encode?
   optional string default_value = 7;
 
   // If set, gives the index of a oneof in the containing type's oneof_decl
@@ -640,8 +639,19 @@ message FieldOptions {
   // implementation must either *always* check its required fields, or *never*
   // check its required fields, regardless of whether or not the message has
   // been parsed.
+  //
+  // As of 2021, lazy does no correctness checks on the byte stream during
+  // parsing.  This may lead to crashes if and when an invalid byte stream is
+  // finally parsed upon access.
+  //
+  // TODO(b/211906113):  Enable validation on lazy fields.
   optional bool lazy = 5 [default = false];
 
+  // unverified_lazy does no correctness checks on the byte stream. This should
+  // only be used where lazy with verification is prohibitive for performance
+  // reasons.
+  optional bool unverified_lazy = 15 [default = false];
+
   // Is this field deprecated?
   // Depending on the target platform, this can emit Deprecated annotations
   // for accessors, or it will be completely ignored; in the very least, this
@@ -757,8 +767,8 @@ message UninterpretedOption {
   // The name of the uninterpreted option.  Each string represents a segment in
   // a dot-separated name.  is_extension is true iff a segment represents an
   // extension (denoted with parentheses in options specs in .proto files).
-  // E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents
-  // "foo.(bar.baz).qux".
+  // E.g.,{ ["foo", false], ["bar.baz", true], ["moo", false] } represents
+  // "foo.(bar.baz).moo".
   message NamePart {
     required string name_part = 1;
 
@@ -838,8 +848,8 @@ message SourceCodeInfo {
     // location.
     //
     // Each element is a field number or an index.  They form a path from
-    // the root FileDescriptorProto to the place where the definition.  For
-    // example, this path:
+    // the root FileDescriptorProto to the place where the definition occurs.
+    // For example, this path:
     //   [ 4, 3, 2, 7, 1 ]
     // refers to:
     //   file.message_type(3)  // 4, 3
@@ -893,13 +903,13 @@ message SourceCodeInfo {
     //   // Comment attached to baz.
     //   // Another line attached to baz.
     //
-    //   // Comment attached to qux.
+    //   // Comment attached to moo.
     //   //
-    //   // Another line attached to qux.
-    //   optional double qux = 4;
+    //   // Another line attached to moo.
+    //   optional double moo = 4;
     //
     //   // Detached comment for corge. This is not leading or trailing comments
-    //   // to qux or corge because there are blank lines separating it from
+    //   // to moo or corge because there are blank lines separating it from
     //   // both.
     //
     //   // Detached comment for corge paragraph 2.