Skip to content

refactor: use strings.Builder to improve performance #4758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor: use strings.Builder to improve performance #4758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions action/protocol/execution/evm/evmstatedbadapter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"bytes"
"context"
"math/big"
"strings"
"testing"

"github.com/ethereum/go-ethereum/common"
Expand Down Expand Up @@ -947,19 +948,19 @@ func TestSortMap(t *testing.T) {
caches := []string{}
for i := 0; i < size; i++ {
stateDB.RevertToSnapshot(sn)
s := ""
var s strings.Builder
if stateDB.disableSortCachedContracts {
for _, c := range stateDB.cachedContract {
s += string(c.SelfState().Root[:])
s.WriteString(string(c.SelfState().Root[:]))
}
} else {
for _, addr := range stateDB.cachedContractAddrs() {
c := stateDB.cachedContract[addr]
s += string(c.SelfState().Root[:])
s.WriteString(string(c.SelfState().Root[:]))
}
}

caches = append(caches, s)
caches = append(caches, s.String())
}
return uniqueSlice(caches)
}
Expand Down
9 changes: 5 additions & 4 deletions ioctl/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,10 +440,11 @@ func (c *client) Insecure() bool {
}

func (m *ConfirmationMessage) String() string {
line := fmt.Sprintf("%s\nOptions:", m.Info)
var line strings.Builder
line.WriteString(fmt.Sprintf("%s\nOptions:", m.Info))
for _, option := range m.Options {
line += " " + option
line.WriteString(" " + option)
}
line += "\nQuit for anything else."
return line
line.WriteString("\nQuit for anything else.")
return line.String()
}
91 changes: 47 additions & 44 deletions ioctl/cmd/action/actionhash.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"log"
"math/big"
"strconv"
"strings"

