This is an automated email from the ASF dual-hosted git repository.
zhaoliwei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
The following commit(s) were added to refs/heads/master by this push:
new 52a29134 chore(pegic&admin-cli): update go-client dependency to apache
org (#983)
52a29134 is described below
commit 52a291342073dcf83860d674cfc5329fb7c51500
Author: Yingchun Lai <[email protected]>
AuthorDate: Fri May 27 10:04:22 2022 +0800
chore(pegic&admin-cli): update go-client dependency to apache org (#983)
---
admin-cli/client/fake_cluster_test.go | 4 ++--
admin-cli/client/fake_meta_test.go | 6 +++---
admin-cli/client/meta.go | 8 ++++----
admin-cli/client/migrate_node.go | 8 ++++----
admin-cli/client/migrate_node_test.go | 2 +-
admin-cli/client/remote_command.go | 2 +-
admin-cli/client/replica_health.go | 4 ++--
admin-cli/client/replica_health_test.go | 8 ++++----
admin-cli/cmd/duplication.go | 2 +-
admin-cli/cmd/remote_command.go | 2 +-
admin-cli/cmd/server_config.go | 2 +-
admin-cli/executor/backup_restore.go | 2 +-
admin-cli/executor/bulk_load.go | 2 +-
admin-cli/executor/create_table.go | 2 +-
admin-cli/executor/disk_info.go | 6 +++---
admin-cli/executor/disk_migrate.go | 4 ++--
admin-cli/executor/duplication.go | 2 +-
admin-cli/executor/list_nodes.go | 4 ++--
admin-cli/executor/list_tables.go | 2 +-
admin-cli/executor/meta_level.go | 2 +-
admin-cli/executor/remote_command.go | 2 +-
admin-cli/executor/server_config.go | 2 +-
admin-cli/executor/server_info.go | 2 +-
admin-cli/executor/toolkits/diskbalancer/balancer.go | 2 +-
admin-cli/executor/toolkits/diskbalancer/helper.go | 4 ++--
admin-cli/executor/toolkits/nodesmigrator/manager.go | 2 +-
admin-cli/executor/toolkits/nodesmigrator/migrator.go | 4 ++--
admin-cli/executor/toolkits/nodesmigrator/nodes.go | 2 +-
admin-cli/executor/use_table.go | 2 +-
admin-cli/go.mod | 5 ++---
admin-cli/go.sum | 19 +++++++------------
admin-cli/main.go | 2 +-
admin-cli/util/common_utils.go | 2 +-
admin-cli/util/pegasus_node.go | 4 ++--
pegic/executor/context.go | 4 ++--
pegic/executor/partition_index.go | 2 +-
pegic/executor/scan.go | 2 +-
pegic/go.mod | 2 +-
pegic/go.sum | 8 ++++----
pegic/interactive/cmd/init.go | 2 +-
pegic/main.go | 2 +-
41 files changed, 72 insertions(+), 78 deletions(-)
diff --git a/admin-cli/client/fake_cluster_test.go
b/admin-cli/client/fake_cluster_test.go
index b30b31b0..13b93bff 100644
--- a/admin-cli/client/fake_cluster_test.go
+++ b/admin-cli/client/fake_cluster_test.go
@@ -23,9 +23,9 @@ import (
"fmt"
"testing"
- "github.com/XiaoMi/pegasus-go-client/idl/base"
- "github.com/XiaoMi/pegasus-go-client/session"
"github.com/apache/incubator-pegasus/admin-cli/util"
+ "github.com/apache/incubator-pegasus/go-client/idl/base"
+ "github.com/apache/incubator-pegasus/go-client/session"
"github.com/stretchr/testify/assert"
"k8s.io/apimachinery/pkg/util/rand"
)
diff --git a/admin-cli/client/fake_meta_test.go
b/admin-cli/client/fake_meta_test.go
index 0a3d76c7..a76ed73f 100644
--- a/admin-cli/client/fake_meta_test.go
+++ b/admin-cli/client/fake_meta_test.go
@@ -22,10 +22,10 @@ package client
import (
"fmt"
- "github.com/XiaoMi/pegasus-go-client/idl/admin"
- "github.com/XiaoMi/pegasus-go-client/idl/base"
- "github.com/XiaoMi/pegasus-go-client/idl/replication"
"github.com/apache/incubator-pegasus/admin-cli/util"
+ "github.com/apache/incubator-pegasus/go-client/idl/admin"
+ "github.com/apache/incubator-pegasus/go-client/idl/base"
+ "github.com/apache/incubator-pegasus/go-client/idl/replication"
)
// fakeMeta implements the Meta interface
diff --git a/admin-cli/client/meta.go b/admin-cli/client/meta.go
index cb755759..91b71dc3 100644
--- a/admin-cli/client/meta.go
+++ b/admin-cli/client/meta.go
@@ -25,11 +25,11 @@ import (
"reflect"
"time"
- "github.com/XiaoMi/pegasus-go-client/idl/admin"
- "github.com/XiaoMi/pegasus-go-client/idl/base"
- "github.com/XiaoMi/pegasus-go-client/idl/replication"
- "github.com/XiaoMi/pegasus-go-client/session"
"github.com/apache/incubator-pegasus/admin-cli/util"
+ "github.com/apache/incubator-pegasus/go-client/idl/admin"
+ "github.com/apache/incubator-pegasus/go-client/idl/base"
+ "github.com/apache/incubator-pegasus/go-client/idl/replication"
+ "github.com/apache/incubator-pegasus/go-client/session"
)
type BalanceType int
diff --git a/admin-cli/client/migrate_node.go b/admin-cli/client/migrate_node.go
index a4307d3a..f425f2e9 100644
--- a/admin-cli/client/migrate_node.go
+++ b/admin-cli/client/migrate_node.go
@@ -23,11 +23,11 @@ import (
"fmt"
"math/rand"
- "github.com/XiaoMi/pegasus-go-client/idl/admin"
- "github.com/XiaoMi/pegasus-go-client/idl/base"
- "github.com/XiaoMi/pegasus-go-client/idl/replication"
- "github.com/XiaoMi/pegasus-go-client/session"
"github.com/apache/incubator-pegasus/admin-cli/util"
+ "github.com/apache/incubator-pegasus/go-client/idl/admin"
+ "github.com/apache/incubator-pegasus/go-client/idl/base"
+ "github.com/apache/incubator-pegasus/go-client/idl/replication"
+ "github.com/apache/incubator-pegasus/go-client/session"
log "github.com/sirupsen/logrus"
)
diff --git a/admin-cli/client/migrate_node_test.go
b/admin-cli/client/migrate_node_test.go
index fa9f553c..3e0e5956 100644
--- a/admin-cli/client/migrate_node_test.go
+++ b/admin-cli/client/migrate_node_test.go
@@ -21,7 +21,7 @@ package client
import (
"testing"
- "github.com/XiaoMi/pegasus-go-client/idl/base"
+ "github.com/apache/incubator-pegasus/go-client/idl/base"
"github.com/stretchr/testify/assert"
)
diff --git a/admin-cli/client/remote_command.go
b/admin-cli/client/remote_command.go
index e5ea9397..48d653a3 100644
--- a/admin-cli/client/remote_command.go
+++ b/admin-cli/client/remote_command.go
@@ -24,8 +24,8 @@ import (
"fmt"
"sync"
- adminCli "github.com/XiaoMi/pegasus-go-client/admin"
"github.com/apache/incubator-pegasus/admin-cli/util"
+ adminCli "github.com/apache/incubator-pegasus/go-client/admin"
)
// CmdResult is the result of remote command to a node.
diff --git a/admin-cli/client/replica_health.go
b/admin-cli/client/replica_health.go
index b7238bb1..338fad74 100644
--- a/admin-cli/client/replica_health.go
+++ b/admin-cli/client/replica_health.go
@@ -20,8 +20,8 @@
package client
import (
- "github.com/XiaoMi/pegasus-go-client/idl/admin"
- "github.com/XiaoMi/pegasus-go-client/idl/replication"
+ "github.com/apache/incubator-pegasus/go-client/idl/admin"
+ "github.com/apache/incubator-pegasus/go-client/idl/replication"
)
// TableHealthInfo is a report of replica health within the table.
diff --git a/admin-cli/client/replica_health_test.go
b/admin-cli/client/replica_health_test.go
index 3d9e7e5a..6080b681 100644
--- a/admin-cli/client/replica_health_test.go
+++ b/admin-cli/client/replica_health_test.go
@@ -23,11 +23,11 @@ import (
"sort"
"testing"
- "github.com/XiaoMi/pegasus-go-client/idl/admin"
- "github.com/XiaoMi/pegasus-go-client/idl/base"
- "github.com/XiaoMi/pegasus-go-client/idl/replication"
- "github.com/XiaoMi/pegasus-go-client/session"
"github.com/apache/incubator-pegasus/admin-cli/util"
+ "github.com/apache/incubator-pegasus/go-client/idl/admin"
+ "github.com/apache/incubator-pegasus/go-client/idl/base"
+ "github.com/apache/incubator-pegasus/go-client/idl/replication"
+ "github.com/apache/incubator-pegasus/go-client/session"
"github.com/stretchr/testify/assert"
)
diff --git a/admin-cli/cmd/duplication.go b/admin-cli/cmd/duplication.go
index 972abe57..253ff863 100644
--- a/admin-cli/cmd/duplication.go
+++ b/admin-cli/cmd/duplication.go
@@ -22,9 +22,9 @@ package cmd
import (
"fmt"
- "github.com/XiaoMi/pegasus-go-client/idl/admin"
"github.com/apache/incubator-pegasus/admin-cli/executor"
"github.com/apache/incubator-pegasus/admin-cli/shell"
+ "github.com/apache/incubator-pegasus/go-client/idl/admin"
"github.com/desertbit/grumble"
)
diff --git a/admin-cli/cmd/remote_command.go b/admin-cli/cmd/remote_command.go
index fd3c5938..e5e8a822 100644
--- a/admin-cli/cmd/remote_command.go
+++ b/admin-cli/cmd/remote_command.go
@@ -23,7 +23,7 @@ import (
"github.com/apache/incubator-pegasus/admin-cli/executor"
"github.com/apache/incubator-pegasus/admin-cli/shell"
- "github.com/XiaoMi/pegasus-go-client/session"
+ "github.com/apache/incubator-pegasus/go-client/session"
"github.com/desertbit/grumble"
)
diff --git a/admin-cli/cmd/server_config.go b/admin-cli/cmd/server_config.go
index 9a1b212b..6029e85e 100644
--- a/admin-cli/cmd/server_config.go
+++ b/admin-cli/cmd/server_config.go
@@ -22,9 +22,9 @@ package cmd
import (
"fmt"
- "github.com/XiaoMi/pegasus-go-client/session"
"github.com/apache/incubator-pegasus/admin-cli/executor"
"github.com/apache/incubator-pegasus/admin-cli/shell"
+ "github.com/apache/incubator-pegasus/go-client/session"
"github.com/desertbit/grumble"
)
diff --git a/admin-cli/executor/backup_restore.go
b/admin-cli/executor/backup_restore.go
index 98179282..2807b77d 100644
--- a/admin-cli/executor/backup_restore.go
+++ b/admin-cli/executor/backup_restore.go
@@ -23,8 +23,8 @@ import (
"fmt"
"time"
- "github.com/XiaoMi/pegasus-go-client/idl/base"
"github.com/apache/incubator-pegasus/admin-cli/tabular"
+ "github.com/apache/incubator-pegasus/go-client/idl/base"
)
func BackupTable(client *Client, tableID int, providerType string, backupPath
string) error {
diff --git a/admin-cli/executor/bulk_load.go b/admin-cli/executor/bulk_load.go
index 99e69dc3..b3cbd2c7 100644
--- a/admin-cli/executor/bulk_load.go
+++ b/admin-cli/executor/bulk_load.go
@@ -22,9 +22,9 @@ package executor
import (
"fmt"
- "github.com/XiaoMi/pegasus-go-client/idl/admin"
"github.com/apache/incubator-pegasus/admin-cli/tabular"
"github.com/apache/incubator-pegasus/admin-cli/util"
+ "github.com/apache/incubator-pegasus/go-client/idl/admin"
"github.com/olekukonko/tablewriter"
)
diff --git a/admin-cli/executor/create_table.go
b/admin-cli/executor/create_table.go
index bcd8c16a..68663963 100644
--- a/admin-cli/executor/create_table.go
+++ b/admin-cli/executor/create_table.go
@@ -23,7 +23,7 @@ import (
"fmt"
"time"
- "github.com/XiaoMi/pegasus-go-client/idl/base"
+ "github.com/apache/incubator-pegasus/go-client/idl/base"
"github.com/cheggaaa/pb/v3"
)
diff --git a/admin-cli/executor/disk_info.go b/admin-cli/executor/disk_info.go
index 24ad8f6a..45fe3876 100644
--- a/admin-cli/executor/disk_info.go
+++ b/admin-cli/executor/disk_info.go
@@ -24,11 +24,11 @@ import (
"fmt"
"time"
- "github.com/XiaoMi/pegasus-go-client/idl/base"
- "github.com/XiaoMi/pegasus-go-client/idl/radmin"
- "github.com/XiaoMi/pegasus-go-client/session"
"github.com/apache/incubator-pegasus/admin-cli/tabular"
"github.com/apache/incubator-pegasus/admin-cli/util"
+ "github.com/apache/incubator-pegasus/go-client/idl/base"
+ "github.com/apache/incubator-pegasus/go-client/idl/radmin"
+ "github.com/apache/incubator-pegasus/go-client/session"
)
type DiskInfoType string
diff --git a/admin-cli/executor/disk_migrate.go
b/admin-cli/executor/disk_migrate.go
index 4da4b01e..2b9c24be 100644
--- a/admin-cli/executor/disk_migrate.go
+++ b/admin-cli/executor/disk_migrate.go
@@ -24,9 +24,9 @@ import (
"fmt"
"time"
- "github.com/XiaoMi/pegasus-go-client/idl/radmin"
- "github.com/XiaoMi/pegasus-go-client/session"
"github.com/apache/incubator-pegasus/admin-cli/util"
+ "github.com/apache/incubator-pegasus/go-client/idl/radmin"
+ "github.com/apache/incubator-pegasus/go-client/session"
)
func DiskMigrate(client *Client, replicaServer string, pidStr string, from
string, to string) error {
diff --git a/admin-cli/executor/duplication.go
b/admin-cli/executor/duplication.go
index 4d5560d6..e6ccc4e2 100644
--- a/admin-cli/executor/duplication.go
+++ b/admin-cli/executor/duplication.go
@@ -23,7 +23,7 @@ import (
"encoding/json"
"fmt"
- "github.com/XiaoMi/pegasus-go-client/idl/admin"
+ "github.com/apache/incubator-pegasus/go-client/idl/admin"
)
// QueryDuplication command
diff --git a/admin-cli/executor/list_nodes.go b/admin-cli/executor/list_nodes.go
index d63fcfd6..d84dd15b 100644
--- a/admin-cli/executor/list_nodes.go
+++ b/admin-cli/executor/list_nodes.go
@@ -23,10 +23,10 @@ import (
"fmt"
"sync"
- "github.com/XiaoMi/pegasus-go-client/idl/admin"
- "github.com/XiaoMi/pegasus-go-client/idl/replication"
"github.com/apache/incubator-pegasus/admin-cli/tabular"
"github.com/apache/incubator-pegasus/admin-cli/util"
+ "github.com/apache/incubator-pegasus/go-client/idl/admin"
+ "github.com/apache/incubator-pegasus/go-client/idl/replication"
"github.com/olekukonko/tablewriter"
batchErr "k8s.io/apimachinery/pkg/util/errors"
)
diff --git a/admin-cli/executor/list_tables.go
b/admin-cli/executor/list_tables.go
index 3ce8a68b..6cb754f6 100644
--- a/admin-cli/executor/list_tables.go
+++ b/admin-cli/executor/list_tables.go
@@ -20,10 +20,10 @@
package executor
import (
- "github.com/XiaoMi/pegasus-go-client/idl/admin"
"github.com/apache/incubator-pegasus/admin-cli/client"
"github.com/apache/incubator-pegasus/admin-cli/tabular"
"github.com/apache/incubator-pegasus/admin-cli/util"
+ "github.com/apache/incubator-pegasus/go-client/idl/admin"
)
// ListTables command.
diff --git a/admin-cli/executor/meta_level.go b/admin-cli/executor/meta_level.go
index a33d493e..31bf8d98 100644
--- a/admin-cli/executor/meta_level.go
+++ b/admin-cli/executor/meta_level.go
@@ -24,7 +24,7 @@ import (
"fmt"
"strings"
- "github.com/XiaoMi/pegasus-go-client/idl/admin"
+ "github.com/apache/incubator-pegasus/go-client/idl/admin"
)
// GetMetaLevel command
diff --git a/admin-cli/executor/remote_command.go
b/admin-cli/executor/remote_command.go
index a4545ff4..c92ba2b9 100644
--- a/admin-cli/executor/remote_command.go
+++ b/admin-cli/executor/remote_command.go
@@ -22,9 +22,9 @@ package executor
import (
"fmt"
- "github.com/XiaoMi/pegasus-go-client/session"
"github.com/apache/incubator-pegasus/admin-cli/client"
"github.com/apache/incubator-pegasus/admin-cli/util"
+ "github.com/apache/incubator-pegasus/go-client/session"
"github.com/olekukonko/tablewriter"
)
diff --git a/admin-cli/executor/server_config.go
b/admin-cli/executor/server_config.go
index 7cbda03a..f17cf27c 100644
--- a/admin-cli/executor/server_config.go
+++ b/admin-cli/executor/server_config.go
@@ -28,8 +28,8 @@ import (
"sync"
"time"
- "github.com/XiaoMi/pegasus-go-client/session"
"github.com/apache/incubator-pegasus/admin-cli/util"
+ "github.com/apache/incubator-pegasus/go-client/session"
"github.com/go-resty/resty/v2"
)
diff --git a/admin-cli/executor/server_info.go
b/admin-cli/executor/server_info.go
index bee7b443..4b51ce33 100644
--- a/admin-cli/executor/server_info.go
+++ b/admin-cli/executor/server_info.go
@@ -20,10 +20,10 @@
package executor
import (
- "github.com/XiaoMi/pegasus-go-client/session"
"github.com/apache/incubator-pegasus/admin-cli/client"
"github.com/apache/incubator-pegasus/admin-cli/tabular"
"github.com/apache/incubator-pegasus/admin-cli/util"
+ "github.com/apache/incubator-pegasus/go-client/session"
"github.com/olekukonko/tablewriter"
)
diff --git a/admin-cli/executor/toolkits/diskbalancer/balancer.go
b/admin-cli/executor/toolkits/diskbalancer/balancer.go
index eca177c9..0c2d1c2a 100644
--- a/admin-cli/executor/toolkits/diskbalancer/balancer.go
+++ b/admin-cli/executor/toolkits/diskbalancer/balancer.go
@@ -24,9 +24,9 @@ import (
"strings"
"time"
- "github.com/XiaoMi/pegasus-go-client/idl/base"
"github.com/apache/incubator-pegasus/admin-cli/executor"
"github.com/apache/incubator-pegasus/admin-cli/executor/toolkits"
+ "github.com/apache/incubator-pegasus/go-client/idl/base"
)
var WaitRunning = time.Second * 10 // time for wait migrate complete
diff --git a/admin-cli/executor/toolkits/diskbalancer/helper.go
b/admin-cli/executor/toolkits/diskbalancer/helper.go
index 09096e90..55ba7494 100644
--- a/admin-cli/executor/toolkits/diskbalancer/helper.go
+++ b/admin-cli/executor/toolkits/diskbalancer/helper.go
@@ -23,12 +23,12 @@ import (
"fmt"
"math"
- "github.com/XiaoMi/pegasus-go-client/idl/admin"
- "github.com/XiaoMi/pegasus-go-client/session"
adminClient "github.com/apache/incubator-pegasus/admin-cli/client"
"github.com/apache/incubator-pegasus/admin-cli/executor"
"github.com/apache/incubator-pegasus/admin-cli/executor/toolkits"
"github.com/apache/incubator-pegasus/admin-cli/util"
+ "github.com/apache/incubator-pegasus/go-client/idl/admin"
+ "github.com/apache/incubator-pegasus/go-client/session"
)
type DiskStats struct {
diff --git a/admin-cli/executor/toolkits/nodesmigrator/manager.go
b/admin-cli/executor/toolkits/nodesmigrator/manager.go
index 84f8934f..5bcce0fd 100644
--- a/admin-cli/executor/toolkits/nodesmigrator/manager.go
+++ b/admin-cli/executor/toolkits/nodesmigrator/manager.go
@@ -26,10 +26,10 @@ import (
"sync/atomic"
"time"
- "github.com/XiaoMi/pegasus-go-client/idl/admin"
"github.com/apache/incubator-pegasus/admin-cli/executor"
"github.com/apache/incubator-pegasus/admin-cli/executor/toolkits"
"github.com/apache/incubator-pegasus/admin-cli/util"
+ "github.com/apache/incubator-pegasus/go-client/idl/admin"
)
var GlobalBatchTable = false
diff --git a/admin-cli/executor/toolkits/nodesmigrator/migrator.go
b/admin-cli/executor/toolkits/nodesmigrator/migrator.go
index 6899b738..8f9046fe 100644
--- a/admin-cli/executor/toolkits/nodesmigrator/migrator.go
+++ b/admin-cli/executor/toolkits/nodesmigrator/migrator.go
@@ -28,12 +28,12 @@ import (
"sync/atomic"
"time"
- "github.com/XiaoMi/pegasus-go-client/idl/base"
- "github.com/XiaoMi/pegasus-go-client/session"
migrator "github.com/apache/incubator-pegasus/admin-cli/client"
"github.com/apache/incubator-pegasus/admin-cli/executor"
"github.com/apache/incubator-pegasus/admin-cli/executor/toolkits"
"github.com/apache/incubator-pegasus/admin-cli/util"
+ "github.com/apache/incubator-pegasus/go-client/idl/base"
+ "github.com/apache/incubator-pegasus/go-client/session"
)
type Migrator struct {
diff --git a/admin-cli/executor/toolkits/nodesmigrator/nodes.go
b/admin-cli/executor/toolkits/nodesmigrator/nodes.go
index dc56b059..c2c09e34 100644
--- a/admin-cli/executor/toolkits/nodesmigrator/nodes.go
+++ b/admin-cli/executor/toolkits/nodesmigrator/nodes.go
@@ -23,11 +23,11 @@ import (
"fmt"
"time"
- "github.com/XiaoMi/pegasus-go-client/idl/base"
migrator "github.com/apache/incubator-pegasus/admin-cli/client"
"github.com/apache/incubator-pegasus/admin-cli/executor"
"github.com/apache/incubator-pegasus/admin-cli/executor/toolkits"
"github.com/apache/incubator-pegasus/admin-cli/util"
+ "github.com/apache/incubator-pegasus/go-client/idl/base"
)
type Replica struct {
diff --git a/admin-cli/executor/use_table.go b/admin-cli/executor/use_table.go
index f3713e5e..63ec77d1 100644
--- a/admin-cli/executor/use_table.go
+++ b/admin-cli/executor/use_table.go
@@ -22,7 +22,7 @@ package executor
import (
"fmt"
- "github.com/XiaoMi/pegasus-go-client/idl/base"
+ "github.com/apache/incubator-pegasus/go-client/idl/base"
)
func UseTable(client *Client, table string) error {
diff --git a/admin-cli/go.mod b/admin-cli/go.mod
index eb3e5362..99f0bbdb 100644
--- a/admin-cli/go.mod
+++ b/admin-cli/go.mod
@@ -20,7 +20,7 @@ module github.com/apache/incubator-pegasus/admin-cli
go 1.14
require (
- github.com/XiaoMi/pegasus-go-client v0.0.0-20211220102249-0e7f49437ffe
+ github.com/apache/incubator-pegasus/go-client
v0.0.0-20220526071020-be5634371701
github.com/cheggaaa/pb/v3 v3.0.6
github.com/desertbit/grumble v1.1.1
github.com/dustin/go-humanize v1.0.0
@@ -32,14 +32,13 @@ require (
github.com/mattn/go-runewidth v0.0.10 // indirect
github.com/mitchellh/mapstructure v1.4.1 // indirect
github.com/olekukonko/tablewriter v0.0.5
- github.com/pegasus-kv/collector v0.0.0-20201231071707-f7bf1d568242
+ github.com/pegasus-kv/collector v0.0.0-20220526124628-023287923c32
github.com/pelletier/go-toml v1.8.1 // indirect
github.com/sirupsen/logrus v1.8.1
github.com/spf13/afero v1.5.1 // indirect
github.com/spf13/cast v1.3.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/stretchr/testify v1.6.1
- github.com/tidwall/gjson v1.9.3 // indirect
golang.org/x/text v0.3.5 // indirect
gopkg.in/ini.v1 v1.62.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0
diff --git a/admin-cli/go.sum b/admin-cli/go.sum
index 410111b1..4d96344b 100644
--- a/admin-cli/go.sum
+++ b/admin-cli/go.sum
@@ -31,9 +31,6 @@ github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod
h1:OXgGpZ6Cli1/URJOF1DMx
github.com/VividCortex/ewma v1.1.1
h1:MnEK4VOv6n0RSY4vtRe3h11qjxL3+t0B8yOL8iMXdcM=
github.com/VividCortex/ewma v1.1.1/go.mod
h1:2Tkkvm3sRDVXaiyucHiACn4cqf7DpdyLvmxzcbUokwA=
github.com/VividCortex/gohistogram v1.0.0/go.mod
h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
-github.com/XiaoMi/pegasus-go-client v0.0.0-20201127155445-d3b9a03abf6e/go.mod
h1:H83dStz3HvHBFC0n7QK+qLHAjqsIghFOFx2TCvq6vzI=
-github.com/XiaoMi/pegasus-go-client v0.0.0-20211220102249-0e7f49437ffe
h1:WSrSLLtR2PGDcCht8BXMk1CgTccvRNQerPpxwxGCle4=
-github.com/XiaoMi/pegasus-go-client v0.0.0-20211220102249-0e7f49437ffe/go.mod
h1:VrfgKISflRhFm32m3e0SXLccvNJTyG8PRywWbUuGEfY=
github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod
h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
github.com/agiledragon/gomonkey v2.0.2+incompatible
h1:eXKi9/piiC3cjJD1658mEE2o3NjkJ5vDLgYjCQu0Xlw=
github.com/agiledragon/gomonkey v2.0.2+incompatible/go.mod
h1:2NGfXu1a80LLr2cmWXGBDaHEjb1idR6+FVlX5T3D9hw=
@@ -44,7 +41,10 @@ github.com/alecthomas/units
v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod
h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod
h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
github.com/andybalholm/brotli v1.0.0/go.mod
h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
+github.com/apache/incubator-pegasus/go-client
v0.0.0-20220526071020-be5634371701
h1:J9d8jaC0rKlnf8iQuImyBiDrZnl794JlGMXX8DhMNrs=
+github.com/apache/incubator-pegasus/go-client
v0.0.0-20220526071020-be5634371701/go.mod
h1:vOnSzVwVYmatouq8qEBX+yWV4AvoCTLRpQn6JA+qojs=
github.com/apache/thrift v0.12.0/go.mod
h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
+github.com/apache/thrift v0.13.0
h1:5hryIiq9gtn+MiLVn0wP37kb/uTeRZgN08WoCsAhIhI=
github.com/apache/thrift v0.13.0/go.mod
h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod
h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod
h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
@@ -377,10 +377,8 @@ github.com/openzipkin/zipkin-go v0.2.2/go.mod
h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnh
github.com/pact-foundation/pact-go v1.0.4/go.mod
h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM=
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod
h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
github.com/pborman/uuid v1.2.0/go.mod
h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
-github.com/pegasus-kv/collector v0.0.0-20201231071707-f7bf1d568242
h1:CSConaLvzWUZ0GynljIZ5MDTrmNasJOjbW457w/IcRM=
-github.com/pegasus-kv/collector v0.0.0-20201231071707-f7bf1d568242/go.mod
h1:HyocrKyzUrRpqPmzKSFNSsf+AAGo/GjIb2QXF4nU4Xw=
-github.com/pegasus-kv/thrift v0.13.0
h1:4ESwaNoHImfbHa9RUGJiJZ4hrxorihZHk5aarYwY8d4=
-github.com/pegasus-kv/thrift v0.13.0/go.mod
h1:Gl9NT/WHG6ABm6NsrbfE8LiJN0sAyneCrvB4qN4NPqQ=
+github.com/pegasus-kv/collector v0.0.0-20220526124628-023287923c32
h1:evBTGUqzrt4Srmj/IIHzQCwQg03WmeOsiIc4kyaNfzM=
+github.com/pegasus-kv/collector v0.0.0-20220526124628-023287923c32/go.mod
h1:3RzVywHIsTOtVPF++Ju75uFJRdU32ARN+W/k7S8Kbek=
github.com/pelletier/go-toml v1.2.0/go.mod
h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
github.com/pelletier/go-toml v1.8.1
h1:1Nf83orprkJyknT6h7zbuEGUEjcyVlCxSUGTENmNCRM=
github.com/pelletier/go-toml v1.8.1/go.mod
h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc=
@@ -484,13 +482,10 @@ github.com/stretchr/testify v1.6.1
h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd
github.com/stretchr/testify v1.6.1/go.mod
h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/subosito/gotenv v1.2.0
h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
github.com/subosito/gotenv v1.2.0/go.mod
h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
-github.com/tidwall/gjson v1.6.3/go.mod
h1:BaHyNc5bjzYkPqgLq7mdVzeiRtULKULXLgZFKsxEHI0=
-github.com/tidwall/gjson v1.9.3 h1:hqzS9wAHMO+KVBBkLxYdkEeeFHuqr95GfClRLKlgK0E=
-github.com/tidwall/gjson v1.9.3/go.mod
h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
-github.com/tidwall/match v1.0.1/go.mod
h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
+github.com/tidwall/gjson v1.14.0
h1:6aeJ0bzojgWLa82gDQHcx3S0Lr/O51I9bJ5nv6JFx5w=
+github.com/tidwall/gjson v1.14.0/go.mod
h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
github.com/tidwall/match v1.1.1/go.mod
h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
-github.com/tidwall/pretty v1.0.2/go.mod
h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
github.com/tidwall/pretty v1.2.0
h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
github.com/tidwall/pretty v1.2.0/go.mod
h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod
h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
diff --git a/admin-cli/main.go b/admin-cli/main.go
index 0ab1aae3..a4646006 100644
--- a/admin-cli/main.go
+++ b/admin-cli/main.go
@@ -24,9 +24,9 @@ import (
"net"
"strings"
- "github.com/XiaoMi/pegasus-go-client/pegalog"
"github.com/apache/incubator-pegasus/admin-cli/cmd"
"github.com/apache/incubator-pegasus/admin-cli/shell"
+ "github.com/apache/incubator-pegasus/go-client/pegalog"
"github.com/desertbit/grumble"
"github.com/sirupsen/logrus"
"gopkg.in/natefinch/lumberjack.v2"
diff --git a/admin-cli/util/common_utils.go b/admin-cli/util/common_utils.go
index 3772d940..bbeb1436 100644
--- a/admin-cli/util/common_utils.go
+++ b/admin-cli/util/common_utils.go
@@ -27,7 +27,7 @@ import (
"strings"
"time"
- "github.com/XiaoMi/pegasus-go-client/idl/base"
+ "github.com/apache/incubator-pegasus/go-client/idl/base"
)
func Str2Gpid(gpid string) (*base.Gpid, error) {
diff --git a/admin-cli/util/pegasus_node.go b/admin-cli/util/pegasus_node.go
index 70eb0fd9..73504214 100644
--- a/admin-cli/util/pegasus_node.go
+++ b/admin-cli/util/pegasus_node.go
@@ -25,8 +25,8 @@ import (
"strings"
"sync"
- "github.com/XiaoMi/pegasus-go-client/idl/base"
- "github.com/XiaoMi/pegasus-go-client/session"
+ "github.com/apache/incubator-pegasus/go-client/idl/base"
+ "github.com/apache/incubator-pegasus/go-client/session"
"github.com/pegasus-kv/collector/aggregate"
)
diff --git a/pegic/executor/context.go b/pegic/executor/context.go
index d5bf104d..02ddbc9e 100644
--- a/pegic/executor/context.go
+++ b/pegic/executor/context.go
@@ -23,8 +23,8 @@ import (
"fmt"
"io"
- "github.com/XiaoMi/pegasus-go-client/pegasus"
- "github.com/XiaoMi/pegasus-go-client/session"
+ "github.com/apache/incubator-pegasus/go-client/pegasus"
+ "github.com/apache/incubator-pegasus/go-client/session"
"github.com/apache/incubator-pegasus/pegic/executor/util"
)
diff --git a/pegic/executor/partition_index.go
b/pegic/executor/partition_index.go
index 31ac3b53..ffb0c03b 100644
--- a/pegic/executor/partition_index.go
+++ b/pegic/executor/partition_index.go
@@ -25,7 +25,7 @@ import (
"hash/crc64"
"time"
- "github.com/XiaoMi/pegasus-go-client/idl/base"
+ "github.com/apache/incubator-pegasus/go-client/idl/base"
)
var crc64Table = crc64.MakeTable(0x9a6c9329ac4bc9b5)
diff --git a/pegic/executor/scan.go b/pegic/executor/scan.go
index e169b922..c1084e5e 100644
--- a/pegic/executor/scan.go
+++ b/pegic/executor/scan.go
@@ -24,7 +24,7 @@ import (
"fmt"
"time"
- "github.com/XiaoMi/pegasus-go-client/pegasus"
+ "github.com/apache/incubator-pegasus/go-client/pegasus"
)
// ScanCommand wraps scan command input.
diff --git a/pegic/go.mod b/pegic/go.mod
index eac79d3f..9a153b9d 100644
--- a/pegic/go.mod
+++ b/pegic/go.mod
@@ -20,7 +20,7 @@ module github.com/apache/incubator-pegasus/pegic
go 1.14
require (
- github.com/XiaoMi/pegasus-go-client v0.0.0-20211126055700-5ae2deb75c37
+ github.com/apache/incubator-pegasus/go-client
v0.0.0-20220526071020-be5634371701
github.com/desertbit/grumble v1.1.1
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/klauspost/compress v1.12.1
diff --git a/pegic/go.sum b/pegic/go.sum
index e6cbcc3b..a8e8d978 100644
--- a/pegic/go.sum
+++ b/pegic/go.sum
@@ -20,12 +20,14 @@ github.com/Netflix/go-expect
v0.0.0-20190729225929-0e00d9168667/go.mod h1:oX5x61
github.com/OneOfOne/xxhash v1.2.2/go.mod
h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/PuerkitoBio/purell v1.0.0/go.mod
h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod
h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
-github.com/XiaoMi/pegasus-go-client v0.0.0-20211126055700-5ae2deb75c37
h1:h1be834SkoleMU2rDxpQuWp4FQhXCPbV1t8yr/fXzXo=
-github.com/XiaoMi/pegasus-go-client v0.0.0-20211126055700-5ae2deb75c37/go.mod
h1:VrfgKISflRhFm32m3e0SXLccvNJTyG8PRywWbUuGEfY=
github.com/agiledragon/gomonkey v2.0.2+incompatible
h1:eXKi9/piiC3cjJD1658mEE2o3NjkJ5vDLgYjCQu0Xlw=
github.com/agiledragon/gomonkey v2.0.2+incompatible/go.mod
h1:2NGfXu1a80LLr2cmWXGBDaHEjb1idR6+FVlX5T3D9hw=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod
h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod
h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/apache/incubator-pegasus/go-client
v0.0.0-20220526071020-be5634371701
h1:J9d8jaC0rKlnf8iQuImyBiDrZnl794JlGMXX8DhMNrs=
+github.com/apache/incubator-pegasus/go-client
v0.0.0-20220526071020-be5634371701/go.mod
h1:vOnSzVwVYmatouq8qEBX+yWV4AvoCTLRpQn6JA+qojs=
+github.com/apache/thrift v0.13.0
h1:5hryIiq9gtn+MiLVn0wP37kb/uTeRZgN08WoCsAhIhI=
+github.com/apache/thrift v0.13.0/go.mod
h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod
h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod
h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod
h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
@@ -209,8 +211,6 @@ github.com/onsi/ginkgo v1.10.1/go.mod
h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+
github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod
h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
github.com/onsi/gomega v1.7.0/go.mod
h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod
h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/pegasus-kv/thrift v0.13.0
h1:4ESwaNoHImfbHa9RUGJiJZ4hrxorihZHk5aarYwY8d4=
-github.com/pegasus-kv/thrift v0.13.0/go.mod
h1:Gl9NT/WHG6ABm6NsrbfE8LiJN0sAyneCrvB4qN4NPqQ=
github.com/pelletier/go-toml v1.2.0/go.mod
h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
github.com/pkg/errors v0.8.0/go.mod
h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.8.1/go.mod
h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
diff --git a/pegic/interactive/cmd/init.go b/pegic/interactive/cmd/init.go
index 0614801a..b7a79ef4 100644
--- a/pegic/interactive/cmd/init.go
+++ b/pegic/interactive/cmd/init.go
@@ -24,7 +24,7 @@ import (
"os"
"strings"
- "github.com/XiaoMi/pegasus-go-client/session"
+ "github.com/apache/incubator-pegasus/go-client/session"
"github.com/apache/incubator-pegasus/pegic/executor"
"github.com/desertbit/grumble"
)
diff --git a/pegic/main.go b/pegic/main.go
index a6f15804..8cc06a32 100644
--- a/pegic/main.go
+++ b/pegic/main.go
@@ -23,7 +23,7 @@ import (
"fmt"
"os"
- "github.com/XiaoMi/pegasus-go-client/pegalog"
+ "github.com/apache/incubator-pegasus/go-client/pegalog"
"github.com/apache/incubator-pegasus/pegic/shell"
"github.com/sirupsen/logrus"
"gopkg.in/natefinch/lumberjack.v2"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
