Skip to content

Commit

Permalink
[dbnode] Remove duplicated clock package (conflicting with src/x/cloc…
Browse files Browse the repository at this point in the history 
…k) (#2838)
  • Loading branch information
@robskillington
robskillington authored Nov 6, 2020
1 parent e62d2e1 commit 30b81ca
Show file tree
Hide file tree
Showing 60 changed files with 64 additions and 150 deletions.
7 changes: 3 additions & 4 deletions src/cmd/tools/dtest/harness/harness.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,18 @@ import (
"github.com/m3db/m3/src/cmd/tools/dtest/config"
"github.com/m3db/m3/src/cmd/tools/dtest/util"
"github.com/m3db/m3/src/cmd/tools/dtest/util/seed"
xclock "github.com/m3db/m3/src/dbnode/clock"
"github.com/m3db/m3/src/dbnode/integration/generate"
"github.com/m3db/m3/src/dbnode/kvconfig"
"github.com/m3db/m3/src/dbnode/retention"
"github.com/m3db/m3/src/dbnode/namespace"
"github.com/m3db/m3/src/dbnode/retention"
"github.com/m3db/m3/src/dbnode/x/m3em/convert"
m3emnode "github.com/m3db/m3/src/dbnode/x/m3em/node"
"github.com/m3db/m3/src/m3em/build"
"github.com/m3db/m3/src/m3em/cluster"
hb "github.com/m3db/m3/src/m3em/generated/proto/heartbeat"
"github.com/m3db/m3/src/m3em/node"
xgrpc "github.com/m3db/m3/src/m3em/x/grpc"
m3xclock "github.com/m3db/m3/src/x/clock"
xclock "github.com/m3db/m3/src/x/clock"
xerrors "github.com/m3db/m3/src/x/errors"
"github.com/m3db/m3/src/x/ident"
"github.com/m3db/m3/src/x/instrument"
Expand Down Expand Up @@ -419,7 +418,7 @@ func (dt *DTestHarness) WaitUntilAllBootstrapped(nodes []node.ServiceNode) error
// available, or the configured bootstrap timeout period; whichever is sooner. It returns
// an error indicating if all the nodes finished bootstrapping.
func (dt *DTestHarness) WaitUntilAllShardsAvailable() error {
allAvailable := m3xclock.WaitUntil(dt.AllShardsAvailable, dt.BootstrapTimeout())
allAvailable := xclock.WaitUntil(dt.AllShardsAvailable, dt.BootstrapTimeout())
if !allAvailable {
return fmt.Errorf("all shards not available")
}
Expand Down
2 changes: 1 addition & 1 deletion src/dbnode/client/client_mock.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/dbnode/client/host_queue.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ import (
"sync"
"time"

"github.com/m3db/m3/src/dbnode/clock"
"github.com/m3db/m3/src/dbnode/generated/thrift/rpc"
"github.com/m3db/m3/src/dbnode/topology"
"github.com/m3db/m3/src/x/clock"
"github.com/m3db/m3/src/x/ident"
"github.com/m3db/m3/src/x/pool"
xsync "github.com/m3db/m3/src/x/sync"
Expand Down
2 changes: 1 addition & 1 deletion src/dbnode/client/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import (
"runtime"
"time"

"github.com/m3db/m3/src/dbnode/clock"
"github.com/m3db/m3/src/dbnode/encoding"
"github.com/m3db/m3/src/dbnode/encoding/m3tsz"
"github.com/m3db/m3/src/dbnode/encoding/proto"
Expand All @@ -38,6 +37,7 @@ import (
m3dbruntime "github.com/m3db/m3/src/dbnode/runtime"
"github.com/m3db/m3/src/dbnode/storage/index"
"github.com/m3db/m3/src/dbnode/topology"
"github.com/m3db/m3/src/x/clock"
xclose "github.com/m3db/m3/src/x/close"
"github.com/m3db/m3/src/x/context"
"github.com/m3db/m3/src/x/ident"
Expand Down
2 changes: 1 addition & 1 deletion src/dbnode/client/session.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import (
"time"

"github.com/m3db/m3/src/cluster/shard"
"github.com/m3db/m3/src/dbnode/clock"
"github.com/m3db/m3/src/dbnode/digest"
"github.com/m3db/m3/src/dbnode/encoding"
"github.com/m3db/m3/src/dbnode/generated/thrift/rpc"
Expand All @@ -48,6 +47,7 @@ import (
"github.com/m3db/m3/src/dbnode/x/xio"
"github.com/m3db/m3/src/dbnode/x/xpool"
"github.com/m3db/m3/src/x/checked"
"github.com/m3db/m3/src/x/clock"
xclose "github.com/m3db/m3/src/x/close"
"github.com/m3db/m3/src/x/context"
xerrors "github.com/m3db/m3/src/x/errors"
Expand Down
2 changes: 1 addition & 1 deletion src/dbnode/client/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ package client
import (
"time"

"github.com/m3db/m3/src/dbnode/clock"
"github.com/m3db/m3/src/dbnode/encoding"
"github.com/m3db/m3/src/dbnode/generated/thrift/rpc"
"github.com/m3db/m3/src/dbnode/namespace"
Expand All @@ -32,6 +31,7 @@ import (
"github.com/m3db/m3/src/dbnode/storage/bootstrap/result"
"github.com/m3db/m3/src/dbnode/storage/index"
"github.com/m3db/m3/src/dbnode/topology"
"github.com/m3db/m3/src/x/clock"
"github.com/m3db/m3/src/x/context"
"github.com/m3db/m3/src/x/ident"
"github.com/m3db/m3/src/x/instrument"
Expand Down
46 changes: 0 additions & 46 deletions src/dbnode/clock/options.go
View file

This file was deleted.

37 changes: 0 additions & 37 deletions src/dbnode/clock/types.go
View file

This file was deleted.

2 changes: 1 addition & 1 deletion src/dbnode/integration/commitlog_bootstrap_index_perf_speed_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ import (
"testing"
"time"

"github.com/m3db/m3/src/dbnode/clock"
"github.com/m3db/m3/src/dbnode/namespace"
"github.com/m3db/m3/src/dbnode/persist/fs"
"github.com/m3db/m3/src/dbnode/persist/fs/commitlog"
"github.com/m3db/m3/src/dbnode/retention"
"github.com/m3db/m3/src/dbnode/ts"
"github.com/m3db/m3/src/x/checked"
"github.com/m3db/m3/src/x/clock"
"github.com/m3db/m3/src/x/context"
"github.com/m3db/m3/src/x/ident"
xtime "github.com/m3db/m3/src/x/time"
Expand Down
2 changes: 1 addition & 1 deletion src/dbnode/integration/generate/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
"os"
"time"

"github.com/m3db/m3/src/dbnode/clock"
"github.com/m3db/m3/src/dbnode/encoding"
"github.com/m3db/m3/src/dbnode/encoding/m3tsz"
"github.com/m3db/m3/src/x/clock"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion src/dbnode/integration/generate/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ import (
"os"
"time"

"github.com/m3db/m3/src/dbnode/clock"
"github.com/m3db/m3/src/dbnode/encoding"
ns "github.com/m3db/m3/src/dbnode/namespace"
"github.com/m3db/m3/src/dbnode/sharding"
"github.com/m3db/m3/src/dbnode/ts"
"github.com/m3db/m3/src/x/clock"
"github.com/m3db/m3/src/x/ident"
xtime "github.com/m3db/m3/src/x/time"
)
Expand Down
2 changes: 1 addition & 1 deletion src/dbnode/integration/setup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ import (
"github.com/m3db/m3/src/cluster/services"
"github.com/m3db/m3/src/cluster/shard"
"github.com/m3db/m3/src/dbnode/client"
"github.com/m3db/m3/src/dbnode/clock"
"github.com/m3db/m3/src/dbnode/generated/thrift/rpc"
"github.com/m3db/m3/src/dbnode/integration/fake"
"github.com/m3db/m3/src/dbnode/integration/generate"
Expand All @@ -56,6 +55,7 @@ import (
"github.com/m3db/m3/src/dbnode/testdata/prototest"
"github.com/m3db/m3/src/dbnode/topology"
"github.com/m3db/m3/src/dbnode/ts"
"github.com/m3db/m3/src/x/clock"
"github.com/m3db/m3/src/x/ident"
xsync "github.com/m3db/m3/src/x/sync"

Expand Down
2 changes: 1 addition & 1 deletion src/dbnode/network/server/tchannelthrift/node/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import (
"time"

"github.com/m3db/m3/src/dbnode/client"
"github.com/m3db/m3/src/dbnode/clock"
"github.com/m3db/m3/src/dbnode/generated/thrift/rpc"
"github.com/m3db/m3/src/dbnode/network/server/tchannelthrift"
"github.com/m3db/m3/src/dbnode/network/server/tchannelthrift/convert"
Expand All @@ -42,6 +41,7 @@ import (
"github.com/m3db/m3/src/dbnode/x/xio"
"github.com/m3db/m3/src/dbnode/x/xpool"
"github.com/m3db/m3/src/x/checked"
"github.com/m3db/m3/src/x/clock"
"github.com/m3db/m3/src/x/context"
xdebug "github.com/m3db/m3/src/x/debug"
xerrors "github.com/m3db/m3/src/x/errors"
Expand Down
2 changes: 1 addition & 1 deletion src/dbnode/network/server/tchannelthrift/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
package tchannelthrift

import (
"github.com/m3db/m3/src/dbnode/clock"
"github.com/m3db/m3/src/dbnode/topology"
"github.com/m3db/m3/src/dbnode/x/xpool"
"github.com/m3db/m3/src/x/clock"
"github.com/m3db/m3/src/x/ident"
"github.com/m3db/m3/src/x/instrument"
"github.com/m3db/m3/src/x/pool"
Expand Down
2 changes: 1 addition & 1 deletion src/dbnode/network/server/tchannelthrift/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
package tchannelthrift

import (
"github.com/m3db/m3/src/dbnode/clock"
"github.com/m3db/m3/src/dbnode/topology"
"github.com/m3db/m3/src/dbnode/x/xpool"
"github.com/m3db/m3/src/x/clock"
"github.com/m3db/m3/src/x/ident"
"github.com/m3db/m3/src/x/instrument"
"github.com/m3db/m3/src/x/serialize"
Expand Down
2 changes: 1 addition & 1 deletion src/dbnode/persist/fs/commitlog/commit_log.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ import (
"sync/atomic"
"time"

"github.com/m3db/m3/src/dbnode/clock"
"github.com/m3db/m3/src/dbnode/persist"
"github.com/m3db/m3/src/dbnode/persist/fs"
"github.com/m3db/m3/src/dbnode/ts"
"github.com/m3db/m3/src/dbnode/ts/writes"
"github.com/m3db/m3/src/x/clock"
"github.com/m3db/m3/src/x/context"
xerrors "github.com/m3db/m3/src/x/errors"
xtime "github.com/m3db/m3/src/x/time"
Expand Down
4 changes: 2 additions & 2 deletions src/dbnode/persist/fs/commitlog/commit_log_mock.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/dbnode/persist/fs/commitlog/commit_log_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ import (
"time"

"github.com/m3db/bitset"
"github.com/m3db/m3/src/dbnode/clock"
"github.com/m3db/m3/src/dbnode/persist"
"github.com/m3db/m3/src/dbnode/persist/fs"
"github.com/m3db/m3/src/dbnode/ts"
"github.com/m3db/m3/src/dbnode/ts/writes"
"github.com/m3db/m3/src/x/checked"
"github.com/m3db/m3/src/x/clock"
"github.com/m3db/m3/src/x/context"
"github.com/m3db/m3/src/x/ident"
xtime "github.com/m3db/m3/src/x/time"
Expand Down
2 changes: 1 addition & 1 deletion src/dbnode/persist/fs/commitlog/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"runtime"
"time"

"github.com/m3db/m3/src/dbnode/clock"
"github.com/m3db/m3/src/dbnode/persist/fs"
"github.com/m3db/m3/src/x/clock"
"github.com/m3db/m3/src/x/ident"
"github.com/m3db/m3/src/x/instrument"
"github.com/m3db/m3/src/x/pool"
Expand Down
2 changes: 1 addition & 1 deletion src/dbnode/persist/fs/commitlog/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ package commitlog
import (
"time"

"github.com/m3db/m3/src/dbnode/clock"
"github.com/m3db/m3/src/dbnode/persist"
"github.com/m3db/m3/src/dbnode/persist/fs"
"github.com/m3db/m3/src/dbnode/ts"
"github.com/m3db/m3/src/dbnode/ts/writes"
"github.com/m3db/m3/src/x/clock"
"github.com/m3db/m3/src/x/context"
"github.com/m3db/m3/src/x/ident"
"github.com/m3db/m3/src/x/instrument"
Expand Down
2 changes: 1 addition & 1 deletion src/dbnode/persist/fs/commitlog/writer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ import (
"os"

"github.com/m3db/bitset"
"github.com/m3db/m3/src/dbnode/clock"
"github.com/m3db/m3/src/dbnode/digest"
"github.com/m3db/m3/src/dbnode/persist"
"github.com/m3db/m3/src/dbnode/persist/fs"
"github.com/m3db/m3/src/dbnode/persist/fs/msgpack"
"github.com/m3db/m3/src/dbnode/persist/schema"
"github.com/m3db/m3/src/dbnode/ts"
"github.com/m3db/m3/src/x/clock"
xos "github.com/m3db/m3/src/x/os"
xtime "github.com/m3db/m3/src/x/time"
)
Expand Down
2 changes: 1 addition & 1 deletion src/dbnode/persist/fs/options.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ import (
"fmt"
"os"

"github.com/m3db/m3/src/dbnode/clock"
"github.com/m3db/m3/src/dbnode/persist/fs/msgpack"
"github.com/m3db/m3/src/dbnode/runtime"
"github.com/m3db/m3/src/m3ninx/index/segment/fst"
"github.com/m3db/m3/src/x/clock"
"github.com/m3db/m3/src/x/instrument"
"github.com/m3db/m3/src/x/mmap"
"github.com/m3db/m3/src/x/pool"
Expand Down
2 changes: 1 addition & 1 deletion src/dbnode/persist/fs/persist_manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (
"sync"
"time"

"github.com/m3db/m3/src/dbnode/clock"
"github.com/m3db/m3/src/dbnode/persist"
"github.com/m3db/m3/src/dbnode/ratelimit"
"github.com/m3db/m3/src/dbnode/runtime"
Expand All @@ -35,6 +34,7 @@ import (
m3ninxfs "github.com/m3db/m3/src/m3ninx/index/segment/fst"
m3ninxpersist "github.com/m3db/m3/src/m3ninx/persist"
"github.com/m3db/m3/src/x/checked"
"github.com/m3db/m3/src/x/clock"
xclose "github.com/m3db/m3/src/x/close"
"github.com/m3db/m3/src/x/instrument"

Expand Down
Loading

0 comments on commit 30b81ca

Please sign in to comment.