"github.com/grpc-ecosystem/go-grpc-middleware/util/metautils"
"github.com/iotexproject/go-pkgs/crypto"
Expand Down Expand Up @@ -167,20 +168,21 @@ func printActionProto(act *iotextypes.Action) (string, error) {
}
//ioctl action should display IOTX unit instead Raul
core := act.Core
result := fmt.Sprintf("\nversion: %d ", core.GetVersion()) +
var result strings.Builder
result.WriteString(fmt.Sprintf("\nversion: %d ", core.GetVersion()) +
fmt.Sprintf("txType: %d ", core.GetTxType()) +
fmt.Sprintf("nonce: %d ", core.GetNonce()) +
fmt.Sprintf("gasLimit: %d ", core.GasLimit) +
fmt.Sprintf("chainID: %d ", core.GetChainID()) +
fmt.Sprintf("encoding: %d\n", act.GetEncoding()) +
fmt.Sprintf("senderAddress: %s %s\n", senderAddress.String(),
Match(senderAddress.String(), "address"))
Match(senderAddress.String(), "address")))
if len(core.GasPrice) > 0 {
gasPriceUnitIOTX, err := util.StringToIOTX(core.GasPrice)
if err != nil {
return "", output.NewError(output.ConfigError, "failed to convert string to IOTX", err)
}
result += fmt.Sprintf("gasPrice: %s IOTX \n", gasPriceUnitIOTX)
result.WriteString(fmt.Sprintf("gasPrice: %s IOTX \n", gasPriceUnitIOTX))
}
if len(core.GetGasFeeCap()) > 0 {
feeCapIOTX, err := util.StringToIOTX(core.GetGasFeeCap())
Expand All @@ -191,28 +193,28 @@ func printActionProto(act *iotextypes.Action) (string, error) {
if err != nil {
return "", output.NewError(output.ConfigError, "failed to convert string to IOTX", err)
}
result += fmt.Sprintf("gasFeeCap: %s IOTX ", feeCapIOTX) +
fmt.Sprintf("gasTipCap: %s IOTX \n", tipCapIOTX)
result.WriteString(fmt.Sprintf("gasFeeCap: %s IOTX ", feeCapIOTX) +
fmt.Sprintf("gasTipCap: %s IOTX \n", tipCapIOTX))
}
if len(core.GetAccessList()) > 0 {
result += "accessList: <\n"
result.WriteString("accessList: <\n")
for _, access := range core.GetAccessList() {
result += fmt.Sprintf(" address: %s %s\n", access.Address,
Match(access.Address, "address"))
result += " storageKeys: <\n"
result.WriteString(fmt.Sprintf(" address: %s %s\n", access.Address,
Match(access.Address, "address")))
result.WriteString(" storageKeys: <\n")
for _, key := range access.StorageKeys {
result += fmt.Sprintf(" %s\n", key)
result.WriteString(fmt.Sprintf(" %s\n", key))
}
result += " >\n"
result.WriteString(" >\n")
}
result += ">\n"
result.WriteString(">\n")
}
if core.BlobTxData != nil {
result += fmt.Sprintf("blob hashes: <\n")
result.WriteString(fmt.Sprintf("blob hashes: <\n"))
for _, hash := range core.BlobTxData.BlobHashes {
result += fmt.Sprintf(" %x\n", hash)
result.WriteString(fmt.Sprintf(" %x\n", hash))
}
result += ">\n"
result.WriteString(">\n")
}

switch {
Expand All @@ -222,50 +224,50 @@ func printActionProto(act *iotextypes.Action) (string, error) {
if err != nil {
return "", output.NewError(output.ConvertError, "failed to convert string into IOTX amount", err)
}
result += "transfer: <\n" +
result.WriteString("transfer: <\n" +
fmt.Sprintf(" recipient: %s %s\n", transfer.Recipient,
Match(transfer.Recipient, "address")) +
fmt.Sprintf(" amount: %s IOTX\n", amount)
fmt.Sprintf(" amount: %s IOTX\n", amount))
if len(transfer.Payload) != 0 {
result += fmt.Sprintf(" payload: %s\n", transfer.Payload)
result.WriteString(fmt.Sprintf(" payload: %s\n", transfer.Payload))
}
result += ">\n"
result.WriteString(">\n")
case core.GetExecution() != nil:
execution := core.GetExecution()
result += "execution: <\n" +
result.WriteString("execution: <\n" +
fmt.Sprintf(" contract: %s %s\n", execution.Contract,
Match(execution.Contract, "address"))
Match(execution.Contract, "address")))
if execution.Amount != "0" {
amount, err := util.StringToIOTX(execution.Amount)
if err != nil {
return "", output.NewError(output.ConvertError, "failed to convert string into IOTX amount", err)
}
result += fmt.Sprintf(" amount: %s IOTX\n", amount)
result.WriteString(fmt.Sprintf(" amount: %s IOTX\n", amount))
}
result += fmt.Sprintf(" data: %x\n", execution.Data) + ">\n"
result.WriteString(fmt.Sprintf(" data: %x\n", execution.Data) + ">\n")
case core.GetPutPollResult() != nil:
putPollResult := core.GetPutPollResult()
result += "putPollResult: <\n" +
result.WriteString("putPollResult: <\n" +
fmt.Sprintf(" height: %d\n", putPollResult.Height) +
" candidates: <\n"
" candidates: <\n")
for _, candidate := range putPollResult.Candidates.Candidates {
result += " candidate: <\n" +
fmt.Sprintf(" address: %s\n", candidate.Address)
result.WriteString(" candidate: <\n" +
fmt.Sprintf(" address: %s\n", candidate.Address))
votes := big.NewInt(0).SetBytes(candidate.Votes)
result += fmt.Sprintf(" votes: %s\n", votes.String()) +
result.WriteString(fmt.Sprintf(" votes: %s\n", votes.String()) +
fmt.Sprintf(" rewardAdress: %s\n", candidate.RewardAddress) +
" >\n"
" >\n")
}
result += " >\n" +
">\n"
result.WriteString(" >\n" +
">\n")
default:
bs, _ := protoV1.Marshal(core)
result += string(bs)
result.WriteString(string(bs))
}
result += fmt.Sprintf("senderPubKey: %x\n", act.SenderPubKey) +
fmt.Sprintf("signature: %x\n", act.Signature)
result.WriteString(fmt.Sprintf("senderPubKey: %x\n", act.SenderPubKey) +
fmt.Sprintf("signature: %x\n", act.Signature))

return result, nil
return result.String(), nil
}

