Skip to content

Commit 11e5598

Browse files
Merge pull request #123 from Ahmadkashif/Issue_113_UseQualiFiedPathForGoMod
use qualified path for go mod
2 parents c7a62b4 + 1b31d80 commit 11e5598

File tree

242 files changed

+1247
-1185
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

242 files changed

+1247
-1185
lines changed

binary_build/build.sh

+10-10
Original file line numberDiff line numberDiff line change
@@ -97,16 +97,16 @@ export CGO_LDFLAGS="-L$rocksdb_dir/lib -L/usr/local/lib -lrocksdb -lstdc++ -lm -
9797
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"
9898

9999
juno_executables="\
100-
juno/cmd/proxy \
101-
juno/cmd/storageserv \
102-
juno/cmd/storageserv/storage/db/dbcopy \
103-
juno/cmd/tools/junocli \
104-
juno/cmd/clustermgr \
105-
juno/cmd/dbscanserv \
106-
juno/cmd/dbscanserv/junoctl \
107-
juno/test/drv/junoload \
108-
juno/cmd/tools/junostats\
109-
juno/cmd/tools/junocfg\
100+
github.com/paypal/junodb/cmd/proxy \
101+
github.com/paypal/junodb/cmd/storageserv \
102+
github.com/paypal/junodb/cmd/storageserv/storage/db/dbcopy \
103+
github.com/paypal/junodb/cmd/tools/junocli \
104+
github.com/paypal/junodb/cmd/clustermgr \
105+
github.com/paypal/junodb/cmd/dbscanserv \
106+
github.com/paypal/junodb/cmd/dbscanserv/junoctl \
107+
github.com/paypal/junodb/test/drv/junoload \
108+
github.com/paypal/junodb/cmd/tools/junostats\
109+
github.com/paypal/junodb/cmd/tools/junocfg\
110110
"
111111
# DO NOT include junoload in any package
112112

cmd/clustermgr/clusterctl/clusterctl.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ import (
2828
"path/filepath"
2929
"strings"
3030

31-
"juno/third_party/forked/golang/glog"
31+
"github.com/paypal/junodb/third_party/forked/golang/glog"
3232

33-
"juno/pkg/version"
33+
"github.com/paypal/junodb/pkg/version"
3434

35-
"juno/cmd/clustermgr/cmd"
35+
"github.com/paypal/junodb/cmd/clustermgr/cmd"
3636
)
3737

3838
//

cmd/clustermgr/clustermgr.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ import (
2727
"os"
2828
"path/filepath"
2929

30-
"juno/third_party/forked/golang/glog"
30+
"github.com/paypal/junodb/third_party/forked/golang/glog"
3131

32-
"juno/pkg/version"
32+
"github.com/paypal/junodb/pkg/version"
3333

34-
"juno/cmd/clustermgr/cmd"
34+
"github.com/paypal/junodb/cmd/clustermgr/cmd"
3535
)
3636

