lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-10-20 19:58:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove github.com/golang/protobuf/proto

Browse Source
This commit is contained in:
chrislu
2024-03-16 23:17:27 -07:00
parent b74e8082ba
commit 1516e0249f
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
weed/shell/command_volume_list_test.go
View File

@@ -5,8 +5,9 @@ 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"
// "google.golang.org/protobuf/proto"
//"github.com/golang/protobuf/proto"
jsonpb "google.golang.org/protobuf/encoding/protojson"
"strconv"
"strings"
"testing"
@@ -91,7 +92,7 @@ func parseOutput(output string) *master_pb.TopologyInfo {
case "volume":
volumeLine := line[len("volume "):]
volume := &master_pb.VolumeInformationMessage{}
proto.UnmarshalText(volumeLine, volume)
jsonpb.Unmarshal([]byte(volumeLine), volume)
disk.VolumeInfos = append(disk.VolumeInfos, volume)
case "ec":
ecVolumeLine := line[len("ec volume "):]