Skip to content
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

use qualified path for go mod #123

Merged
merged 15 commits into from
May 21, 2024
Merged

use qualified path for go mod #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e770a59
Merge pull request #90 from paypal/dev
NeetishPathak May 11, 2023
18fcd52
Merge pull request #95 from paypal/dev
NeetishPathak May 12, 2023
95f443d
Merge pull request #98 from paypal/dev
NeetishPathak May 12, 2023
e6ab2d4
Merge pull request #103 from paypal/dev
NeetishPathak May 12, 2023
f1899e4
Merge pull request #104 from paypal/dev
NeetishPathak May 12, 2023
7314a40
using fully qualified module path
Ahmadkashif May 21, 2023
3c7ae7f
Adding comments for documentation for clientImpl.go
Ahmadkashif May 21, 2023
34b2e12
Adding comments for documentation for config.go
Ahmadkashif May 21, 2023
873ce04
Adding comments for documentation for error.go
Ahmadkashif May 21, 2023
9325722
Adding comments for documentation for option.go
Ahmadkashif May 21, 2023
77c6893
Updating imports for clustermgr, clusterctl, ctx, proc, processor, re…
Ahmadkashif May 21, 2023
10eb923
Updating imports for all golang files
Ahmadkashif May 21, 2023
a109fb4
Fixing Build error
Ahmadkashif May 24, 2023
960cf41
Merge branch 'dev' into Issue_113_UseQualiFiedPathForGoMod
Ahmadkashif Aug 15, 2023
1b31d80
Merge branch 'dev' into Issue_113_UseQualiFiedPathForGoMod
NeetishPathak May 21, 2024
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
20 changes: 10 additions & 10 deletions binary_build/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions cmd/clustermgr/clusterctl/clusterctl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

//
Expand Down
6 changes: 3 additions & 3 deletions cmd/clustermgr/clustermgr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions cmd/clustermgr/cmd/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions cmd/clustermgr/cmd/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
10 changes: 5 additions & 5 deletions cmd/dbscanserv/app/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions cmd/dbscanserv/app/collect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
18 changes: 9 additions & 9 deletions cmd/dbscanserv/app/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions cmd/dbscanserv/app/patch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions cmd/dbscanserv/app/remote.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions cmd/dbscanserv/app/rpcclient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions cmd/dbscanserv/app/scan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions cmd/dbscanserv/junoctl/junoctl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
8 changes: 4 additions & 4 deletions cmd/dbscanserv/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
10 changes: 5 additions & 5 deletions cmd/dbscanserv/patch/relay.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions cmd/dbscanserv/prime/db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmd/dbscanserv/prime/log.go
View file
Open in desktop
Original file line number Diff 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
4 changes: 2 additions & 2 deletions cmd/dbscanserv/prime/meta.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions cmd/dbscanserv/prime/opdata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
10 changes: 5 additions & 5 deletions cmd/dbscanserv/prime/replicate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions cmd/dbscanserv/prime/result.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
12 changes: 6 additions & 6 deletions cmd/proxy/app/proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
22 changes: 11 additions & 11 deletions cmd/proxy/app/proxymgr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
Loading
Loading