Merge pull request #123 from Ahmadkashif/Issue_113_UseQualiFiedPathFo…

…rGoMod use qualified path for go mod
paypal · May 21, 2024 · 11e5598 · 11e5598
2 parents c7a62b4 + 1b31d80
commit 11e5598
Show file tree

Hide file tree

Showing 242 changed files with 1,247 additions and 1,185 deletions.
diff --git a/binary_build/build.sh b/binary_build/build.sh
@@ -97,16 +97,16 @@ export CGO_LDFLAGS="-L$rocksdb_dir/lib -L/usr/local/lib -lrocksdb -lstdc++ -lm -
 juno_version_info="-X juno/pkg/version.BuildTime=$build_time -X juno/pkg/version.Revision=$code_revision -X juno/pkg/version.BuildId=$JUNO_BUILD_NUMBER"
 
 juno_executables="\
-	juno/cmd/proxy \
-	juno/cmd/storageserv \
-	juno/cmd/storageserv/storage/db/dbcopy \
-	juno/cmd/tools/junocli \
-	juno/cmd/clustermgr \
-	juno/cmd/dbscanserv \
-	juno/cmd/dbscanserv/junoctl \
-        juno/test/drv/junoload \
-        juno/cmd/tools/junostats\
-        juno/cmd/tools/junocfg\
+	github.com/paypal/junodb/cmd/proxy \
+	github.com/paypal/junodb/cmd/storageserv \
+	github.com/paypal/junodb/cmd/storageserv/storage/db/dbcopy \
+	github.com/paypal/junodb/cmd/tools/junocli \
+	github.com/paypal/junodb/cmd/clustermgr \
+	github.com/paypal/junodb/cmd/dbscanserv \
+	github.com/paypal/junodb/cmd/dbscanserv/junoctl \
+        github.com/paypal/junodb/test/drv/junoload \
+        github.com/paypal/junodb/cmd/tools/junostats\
+        github.com/paypal/junodb/cmd/tools/junocfg\
 	"
 # DO NOT include junoload in any package
 

diff --git a/cmd/clustermgr/clusterctl/clusterctl.go b/cmd/clustermgr/clusterctl/clusterctl.go
@@ -28,11 +28,11 @@ import (
 	"path/filepath"
 	"strings"
 
-	"juno/third_party/forked/golang/glog"
+	"github.com/paypal/junodb/third_party/forked/golang/glog"
 
-	"juno/pkg/version"
+	"github.com/paypal/junodb/pkg/version"
 
-	"juno/cmd/clustermgr/cmd"
+	"github.com/paypal/junodb/cmd/clustermgr/cmd"
 )
 
 //

