diff options
| author | chrislu <chris.lu@gmail.com> | 2024-03-17 01:00:43 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2024-03-17 01:00:43 -0700 |
| commit | 4dce1e9d29c42fd5fb08e30491eb5e6958512319 (patch) | |
| tree | f5a20cf6f53476dc9fe2abb8b51b33f26ba60f5f /weed/shell | |
| parent | a8b73296d7ea4c5103a1e3d7b889826983ad6565 (diff) | |
| download | seaweedfs-4dce1e9d29c42fd5fb08e30491eb5e6958512319.tar.xz seaweedfs-4dce1e9d29c42fd5fb08e30491eb5e6958512319.zip | |
Revert "remove github.com/golang/protobuf/proto"
This reverts commit 1516e0249f5c7259880c3b5365b42ee0469510dd.
Diffstat (limited to 'weed/shell')
| -rw-r--r-- | weed/shell/command_volume_list_test.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/weed/shell/command_volume_list_test.go b/weed/shell/command_volume_list_test.go index b2fe9c862..1c8368229 100644 --- a/weed/shell/command_volume_list_test.go +++ b/weed/shell/command_volume_list_test.go @@ -5,9 +5,8 @@ import ( "github.com/seaweedfs/seaweedfs/weed/storage/erasure_coding" "github.com/seaweedfs/seaweedfs/weed/storage/types" "github.com/stretchr/testify/assert" - // "google.golang.org/protobuf/proto" - //"github.com/golang/protobuf/proto" - jsonpb "google.golang.org/protobuf/encoding/protojson" + //"google.golang.org/protobuf/proto" + "github.com/golang/protobuf/proto" "strconv" "strings" "testing" @@ -92,7 +91,7 @@ func parseOutput(output string) *master_pb.TopologyInfo { case "volume": volumeLine := line[len("volume "):] volume := &master_pb.VolumeInformationMessage{} - jsonpb.Unmarshal([]byte(volumeLine), volume) + proto.UnmarshalText(volumeLine, volume) disk.VolumeInfos = append(disk.VolumeInfos, volume) case "ec": ecVolumeLine := line[len("ec volume "):] |