3737
var (

cmd/clustermgr/cmd/cmd.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ import (
2727
"strings"
2828
"time"
2929

30-
"juno/third_party/forked/golang/glog"
30+
"github.com/paypal/junodb/third_party/forked/golang/glog"
3131

32-
"juno/pkg/cluster"
33-
"juno/pkg/etcd"
32+
"github.com/paypal/junodb/pkg/cluster"
33+
"github.com/paypal/junodb/pkg/etcd"
3434
)
3535

3636
func GetStatus(configFile string) {

cmd/clustermgr/cmd/config.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ import (
2626

2727
"github.com/BurntSushi/toml"
2828

29-
"juno/third_party/forked/golang/glog"
29+
"github.com/paypal/junodb/third_party/forked/golang/glog"
3030

31-
"juno/pkg/cluster"
32-
"juno/pkg/etcd"
31+
"github.com/paypal/junodb/pkg/cluster"
32+
"github.com/paypal/junodb/pkg/etcd"
3333
)
3434

3535
var (

cmd/dbscanserv/app/cmd.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ import (
2828
"strings"
2929
"time"
3030

31-
"juno/third_party/forked/golang/glog"
32-
"juno/third_party/forked/tecbot/gorocksdb"
31+
"github.com/paypal/junodb/third_party/forked/golang/glog"
32+
"github.com/paypal/junodb/third_party/forked/tecbot/gorocksdb"
3333

34-
"juno/cmd/dbscanserv/prime"
35-
"juno/cmd/storageserv/compact"
36-
"juno/cmd/storageserv/storage/db"
34+
"github.com/paypal/junodb/cmd/dbscanserv/prime"
35+
"github.com/paypal/junodb/cmd/storageserv/compact"
36+
"github.com/paypal/junodb/cmd/storageserv/storage/db"
3737
)
3838

3939
type CmdLine struct {

cmd/dbscanserv/app/collect.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ import (
2525
"sync/atomic"
2626
"time"
2727

28-
"juno/third_party/forked/golang/glog"
28+
"github.com/paypal/junodb/third_party/forked/golang/glog"
2929

30-
"juno/cmd/dbscanserv/prime"
31-
"juno/pkg/logging"
30+
"github.com/paypal/junodb/cmd/dbscanserv/prime"
31+
"github.com/paypal/junodb/pkg/logging"
3232
)
3333

3434
type Collector struct {

cmd/dbscanserv/app/init.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ import (
2727

2828
"github.com/BurntSushi/toml"
2929

30-
"juno/third_party/forked/golang/glog"
31-
32-
"juno/cmd/clustermgr/cmd"
33-
"juno/cmd/dbscanserv/config"
34-
"juno/cmd/dbscanserv/prime"
35-
"juno/cmd/storageserv/storage/db"
36-
"juno/pkg/cluster"
37-
"juno/pkg/etcd"
38-
"juno/pkg/sec"
30+
"github.com/paypal/junodb/third_party/forked/golang/glog"
31+
32+
"github.com/paypal/junodb/cmd/clustermgr/cmd"
33+
"github.com/paypal/junodb/cmd/dbscanserv/config"
34+
"github.com/paypal/junodb/cmd/dbscanserv/prime"
35+
"github.com/paypal/junodb/cmd/storageserv/storage/db"
36+
"github.com/paypal/junodb/pkg/cluster"
37+
"github.com/paypal/junodb/pkg/etcd"
38+
"github.com/paypal/junodb/pkg/sec"
3939
)
4040

4141
type CmdConfig cmd.Config

cmd/dbscanserv/app/patch.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ import (
2727
"sync"
2828
"time"
2929

30-
"juno/third_party/forked/golang/glog"
31-
"juno/third_party/forked/tecbot/gorocksdb"
32-
33-
"juno/cmd/dbscanserv/config"
34-
"juno/cmd/dbscanserv/prime"
35-
"juno/cmd/storageserv/storage/db"
36-
"juno/pkg/proto"
37-
"juno/pkg/util"
30+
"github.com/paypal/junodb/third_party/forked/golang/glog"
31+
"github.com/paypal/junodb/third_party/forked/tecbot/gorocksdb"
32+
33+
"github.com/paypal/junodb/cmd/dbscanserv/config"
34+
"github.com/paypal/junodb/cmd/dbscanserv/prime"
35+
"github.com/paypal/junodb/cmd/storageserv/storage/db"
36+
"github.com/paypal/junodb/pkg/proto"
37+
"github.com/paypal/junodb/pkg/util"
3838
)
3939

4040
type CmdUpdatePatch struct {

cmd/dbscanserv/app/remote.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ import (
3030
"sync/atomic"
3131
"time"
3232

33-
"juno/third_party/forked/golang/glog"
33+
"github.com/paypal/junodb/third_party/forked/golang/glog"
3434

35-
"juno/cmd/dbscanserv/config"
36-
"juno/cmd/dbscanserv/prime"
37-
"juno/pkg/net/netutil"
35+
"github.com/paypal/junodb/cmd/dbscanserv/config"
36+
"github.com/paypal/junodb/cmd/dbscanserv/prime"
37+
"github.com/paypal/junodb/pkg/net/netutil"
3838
)
3939

4040
type Remote int

cmd/dbscanserv/app/rpcclient.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ import (
2727
"strings"
2828
"time"
2929

30-
"juno/third_party/forked/golang/glog"
30+
"github.com/paypal/junodb/third_party/forked/golang/glog"
3131

32-
"juno/cmd/dbscanserv/config"
33-
"juno/cmd/dbscanserv/prime"
32+
"github.com/paypal/junodb/cmd/dbscanserv/config"
33+
"github.com/paypal/junodb/cmd/dbscanserv/prime"
3434
)
3535

3636
type RpcClient struct {

cmd/dbscanserv/app/scan.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ import (
2424
"sync/atomic"
2525
"time"
2626

27-
"juno/third_party/forked/golang/glog"
28-
"juno/third_party/forked/tecbot/gorocksdb"
27+
"github.com/paypal/junodb/third_party/forked/golang/glog"
28+
"github.com/paypal/junodb/third_party/forked/tecbot/gorocksdb"
2929

30-
"juno/cmd/dbscanserv/prime"
31-
"juno/cmd/storageserv/storage/db"
30+
"github.com/paypal/junodb/cmd/dbscanserv/prime"
31+
"github.com/paypal/junodb/cmd/storageserv/storage/db"
3232
)
3333

3434
// Map from zoneid, shardid to Scanner

cmd/dbscanserv/junoctl/junoctl.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import (
2525
"os"
2626
"path/filepath"
2727

28-
"juno/cmd/dbscanserv/app"
29-
"juno/pkg/version"
30-
"juno/third_party/forked/golang/glog"
28+
"github.com/paypal/junodb/cmd/dbscanserv/app"
29+
"github.com/paypal/junodb/pkg/version"
30+
"github.com/paypal/junodb/third_party/forked/golang/glog"
3131
)
3232

3333
func main() {

cmd/dbscanserv/main.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ import (
2727
"strconv"
2828
"strings"
2929

30-
"juno/third_party/forked/golang/glog"
30+
"github.com/paypal/junodb/third_party/forked/golang/glog"
3131

32-
"juno/cmd/dbscanserv/app"
33-
"juno/cmd/dbscanserv/prime"
34-
"juno/pkg/version"
32+
"github.com/paypal/junodb/cmd/dbscanserv/app"
33+
"github.com/paypal/junodb/cmd/dbscanserv/prime"
34+
"github.com/paypal/junodb/pkg/version"
3535
)
3636

3737
func parseKeyRange(keyRange string, cmd string) (start int, stop int, skip int) {

cmd/dbscanserv/patch/relay.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ package patch
2222
import (
2323
"time"
2424

25-
"juno/third_party/forked/golang/glog"
25+
"github.com/paypal/junodb/third_party/forked/golang/glog"
2626

27-
"juno/cmd/dbscanserv/app"
28-
"juno/cmd/dbscanserv/config"
29-
"juno/cmd/storageserv/storage/db"
30-
"juno/pkg/proto"
27+
"github.com/paypal/junodb/cmd/dbscanserv/app"
28+
"github.com/paypal/junodb/cmd/dbscanserv/config"
29+
"github.com/paypal/junodb/cmd/storageserv/storage/db"
30+
"github.com/paypal/junodb/pkg/proto"
3131
)
3232

3333
// Called by storageserv.

cmd/dbscanserv/prime/db.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ import (
2626
"sync/atomic"
2727
"time"
2828

29-
"juno/third_party/forked/golang/glog"
30-
"juno/third_party/forked/tecbot/gorocksdb"
29+
"github.com/paypal/junodb/third_party/forked/golang/glog"
30+
"github.com/paypal/junodb/third_party/forked/tecbot/gorocksdb"
3131

32-
"juno/cmd/storageserv/storage/db"
32+
"github.com/paypal/junodb/cmd/storageserv/storage/db"
3333
)
3434

3535
// Map from zoneid, nodeid to db handle

cmd/dbscanserv/prime/log.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"fmt"
2424
"os"
2525

26-
"juno/third_party/forked/golang/glog"
26+
"github.com/paypal/junodb/third_party/forked/golang/glog"
2727
)
2828

2929
var (

cmd/dbscanserv/prime/meta.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ import (
2828
"sync/atomic"
2929
"time"
3030

31-
"juno/third_party/forked/golang/glog"
31+
"github.com/paypal/junodb/third_party/forked/golang/glog"
3232

33-
"juno/cmd/storageserv/storage/db"
33+
"github.com/paypal/junodb/cmd/storageserv/storage/db"
3434
)
3535

3636
type Meta struct {

cmd/dbscanserv/prime/opdata.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ import (
2626
"sync/atomic"
2727
"time"
2828

29-
"juno/third_party/forked/golang/glog"
29+
"github.com/paypal/junodb/third_party/forked/golang/glog"
3030

31-
"juno/cmd/storageserv/storage/db"
32-
"juno/pkg/proto"
31+
"github.com/paypal/junodb/cmd/storageserv/storage/db"
32+
"github.com/paypal/junodb/pkg/proto"
3333
)
3434

3535
type OpRecord struct {

cmd/dbscanserv/prime/replicate.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ import (
2424
"runtime"
2525
"time"
2626

27-
"juno/third_party/forked/golang/glog"
27+
"github.com/paypal/junodb/third_party/forked/golang/glog"
2828

29-
"juno/internal/cli"
30-
"juno/pkg/io"
31-
"juno/pkg/proto"
32-
"juno/pkg/sec"
29+
"github.com/paypal/junodb/internal/cli"
30+
"github.com/paypal/junodb/pkg/io"
31+
"github.com/paypal/junodb/pkg/proto"
32+
"github.com/paypal/junodb/pkg/sec"
3333
)
3434

3535
var (

cmd/dbscanserv/prime/result.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import (
2323
"strings"
2424
"time"
2525

26-
"juno/third_party/forked/golang/glog"
26+
"github.com/paypal/junodb/third_party/forked/golang/glog"
2727

28-
"juno/pkg/client"
29-
"juno/pkg/util"
28+
"github.com/paypal/junodb/pkg/client"
29+
"github.com/paypal/junodb/pkg/util"
3030
)
3131

3232
type KeyList struct {

cmd/proxy/app/proxy.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ import (
3030
"os/exec"
3131
"path/filepath"
3232

33-
"juno/third_party/forked/golang/glog"
33+
"github.com/paypal/junodb/third_party/forked/golang/glog"
3434

35-
"juno/cmd/proxy/config"
36-
"juno/pkg/cmd"
37-
"juno/pkg/initmgr"
38-
"juno/pkg/sec"
39-
"juno/pkg/version"
35+
"github.com/paypal/junodb/cmd/proxy/config"
36+
"github.com/paypal/junodb/pkg/cmd"
37+
"github.com/paypal/junodb/pkg/initmgr"
38+
"github.com/paypal/junodb/pkg/sec"
39+
"github.com/paypal/junodb/pkg/version"
4040
)
4141

4242
func Main() {

cmd/proxy/app/proxymgr.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@ import (
2828
"strings"
2929
"syscall"
3030

31-
"juno/third_party/forked/golang/glog"
32-
33-
"juno/cmd/proxy/config"
34-
"juno/cmd/proxy/stats"
35-
"juno/pkg/cmd"
36-
"juno/pkg/initmgr"
37-
"juno/pkg/logging"
38-
"juno/pkg/logging/cal"
39-
"juno/pkg/sec"
40-
"juno/pkg/service"
41-
"juno/pkg/util"
31+
"github.com/paypal/junodb/third_party/forked/golang/glog"
32+
33+
"github.com/paypal/junodb/cmd/proxy/config"
34+
"github.com/paypal/junodb/cmd/proxy/stats"
35+
"github.com/paypal/junodb/pkg/cmd"
36+
"github.com/paypal/junodb/pkg/initmgr"
37+
"github.com/paypal/junodb/pkg/logging"
38+
"github.com/paypal/junodb/pkg/logging/cal"
39+
"github.com/paypal/junodb/pkg/sec"
40+
"github.com/paypal/junodb/pkg/service"
41+
"github.com/paypal/junodb/pkg/util"
4242
)
4343

4444
const (

0 commit comments

Comments
 (0)