diff --git a/cmd/clustermgr/clustermgr.go b/cmd/clustermgr/clustermgr.go
@@ -27,11 +27,11 @@ import (
 	"os"
 	"path/filepath"
 
-	"juno/third_party/forked/golang/glog"
+	"github.com/paypal/junodb/third_party/forked/golang/glog"
 
-	"juno/pkg/version"
+	"github.com/paypal/junodb/pkg/version"
 
-	"juno/cmd/clustermgr/cmd"
+	"github.com/paypal/junodb/cmd/clustermgr/cmd"
 )
 
 var (

diff --git a/cmd/clustermgr/cmd/cmd.go b/cmd/clustermgr/cmd/cmd.go
@@ -27,10 +27,10 @@ import (
 	"strings"
 	"time"
 
-	"juno/third_party/forked/golang/glog"
+	"github.com/paypal/junodb/third_party/forked/golang/glog"
 
-	"juno/pkg/cluster"
-	"juno/pkg/etcd"
+	"github.com/paypal/junodb/pkg/cluster"
+	"github.com/paypal/junodb/pkg/etcd"
 )
 
 func GetStatus(configFile string) {

diff --git a/cmd/clustermgr/cmd/config.go b/cmd/clustermgr/cmd/config.go
@@ -26,10 +26,10 @@ import (
 
 	"github.com/BurntSushi/toml"
 
-	"juno/third_party/forked/golang/glog"
+	"github.com/paypal/junodb/third_party/forked/golang/glog"
 
-	"juno/pkg/cluster"
-	"juno/pkg/etcd"
+	"github.com/paypal/junodb/pkg/cluster"
+	"github.com/paypal/junodb/pkg/etcd"
 )
 
 var (

diff --git a/cmd/dbscanserv/app/cmd.go b/cmd/dbscanserv/app/cmd.go
@@ -28,12 +28,12 @@ import (
 	"strings"
 	"time"
 
-	"juno/third_party/forked/golang/glog"
-	"juno/third_party/forked/tecbot/gorocksdb"
+	"github.com/paypal/junodb/third_party/forked/golang/glog"
+	"github.com/paypal/junodb/third_party/forked/tecbot/gorocksdb"
 
-	"juno/cmd/dbscanserv/prime"
-	"juno/cmd/storageserv/compact"
-	"juno/cmd/storageserv/storage/db"
+	"github.com/paypal/junodb/cmd/dbscanserv/prime"
+	"github.com/paypal/junodb/cmd/storageserv/compact"
+	"github.com/paypal/junodb/cmd/storageserv/storage/db"
 )
 
 type CmdLine struct {

diff --git a/cmd/dbscanserv/app/collect.go b/cmd/dbscanserv/app/collect.go
@@ -25,10 +25,10 @@ import (
 	"sync/atomic"
 	"time"
 
-	"juno/third_party/forked/golang/glog"
+	"github.com/paypal/junodb/third_party/forked/golang/glog"
 
-	"juno/cmd/dbscanserv/prime"
-	"juno/pkg/logging"
+	"github.com/paypal/junodb/cmd/dbscanserv/prime"
+	"github.com/paypal/junodb/pkg/logging"
 )
 
 type Collector struct {

diff --git a/cmd/dbscanserv/app/init.go b/cmd/dbscanserv/app/init.go
@@ -27,15 +27,15 @@ import (
 
 	"github.com/BurntSushi/toml"
 
-	"juno/third_party/forked/golang/glog"
-
-	"juno/cmd/clustermgr/cmd"
-	"juno/cmd/dbscanserv/config"
-	"juno/cmd/dbscanserv/prime"
-	"juno/cmd/storageserv/storage/db"
-	"juno/pkg/cluster"
-	"juno/pkg/etcd"
-	"juno/pkg/sec"
+	"github.com/paypal/junodb/third_party/forked/golang/glog"
+
+	"github.com/paypal/junodb/cmd/clustermgr/cmd"
+	"github.com/paypal/junodb/cmd/dbscanserv/config"
+	"github.com/paypal/junodb/cmd/dbscanserv/prime"
+	"github.com/paypal/junodb/cmd/storageserv/storage/db"
+	"github.com/paypal/junodb/pkg/cluster"
+	"github.com/paypal/junodb/pkg/etcd"
+	"github.com/paypal/junodb/pkg/sec"
 )
 
 type CmdConfig cmd.Config

diff --git a/cmd/dbscanserv/app/patch.go b/cmd/dbscanserv/app/patch.go
@@ -27,14 +27,14 @@ import (
 	"sync"
 	"time"
 
-	"juno/third_party/forked/golang/glog"
-	"juno/third_party/forked/tecbot/gorocksdb"
-
-	"juno/cmd/dbscanserv/config"
-	"juno/cmd/dbscanserv/prime"
-	"juno/cmd/storageserv/storage/db"
-	"juno/pkg/proto"
-	"juno/pkg/util"
+	"github.com/paypal/junodb/third_party/forked/golang/glog"
+	"github.com/paypal/junodb/third_party/forked/tecbot/gorocksdb"
+
+	"github.com/paypal/junodb/cmd/dbscanserv/config"
+	"github.com/paypal/junodb/cmd/dbscanserv/prime"
+	"github.com/paypal/junodb/cmd/storageserv/storage/db"
+	"github.com/paypal/junodb/pkg/proto"
+	"github.com/paypal/junodb/pkg/util"
 )
 
 type CmdUpdatePatch struct {

diff --git a/cmd/dbscanserv/app/remote.go b/cmd/dbscanserv/app/remote.go
@@ -30,11 +30,11 @@ import (
 	"sync/atomic"
 	"time"
 
-	"juno/third_party/forked/golang/glog"
+	"github.com/paypal/junodb/third_party/forked/golang/glog"
 
-	"juno/cmd/dbscanserv/config"
-	"juno/cmd/dbscanserv/prime"
-	"juno/pkg/net/netutil"
+	"github.com/paypal/junodb/cmd/dbscanserv/config"
+	"github.com/paypal/junodb/cmd/dbscanserv/prime"
+	"github.com/paypal/junodb/pkg/net/netutil"
 )
 
 type Remote int

diff --git a/cmd/dbscanserv/app/rpcclient.go b/cmd/dbscanserv/app/rpcclient.go
@@ -27,10 +27,10 @@ import (
 	"strings"
 	"time"
 
-	"juno/third_party/forked/golang/glog"
+	"github.com/paypal/junodb/third_party/forked/golang/glog"
 
-	"juno/cmd/dbscanserv/config"
-	"juno/cmd/dbscanserv/prime"
+	"github.com/paypal/junodb/cmd/dbscanserv/config"
+	"github.com/paypal/junodb/cmd/dbscanserv/prime"
 )
 
 type RpcClient struct {

diff --git a/cmd/dbscanserv/app/scan.go b/cmd/dbscanserv/app/scan.go
@@ -24,11 +24,11 @@ import (
 	"sync/atomic"
 	"time"
 
-	"juno/third_party/forked/golang/glog"
-	"juno/third_party/forked/tecbot/gorocksdb"
+	"github.com/paypal/junodb/third_party/forked/golang/glog"
+	"github.com/paypal/junodb/third_party/forked/tecbot/gorocksdb"
 
-	"juno/cmd/dbscanserv/prime"
-	"juno/cmd/storageserv/storage/db"
+	"github.com/paypal/junodb/cmd/dbscanserv/prime"
+	"github.com/paypal/junodb/cmd/storageserv/storage/db"
 )
 
 // Map from zoneid, shardid to Scanner

diff --git a/cmd/dbscanserv/junoctl/junoctl.go b/cmd/dbscanserv/junoctl/junoctl.go
@@ -25,9 +25,9 @@ import (
 	"os"
 	"path/filepath"
 
-	"juno/cmd/dbscanserv/app"
-	"juno/pkg/version"
-	"juno/third_party/forked/golang/glog"
+	"github.com/paypal/junodb/cmd/dbscanserv/app"
+	"github.com/paypal/junodb/pkg/version"
+	"github.com/paypal/junodb/third_party/forked/golang/glog"
 )
 
 func main() {

diff --git a/cmd/dbscanserv/main.go b/cmd/dbscanserv/main.go
@@ -27,11 +27,11 @@ import (
 	"strconv"
 	"strings"
 
-	"juno/third_party/forked/golang/glog"
+	"github.com/paypal/junodb/third_party/forked/golang/glog"
 
-	"juno/cmd/dbscanserv/app"
-	"juno/cmd/dbscanserv/prime"
-	"juno/pkg/version"
+	"github.com/paypal/junodb/cmd/dbscanserv/app"
+	"github.com/paypal/junodb/cmd/dbscanserv/prime"
+	"github.com/paypal/junodb/pkg/version"
 )
 
 func parseKeyRange(keyRange string, cmd string) (start int, stop int, skip int) {

diff --git a/cmd/dbscanserv/patch/relay.go b/cmd/dbscanserv/patch/relay.go
@@ -22,12 +22,12 @@ package patch
 import (
 	"time"
 
-	"juno/third_party/forked/golang/glog"
+	"github.com/paypal/junodb/third_party/forked/golang/glog"
 
-	"juno/cmd/dbscanserv/app"
-	"juno/cmd/dbscanserv/config"
-	"juno/cmd/storageserv/storage/db"
-	"juno/pkg/proto"
+	"github.com/paypal/junodb/cmd/dbscanserv/app"
+	"github.com/paypal/junodb/cmd/dbscanserv/config"
+	"github.com/paypal/junodb/cmd/storageserv/storage/db"
+	"github.com/paypal/junodb/pkg/proto"
 )
 
 // Called by storageserv.

diff --git a/cmd/dbscanserv/prime/db.go b/cmd/dbscanserv/prime/db.go
@@ -26,10 +26,10 @@ import (
 	"sync/atomic"
 	"time"
 
-	"juno/third_party/forked/golang/glog"
-	"juno/third_party/forked/tecbot/gorocksdb"
+	"github.com/paypal/junodb/third_party/forked/golang/glog"
+	"github.com/paypal/junodb/third_party/forked/tecbot/gorocksdb"
 
-	"juno/cmd/storageserv/storage/db"
+	"github.com/paypal/junodb/cmd/storageserv/storage/db"
 )
 
 // Map from zoneid, nodeid to db handle

diff --git a/cmd/dbscanserv/prime/log.go b/cmd/dbscanserv/prime/log.go
@@ -23,7 +23,7 @@ import (
 	"fmt"
 	"os"
 
-	"juno/third_party/forked/golang/glog"
+	"github.com/paypal/junodb/third_party/forked/golang/glog"
 )
 
 var (

diff --git a/cmd/dbscanserv/prime/meta.go b/cmd/dbscanserv/prime/meta.go
@@ -28,9 +28,9 @@ import (
 	"sync/atomic"
 	"time"
 
-	"juno/third_party/forked/golang/glog"
+	"github.com/paypal/junodb/third_party/forked/golang/glog"
 
-	"juno/cmd/storageserv/storage/db"
+	"github.com/paypal/junodb/cmd/storageserv/storage/db"
 )
 
 type Meta struct {

diff --git a/cmd/dbscanserv/prime/opdata.go b/cmd/dbscanserv/prime/opdata.go
@@ -26,10 +26,10 @@ import (
 	"sync/atomic"
 	"time"
 
-	"juno/third_party/forked/golang/glog"
+	"github.com/paypal/junodb/third_party/forked/golang/glog"
 
-	"juno/cmd/storageserv/storage/db"
-	"juno/pkg/proto"
+	"github.com/paypal/junodb/cmd/storageserv/storage/db"
+	"github.com/paypal/junodb/pkg/proto"
 )
 
 type OpRecord struct {

diff --git a/cmd/dbscanserv/prime/replicate.go b/cmd/dbscanserv/prime/replicate.go
@@ -24,12 +24,12 @@ import (
 	"runtime"
 	"time"
 
-	"juno/third_party/forked/golang/glog"
+	"github.com/paypal/junodb/third_party/forked/golang/glog"
 
-	"juno/internal/cli"
-	"juno/pkg/io"
-	"juno/pkg/proto"
-	"juno/pkg/sec"
+	"github.com/paypal/junodb/internal/cli"
+	"github.com/paypal/junodb/pkg/io"
+	"github.com/paypal/junodb/pkg/proto"
+	"github.com/paypal/junodb/pkg/sec"
 )
 
 var (

diff --git a/cmd/dbscanserv/prime/result.go b/cmd/dbscanserv/prime/result.go
@@ -23,10 +23,10 @@ import (
 	"strings"
 	"time"
 
-	"juno/third_party/forked/golang/glog"
+	"github.com/paypal/junodb/third_party/forked/golang/glog"
 
-	"juno/pkg/client"
-	"juno/pkg/util"
+	"github.com/paypal/junodb/pkg/client"
+	"github.com/paypal/junodb/pkg/util"
 )
 
 type KeyList struct {

diff --git a/cmd/proxy/app/proxy.go b/cmd/proxy/app/proxy.go
@@ -30,13 +30,13 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	"juno/third_party/forked/golang/glog"
+	"github.com/paypal/junodb/third_party/forked/golang/glog"
 
-	"juno/cmd/proxy/config"
-	"juno/pkg/cmd"
-	"juno/pkg/initmgr"
-	"juno/pkg/sec"
-	"juno/pkg/version"
+	"github.com/paypal/junodb/cmd/proxy/config"
+	"github.com/paypal/junodb/pkg/cmd"
+	"github.com/paypal/junodb/pkg/initmgr"
+	"github.com/paypal/junodb/pkg/sec"
+	"github.com/paypal/junodb/pkg/version"
 )
 
 func Main() {

diff --git a/cmd/proxy/app/proxymgr.go b/cmd/proxy/app/proxymgr.go
@@ -28,17 +28,17 @@ import (
 	"strings"
 	"syscall"
 
-	"juno/third_party/forked/golang/glog"
-
-	"juno/cmd/proxy/config"
-	"juno/cmd/proxy/stats"
-	"juno/pkg/cmd"
-	"juno/pkg/initmgr"
-	"juno/pkg/logging"
-	"juno/pkg/logging/cal"
-	"juno/pkg/sec"
-	"juno/pkg/service"
-	"juno/pkg/util"
+	"github.com/paypal/junodb/third_party/forked/golang/glog"
+
+	"github.com/paypal/junodb/cmd/proxy/config"
+	"github.com/paypal/junodb/cmd/proxy/stats"
+	"github.com/paypal/junodb/pkg/cmd"
+	"github.com/paypal/junodb/pkg/initmgr"
+	"github.com/paypal/junodb/pkg/logging"
+	"github.com/paypal/junodb/pkg/logging/cal"
+	"github.com/paypal/junodb/pkg/sec"
+	"github.com/paypal/junodb/pkg/service"
+	"github.com/paypal/junodb/pkg/util"
 )
 
 const (
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,7 @@ import ( @@
     	"fmt"
     	"os"
-    	"juno/third_party/forked/golang/glog"
+    	"github.com/paypal/junodb/third_party/forked/golang/glog"
     )
     var (
@@ Expand Down @@