func printReceiptProto(receipt *iotextypes.Receipt) string {
Expand Down Expand Up @@ -310,23 +312,24 @@ func printReceiptProto(receipt *iotextypes.Receipt) string {
}

func printLogs(logs []*iotextypes.Log) string {
result := "logs:<\n"
var result strings.Builder
result.WriteString("logs:<\n")
for _, l := range logs {
result += " <\n" +
result.WriteString(" <\n" +
fmt.Sprintf(" contractAddress: %s\n", l.ContractAddress) +
" topics:<\n"
" topics:<\n")
for _, topic := range l.Topics {
result += fmt.Sprintf(" %s\n", hex.EncodeToString(topic))
result.WriteString(fmt.Sprintf(" %s\n", hex.EncodeToString(topic)))
}
result += " >\n"
result.WriteString(" >\n")
if len(l.Data) > 0 {
result += fmt.Sprintf(" data: %s\n", hex.EncodeToString(l.Data))
result.WriteString(fmt.Sprintf(" data: %s\n", hex.EncodeToString(l.Data)))
}
result += " >\n"
result.WriteString(" >\n")

}
result += ">\n"
return result
result.WriteString(">\n")
return result.String()
}

// Match returns human readable expression
Expand Down
8 changes: 5 additions & 3 deletions ioctl/cmd/alias/aliasimport.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"encoding/json"
"fmt"
"os"
"strings"

"github.com/spf13/cobra"
yaml "gopkg.in/yaml.v2"
Expand Down Expand Up @@ -106,11 +107,12 @@ func aliasImport(cmd *cobra.Command, args []string) error {

func (m *importMessage) String() string {
if output.Format == "" {
line := fmt.Sprintf("%d/%d aliases imported\nExisted aliases:", m.ImportedNumber, m.TotalNumber)
var line strings.Builder
line.WriteString(fmt.Sprintf("%d/%d aliases imported\nExisted aliases:", m.ImportedNumber, m.TotalNumber))
for _, alias := range m.Unimported {
line += fmt.Sprint(" " + alias.Name)
line.WriteString(fmt.Sprint(" " + alias.Name))
}
return line
return line.String()
}
return output.FormatString(output.Result, m)
}
65 changes: 34 additions & 31 deletions ioctl/newcmd/action/actionhash.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"log"
"math/big"
"strconv"
"strings"

"github.com/grpc-ecosystem/go-grpc-middleware/util/metautils"
"github.com/iotexproject/go-pkgs/crypto"
Expand Down Expand Up @@ -169,68 +170,69 @@ func printActionProto(client ioctl.Client, action *iotextypes.Action) (string, e
if err != nil {
return "", errors.Wrap(err, "failed to convert string to IOTX")
}
result := fmt.Sprintf("\nversion: %d ", core.GetVersion()) +
var result strings.Builder
result.WriteString(fmt.Sprintf("\nversion: %d ", core.GetVersion()) +
fmt.Sprintf("nonce: %d ", core.GetNonce()) +
fmt.Sprintf("gasLimit: %d ", core.GasLimit) +
fmt.Sprintf("gasPrice: %s IOTX ", gasPriceUnitIOTX) +
fmt.Sprintf("chainID: %d ", core.GetChainID()) +
fmt.Sprintf("encoding: %d\n", action.GetEncoding()) +
fmt.Sprintf("senderAddress: %s %s\n", senderAddress.String(),
Match(client, senderAddress.String(), "address"))
Match(client, senderAddress.String(), "address")))
switch {
case core.GetTransfer() != nil:
transfer := core.GetTransfer()
amount, err := util.StringToIOTX(transfer.Amount)
if err != nil {
return "", errors.Wrap(err, "failed to convert string into IOTX amount")
}
result += "transfer: <\n" +
result.WriteString("transfer: <\n" +
fmt.Sprintf(" recipient: %s %s\n", transfer.Recipient,
Match(client, transfer.Recipient, "address")) +
fmt.Sprintf(" amount: %s IOTX\n", amount)
fmt.Sprintf(" amount: %s IOTX\n", amount))
if len(transfer.Payload) != 0 {
result += fmt.Sprintf(" payload: %s\n", transfer.Payload)
result.WriteString(fmt.Sprintf(" payload: %s\n", transfer.Payload))
}
result += ">\n"
result.WriteString(">\n")
case core.GetExecution() != nil:
execution := core.GetExecution()
result += "execution: <\n" +
result.WriteString("execution: <\n" +
fmt.Sprintf(" contract: %s %s\n", execution.Contract,
Match(client, execution.Contract, "address"))
Match(client, execution.Contract, "address")))
if execution.Amount != "0" {
amount, err := util.StringToIOTX(execution.Amount)
if err != nil {
return "", errors.Wrap(err, "failed to convert string into IOTX amount")
}
result += fmt.Sprintf(" amount: %s IOTX\n", amount)
result.WriteString(fmt.Sprintf(" amount: %s IOTX\n", amount))
}
result += fmt.Sprintf(" data: %x\n", execution.Data) + ">\n"
result.WriteString(fmt.Sprintf(" data: %x\n", execution.Data) + ">\n")
case core.GetPutPollResult() != nil:
putPollResult := core.GetPutPollResult()
result += "putPollResult: <\n" +
result.WriteString("putPollResult: <\n" +
fmt.Sprintf(" height: %d\n", putPollResult.Height) +
" candidates: <\n"
" candidates: <\n")
for _, candidate := range putPollResult.Candidates.Candidates {
result += " candidate: <\n" +
fmt.Sprintf(" address: %s\n", candidate.Address)
result.WriteString(" candidate: <\n" +
fmt.Sprintf(" address: %s\n", candidate.Address))
votes := big.NewInt(0).SetBytes(candidate.Votes)
result += fmt.Sprintf(" votes: %s\n", votes.String()) +
result.WriteString(fmt.Sprintf(" votes: %s\n", votes.String()) +
fmt.Sprintf(" rewardAdress: %s\n", candidate.RewardAddress) +
" >\n"
" >\n")
}
result += " >\n" +
">\n"
result.WriteString(" >\n" +
">\n")
default:
bs, err := protoV1.Marshal(core)
if err != nil {
return "", errors.Wrap(err, "failed to marshal core")
}
result += string(bs)
result.WriteString(string(bs))
}
result += fmt.Sprintf("senderPubKey: %x\n", action.SenderPubKey) +
fmt.Sprintf("signature: %x\n", action.Signature)
result.WriteString(fmt.Sprintf("senderPubKey: %x\n", action.SenderPubKey) +
fmt.Sprintf("signature: %x\n", action.Signature))

return result, nil
return result.String(), nil
}

func printReceiptProto(client ioctl.Client, receipt *iotextypes.Receipt) string {
Expand All @@ -256,23 +258,24 @@ func printReceiptProto(client ioctl.Client, receipt *iotextypes.Receipt) string
}

func printLogs(logs []*iotextypes.Log) string {
result := "logs:<\n"
var result strings.Builder
result.WriteString("logs:<\n")
for _, l := range logs {
result += " <\n" +
result.WriteString(" <\n" +
fmt.Sprintf(" contractAddress: %s\n", l.ContractAddress) +
" topics:<\n"
" topics:<\n")
for _, topic := range l.Topics {
result += fmt.Sprintf(" %s\n", hex.EncodeToString(topic))
result.WriteString(fmt.Sprintf(" %s\n", hex.EncodeToString(topic)))
}
result += " >\n"
result.WriteString(" >\n")
if len(l.Data) > 0 {
result += fmt.Sprintf(" data: %s\n", hex.EncodeToString(l.Data))
result.WriteString(fmt.Sprintf(" data: %s\n", hex.EncodeToString(l.Data)))
}
result += " >\n"
result.WriteString(" >\n")

}
result += ">\n"
return result
result.WriteString(">\n")
return result.String()
}

// Match returns human readable expression
Expand Down
Loading