Merge remote-tracking branch 'origin/master' into refactor_field_type

osa1 · osa1 · commit f16c048b2704 · 2022-04-27T10:09:50.000+02:00
diff --git a/protobuf/lib/meta.dart b/protobuf/lib/meta.dart
@@ -26,8 +26,6 @@ const GeneratedMessage_reservedNames = <String>[
   'eventPlugin',
   'extensionsAreInitialized',
   'freeze',
-  'fromBuffer',
-  'fromJson',
   'getDefaultForField',
   'getExtension',
   'getField',
diff --git a/protobuf/lib/src/protobuf/extension_registry.dart b/protobuf/lib/src/protobuf/extension_registry.dart
@@ -49,7 +49,7 @@ class ExtensionRegistry {
   ///
   /// Using this method to retrieve extensions is more expensive overall than
   /// using an [ExtensionRegistry] with all the needed extensions when doing
-  /// [GeneratedMessage.fromBuffer].
+  /// [GeneratedMessage.mergeFromBuffer].
   ///
   /// Example:
   ///
diff --git a/protobuf/lib/src/protobuf/field_set.dart b/protobuf/lib/src/protobuf/field_set.dart
@@ -654,50 +654,28 @@ class _FieldSet {
     if (_hashCodesCanBeMemoized && _memoizedHashCode != null) {
       return _memoizedHashCode!;
     }
-    // Hashes the value of one field (recursively).
-    int hashField(int hash, FieldInfo fi, value) {
-      if (value is List && value.isEmpty) {
-        return hash; // It's either repeated or an empty byte array.
-      }
 
-      hash = _HashUtils._combine(hash, fi.tagNumber);
-      if (fi.type.baseType == FieldBaseType.bytes) {
-        // Bytes are represented as a List<int> (Usually with byte-data).
-        // We special case that to match our equality semantics.
-        hash = _HashUtils._combine(hash, _HashUtils._hashObjects(value));
-      } else if (fi.type.baseType != FieldBaseType.enum_) {
-        hash = _HashUtils._combine(hash, value.hashCode);
-      } else if (fi.isRepeated) {
-        hash = _HashUtils._combine(
-            hash, _HashUtils._hashObjects(value.map((enm) => enm.value)));
-      } else {
-        ProtobufEnum enm = value;
-        hash = _HashUtils._combine(hash, enm.value);
-      }
+    // Hash with descriptor.
+    var hash = _HashUtils._combine(0, _meta.hashCode);
 
-      return hash;
+    // Hash with non-extension fields.
+    final values = _values;
+    for (final fi in _infosSortedByTag) {
+      final value = values[fi.index!];
+      if (value == null) continue;
+      hash = _hashField(hash, fi, value);
     }
 
-    int hashEachField(int hash) {
-      //non-extension fields
-      hash = _infosSortedByTag.where((fi) => _values[fi.index!] != null).fold(
-          hash, (int h, FieldInfo fi) => hashField(h, fi, _values[fi.index!]));
-
-      if (!_hasExtensions) return hash;
-
-      hash =
-          _sorted(_extensions!._tagNumbers).fold(hash, (int h, int tagNumber) {
-        var fi = _extensions!._getInfoOrNull(tagNumber)!;
-        return hashField(h, fi, _extensions!._getFieldOrNull(fi));
-      });
-
-      return hash;
+    // Hash with extension fields.
+    if (_hasExtensions) {
+      final extensions = _extensions!;
+      final sortedByTagNumbers = _sorted(extensions._tagNumbers);
+      for (final tagNumber in sortedByTagNumbers) {
+        final fi = extensions._getInfoOrNull(tagNumber)!;
+        hash = _hashField(hash, fi, extensions._getFieldOrNull(fi));
+      }
     }
 
-    // Hash with descriptor.
-    var hash = _HashUtils._combine(0, _meta.hashCode);
-    // Hash with fields.
-    hash = hashEachField(hash);
     // Hash with unknown fields.
     if (_hasUnknownFields) {
       hash = _HashUtils._combine(hash, _unknownFields.hashCode);
@@ -709,6 +687,30 @@ class _FieldSet {
     return hash;
   }
 
+  // Hashes the value of one field (recursively).
+  static int _hashField(int hash, FieldInfo fi, value) {
+    if (value is List && value.isEmpty) {
+      return hash; // It's either repeated or an empty byte array.
+    }
+
+    hash = _HashUtils._combine(hash, fi.tagNumber);
+    if (fi.type.baseType == FieldBaseType.bytes) {
+      // Bytes are represented as a List<int> (Usually with byte-data).
+      // We special case that to match our equality semantics.
+      hash = _HashUtils._combine(hash, _HashUtils._hashObjects(value));
+    } else if (!fi.type.isEnum) {
+      hash = _HashUtils._combine(hash, value.hashCode);
+    } else if (fi.type.isRepeated) {
+      hash = _HashUtils._combine(
+          hash, _HashUtils._hashObjects(value.map((enm) => enm.value)));
+    } else {
+      ProtobufEnum enm = value;
+      hash = _HashUtils._combine(hash, enm.value);
+    }
+
+    return hash;
+  }
+
   void writeString(StringBuffer out, String indent) {
     void renderValue(key, value) {
       if (value is GeneratedMessage) {
diff --git a/protobuf/lib/src/protobuf/generated_message.dart b/protobuf/lib/src/protobuf/generated_message.dart
@@ -29,19 +29,6 @@ abstract class GeneratedMessage {
     if (eventPlugin != null) eventPlugin!.attach(this);
   }
 
-  GeneratedMessage.fromBuffer(
-      List<int> input, ExtensionRegistry extensionRegistry) {
-    __fieldSet = _FieldSet(this, info_, eventPlugin);
-    if (eventPlugin != null) eventPlugin!.attach(this);
-    mergeFromBuffer(input, extensionRegistry);
-  }
-
-  GeneratedMessage.fromJson(String input, ExtensionRegistry extensionRegistry) {
-    __fieldSet = _FieldSet(this, info_, eventPlugin);
-    if (eventPlugin != null) eventPlugin!.attach(this);
-    mergeFromJson(input, extensionRegistry);
-  }
-
   // Overridden by subclasses.
   BuilderInfo get info_;
 
diff --git a/protoc_plugin/README.md b/protoc_plugin/README.md
@@ -64,7 +64,7 @@ your `PATH` with name `protoc-gen-dart`, or pass the path to it to `protoc`'s
 ## How to use
 
 Once you have `protoc-gen-dart` in the `PATH` the protocol buffer compiler can
-be invoked like this:
+be invoked like this to generate Dart for the proto file `test.proto`:
 
     $ protoc --dart_out=. test.proto
 
@@ -106,21 +106,25 @@ re-export the relevant protocol buffer classes.
 Say we have the file `m1.proto` with the following content
 
 ```proto
+syntax = "proto3";
+
 message M1 {
-  optional string a;
+  string a = 1;
 }
 ```
 
 and `m2.proto` containing
 
 ```proto
+syntax = "proto3";
+
 message M2 {
-  optional string b;
+  string b = 1;
 }
 ```
 
 Compiling these to Dart will produce two libraries in `m1.pb.dart` and
-`m2.pb.dart`. The following code shows a library M which combines
+`m2.pb.dart`. The following code shows a library `M` which combines
 these two protocol buffer libraries, exposes the classes `M1` and `M2` and
 adds some additional methods.
 
diff --git a/protoc_plugin/test/generated_message_test.dart b/protoc_plugin/test/generated_message_test.dart
@@ -468,8 +468,6 @@ void main() {
     message.noSuchMethod_2 = 1;
     message.runtimeType_3 = 1;
     message.toString_4 = 1;
-    message.fromBuffer_10 = 1;
-    message.fromJson_11 = 1;
     message.hasRequiredFields_12 = 1;
     message.isInitialized_13 = 1;
     message.clear_14 = 1;
@@ -507,8 +505,6 @@ void main() {
     message.noSuchMethod_2.clear();
     message.runtimeType_3.clear();
     message.toString_4.clear();
-    message.fromBuffer_10.clear();
-    message.fromJson_11.clear();
     message.hasRequiredFields_12.clear();
     message.isInitialized_13.clear();
     message.clear_14.clear();
@@ -550,8 +546,6 @@ void main() {
     message.noSuchMethod_2 = 1;
     message.runtimeType_3 = 1;
     message.toString_4 = 1;
-    message.fromBuffer_10 = 1;
-    message.fromJson_11 = 1;
     message.hasRequiredFields_12 = 1;
     message.isInitialized_13 = 1;
     message.clear_14 = 1;
diff --git a/query_benchmark/bin/set_nested_value.dart b/query_benchmark/bin/set_nested_value.dart
@@ -20,7 +20,7 @@ main() {
       title: 'protobuf_decode',
       duration: measure(() => a.rebuild((f0.A0 a0Builder) {
             a0Builder.a4.last = a0Builder.a4.last.rebuild((f2.A1 a1builder) {
-              a1builder.a378.rebuild(
+              a1builder.a378 = a1builder.a378.rebuild(
                   (f19.A220 a220builder) => a220builder.a234 = 'new_value');
             });
           })),
