From de6d7711cc951bc0298a67a8dfaeeb816282a2db Mon Sep 17 00:00:00 2001 From: Tobias Schottdorf Date: Wed, 4 Mar 2020 11:01:36 +0100 Subject: [PATCH] engine: Goland-move to top-level pkg/engine Final name will be ./pkg/storage. No manual edits. Release note: None --- pkg/ccl/changefeedccl/changefeed_test.go | 2 +- pkg/ccl/changefeedccl/kvfeed/scanner.go | 2 +- pkg/ccl/changefeedccl/schemafeed/schema_feed.go | 2 +- pkg/ccl/cliccl/debug.go | 2 +- pkg/ccl/cmdccl/enc_utils/main.go | 2 +- pkg/ccl/followerreadsccl/followerreads_test.go | 2 +- pkg/ccl/importccl/bench_test.go | 2 +- pkg/ccl/importccl/load.go | 2 +- pkg/ccl/storageccl/bench_test.go | 2 +- pkg/ccl/storageccl/engineccl/bench_test.go | 2 +- pkg/ccl/storageccl/engineccl/ctr_stream.go | 2 +- pkg/ccl/storageccl/engineccl/ctr_stream_test.go | 2 +- pkg/ccl/storageccl/engineccl/encrypted_fs.go | 4 ++-- pkg/ccl/storageccl/engineccl/encrypted_fs_test.go | 4 ++-- pkg/ccl/storageccl/engineccl/pebble_key_manager.go | 2 +- pkg/ccl/storageccl/engineccl/rocksdb.go | 4 ++-- pkg/ccl/storageccl/engineccl/rocksdb_test.go | 2 +- pkg/ccl/storageccl/export.go | 2 +- pkg/ccl/storageccl/export_test.go | 2 +- pkg/ccl/storageccl/import.go | 2 +- pkg/ccl/storageccl/import_test.go | 2 +- pkg/ccl/storageccl/revision_reader.go | 2 +- pkg/ccl/storageccl/writebatch.go | 4 ++-- pkg/ccl/storageccl/writebatch_test.go | 4 ++-- pkg/ccl/utilccl/sampledataccl/bankdata.go | 2 +- pkg/ccl/workloadccl/format/sstable.go | 2 +- pkg/cli/context.go | 2 +- pkg/cli/debug.go | 4 ++-- pkg/cli/debug_check_store.go | 4 ++-- pkg/cli/debug_check_store_test.go | 2 +- pkg/cli/debug_synctest.go | 2 +- pkg/cli/debug_test.go | 2 +- pkg/cli/flags_util.go | 2 +- pkg/cli/start.go | 4 ++-- pkg/cli/syncbench/syncbench.go | 2 +- pkg/engine/batch.go | 2 +- pkg/engine/batch_test.go | 2 +- pkg/engine/bench_test.go | 2 +- pkg/engine/engine.go | 4 ++-- pkg/engine/engine_test.go | 4 ++-- pkg/engine/enginepb/decode_test.go | 4 ++-- pkg/engine/enginepb/mvcc_test.go | 2 +- pkg/engine/in_mem.go | 2 +- pkg/engine/merge.go | 2 +- pkg/engine/merge_test.go | 2 +- pkg/engine/metamorphic/generator.go | 2 +- pkg/engine/metamorphic/operands.go | 2 +- pkg/engine/metamorphic/operations.go | 4 ++-- pkg/engine/mvcc.go | 2 +- pkg/engine/mvcc_history_test.go | 2 +- pkg/engine/mvcc_incremental_iterator.go | 2 +- pkg/engine/mvcc_incremental_iterator_test.go | 2 +- pkg/engine/mvcc_logical_ops.go | 2 +- pkg/engine/mvcc_logical_ops_test.go | 2 +- pkg/engine/mvcc_stats_test.go | 2 +- pkg/engine/mvcc_test.go | 2 +- pkg/engine/pebble.go | 4 ++-- pkg/engine/pebble_file_registry.go | 2 +- pkg/engine/pebble_file_registry_test.go | 2 +- pkg/engine/pebble_iterator.go | 2 +- pkg/engine/pebble_merge.go | 2 +- pkg/engine/pebble_mvcc_scanner.go | 2 +- pkg/engine/pebble_test.go | 2 +- pkg/engine/rocksdb.go | 4 ++-- pkg/engine/sst_writer_test.go | 2 +- pkg/engine/tee.go | 4 ++-- pkg/engine/temp_engine.go | 4 ++-- pkg/internal/client/batch.go | 2 +- pkg/internal/client/client_test.go | 2 +- pkg/internal/client/db.go | 2 +- pkg/internal/client/mock_transactional_sender.go | 2 +- pkg/internal/client/sender.go | 2 +- pkg/internal/client/txn.go | 2 +- pkg/kv/dist_sender_server_test.go | 2 +- pkg/kv/kvnemesis/engine.go | 2 +- pkg/kv/kvnemesis/engine_test.go | 2 +- pkg/kv/kvnemesis/validator.go | 2 +- pkg/kv/kvnemesis/validator_test.go | 2 +- pkg/kv/kvnemesis/watcher.go | 2 +- pkg/kv/kvserver/abortspan/abortspan.go | 4 ++-- pkg/kv/kvserver/abortspan/abortspan_test.go | 4 ++-- pkg/kv/kvserver/addressing_test.go | 2 +- pkg/kv/kvserver/allocator_test.go | 2 +- pkg/kv/kvserver/api.pb.go | 2 +- pkg/kv/kvserver/batch_spanset_test.go | 4 ++-- pkg/kv/kvserver/batcheval/cmd_add_sstable.go | 4 ++-- pkg/kv/kvserver/batcheval/cmd_add_sstable_test.go | 4 ++-- pkg/kv/kvserver/batcheval/cmd_clear_range.go | 4 ++-- pkg/kv/kvserver/batcheval/cmd_clear_range_test.go | 4 ++-- pkg/kv/kvserver/batcheval/cmd_compute_checksum.go | 2 +- pkg/kv/kvserver/batcheval/cmd_conditional_put.go | 2 +- pkg/kv/kvserver/batcheval/cmd_delete.go | 2 +- pkg/kv/kvserver/batcheval/cmd_delete_range.go | 2 +- pkg/kv/kvserver/batcheval/cmd_end_transaction.go | 4 ++-- pkg/kv/kvserver/batcheval/cmd_end_transaction_test.go | 4 ++-- pkg/kv/kvserver/batcheval/cmd_gc.go | 2 +- pkg/kv/kvserver/batcheval/cmd_get.go | 2 +- pkg/kv/kvserver/batcheval/cmd_heartbeat_txn.go | 2 +- pkg/kv/kvserver/batcheval/cmd_increment.go | 2 +- pkg/kv/kvserver/batcheval/cmd_init_put.go | 2 +- pkg/kv/kvserver/batcheval/cmd_lease.go | 4 ++-- pkg/kv/kvserver/batcheval/cmd_lease_info.go | 2 +- pkg/kv/kvserver/batcheval/cmd_lease_request.go | 2 +- pkg/kv/kvserver/batcheval/cmd_lease_transfer.go | 2 +- pkg/kv/kvserver/batcheval/cmd_merge.go | 2 +- pkg/kv/kvserver/batcheval/cmd_push_txn.go | 2 +- pkg/kv/kvserver/batcheval/cmd_put.go | 2 +- pkg/kv/kvserver/batcheval/cmd_query_intent.go | 2 +- pkg/kv/kvserver/batcheval/cmd_query_txn.go | 2 +- pkg/kv/kvserver/batcheval/cmd_range_stats.go | 2 +- pkg/kv/kvserver/batcheval/cmd_recompute_stats.go | 4 ++-- pkg/kv/kvserver/batcheval/cmd_recover_txn.go | 2 +- pkg/kv/kvserver/batcheval/cmd_recover_txn_test.go | 2 +- pkg/kv/kvserver/batcheval/cmd_refresh.go | 2 +- pkg/kv/kvserver/batcheval/cmd_refresh_range.go | 2 +- pkg/kv/kvserver/batcheval/cmd_refresh_range_test.go | 4 ++-- pkg/kv/kvserver/batcheval/cmd_resolve_intent.go | 2 +- pkg/kv/kvserver/batcheval/cmd_resolve_intent_range.go | 2 +- pkg/kv/kvserver/batcheval/cmd_resolve_intent_test.go | 4 ++-- pkg/kv/kvserver/batcheval/cmd_reverse_scan.go | 2 +- pkg/kv/kvserver/batcheval/cmd_revert_range.go | 2 +- pkg/kv/kvserver/batcheval/cmd_revert_range_test.go | 4 ++-- pkg/kv/kvserver/batcheval/cmd_scan.go | 2 +- pkg/kv/kvserver/batcheval/cmd_scan_test.go | 2 +- pkg/kv/kvserver/batcheval/cmd_subsume.go | 2 +- pkg/kv/kvserver/batcheval/cmd_truncate_log.go | 2 +- pkg/kv/kvserver/batcheval/cmd_truncate_log_test.go | 2 +- pkg/kv/kvserver/batcheval/command.go | 2 +- pkg/kv/kvserver/batcheval/declare.go | 2 +- pkg/kv/kvserver/batcheval/eval_context.go | 4 ++-- pkg/kv/kvserver/batcheval/intent.go | 2 +- pkg/kv/kvserver/batcheval/split_stats_helper.go | 2 +- pkg/kv/kvserver/batcheval/transaction.go | 4 ++-- pkg/kv/kvserver/batcheval/transaction_test.go | 2 +- pkg/kv/kvserver/below_raft_protos_test.go | 4 ++-- pkg/kv/kvserver/bulk/buffering_adder.go | 2 +- pkg/kv/kvserver/bulk/sst_batcher.go | 4 ++-- pkg/kv/kvserver/bulk/sst_batcher_test.go | 4 ++-- pkg/kv/kvserver/client_merge_test.go | 4 ++-- pkg/kv/kvserver/client_raft_test.go | 4 ++-- pkg/kv/kvserver/client_replica_gc_test.go | 2 +- pkg/kv/kvserver/client_replica_test.go | 4 ++-- pkg/kv/kvserver/client_split_test.go | 4 ++-- pkg/kv/kvserver/client_test.go | 4 ++-- pkg/kv/kvserver/compactor/compactor.go | 2 +- pkg/kv/kvserver/compactor/compactor_test.go | 4 ++-- pkg/kv/kvserver/concurrency/concurrency_control.go | 2 +- pkg/kv/kvserver/concurrency/concurrency_manager_test.go | 2 +- pkg/kv/kvserver/concurrency/lock_table.go | 2 +- pkg/kv/kvserver/concurrency/lock_table_test.go | 2 +- pkg/kv/kvserver/concurrency/lock_table_waiter.go | 2 +- pkg/kv/kvserver/concurrency/lock_table_waiter_test.go | 2 +- pkg/kv/kvserver/consistency_queue_test.go | 4 ++-- pkg/kv/kvserver/debug_print.go | 4 ++-- pkg/kv/kvserver/debug_print_test.go | 2 +- pkg/kv/kvserver/gc/data_distribution_test.go | 4 ++-- pkg/kv/kvserver/gc/gc.go | 4 ++-- pkg/kv/kvserver/gc/gc_iterator.go | 2 +- pkg/kv/kvserver/gc/gc_iterator_test.go | 2 +- pkg/kv/kvserver/gc/gc_old_test.go | 4 ++-- pkg/kv/kvserver/gc/gc_random_test.go | 2 +- pkg/kv/kvserver/gc_queue.go | 2 +- pkg/kv/kvserver/gc_queue_test.go | 4 ++-- pkg/kv/kvserver/helpers_test.go | 4 ++-- pkg/kv/kvserver/intentresolver/intent_resolver.go | 2 +- pkg/kv/kvserver/intentresolver/intent_resolver_test.go | 2 +- pkg/kv/kvserver/merge_queue.go | 2 +- pkg/kv/kvserver/merge_queue_test.go | 2 +- pkg/kv/kvserver/metrics.go | 4 ++-- pkg/kv/kvserver/node_liveness.go | 2 +- pkg/kv/kvserver/queue.go | 2 +- pkg/kv/kvserver/queue_test.go | 2 +- pkg/kv/kvserver/raft_log_queue_test.go | 2 +- pkg/kv/kvserver/raft_transport.go | 2 +- pkg/kv/kvserver/rangefeed/processor.go | 4 ++-- pkg/kv/kvserver/rangefeed/processor_test.go | 4 ++-- pkg/kv/kvserver/rangefeed/registry.go | 4 ++-- pkg/kv/kvserver/rangefeed/registry_test.go | 2 +- pkg/kv/kvserver/rangefeed/resolved_timestamp.go | 2 +- pkg/kv/kvserver/rangefeed/task.go | 4 ++-- pkg/kv/kvserver/rangefeed/task_test.go | 4 ++-- pkg/kv/kvserver/rditer/replica_data_iter.go | 2 +- pkg/kv/kvserver/rditer/replica_data_iter_test.go | 2 +- pkg/kv/kvserver/rditer/stats.go | 4 ++-- pkg/kv/kvserver/replica.go | 4 ++-- pkg/kv/kvserver/replica_application_result.go | 2 +- pkg/kv/kvserver/replica_application_state_machine.go | 4 ++-- pkg/kv/kvserver/replica_command.go | 2 +- pkg/kv/kvserver/replica_consistency.go | 4 ++-- pkg/kv/kvserver/replica_consistency_diff.go | 2 +- pkg/kv/kvserver/replica_destroy.go | 4 ++-- pkg/kv/kvserver/replica_eval_context_span.go | 4 ++-- pkg/kv/kvserver/replica_evaluate.go | 4 ++-- pkg/kv/kvserver/replica_evaluate_test.go | 4 ++-- pkg/kv/kvserver/replica_proposal.go | 4 ++-- pkg/kv/kvserver/replica_raft.go | 2 +- pkg/kv/kvserver/replica_raft_truncation_test.go | 2 +- pkg/kv/kvserver/replica_raftstorage.go | 4 ++-- pkg/kv/kvserver/replica_rangefeed.go | 4 ++-- pkg/kv/kvserver/replica_sideload_disk.go | 2 +- pkg/kv/kvserver/replica_sideload_inmem.go | 2 +- pkg/kv/kvserver/replica_sideload_test.go | 2 +- pkg/kv/kvserver/replica_sst_snapshot_storage.go | 4 ++-- pkg/kv/kvserver/replica_sst_snapshot_storage_test.go | 2 +- pkg/kv/kvserver/replica_test.go | 4 ++-- pkg/kv/kvserver/replica_write.go | 4 ++-- pkg/kv/kvserver/scanner_test.go | 2 +- pkg/kv/kvserver/spanset/batch.go | 4 ++-- pkg/kv/kvserver/split_queue.go | 2 +- pkg/kv/kvserver/split_queue_test.go | 2 +- pkg/kv/kvserver/stateloader/initial.go | 4 ++-- pkg/kv/kvserver/stateloader/initial_test.go | 2 +- pkg/kv/kvserver/stateloader/stateloader.go | 4 ++-- pkg/kv/kvserver/stats_test.go | 2 +- pkg/kv/kvserver/storagepb/proposer_kv.pb.go | 2 +- pkg/kv/kvserver/storagepb/state.pb.go | 2 +- pkg/kv/kvserver/store.go | 4 ++-- pkg/kv/kvserver/store_bootstrap.go | 4 ++-- pkg/kv/kvserver/store_create_replica.go | 2 +- pkg/kv/kvserver/store_pool_test.go | 4 ++-- pkg/kv/kvserver/store_rebalancer_test.go | 2 +- pkg/kv/kvserver/store_snapshot.go | 2 +- pkg/kv/kvserver/store_split.go | 4 ++-- pkg/kv/kvserver/store_test.go | 4 ++-- pkg/kv/kvserver/stores.go | 2 +- pkg/kv/kvserver/stores_server.go | 2 +- pkg/kv/kvserver/stores_test.go | 2 +- pkg/kv/kvserver/syncing_write.go | 2 +- pkg/kv/kvserver/track_raft_protos.go | 2 +- pkg/kv/kvserver/ts_maintenance_queue.go | 2 +- pkg/kv/kvserver/ts_maintenance_queue_test.go | 2 +- pkg/kv/kvserver/txn_wait_queue_test.go | 4 ++-- pkg/kv/kvserver/txnwait/queue.go | 2 +- pkg/kv/kvserver/txnwait/queue_test.go | 2 +- pkg/kv/split_test.go | 2 +- pkg/kv/truncate_test.go | 2 +- pkg/kv/txn_coord_sender.go | 2 +- pkg/kv/txn_coord_sender_savepoints.go | 2 +- pkg/kv/txn_coord_sender_test.go | 4 ++-- pkg/kv/txn_correctness_test.go | 2 +- pkg/kv/txn_interceptor_pipeliner.go | 2 +- pkg/kv/txn_interceptor_pipeliner_test.go | 2 +- pkg/kv/txn_interceptor_seq_num_allocator.go | 2 +- pkg/kv/txn_interceptor_seq_num_allocator_test.go | 2 +- pkg/kv/txn_test.go | 2 +- pkg/roachpb/api.pb.go | 2 +- pkg/roachpb/batch.go | 2 +- pkg/roachpb/batch_test.go | 2 +- pkg/roachpb/data.go | 2 +- pkg/roachpb/data.pb.go | 2 +- pkg/roachpb/data_test.go | 2 +- pkg/roachpb/ignored_seqnums.go | 2 +- pkg/roachpb/ignored_seqnums_test.go | 2 +- pkg/roachpb/string_test.go | 2 +- pkg/server/config.go | 4 ++-- pkg/server/config_unix.go | 2 +- pkg/server/config_windows.go | 2 +- pkg/server/node.go | 2 +- pkg/server/node_engine_health.go | 2 +- pkg/server/node_test.go | 2 +- pkg/server/server.go | 4 ++-- pkg/server/server_test.go | 2 +- pkg/server/serverpb/admin.pb.go | 2 +- pkg/server/serverpb/status.pb.go | 2 +- pkg/server/status.go | 2 +- pkg/server/status_test.go | 2 +- pkg/server/sticky_engine.go | 4 ++-- pkg/server/sticky_engine_test.go | 4 ++-- pkg/server/testserver.go | 2 +- pkg/sql/colcontainer/diskqueue.go | 2 +- pkg/sql/colcontainer/partitionedqueue_test.go | 2 +- pkg/sql/colflow/vectorized_flow_test.go | 2 +- pkg/sql/distsql/columnar_utils_test.go | 2 +- pkg/sql/execinfra/server_config.go | 2 +- pkg/sql/row/fetcher_mvcc_test.go | 2 +- pkg/sql/row/kv_fetcher.go | 2 +- pkg/sql/rowcontainer/disk_row_container_test.go | 2 +- pkg/sql/rowcontainer/hash_row_container_test.go | 2 +- pkg/sql/rowcontainer/row_container_test.go | 2 +- pkg/sql/rowexec/hashjoiner_test.go | 2 +- pkg/sql/rowexec/joinreader_test.go | 2 +- pkg/sql/rowexec/sorter_test.go | 2 +- pkg/sql/rowexec/windower_test.go | 2 +- pkg/sql/rowflow/routers_test.go | 2 +- pkg/testutils/colcontainerutils/diskqueuecfg.go | 4 ++-- pkg/testutils/localtestcluster/local_test_cluster.go | 2 +- pkg/ts/db_test.go | 2 +- pkg/ts/maintenance.go | 2 +- pkg/ts/pruning.go | 2 +- pkg/ts/timeseries_test.go | 2 +- pkg/util/protoutil/clone_test.go | 2 +- 291 files changed, 374 insertions(+), 374 deletions(-) diff --git a/pkg/ccl/changefeedccl/changefeed_test.go b/pkg/ccl/changefeedccl/changefeed_test.go index 8d0a699df808..ba0e9dc14034 100644 --- a/pkg/ccl/changefeedccl/changefeed_test.go +++ b/pkg/ccl/changefeedccl/changefeed_test.go @@ -28,11 +28,11 @@ import ( "github.com/cockroachdb/cockroach/pkg/ccl/changefeedccl/cdctest" "github.com/cockroachdb/cockroach/pkg/ccl/changefeedccl/changefeedbase" "github.com/cockroachdb/cockroach/pkg/ccl/utilccl" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/jobs" "github.com/cockroachdb/cockroach/pkg/jobs/jobspb" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/security" "github.com/cockroachdb/cockroach/pkg/server" diff --git a/pkg/ccl/changefeedccl/kvfeed/scanner.go b/pkg/ccl/changefeedccl/kvfeed/scanner.go index 5208d1bbe067..f34115021f5d 100644 --- a/pkg/ccl/changefeedccl/kvfeed/scanner.go +++ b/pkg/ccl/changefeedccl/kvfeed/scanner.go @@ -13,11 +13,11 @@ import ( "sync/atomic" "time" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/gossip" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/sql/covering" diff --git a/pkg/ccl/changefeedccl/schemafeed/schema_feed.go b/pkg/ccl/changefeedccl/schemafeed/schema_feed.go index fce04a7c2f00..dedb7ce0c3db 100644 --- a/pkg/ccl/changefeedccl/schemafeed/schema_feed.go +++ b/pkg/ccl/changefeedccl/schemafeed/schema_feed.go @@ -15,10 +15,10 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/ccl/changefeedccl/changefeedbase" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/jobs/jobspb" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/sql" diff --git a/pkg/ccl/cliccl/debug.go b/pkg/ccl/cliccl/debug.go index 224508f7ff94..072496bf1c9e 100644 --- a/pkg/ccl/cliccl/debug.go +++ b/pkg/ccl/cliccl/debug.go @@ -23,7 +23,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/ccl/cliccl/cliflagsccl" "github.com/cockroachdb/cockroach/pkg/ccl/storageccl/engineccl/enginepbccl" "github.com/cockroachdb/cockroach/pkg/cli" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/timeutil" diff --git a/pkg/ccl/cmdccl/enc_utils/main.go b/pkg/ccl/cmdccl/enc_utils/main.go index 23d2b2594f7a..ebb305cc79c0 100644 --- a/pkg/ccl/cmdccl/enc_utils/main.go +++ b/pkg/ccl/cmdccl/enc_utils/main.go @@ -19,7 +19,7 @@ import ( "path/filepath" "github.com/cockroachdb/cockroach/pkg/ccl/storageccl/engineccl/enginepbccl" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/pkg/errors" diff --git a/pkg/ccl/followerreadsccl/followerreads_test.go b/pkg/ccl/followerreadsccl/followerreads_test.go index 6bb5746b8a12..82551c59a25c 100644 --- a/pkg/ccl/followerreadsccl/followerreads_test.go +++ b/pkg/ccl/followerreadsccl/followerreads_test.go @@ -15,9 +15,9 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/ccl/utilccl" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/rpc" "github.com/cockroachdb/cockroach/pkg/settings/cluster" diff --git a/pkg/ccl/importccl/bench_test.go b/pkg/ccl/importccl/bench_test.go index 78eb3ff7902e..bb98c9fe25b4 100644 --- a/pkg/ccl/importccl/bench_test.go +++ b/pkg/ccl/importccl/bench_test.go @@ -17,8 +17,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/ccl/importccl" "github.com/cockroachdb/cockroach/pkg/ccl/workloadccl/format" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/server" "github.com/cockroachdb/cockroach/pkg/sql/row" diff --git a/pkg/ccl/importccl/load.go b/pkg/ccl/importccl/load.go index 6b0a46505a40..f77be10dffc6 100644 --- a/pkg/ccl/importccl/load.go +++ b/pkg/ccl/importccl/load.go @@ -21,10 +21,10 @@ import ( "github.com/cockroachdb/cockroach/pkg/blobs" "github.com/cockroachdb/cockroach/pkg/ccl/backupccl" "github.com/cockroachdb/cockroach/pkg/config/zonepb" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/cloud" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/sql" diff --git a/pkg/ccl/storageccl/bench_test.go b/pkg/ccl/storageccl/bench_test.go index 057b6c7f2c7c..da0cfd26a32b 100644 --- a/pkg/ccl/storageccl/bench_test.go +++ b/pkg/ccl/storageccl/bench_test.go @@ -17,10 +17,10 @@ import ( "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/ccl/utilccl/sampledataccl" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/cloud" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/testutils" diff --git a/pkg/ccl/storageccl/engineccl/bench_test.go b/pkg/ccl/storageccl/engineccl/bench_test.go index f218a93179b4..928b06e03bf4 100644 --- a/pkg/ccl/storageccl/engineccl/bench_test.go +++ b/pkg/ccl/storageccl/engineccl/bench_test.go @@ -17,7 +17,7 @@ import ( "testing" "github.com/cockroachdb/cockroach/pkg/base" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/testutils" diff --git a/pkg/ccl/storageccl/engineccl/ctr_stream.go b/pkg/ccl/storageccl/engineccl/ctr_stream.go index 77de226cb787..0567aaba3854 100644 --- a/pkg/ccl/storageccl/engineccl/ctr_stream.go +++ b/pkg/ccl/storageccl/engineccl/ctr_stream.go @@ -17,7 +17,7 @@ import ( "fmt" "github.com/cockroachdb/cockroach/pkg/ccl/storageccl/engineccl/enginepbccl" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" ) // FileCipherStreamCreator wraps the KeyManager interface and provides functions to create a diff --git a/pkg/ccl/storageccl/engineccl/ctr_stream_test.go b/pkg/ccl/storageccl/engineccl/ctr_stream_test.go index 699fa81cccfb..9de9965c0ff9 100644 --- a/pkg/ccl/storageccl/engineccl/ctr_stream_test.go +++ b/pkg/ccl/storageccl/engineccl/ctr_stream_test.go @@ -16,7 +16,7 @@ import ( "testing" "github.com/cockroachdb/cockroach/pkg/ccl/storageccl/engineccl/enginepbccl" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/kr/pretty" "github.com/stretchr/testify/require" diff --git a/pkg/ccl/storageccl/engineccl/encrypted_fs.go b/pkg/ccl/storageccl/engineccl/encrypted_fs.go index 82bafd462743..3dd124d8f9f7 100644 --- a/pkg/ccl/storageccl/engineccl/encrypted_fs.go +++ b/pkg/ccl/storageccl/engineccl/encrypted_fs.go @@ -14,8 +14,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/ccl/baseccl" "github.com/cockroachdb/cockroach/pkg/ccl/storageccl/engineccl/enginepbccl" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/pebble/vfs" diff --git a/pkg/ccl/storageccl/engineccl/encrypted_fs_test.go b/pkg/ccl/storageccl/engineccl/encrypted_fs_test.go index d52a16517e91..98af491de39f 100644 --- a/pkg/ccl/storageccl/engineccl/encrypted_fs_test.go +++ b/pkg/ccl/storageccl/engineccl/encrypted_fs_test.go @@ -19,8 +19,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/ccl/baseccl" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/protoutil" diff --git a/pkg/ccl/storageccl/engineccl/pebble_key_manager.go b/pkg/ccl/storageccl/engineccl/pebble_key_manager.go index 80996d53b411..b27ca007cd6f 100644 --- a/pkg/ccl/storageccl/engineccl/pebble_key_manager.go +++ b/pkg/ccl/storageccl/engineccl/pebble_key_manager.go @@ -18,7 +18,7 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/ccl/storageccl/engineccl/enginepbccl" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/cockroachdb/cockroach/pkg/util/syncutil" diff --git a/pkg/ccl/storageccl/engineccl/rocksdb.go b/pkg/ccl/storageccl/engineccl/rocksdb.go index 26049cfcdb18..39918b5f3444 100644 --- a/pkg/ccl/storageccl/engineccl/rocksdb.go +++ b/pkg/ccl/storageccl/engineccl/rocksdb.go @@ -11,8 +11,8 @@ package engineccl import ( "unsafe" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/pkg/errors" ) diff --git a/pkg/ccl/storageccl/engineccl/rocksdb_test.go b/pkg/ccl/storageccl/engineccl/rocksdb_test.go index 8b4d1babe541..6af285e8c8ad 100644 --- a/pkg/ccl/storageccl/engineccl/rocksdb_test.go +++ b/pkg/ccl/storageccl/engineccl/rocksdb_test.go @@ -11,7 +11,7 @@ package engineccl import ( "testing" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/ccl/storageccl/export.go b/pkg/ccl/storageccl/export.go index 59c38a34983f..6319662a82b5 100644 --- a/pkg/ccl/storageccl/export.go +++ b/pkg/ccl/storageccl/export.go @@ -14,11 +14,11 @@ import ( "crypto/sha512" "fmt" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/cloud" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings" diff --git a/pkg/ccl/storageccl/export_test.go b/pkg/ccl/storageccl/export_test.go index d85fa3b15d27..1d6e3f3e0dae 100644 --- a/pkg/ccl/storageccl/export_test.go +++ b/pkg/ccl/storageccl/export_test.go @@ -21,9 +21,9 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/base" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/testutils" diff --git a/pkg/ccl/storageccl/import.go b/pkg/ccl/storageccl/import.go index 51ad583f7c50..84e4a3797117 100644 --- a/pkg/ccl/storageccl/import.go +++ b/pkg/ccl/storageccl/import.go @@ -15,10 +15,10 @@ import ( "io/ioutil" "github.com/cockroachdb/cockroach/pkg/base" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/bulk" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings" "github.com/cockroachdb/cockroach/pkg/settings/cluster" diff --git a/pkg/ccl/storageccl/import_test.go b/pkg/ccl/storageccl/import_test.go index f47328591b40..a06125761633 100644 --- a/pkg/ccl/storageccl/import_test.go +++ b/pkg/ccl/storageccl/import_test.go @@ -21,11 +21,11 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/base" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/cloud" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings/cluster" diff --git a/pkg/ccl/storageccl/revision_reader.go b/pkg/ccl/storageccl/revision_reader.go index cd0bdcb10b2f..a9f566313e5b 100644 --- a/pkg/ccl/storageccl/revision_reader.go +++ b/pkg/ccl/storageccl/revision_reader.go @@ -11,8 +11,8 @@ package storageccl import ( "context" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/internal/client" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" ) diff --git a/pkg/ccl/storageccl/writebatch.go b/pkg/ccl/storageccl/writebatch.go index 81a2d327fe4c..a009a5604634 100644 --- a/pkg/ccl/storageccl/writebatch.go +++ b/pkg/ccl/storageccl/writebatch.go @@ -13,10 +13,10 @@ import ( "fmt" "github.com/cockroachdb/cockroach/pkg/ccl/storageccl/engineccl" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/log" diff --git a/pkg/ccl/storageccl/writebatch_test.go b/pkg/ccl/storageccl/writebatch_test.go index fa7709ea7e57..8ab75e89a4a4 100644 --- a/pkg/ccl/storageccl/writebatch_test.go +++ b/pkg/ccl/storageccl/writebatch_test.go @@ -15,10 +15,10 @@ import ( "testing" "github.com/cockroachdb/cockroach/pkg/base" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" diff --git a/pkg/ccl/utilccl/sampledataccl/bankdata.go b/pkg/ccl/utilccl/sampledataccl/bankdata.go index 1d9e9710b5d5..dcbcc91c4f84 100644 --- a/pkg/ccl/utilccl/sampledataccl/bankdata.go +++ b/pkg/ccl/utilccl/sampledataccl/bankdata.go @@ -22,8 +22,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/ccl/backupccl" "github.com/cockroachdb/cockroach/pkg/ccl/importccl" "github.com/cockroachdb/cockroach/pkg/ccl/storageccl" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/testutils" diff --git a/pkg/ccl/workloadccl/format/sstable.go b/pkg/ccl/workloadccl/format/sstable.go index 2311c9a81770..034c30c2bf61 100644 --- a/pkg/ccl/workloadccl/format/sstable.go +++ b/pkg/ccl/workloadccl/format/sstable.go @@ -14,8 +14,8 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/ccl/importccl" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/sql/parser" "github.com/cockroachdb/cockroach/pkg/sql/row" "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" diff --git a/pkg/cli/context.go b/pkg/cli/context.go index 841eb311d3d3..fee3ae329ef8 100644 --- a/pkg/cli/context.go +++ b/pkg/cli/context.go @@ -18,7 +18,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/config/zonepb" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/server" "github.com/cockroachdb/cockroach/pkg/settings" "github.com/cockroachdb/cockroach/pkg/settings/cluster" diff --git a/pkg/cli/debug.go b/pkg/cli/debug.go index df78568be576..d637782fb46d 100644 --- a/pkg/cli/debug.go +++ b/pkg/cli/debug.go @@ -30,12 +30,12 @@ import ( "github.com/cockroachdb/cockroach/pkg/cli/syncbench" "github.com/cockroachdb/cockroach/pkg/config" "github.com/cockroachdb/cockroach/pkg/config/zonepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/gossip" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency/lock" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/gc" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/rditer" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/stateloader" diff --git a/pkg/cli/debug_check_store.go b/pkg/cli/debug_check_store.go index d3b1b1ef5e7c..4ca56325b267 100644 --- a/pkg/cli/debug_check_store.go +++ b/pkg/cli/debug_check_store.go @@ -17,10 +17,10 @@ import ( "runtime" "strings" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/rditer" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/stateloader" "github.com/cockroachdb/cockroach/pkg/roachpb" diff --git a/pkg/cli/debug_check_store_test.go b/pkg/cli/debug_check_store_test.go index e4ede1b3b2d4..ee59e4b6fdb6 100644 --- a/pkg/cli/debug_check_store_test.go +++ b/pkg/cli/debug_check_store_test.go @@ -19,7 +19,7 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/base" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/stateloader" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils" diff --git a/pkg/cli/debug_synctest.go b/pkg/cli/debug_synctest.go index 4218fba29209..1b6ede7e9e79 100644 --- a/pkg/cli/debug_synctest.go +++ b/pkg/cli/debug_synctest.go @@ -22,7 +22,7 @@ import ( "strconv" "time" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/encoding" "github.com/cockroachdb/cockroach/pkg/util/stop" diff --git a/pkg/cli/debug_test.go b/pkg/cli/debug_test.go index 86f0ba52b683..a5e2bf675677 100644 --- a/pkg/cli/debug_test.go +++ b/pkg/cli/debug_test.go @@ -22,11 +22,11 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/base" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/gossip" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/rpc" "github.com/cockroachdb/cockroach/pkg/server" diff --git a/pkg/cli/flags_util.go b/pkg/cli/flags_util.go index b17192cc4450..de02c323321e 100644 --- a/pkg/cli/flags_util.go +++ b/pkg/cli/flags_util.go @@ -18,8 +18,8 @@ import ( "strconv" "strings" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/server/status" "github.com/cockroachdb/cockroach/pkg/util" diff --git a/pkg/cli/start.go b/pkg/cli/start.go index ed5464334280..58912acbc155 100644 --- a/pkg/cli/start.go +++ b/pkg/cli/start.go @@ -31,8 +31,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/build" "github.com/cockroachdb/cockroach/pkg/cli/cliflags" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/rpc" "github.com/cockroachdb/cockroach/pkg/security" diff --git a/pkg/cli/syncbench/syncbench.go b/pkg/cli/syncbench/syncbench.go index eec17001c64c..ab66897284b0 100644 --- a/pkg/cli/syncbench/syncbench.go +++ b/pkg/cli/syncbench/syncbench.go @@ -21,7 +21,7 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/base" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/util/encoding" "github.com/cockroachdb/cockroach/pkg/util/log" diff --git a/pkg/engine/batch.go b/pkg/engine/batch.go index 645ceda6728a..b24dbc5c83c7 100644 --- a/pkg/engine/batch.go +++ b/pkg/engine/batch.go @@ -13,7 +13,7 @@ package engine import ( "encoding/binary" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/pebble" "github.com/pkg/errors" diff --git a/pkg/engine/batch_test.go b/pkg/engine/batch_test.go index 72933fb0c7dd..7b5b3d119058 100644 --- a/pkg/engine/batch_test.go +++ b/pkg/engine/batch_test.go @@ -18,7 +18,7 @@ import ( "sync/atomic" "testing" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/engine/bench_test.go b/pkg/engine/bench_test.go index 58e0356d0c7a..d6b045299e7f 100644 --- a/pkg/engine/bench_test.go +++ b/pkg/engine/bench_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency/lock" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/util/encoding" diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index 31f1a795e4d5..fdbe4d7d43c4 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -17,8 +17,8 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/base" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/fs" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/fs" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings" "github.com/cockroachdb/cockroach/pkg/settings/cluster" diff --git a/pkg/engine/engine_test.go b/pkg/engine/engine_test.go index a51481298ecd..737a5d360a7d 100644 --- a/pkg/engine/engine_test.go +++ b/pkg/engine/engine_test.go @@ -27,8 +27,8 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/base" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/fs" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/fs" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/testutils" diff --git a/pkg/engine/enginepb/decode_test.go b/pkg/engine/enginepb/decode_test.go index ad53883df237..f1a92aef6ad8 100644 --- a/pkg/engine/enginepb/decode_test.go +++ b/pkg/engine/enginepb/decode_test.go @@ -14,8 +14,8 @@ import ( "encoding/binary" "testing" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" ) diff --git a/pkg/engine/enginepb/mvcc_test.go b/pkg/engine/enginepb/mvcc_test.go index 0027ea2327c1..aa2816732811 100644 --- a/pkg/engine/enginepb/mvcc_test.go +++ b/pkg/engine/enginepb/mvcc_test.go @@ -14,7 +14,7 @@ import ( "fmt" "testing" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/uuid" diff --git a/pkg/engine/in_mem.go b/pkg/engine/in_mem.go index ba9d19442868..7266bc38c14c 100644 --- a/pkg/engine/in_mem.go +++ b/pkg/engine/in_mem.go @@ -14,7 +14,7 @@ import ( "context" "fmt" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" ) diff --git a/pkg/engine/merge.go b/pkg/engine/merge.go index dd1a8d20f40a..fc43c9f739da 100644 --- a/pkg/engine/merge.go +++ b/pkg/engine/merge.go @@ -11,7 +11,7 @@ package engine import ( - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/protoutil" ) diff --git a/pkg/engine/merge_test.go b/pkg/engine/merge_test.go index 8e596186f86e..18ea8e8c292c 100644 --- a/pkg/engine/merge_test.go +++ b/pkg/engine/merge_test.go @@ -16,7 +16,7 @@ import ( "reflect" "testing" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/protoutil" diff --git a/pkg/engine/metamorphic/generator.go b/pkg/engine/metamorphic/generator.go index 85913cccc837..f0d60b0fe549 100644 --- a/pkg/engine/metamorphic/generator.go +++ b/pkg/engine/metamorphic/generator.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/cockroachdb/cockroach/pkg/base" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/engine/metamorphic/operands.go b/pkg/engine/metamorphic/operands.go index 52137f34d5b6..4bacd74ad6c1 100644 --- a/pkg/engine/metamorphic/operands.go +++ b/pkg/engine/metamorphic/operands.go @@ -15,7 +15,7 @@ import ( "math/rand" "strconv" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" ) diff --git a/pkg/engine/metamorphic/operations.go b/pkg/engine/metamorphic/operations.go index f77a46670f84..9bb86d65ecc8 100644 --- a/pkg/engine/metamorphic/operations.go +++ b/pkg/engine/metamorphic/operations.go @@ -18,9 +18,9 @@ import ( "path/filepath" "sort" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/uint128" diff --git a/pkg/engine/mvcc.go b/pkg/engine/mvcc.go index ab0f997cc772..27c13e5c58ed 100644 --- a/pkg/engine/mvcc.go +++ b/pkg/engine/mvcc.go @@ -21,8 +21,8 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/clusterversion" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/encoding" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/engine/mvcc_history_test.go b/pkg/engine/mvcc_history_test.go index d36f2c17f934..f9cc2ed6e6cd 100644 --- a/pkg/engine/mvcc_history_test.go +++ b/pkg/engine/mvcc_history_test.go @@ -19,7 +19,7 @@ import ( "strings" "testing" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/leaktest" diff --git a/pkg/engine/mvcc_incremental_iterator.go b/pkg/engine/mvcc_incremental_iterator.go index 97a22cb530bc..a8f6267307c2 100644 --- a/pkg/engine/mvcc_incremental_iterator.go +++ b/pkg/engine/mvcc_incremental_iterator.go @@ -11,7 +11,7 @@ package engine import ( - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/protoutil" diff --git a/pkg/engine/mvcc_incremental_iterator_test.go b/pkg/engine/mvcc_incremental_iterator_test.go index 244449634741..0786133194e9 100644 --- a/pkg/engine/mvcc_incremental_iterator_test.go +++ b/pkg/engine/mvcc_incremental_iterator_test.go @@ -16,7 +16,7 @@ import ( "math" "testing" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/engine/mvcc_logical_ops.go b/pkg/engine/mvcc_logical_ops.go index 0c82e8474eb8..b0e60f4cb7f9 100644 --- a/pkg/engine/mvcc_logical_ops.go +++ b/pkg/engine/mvcc_logical_ops.go @@ -13,8 +13,8 @@ package engine import ( "fmt" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/bufalloc" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/engine/mvcc_logical_ops_test.go b/pkg/engine/mvcc_logical_ops_test.go index 12ed27a590d4..aaa7269a2476 100644 --- a/pkg/engine/mvcc_logical_ops_test.go +++ b/pkg/engine/mvcc_logical_ops_test.go @@ -16,8 +16,8 @@ import ( "strings" "testing" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/leaktest" diff --git a/pkg/engine/mvcc_stats_test.go b/pkg/engine/mvcc_stats_test.go index 400a6fa25620..51a78a6136a0 100644 --- a/pkg/engine/mvcc_stats_test.go +++ b/pkg/engine/mvcc_stats_test.go @@ -17,8 +17,8 @@ import ( "sort" "testing" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/engine/mvcc_test.go b/pkg/engine/mvcc_test.go index 1fcb6ae7792c..16edf6a09947 100644 --- a/pkg/engine/mvcc_test.go +++ b/pkg/engine/mvcc_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/testutils/zerofields" diff --git a/pkg/engine/pebble.go b/pkg/engine/pebble.go index 11811a739664..34e0cfc79158 100644 --- a/pkg/engine/pebble.go +++ b/pkg/engine/pebble.go @@ -21,8 +21,8 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/base" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/fs" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/fs" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/engine/pebble_file_registry.go b/pkg/engine/pebble_file_registry.go index ed083d0fe9b9..dcf4b71e7841 100644 --- a/pkg/engine/pebble_file_registry.go +++ b/pkg/engine/pebble_file_registry.go @@ -16,7 +16,7 @@ import ( "os" "strings" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/pebble/vfs" diff --git a/pkg/engine/pebble_file_registry_test.go b/pkg/engine/pebble_file_registry_test.go index b29258d7ea6f..e48a22a6b2e3 100644 --- a/pkg/engine/pebble_file_registry_test.go +++ b/pkg/engine/pebble_file_registry_test.go @@ -15,7 +15,7 @@ import ( "strings" "testing" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/pebble/vfs" "github.com/kr/pretty" diff --git a/pkg/engine/pebble_iterator.go b/pkg/engine/pebble_iterator.go index b0e558d4ddcc..232bbd545823 100644 --- a/pkg/engine/pebble_iterator.go +++ b/pkg/engine/pebble_iterator.go @@ -15,8 +15,8 @@ import ( "math" "sync" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/protoutil" diff --git a/pkg/engine/pebble_merge.go b/pkg/engine/pebble_merge.go index 05610d268a08..7912958fbf46 100644 --- a/pkg/engine/pebble_merge.go +++ b/pkg/engine/pebble_merge.go @@ -13,7 +13,7 @@ package engine import ( "sort" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/cockroachdb/errors" diff --git a/pkg/engine/pebble_mvcc_scanner.go b/pkg/engine/pebble_mvcc_scanner.go index 40f4b0273fd5..b2c131fab2fc 100644 --- a/pkg/engine/pebble_mvcc_scanner.go +++ b/pkg/engine/pebble_mvcc_scanner.go @@ -16,8 +16,8 @@ import ( "sort" "sync" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/protoutil" diff --git a/pkg/engine/pebble_test.go b/pkg/engine/pebble_test.go index bdc9ac1533bb..9ea0096fb962 100644 --- a/pkg/engine/pebble_test.go +++ b/pkg/engine/pebble_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/protoutil" diff --git a/pkg/engine/rocksdb.go b/pkg/engine/rocksdb.go index 7122af6696cb..a6ad030692fe 100644 --- a/pkg/engine/rocksdb.go +++ b/pkg/engine/rocksdb.go @@ -27,8 +27,8 @@ import ( "unsafe" "github.com/cockroachdb/cockroach/pkg/base" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/fs" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/fs" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings" "github.com/cockroachdb/cockroach/pkg/util" diff --git a/pkg/engine/sst_writer_test.go b/pkg/engine/sst_writer_test.go index 7f0abe66e641..6ddc490bb6bf 100644 --- a/pkg/engine/sst_writer_test.go +++ b/pkg/engine/sst_writer_test.go @@ -14,8 +14,8 @@ import ( "math/rand" "testing" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/encoding" "github.com/cockroachdb/cockroach/pkg/util/leaktest" diff --git a/pkg/engine/tee.go b/pkg/engine/tee.go index 0fb80b123441..082b31517250 100644 --- a/pkg/engine/tee.go +++ b/pkg/engine/tee.go @@ -19,8 +19,8 @@ import ( "path/filepath" "strings" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/fs" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/fs" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/log" diff --git a/pkg/engine/temp_engine.go b/pkg/engine/temp_engine.go index 0d493843dde4..5fda0e37defe 100644 --- a/pkg/engine/temp_engine.go +++ b/pkg/engine/temp_engine.go @@ -15,9 +15,9 @@ import ( "fmt" "github.com/cockroachdb/cockroach/pkg/base" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/fs" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/diskmap" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/fs" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/pebble" diff --git a/pkg/internal/client/batch.go b/pkg/internal/client/batch.go index 542d23b8957a..73db38e760d8 100644 --- a/pkg/internal/client/batch.go +++ b/pkg/internal/client/batch.go @@ -13,7 +13,7 @@ package client import ( "context" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/pkg/errors" diff --git a/pkg/internal/client/client_test.go b/pkg/internal/client/client_test.go index fdff438f37dd..98f684ef799e 100644 --- a/pkg/internal/client/client_test.go +++ b/pkg/internal/client/client_test.go @@ -24,9 +24,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/config/zonepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/server" diff --git a/pkg/internal/client/db.go b/pkg/internal/client/db.go index 6df2d5811523..b538ce1ee611 100644 --- a/pkg/internal/client/db.go +++ b/pkg/internal/client/db.go @@ -16,7 +16,7 @@ import ( "strings" "github.com/cockroachdb/cockroach/pkg/base" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/log" diff --git a/pkg/internal/client/mock_transactional_sender.go b/pkg/internal/client/mock_transactional_sender.go index 957a5f3dddaa..a94332fee829 100644 --- a/pkg/internal/client/mock_transactional_sender.go +++ b/pkg/internal/client/mock_transactional_sender.go @@ -13,7 +13,7 @@ package client import ( "context" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/errors" diff --git a/pkg/internal/client/sender.go b/pkg/internal/client/sender.go index 16c8b073e058..79eb154a0597 100644 --- a/pkg/internal/client/sender.go +++ b/pkg/internal/client/sender.go @@ -13,7 +13,7 @@ package client import ( "context" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" ) diff --git a/pkg/internal/client/txn.go b/pkg/internal/client/txn.go index 94ffb6690e4a..bb1e954d15b3 100644 --- a/pkg/internal/client/txn.go +++ b/pkg/internal/client/txn.go @@ -15,7 +15,7 @@ import ( "fmt" "time" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/contextutil" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/dist_sender_server_test.go b/pkg/kv/dist_sender_server_test.go index 1abf83bf3830..ec6c4a23ab80 100644 --- a/pkg/kv/dist_sender_server_test.go +++ b/pkg/kv/dist_sender_server_test.go @@ -22,12 +22,12 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/base" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/gossip" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/rpc/nodedialer" diff --git a/pkg/kv/kvnemesis/engine.go b/pkg/kv/kvnemesis/engine.go index 63c0921f4b2c..d28e6cc2c000 100644 --- a/pkg/kv/kvnemesis/engine.go +++ b/pkg/kv/kvnemesis/engine.go @@ -14,7 +14,7 @@ import ( "fmt" "strings" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/google/btree" diff --git a/pkg/kv/kvnemesis/engine_test.go b/pkg/kv/kvnemesis/engine_test.go index 3a6bffd0af32..ada20b57da1a 100644 --- a/pkg/kv/kvnemesis/engine_test.go +++ b/pkg/kv/kvnemesis/engine_test.go @@ -14,7 +14,7 @@ import ( "strings" "testing" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/leaktest" diff --git a/pkg/kv/kvnemesis/validator.go b/pkg/kv/kvnemesis/validator.go index 1580f7123ab8..338419cf6d15 100644 --- a/pkg/kv/kvnemesis/validator.go +++ b/pkg/kv/kvnemesis/validator.go @@ -17,7 +17,7 @@ import ( "sort" "strings" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/uuid" diff --git a/pkg/kv/kvnemesis/validator_test.go b/pkg/kv/kvnemesis/validator_test.go index 1e98aa9b1672..b81f8f79c2f6 100644 --- a/pkg/kv/kvnemesis/validator_test.go +++ b/pkg/kv/kvnemesis/validator_test.go @@ -14,7 +14,7 @@ import ( "context" "testing" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/leaktest" diff --git a/pkg/kv/kvnemesis/watcher.go b/pkg/kv/kvnemesis/watcher.go index 2f5009d31b0c..5c56f16d1473 100644 --- a/pkg/kv/kvnemesis/watcher.go +++ b/pkg/kv/kvnemesis/watcher.go @@ -14,9 +14,9 @@ import ( "context" "time" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/kv" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/ctxgroup" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/kvserver/abortspan/abortspan.go b/pkg/kv/kvserver/abortspan/abortspan.go index e9eea1ecfade..e67e06120ba4 100644 --- a/pkg/kv/kvserver/abortspan/abortspan.go +++ b/pkg/kv/kvserver/abortspan/abortspan.go @@ -13,9 +13,9 @@ package abortspan import ( "context" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/kvserver/abortspan/abortspan_test.go b/pkg/kv/kvserver/abortspan/abortspan_test.go index 43d0051da501..40522a8491b8 100644 --- a/pkg/kv/kvserver/abortspan/abortspan_test.go +++ b/pkg/kv/kvserver/abortspan/abortspan_test.go @@ -15,8 +15,8 @@ import ( "reflect" "testing" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/leaktest" diff --git a/pkg/kv/kvserver/addressing_test.go b/pkg/kv/kvserver/addressing_test.go index 80499e779543..47c029eb0f41 100644 --- a/pkg/kv/kvserver/addressing_test.go +++ b/pkg/kv/kvserver/addressing_test.go @@ -19,10 +19,10 @@ import ( "testing" "time" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/kvserver/allocator_test.go b/pkg/kv/kvserver/allocator_test.go index 4726b81b91a0..71b14dbf456d 100644 --- a/pkg/kv/kvserver/allocator_test.go +++ b/pkg/kv/kvserver/allocator_test.go @@ -24,10 +24,10 @@ import ( "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/config/zonepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/gossip" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/constraint" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/rpc" diff --git a/pkg/kv/kvserver/api.pb.go b/pkg/kv/kvserver/api.pb.go index d4141a3ba635..34e2d647f900 100644 --- a/pkg/kv/kvserver/api.pb.go +++ b/pkg/kv/kvserver/api.pb.go @@ -9,7 +9,7 @@ import ( io "io" math "math" - enginepb "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + enginepb "github.com/cockroachdb/cockroach/pkg/engine/enginepb" github_com_cockroachdb_cockroach_pkg_roachpb "github.com/cockroachdb/cockroach/pkg/roachpb" roachpb "github.com/cockroachdb/cockroach/pkg/roachpb" github_com_cockroachdb_cockroach_pkg_util_uuid "github.com/cockroachdb/cockroach/pkg/util/uuid" diff --git a/pkg/kv/kvserver/batch_spanset_test.go b/pkg/kv/kvserver/batch_spanset_test.go index a6ed7bf2c06a..cd20bd864023 100644 --- a/pkg/kv/kvserver/batch_spanset_test.go +++ b/pkg/kv/kvserver/batch_spanset_test.go @@ -16,9 +16,9 @@ import ( "reflect" "testing" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency/lock" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils" diff --git a/pkg/kv/kvserver/batcheval/cmd_add_sstable.go b/pkg/kv/kvserver/batcheval/cmd_add_sstable.go index a3a7ce890fd1..54c290b3edd0 100644 --- a/pkg/kv/kvserver/batcheval/cmd_add_sstable.go +++ b/pkg/kv/kvserver/batcheval/cmd_add_sstable.go @@ -14,10 +14,10 @@ import ( "context" "github.com/cockroachdb/cockroach/pkg/clusterversion" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" "github.com/cockroachdb/cockroach/pkg/roachpb" diff --git a/pkg/kv/kvserver/batcheval/cmd_add_sstable_test.go b/pkg/kv/kvserver/batcheval/cmd_add_sstable_test.go index a35dddad093b..7e1f3e7feee1 100644 --- a/pkg/kv/kvserver/batcheval/cmd_add_sstable_test.go +++ b/pkg/kv/kvserver/batcheval/cmd_add_sstable_test.go @@ -20,12 +20,12 @@ import ( "testing" "github.com/cockroachdb/cockroach/pkg/base" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" diff --git a/pkg/kv/kvserver/batcheval/cmd_clear_range.go b/pkg/kv/kvserver/batcheval/cmd_clear_range.go index 79663ed825d2..bccad34dc224 100644 --- a/pkg/kv/kvserver/batcheval/cmd_clear_range.go +++ b/pkg/kv/kvserver/batcheval/cmd_clear_range.go @@ -14,10 +14,10 @@ import ( "context" "errors" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" "github.com/cockroachdb/cockroach/pkg/roachpb" diff --git a/pkg/kv/kvserver/batcheval/cmd_clear_range_test.go b/pkg/kv/kvserver/batcheval/cmd_clear_range_test.go index 7382035f0253..699d03dc397c 100644 --- a/pkg/kv/kvserver/batcheval/cmd_clear_range_test.go +++ b/pkg/kv/kvserver/batcheval/cmd_clear_range_test.go @@ -18,8 +18,8 @@ import ( "testing" "time" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/leaktest" diff --git a/pkg/kv/kvserver/batcheval/cmd_compute_checksum.go b/pkg/kv/kvserver/batcheval/cmd_compute_checksum.go index 75517924048d..35de39b2c1bf 100644 --- a/pkg/kv/kvserver/batcheval/cmd_compute_checksum.go +++ b/pkg/kv/kvserver/batcheval/cmd_compute_checksum.go @@ -14,8 +14,8 @@ import ( "context" "time" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" "github.com/cockroachdb/cockroach/pkg/roachpb" diff --git a/pkg/kv/kvserver/batcheval/cmd_conditional_put.go b/pkg/kv/kvserver/batcheval/cmd_conditional_put.go index 2e23a6b89ac9..3e6c3f7321b5 100644 --- a/pkg/kv/kvserver/batcheval/cmd_conditional_put.go +++ b/pkg/kv/kvserver/batcheval/cmd_conditional_put.go @@ -13,8 +13,8 @@ package batcheval import ( "context" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" ) diff --git a/pkg/kv/kvserver/batcheval/cmd_delete.go b/pkg/kv/kvserver/batcheval/cmd_delete.go index e862fdde4080..a80466c8992b 100644 --- a/pkg/kv/kvserver/batcheval/cmd_delete.go +++ b/pkg/kv/kvserver/batcheval/cmd_delete.go @@ -13,8 +13,8 @@ package batcheval import ( "context" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" ) diff --git a/pkg/kv/kvserver/batcheval/cmd_delete_range.go b/pkg/kv/kvserver/batcheval/cmd_delete_range.go index 3a23a57f0316..0fd492624c8b 100644 --- a/pkg/kv/kvserver/batcheval/cmd_delete_range.go +++ b/pkg/kv/kvserver/batcheval/cmd_delete_range.go @@ -13,8 +13,8 @@ package batcheval import ( "context" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/kvserver/batcheval/cmd_end_transaction.go b/pkg/kv/kvserver/batcheval/cmd_end_transaction.go index f5d026c205c3..cd9aa5138d89 100644 --- a/pkg/kv/kvserver/batcheval/cmd_end_transaction.go +++ b/pkg/kv/kvserver/batcheval/cmd_end_transaction.go @@ -18,12 +18,12 @@ import ( "sync/atomic" "github.com/cockroachdb/cockroach/pkg/clusterversion" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/abortspan" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency/lock" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/rditer" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/stateloader" diff --git a/pkg/kv/kvserver/batcheval/cmd_end_transaction_test.go b/pkg/kv/kvserver/batcheval/cmd_end_transaction_test.go index 71438ff8eee3..8b5bf9c0ef97 100644 --- a/pkg/kv/kvserver/batcheval/cmd_end_transaction_test.go +++ b/pkg/kv/kvserver/batcheval/cmd_end_transaction_test.go @@ -15,10 +15,10 @@ import ( "regexp" "testing" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/abortspan" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/kvserver/batcheval/cmd_gc.go b/pkg/kv/kvserver/batcheval/cmd_gc.go index 9ad9f664f2eb..37c8e9395d9a 100644 --- a/pkg/kv/kvserver/batcheval/cmd_gc.go +++ b/pkg/kv/kvserver/batcheval/cmd_gc.go @@ -13,9 +13,9 @@ package batcheval import ( "context" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" "github.com/cockroachdb/cockroach/pkg/roachpb" diff --git a/pkg/kv/kvserver/batcheval/cmd_get.go b/pkg/kv/kvserver/batcheval/cmd_get.go index 72f893ac85b7..c5750a0026d8 100644 --- a/pkg/kv/kvserver/batcheval/cmd_get.go +++ b/pkg/kv/kvserver/batcheval/cmd_get.go @@ -13,8 +13,8 @@ package batcheval import ( "context" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/log" ) diff --git a/pkg/kv/kvserver/batcheval/cmd_heartbeat_txn.go b/pkg/kv/kvserver/batcheval/cmd_heartbeat_txn.go index 23e4e1bbdaa0..a055ff8af8f4 100644 --- a/pkg/kv/kvserver/batcheval/cmd_heartbeat_txn.go +++ b/pkg/kv/kvserver/batcheval/cmd_heartbeat_txn.go @@ -14,9 +14,9 @@ import ( "context" "fmt" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/kvserver/batcheval/cmd_increment.go b/pkg/kv/kvserver/batcheval/cmd_increment.go index c70ff373cbdc..64a92d7468c7 100644 --- a/pkg/kv/kvserver/batcheval/cmd_increment.go +++ b/pkg/kv/kvserver/batcheval/cmd_increment.go @@ -13,8 +13,8 @@ package batcheval import ( "context" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" ) diff --git a/pkg/kv/kvserver/batcheval/cmd_init_put.go b/pkg/kv/kvserver/batcheval/cmd_init_put.go index 12e11955cb67..366fa82f7747 100644 --- a/pkg/kv/kvserver/batcheval/cmd_init_put.go +++ b/pkg/kv/kvserver/batcheval/cmd_init_put.go @@ -13,8 +13,8 @@ package batcheval import ( "context" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" ) diff --git a/pkg/kv/kvserver/batcheval/cmd_lease.go b/pkg/kv/kvserver/batcheval/cmd_lease.go index 104cc891ba92..28455036638c 100644 --- a/pkg/kv/kvserver/batcheval/cmd_lease.go +++ b/pkg/kv/kvserver/batcheval/cmd_lease.go @@ -14,10 +14,10 @@ import ( "context" "fmt" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" "github.com/cockroachdb/cockroach/pkg/roachpb" diff --git a/pkg/kv/kvserver/batcheval/cmd_lease_info.go b/pkg/kv/kvserver/batcheval/cmd_lease_info.go index 04131ff65a6a..cc37ede12258 100644 --- a/pkg/kv/kvserver/batcheval/cmd_lease_info.go +++ b/pkg/kv/kvserver/batcheval/cmd_lease_info.go @@ -13,9 +13,9 @@ package batcheval import ( "context" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/roachpb" ) diff --git a/pkg/kv/kvserver/batcheval/cmd_lease_request.go b/pkg/kv/kvserver/batcheval/cmd_lease_request.go index 6341c077676c..0fb0fe2a783e 100644 --- a/pkg/kv/kvserver/batcheval/cmd_lease_request.go +++ b/pkg/kv/kvserver/batcheval/cmd_lease_request.go @@ -13,8 +13,8 @@ package batcheval import ( "context" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" ) diff --git a/pkg/kv/kvserver/batcheval/cmd_lease_transfer.go b/pkg/kv/kvserver/batcheval/cmd_lease_transfer.go index 8d8c15bfa742..4a116cc0b819 100644 --- a/pkg/kv/kvserver/batcheval/cmd_lease_transfer.go +++ b/pkg/kv/kvserver/batcheval/cmd_lease_transfer.go @@ -13,9 +13,9 @@ package batcheval import ( "context" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/log" diff --git a/pkg/kv/kvserver/batcheval/cmd_merge.go b/pkg/kv/kvserver/batcheval/cmd_merge.go index 4b265c38ddfa..33a7ecfc5ea7 100644 --- a/pkg/kv/kvserver/batcheval/cmd_merge.go +++ b/pkg/kv/kvserver/batcheval/cmd_merge.go @@ -13,8 +13,8 @@ package batcheval import ( "context" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" ) diff --git a/pkg/kv/kvserver/batcheval/cmd_push_txn.go b/pkg/kv/kvserver/batcheval/cmd_push_txn.go index b31c4fb205b1..f236e38cfdc3 100644 --- a/pkg/kv/kvserver/batcheval/cmd_push_txn.go +++ b/pkg/kv/kvserver/batcheval/cmd_push_txn.go @@ -14,9 +14,9 @@ import ( "bytes" "context" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/txnwait" "github.com/cockroachdb/cockroach/pkg/roachpb" diff --git a/pkg/kv/kvserver/batcheval/cmd_put.go b/pkg/kv/kvserver/batcheval/cmd_put.go index 8ca5d2bc7039..0f37b4fcf034 100644 --- a/pkg/kv/kvserver/batcheval/cmd_put.go +++ b/pkg/kv/kvserver/batcheval/cmd_put.go @@ -13,8 +13,8 @@ package batcheval import ( "context" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/kvserver/batcheval/cmd_query_intent.go b/pkg/kv/kvserver/batcheval/cmd_query_intent.go index 654bd2c05c32..332effe91c19 100644 --- a/pkg/kv/kvserver/batcheval/cmd_query_intent.go +++ b/pkg/kv/kvserver/batcheval/cmd_query_intent.go @@ -13,8 +13,8 @@ package batcheval import ( "context" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/kvserver/batcheval/cmd_query_txn.go b/pkg/kv/kvserver/batcheval/cmd_query_txn.go index 74efe11be8ea..2899e7d00397 100644 --- a/pkg/kv/kvserver/batcheval/cmd_query_txn.go +++ b/pkg/kv/kvserver/batcheval/cmd_query_txn.go @@ -14,9 +14,9 @@ import ( "bytes" "context" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/kvserver/batcheval/cmd_range_stats.go b/pkg/kv/kvserver/batcheval/cmd_range_stats.go index ce27ec1ad359..2a9abf5e5249 100644 --- a/pkg/kv/kvserver/batcheval/cmd_range_stats.go +++ b/pkg/kv/kvserver/batcheval/cmd_range_stats.go @@ -13,8 +13,8 @@ package batcheval import ( "context" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" ) diff --git a/pkg/kv/kvserver/batcheval/cmd_recompute_stats.go b/pkg/kv/kvserver/batcheval/cmd_recompute_stats.go index b384121abe8f..6e06734aff3a 100644 --- a/pkg/kv/kvserver/batcheval/cmd_recompute_stats.go +++ b/pkg/kv/kvserver/batcheval/cmd_recompute_stats.go @@ -14,10 +14,10 @@ import ( "context" "github.com/cockroachdb/cockroach/pkg/clusterversion" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/rditer" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/roachpb" diff --git a/pkg/kv/kvserver/batcheval/cmd_recover_txn.go b/pkg/kv/kvserver/batcheval/cmd_recover_txn.go index 22030aeb7961..3a4273277ccb 100644 --- a/pkg/kv/kvserver/batcheval/cmd_recover_txn.go +++ b/pkg/kv/kvserver/batcheval/cmd_recover_txn.go @@ -15,9 +15,9 @@ import ( "context" "fmt" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/kvserver/batcheval/cmd_recover_txn_test.go b/pkg/kv/kvserver/batcheval/cmd_recover_txn_test.go index 1eef24be8ba9..0acb129d3724 100644 --- a/pkg/kv/kvserver/batcheval/cmd_recover_txn_test.go +++ b/pkg/kv/kvserver/batcheval/cmd_recover_txn_test.go @@ -14,8 +14,8 @@ import ( "context" "testing" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/kvserver/batcheval/cmd_refresh.go b/pkg/kv/kvserver/batcheval/cmd_refresh.go index 558b964517e7..b532e2e6ec16 100644 --- a/pkg/kv/kvserver/batcheval/cmd_refresh.go +++ b/pkg/kv/kvserver/batcheval/cmd_refresh.go @@ -13,8 +13,8 @@ package batcheval import ( "context" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/pkg/errors" diff --git a/pkg/kv/kvserver/batcheval/cmd_refresh_range.go b/pkg/kv/kvserver/batcheval/cmd_refresh_range.go index 777e21c10b3c..44ce2f3efd91 100644 --- a/pkg/kv/kvserver/batcheval/cmd_refresh_range.go +++ b/pkg/kv/kvserver/batcheval/cmd_refresh_range.go @@ -13,8 +13,8 @@ package batcheval import ( "context" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/pkg/errors" diff --git a/pkg/kv/kvserver/batcheval/cmd_refresh_range_test.go b/pkg/kv/kvserver/batcheval/cmd_refresh_range_test.go index dd56fa2e62eb..cd1fabe8a4b3 100644 --- a/pkg/kv/kvserver/batcheval/cmd_refresh_range_test.go +++ b/pkg/kv/kvserver/batcheval/cmd_refresh_range_test.go @@ -14,9 +14,9 @@ import ( "context" "testing" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/leaktest" diff --git a/pkg/kv/kvserver/batcheval/cmd_resolve_intent.go b/pkg/kv/kvserver/batcheval/cmd_resolve_intent.go index e8e8e4421810..5cc031362c92 100644 --- a/pkg/kv/kvserver/batcheval/cmd_resolve_intent.go +++ b/pkg/kv/kvserver/batcheval/cmd_resolve_intent.go @@ -13,9 +13,9 @@ package batcheval import ( "context" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/kvserver/batcheval/cmd_resolve_intent_range.go b/pkg/kv/kvserver/batcheval/cmd_resolve_intent_range.go index d94ee6902b36..212e2f6799bc 100644 --- a/pkg/kv/kvserver/batcheval/cmd_resolve_intent_range.go +++ b/pkg/kv/kvserver/batcheval/cmd_resolve_intent_range.go @@ -13,8 +13,8 @@ package batcheval import ( "context" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/roachpb" ) diff --git a/pkg/kv/kvserver/batcheval/cmd_resolve_intent_test.go b/pkg/kv/kvserver/batcheval/cmd_resolve_intent_test.go index f5662b7f3d9a..09da55539a11 100644 --- a/pkg/kv/kvserver/batcheval/cmd_resolve_intent_test.go +++ b/pkg/kv/kvserver/batcheval/cmd_resolve_intent_test.go @@ -16,9 +16,9 @@ import ( "strings" "testing" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/abortspan" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils" diff --git a/pkg/kv/kvserver/batcheval/cmd_reverse_scan.go b/pkg/kv/kvserver/batcheval/cmd_reverse_scan.go index e3520bb62b89..3a8a298dbe03 100644 --- a/pkg/kv/kvserver/batcheval/cmd_reverse_scan.go +++ b/pkg/kv/kvserver/batcheval/cmd_reverse_scan.go @@ -14,8 +14,8 @@ import ( "context" "fmt" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" ) diff --git a/pkg/kv/kvserver/batcheval/cmd_revert_range.go b/pkg/kv/kvserver/batcheval/cmd_revert_range.go index 8cc4d2c29bf3..56f179b7a569 100644 --- a/pkg/kv/kvserver/batcheval/cmd_revert_range.go +++ b/pkg/kv/kvserver/batcheval/cmd_revert_range.go @@ -13,9 +13,9 @@ package batcheval import ( "context" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/kvserver/batcheval/cmd_revert_range_test.go b/pkg/kv/kvserver/batcheval/cmd_revert_range_test.go index 2a642227a676..26150d8266b8 100644 --- a/pkg/kv/kvserver/batcheval/cmd_revert_range_test.go +++ b/pkg/kv/kvserver/batcheval/cmd_revert_range_test.go @@ -18,8 +18,8 @@ import ( "testing" "time" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/kvserver/batcheval/cmd_scan.go b/pkg/kv/kvserver/batcheval/cmd_scan.go index c127713674fa..e73a350b64ae 100644 --- a/pkg/kv/kvserver/batcheval/cmd_scan.go +++ b/pkg/kv/kvserver/batcheval/cmd_scan.go @@ -14,8 +14,8 @@ import ( "context" "fmt" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" ) diff --git a/pkg/kv/kvserver/batcheval/cmd_scan_test.go b/pkg/kv/kvserver/batcheval/cmd_scan_test.go index 5b020fc515a6..3700c294429b 100644 --- a/pkg/kv/kvserver/batcheval/cmd_scan_test.go +++ b/pkg/kv/kvserver/batcheval/cmd_scan_test.go @@ -15,7 +15,7 @@ import ( "fmt" "testing" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/kvserver/batcheval/cmd_subsume.go b/pkg/kv/kvserver/batcheval/cmd_subsume.go index bd0aead4f562..421e6f244ece 100644 --- a/pkg/kv/kvserver/batcheval/cmd_subsume.go +++ b/pkg/kv/kvserver/batcheval/cmd_subsume.go @@ -15,9 +15,9 @@ import ( "context" "fmt" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/pkg/errors" diff --git a/pkg/kv/kvserver/batcheval/cmd_truncate_log.go b/pkg/kv/kvserver/batcheval/cmd_truncate_log.go index 8daffb3ed644..ae1b83afb028 100644 --- a/pkg/kv/kvserver/batcheval/cmd_truncate_log.go +++ b/pkg/kv/kvserver/batcheval/cmd_truncate_log.go @@ -13,9 +13,9 @@ package batcheval import ( "context" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" "github.com/cockroachdb/cockroach/pkg/roachpb" diff --git a/pkg/kv/kvserver/batcheval/cmd_truncate_log_test.go b/pkg/kv/kvserver/batcheval/cmd_truncate_log_test.go index 064a125eb3a4..a3c4d3b1f0cc 100644 --- a/pkg/kv/kvserver/batcheval/cmd_truncate_log_test.go +++ b/pkg/kv/kvserver/batcheval/cmd_truncate_log_test.go @@ -15,8 +15,8 @@ import ( "fmt" "testing" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/leaktest" diff --git a/pkg/kv/kvserver/batcheval/command.go b/pkg/kv/kvserver/batcheval/command.go index f7644c3e0f25..876f0abba376 100644 --- a/pkg/kv/kvserver/batcheval/command.go +++ b/pkg/kv/kvserver/batcheval/command.go @@ -13,8 +13,8 @@ package batcheval import ( "context" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/log" diff --git a/pkg/kv/kvserver/batcheval/declare.go b/pkg/kv/kvserver/batcheval/declare.go index 1546b3b61a41..5652f3674014 100644 --- a/pkg/kv/kvserver/batcheval/declare.go +++ b/pkg/kv/kvserver/batcheval/declare.go @@ -13,8 +13,8 @@ package batcheval import ( "context" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/roachpb" ) diff --git a/pkg/kv/kvserver/batcheval/eval_context.go b/pkg/kv/kvserver/batcheval/eval_context.go index f82a40880f9b..9bf42cb10200 100644 --- a/pkg/kv/kvserver/batcheval/eval_context.go +++ b/pkg/kv/kvserver/batcheval/eval_context.go @@ -14,12 +14,12 @@ import ( "context" "fmt" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/abortspan" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/cloud" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings/cluster" diff --git a/pkg/kv/kvserver/batcheval/intent.go b/pkg/kv/kvserver/batcheval/intent.go index cd89a3d0d648..f335ce6bd4c2 100644 --- a/pkg/kv/kvserver/batcheval/intent.go +++ b/pkg/kv/kvserver/batcheval/intent.go @@ -13,7 +13,7 @@ package batcheval import ( "context" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" ) diff --git a/pkg/kv/kvserver/batcheval/split_stats_helper.go b/pkg/kv/kvserver/batcheval/split_stats_helper.go index 9a738f199db8..d55415f2b982 100644 --- a/pkg/kv/kvserver/batcheval/split_stats_helper.go +++ b/pkg/kv/kvserver/batcheval/split_stats_helper.go @@ -10,7 +10,7 @@ package batcheval -import "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" +import "github.com/cockroachdb/cockroach/pkg/engine/enginepb" // splitStatsHelper codifies and explains the stats computations related to a // split. The quantities known during a split (i.e. while the split trigger diff --git a/pkg/kv/kvserver/batcheval/transaction.go b/pkg/kv/kvserver/batcheval/transaction.go index 1d17052e28bd..733de959fe11 100644 --- a/pkg/kv/kvserver/batcheval/transaction.go +++ b/pkg/kv/kvserver/batcheval/transaction.go @@ -15,8 +15,8 @@ import ( "context" "fmt" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util" "github.com/cockroachdb/cockroach/pkg/util/log" diff --git a/pkg/kv/kvserver/batcheval/transaction_test.go b/pkg/kv/kvserver/batcheval/transaction_test.go index 0bdc83581641..d16d3a95bceb 100644 --- a/pkg/kv/kvserver/batcheval/transaction_test.go +++ b/pkg/kv/kvserver/batcheval/transaction_test.go @@ -14,8 +14,8 @@ import ( "context" "testing" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/abortspan" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/leaktest" diff --git a/pkg/kv/kvserver/below_raft_protos_test.go b/pkg/kv/kvserver/below_raft_protos_test.go index 60a14742b7c8..1a84e9827792 100644 --- a/pkg/kv/kvserver/below_raft_protos_test.go +++ b/pkg/kv/kvserver/below_raft_protos_test.go @@ -17,8 +17,8 @@ import ( "reflect" "testing" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/leaktest" diff --git a/pkg/kv/kvserver/bulk/buffering_adder.go b/pkg/kv/kvserver/bulk/buffering_adder.go index 0872a07ece83..94e123c2da68 100644 --- a/pkg/kv/kvserver/bulk/buffering_adder.go +++ b/pkg/kv/kvserver/bulk/buffering_adder.go @@ -15,8 +15,8 @@ import ( "sort" "time" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/kv" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings/cluster" diff --git a/pkg/kv/kvserver/bulk/sst_batcher.go b/pkg/kv/kvserver/bulk/sst_batcher.go index 2ee1cfde9582..6ed521837eee 100644 --- a/pkg/kv/kvserver/bulk/sst_batcher.go +++ b/pkg/kv/kvserver/bulk/sst_batcher.go @@ -16,10 +16,10 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/clusterversion" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings" diff --git a/pkg/kv/kvserver/bulk/sst_batcher_test.go b/pkg/kv/kvserver/bulk/sst_batcher_test.go index 729944d2b3e6..7ab70860fca5 100644 --- a/pkg/kv/kvserver/bulk/sst_batcher_test.go +++ b/pkg/kv/kvserver/bulk/sst_batcher_test.go @@ -20,12 +20,12 @@ import ( "testing" "github.com/cockroachdb/cockroach/pkg/base" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/bulk" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings/cluster" diff --git a/pkg/kv/kvserver/client_merge_test.go b/pkg/kv/kvserver/client_merge_test.go index 4dca2c60d9e6..e406b84504a6 100644 --- a/pkg/kv/kvserver/client_merge_test.go +++ b/pkg/kv/kvserver/client_merge_test.go @@ -27,13 +27,13 @@ import ( "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/config/zonepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/gossip" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/rditer" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/stateloader" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" diff --git a/pkg/kv/kvserver/client_raft_test.go b/pkg/kv/kvserver/client_raft_test.go index 0195929f3544..cb486c58fb4b 100644 --- a/pkg/kv/kvserver/client_raft_test.go +++ b/pkg/kv/kvserver/client_raft_test.go @@ -25,12 +25,12 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/base" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/gossip" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/stateloader" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" diff --git a/pkg/kv/kvserver/client_replica_gc_test.go b/pkg/kv/kvserver/client_replica_gc_test.go index 7696eaba8431..460192fc1c07 100644 --- a/pkg/kv/kvserver/client_replica_gc_test.go +++ b/pkg/kv/kvserver/client_replica_gc_test.go @@ -20,8 +20,8 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/base" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils" diff --git a/pkg/kv/kvserver/client_replica_test.go b/pkg/kv/kvserver/client_replica_test.go index 0274cf486065..47f837ab175f 100644 --- a/pkg/kv/kvserver/client_replica_test.go +++ b/pkg/kv/kvserver/client_replica_test.go @@ -24,12 +24,12 @@ import ( "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/config/zonepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" "github.com/cockroachdb/cockroach/pkg/roachpb" diff --git a/pkg/kv/kvserver/client_split_test.go b/pkg/kv/kvserver/client_split_test.go index 6cfdc6a68ece..f87a78c49248 100644 --- a/pkg/kv/kvserver/client_split_test.go +++ b/pkg/kv/kvserver/client_split_test.go @@ -27,14 +27,14 @@ import ( "github.com/cockroachdb/cockroach/pkg/clusterversion" "github.com/cockroachdb/cockroach/pkg/config" "github.com/cockroachdb/cockroach/pkg/config/zonepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/gossip" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/abortspan" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/stateloader" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/roachpb" diff --git a/pkg/kv/kvserver/client_test.go b/pkg/kv/kvserver/client_test.go index a5883dbb390b..309920fdcda5 100644 --- a/pkg/kv/kvserver/client_test.go +++ b/pkg/kv/kvserver/client_test.go @@ -35,14 +35,14 @@ import ( "github.com/cockroachdb/cockroach/pkg/clusterversion" "github.com/cockroachdb/cockroach/pkg/config" "github.com/cockroachdb/cockroach/pkg/config/zonepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/gossip" "github.com/cockroachdb/cockroach/pkg/gossip/resolver" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/rditer" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/stateloader" "github.com/cockroachdb/cockroach/pkg/roachpb" diff --git a/pkg/kv/kvserver/compactor/compactor.go b/pkg/kv/kvserver/compactor/compactor.go index 71cf8958315c..951854d758b8 100644 --- a/pkg/kv/kvserver/compactor/compactor.go +++ b/pkg/kv/kvserver/compactor/compactor.go @@ -15,8 +15,8 @@ import ( "fmt" "time" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings/cluster" diff --git a/pkg/kv/kvserver/compactor/compactor_test.go b/pkg/kv/kvserver/compactor/compactor_test.go index 5578788fd321..2634d5f6ff16 100644 --- a/pkg/kv/kvserver/compactor/compactor_test.go +++ b/pkg/kv/kvserver/compactor/compactor_test.go @@ -19,9 +19,9 @@ import ( "testing" "time" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings/cluster" diff --git a/pkg/kv/kvserver/concurrency/concurrency_control.go b/pkg/kv/kvserver/concurrency/concurrency_control.go index 41155778ac28..bfb8785512f3 100644 --- a/pkg/kv/kvserver/concurrency/concurrency_control.go +++ b/pkg/kv/kvserver/concurrency/concurrency_control.go @@ -16,8 +16,8 @@ package concurrency import ( "context" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency/lock" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/txnwait" diff --git a/pkg/kv/kvserver/concurrency/concurrency_manager_test.go b/pkg/kv/kvserver/concurrency/concurrency_manager_test.go index ade0767cce1d..a4ab499eb558 100644 --- a/pkg/kv/kvserver/concurrency/concurrency_manager_test.go +++ b/pkg/kv/kvserver/concurrency/concurrency_manager_test.go @@ -24,10 +24,10 @@ import ( "testing" "time" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency/lock" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/intentresolver" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/txnwait" diff --git a/pkg/kv/kvserver/concurrency/lock_table.go b/pkg/kv/kvserver/concurrency/lock_table.go index 82e1998837f7..212a03df6c15 100644 --- a/pkg/kv/kvserver/concurrency/lock_table.go +++ b/pkg/kv/kvserver/concurrency/lock_table.go @@ -18,9 +18,9 @@ import ( "sync" "sync/atomic" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency/lock" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/kvserver/concurrency/lock_table_test.go b/pkg/kv/kvserver/concurrency/lock_table_test.go index 94d602f20ce8..a344523de908 100644 --- a/pkg/kv/kvserver/concurrency/lock_table_test.go +++ b/pkg/kv/kvserver/concurrency/lock_table_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency/lock" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanlatch" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/roachpb" diff --git a/pkg/kv/kvserver/concurrency/lock_table_waiter.go b/pkg/kv/kvserver/concurrency/lock_table_waiter.go index 4bafa350dc13..8d61724ed149 100644 --- a/pkg/kv/kvserver/concurrency/lock_table_waiter.go +++ b/pkg/kv/kvserver/concurrency/lock_table_waiter.go @@ -15,7 +15,7 @@ import ( "math" "time" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/intentresolver" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/roachpb" diff --git a/pkg/kv/kvserver/concurrency/lock_table_waiter_test.go b/pkg/kv/kvserver/concurrency/lock_table_waiter_test.go index 1eafaf5a2294..686651928598 100644 --- a/pkg/kv/kvserver/concurrency/lock_table_waiter_test.go +++ b/pkg/kv/kvserver/concurrency/lock_table_waiter_test.go @@ -14,7 +14,7 @@ import ( "context" "testing" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/intentresolver" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/roachpb" diff --git a/pkg/kv/kvserver/consistency_queue_test.go b/pkg/kv/kvserver/consistency_queue_test.go index 0f416d59efba..9edb9363b617 100644 --- a/pkg/kv/kvserver/consistency_queue_test.go +++ b/pkg/kv/kvserver/consistency_queue_test.go @@ -22,10 +22,10 @@ import ( "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/config" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/stateloader" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/roachpb" diff --git a/pkg/kv/kvserver/debug_print.go b/pkg/kv/kvserver/debug_print.go index 8a4a837ff614..dafc81ff3a9d 100644 --- a/pkg/kv/kvserver/debug_print.go +++ b/pkg/kv/kvserver/debug_print.go @@ -17,9 +17,9 @@ import ( "strconv" "strings" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/kvserver/debug_print_test.go b/pkg/kv/kvserver/debug_print_test.go index ccd91313f829..ab5f4958ec52 100644 --- a/pkg/kv/kvserver/debug_print_test.go +++ b/pkg/kv/kvserver/debug_print_test.go @@ -14,7 +14,7 @@ import ( "math" "testing" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/kvserver/gc/data_distribution_test.go b/pkg/kv/kvserver/gc/data_distribution_test.go index 155317bb62a3..21f5c9e96ab1 100644 --- a/pkg/kv/kvserver/gc/data_distribution_test.go +++ b/pkg/kv/kvserver/gc/data_distribution_test.go @@ -18,9 +18,9 @@ import ( "testing" "time" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/rditer" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/encoding" diff --git a/pkg/kv/kvserver/gc/gc.go b/pkg/kv/kvserver/gc/gc.go index 3a058b9bb5ad..c01239f37023 100644 --- a/pkg/kv/kvserver/gc/gc.go +++ b/pkg/kv/kvserver/gc/gc.go @@ -22,11 +22,11 @@ import ( "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/config/zonepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/abortspan" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency/lock" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/bufalloc" diff --git a/pkg/kv/kvserver/gc/gc_iterator.go b/pkg/kv/kvserver/gc/gc_iterator.go index 017376c4092c..38f5f3667bc6 100644 --- a/pkg/kv/kvserver/gc/gc_iterator.go +++ b/pkg/kv/kvserver/gc/gc_iterator.go @@ -11,7 +11,7 @@ package gc import ( - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/rditer" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/bufalloc" diff --git a/pkg/kv/kvserver/gc/gc_iterator_test.go b/pkg/kv/kvserver/gc/gc_iterator_test.go index f0288923705e..ffa56f4ed817 100644 --- a/pkg/kv/kvserver/gc/gc_iterator_test.go +++ b/pkg/kv/kvserver/gc/gc_iterator_test.go @@ -16,8 +16,8 @@ import ( "testing" "time" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/uuid" diff --git a/pkg/kv/kvserver/gc/gc_old_test.go b/pkg/kv/kvserver/gc/gc_old_test.go index 69e6ee913d39..69cc3195a5bf 100644 --- a/pkg/kv/kvserver/gc/gc_old_test.go +++ b/pkg/kv/kvserver/gc/gc_old_test.go @@ -16,8 +16,8 @@ import ( "testing" "github.com/cockroachdb/cockroach/pkg/config/zonepb" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/rditer" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/roachpb" diff --git a/pkg/kv/kvserver/gc/gc_random_test.go b/pkg/kv/kvserver/gc/gc_random_test.go index 7eaa123619ed..083db468f3d6 100644 --- a/pkg/kv/kvserver/gc/gc_random_test.go +++ b/pkg/kv/kvserver/gc/gc_random_test.go @@ -19,7 +19,7 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/config/zonepb" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/stretchr/testify/require" diff --git a/pkg/kv/kvserver/gc_queue.go b/pkg/kv/kvserver/gc_queue.go index 1c1a777035b7..82a9a2121041 100644 --- a/pkg/kv/kvserver/gc_queue.go +++ b/pkg/kv/kvserver/gc_queue.go @@ -20,8 +20,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/config" "github.com/cockroachdb/cockroach/pkg/config/zonepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/gossip" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/gc" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/kvserver/gc_queue_test.go b/pkg/kv/kvserver/gc_queue_test.go index cc56401d6ea9..d9beba20ec06 100644 --- a/pkg/kv/kvserver/gc_queue_test.go +++ b/pkg/kv/kvserver/gc_queue_test.go @@ -21,9 +21,9 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/config/zonepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/gc" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/roachpb" diff --git a/pkg/kv/kvserver/helpers_test.go b/pkg/kv/kvserver/helpers_test.go index b91afa8a7ca0..5365546ce8e7 100644 --- a/pkg/kv/kvserver/helpers_test.go +++ b/pkg/kv/kvserver/helpers_test.go @@ -26,11 +26,11 @@ import ( circuit "github.com/cockroachdb/circuitbreaker" "github.com/cockroachdb/cockroach/pkg/config" "github.com/cockroachdb/cockroach/pkg/config/zonepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/rditer" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" "github.com/cockroachdb/cockroach/pkg/roachpb" diff --git a/pkg/kv/kvserver/intentresolver/intent_resolver.go b/pkg/kv/kvserver/intentresolver/intent_resolver.go index 78c2313c082b..1ec27a222fb9 100644 --- a/pkg/kv/kvserver/intentresolver/intent_resolver.go +++ b/pkg/kv/kvserver/intentresolver/intent_resolver.go @@ -16,13 +16,13 @@ import ( "sort" "time" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/internal/client/requestbatcher" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvbase" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency/lock" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/txnwait" "github.com/cockroachdb/cockroach/pkg/roachpb" diff --git a/pkg/kv/kvserver/intentresolver/intent_resolver_test.go b/pkg/kv/kvserver/intentresolver/intent_resolver_test.go index 534e8429665e..a338566a846d 100644 --- a/pkg/kv/kvserver/intentresolver/intent_resolver_test.go +++ b/pkg/kv/kvserver/intentresolver/intent_resolver_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils" diff --git a/pkg/kv/kvserver/merge_queue.go b/pkg/kv/kvserver/merge_queue.go index dfdf9f7718b3..d63298b59cae 100644 --- a/pkg/kv/kvserver/merge_queue.go +++ b/pkg/kv/kvserver/merge_queue.go @@ -17,10 +17,10 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/config" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/gossip" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings" diff --git a/pkg/kv/kvserver/merge_queue_test.go b/pkg/kv/kvserver/merge_queue_test.go index 4571e82808b8..2b3c71a4a9aa 100644 --- a/pkg/kv/kvserver/merge_queue_test.go +++ b/pkg/kv/kvserver/merge_queue_test.go @@ -16,9 +16,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/config" "github.com/cockroachdb/cockroach/pkg/config/zonepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/gossip" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/kvserver/metrics.go b/pkg/kv/kvserver/metrics.go index e0b838ccd32b..be1502866ea5 100644 --- a/pkg/kv/kvserver/metrics.go +++ b/pkg/kv/kvserver/metrics.go @@ -14,9 +14,9 @@ import ( "context" "time" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/rangefeed" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/metric" diff --git a/pkg/kv/kvserver/node_liveness.go b/pkg/kv/kvserver/node_liveness.go index f4e393aad56d..e93b9177a04a 100644 --- a/pkg/kv/kvserver/node_liveness.go +++ b/pkg/kv/kvserver/node_liveness.go @@ -17,12 +17,12 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/base" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/gossip" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/closedts" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/closedts/ctpb" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings/cluster" diff --git a/pkg/kv/kvserver/queue.go b/pkg/kv/kvserver/queue.go index d72fbe7ab0c1..16e5adca8165 100644 --- a/pkg/kv/kvserver/queue.go +++ b/pkg/kv/kvserver/queue.go @@ -18,8 +18,8 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/config" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/gossip" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings" diff --git a/pkg/kv/kvserver/queue_test.go b/pkg/kv/kvserver/queue_test.go index 585f3d803dbd..8667f98e889f 100644 --- a/pkg/kv/kvserver/queue_test.go +++ b/pkg/kv/kvserver/queue_test.go @@ -22,9 +22,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/config" "github.com/cockroachdb/cockroach/pkg/config/zonepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/gossip" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/rpc" "github.com/cockroachdb/cockroach/pkg/settings/cluster" diff --git a/pkg/kv/kvserver/raft_log_queue_test.go b/pkg/kv/kvserver/raft_log_queue_test.go index 32615d7b88e2..e762476be966 100644 --- a/pkg/kv/kvserver/raft_log_queue_test.go +++ b/pkg/kv/kvserver/raft_log_queue_test.go @@ -20,9 +20,9 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/base" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/kvserver/raft_transport.go b/pkg/kv/kvserver/raft_transport.go index 379d86a82044..25c047536fd4 100644 --- a/pkg/kv/kvserver/raft_transport.go +++ b/pkg/kv/kvserver/raft_transport.go @@ -21,7 +21,7 @@ import ( "unsafe" "github.com/cockroachdb/cockroach/pkg/base" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/rpc" "github.com/cockroachdb/cockroach/pkg/rpc/nodedialer" diff --git a/pkg/kv/kvserver/rangefeed/processor.go b/pkg/kv/kvserver/rangefeed/processor.go index 875f296eef8b..beecdd274499 100644 --- a/pkg/kv/kvserver/rangefeed/processor.go +++ b/pkg/kv/kvserver/rangefeed/processor.go @@ -15,8 +15,8 @@ import ( "fmt" "time" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/log" diff --git a/pkg/kv/kvserver/rangefeed/processor_test.go b/pkg/kv/kvserver/rangefeed/processor_test.go index 242cb2c2814e..645b73fc1252 100644 --- a/pkg/kv/kvserver/rangefeed/processor_test.go +++ b/pkg/kv/kvserver/rangefeed/processor_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/kvserver/rangefeed/registry.go b/pkg/kv/kvserver/rangefeed/registry.go index 804a74e7f636..4a010ddb066d 100644 --- a/pkg/kv/kvserver/rangefeed/registry.go +++ b/pkg/kv/kvserver/rangefeed/registry.go @@ -17,8 +17,8 @@ import ( "sync" "time" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/bufalloc" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/kvserver/rangefeed/registry_test.go b/pkg/kv/kvserver/rangefeed/registry_test.go index 5b26f16b4601..a06a8b108c13 100644 --- a/pkg/kv/kvserver/rangefeed/registry_test.go +++ b/pkg/kv/kvserver/rangefeed/registry_test.go @@ -15,8 +15,8 @@ import ( "fmt" "testing" + "github.com/cockroachdb/cockroach/pkg/engine" _ "github.com/cockroachdb/cockroach/pkg/keys" // hook up pretty printer - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/leaktest" diff --git a/pkg/kv/kvserver/rangefeed/resolved_timestamp.go b/pkg/kv/kvserver/rangefeed/resolved_timestamp.go index 205754160977..bb728801ff6a 100644 --- a/pkg/kv/kvserver/rangefeed/resolved_timestamp.go +++ b/pkg/kv/kvserver/rangefeed/resolved_timestamp.go @@ -15,7 +15,7 @@ import ( "container/heap" "fmt" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/uuid" diff --git a/pkg/kv/kvserver/rangefeed/task.go b/pkg/kv/kvserver/rangefeed/task.go index af20ecc3bcf7..90d265d4fc35 100644 --- a/pkg/kv/kvserver/rangefeed/task.go +++ b/pkg/kv/kvserver/rangefeed/task.go @@ -13,8 +13,8 @@ package rangefeed import ( "context" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/log" diff --git a/pkg/kv/kvserver/rangefeed/task_test.go b/pkg/kv/kvserver/rangefeed/task_test.go index 0560db7add14..d6e71c99945d 100644 --- a/pkg/kv/kvserver/rangefeed/task_test.go +++ b/pkg/kv/kvserver/rangefeed/task_test.go @@ -15,8 +15,8 @@ import ( "sort" "testing" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/leaktest" diff --git a/pkg/kv/kvserver/rditer/replica_data_iter.go b/pkg/kv/kvserver/rditer/replica_data_iter.go index 14f390f43867..cf872ebcc211 100644 --- a/pkg/kv/kvserver/rditer/replica_data_iter.go +++ b/pkg/kv/kvserver/rditer/replica_data_iter.go @@ -11,8 +11,8 @@ package rditer import ( + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/bufalloc" ) diff --git a/pkg/kv/kvserver/rditer/replica_data_iter_test.go b/pkg/kv/kvserver/rditer/replica_data_iter_test.go index 2b88bfae2003..7a9f1524a842 100644 --- a/pkg/kv/kvserver/rditer/replica_data_iter_test.go +++ b/pkg/kv/kvserver/rditer/replica_data_iter_test.go @@ -16,8 +16,8 @@ import ( "fmt" "testing" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils" diff --git a/pkg/kv/kvserver/rditer/stats.go b/pkg/kv/kvserver/rditer/stats.go index 58734b537f2b..7a6e1604b51f 100644 --- a/pkg/kv/kvserver/rditer/stats.go +++ b/pkg/kv/kvserver/rditer/stats.go @@ -11,8 +11,8 @@ package rditer import ( - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" ) diff --git a/pkg/kv/kvserver/replica.go b/pkg/kv/kvserver/replica.go index 4a7905461f76..f3b92cbf7bb7 100644 --- a/pkg/kv/kvserver/replica.go +++ b/pkg/kv/kvserver/replica.go @@ -20,6 +20,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/config/zonepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/abortspan" @@ -27,8 +29,6 @@ import ( "github.com/cockroachdb/cockroach/pkg/kv/kvserver/closedts/ctpb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/cloud" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/rangefeed" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/split" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/stateloader" diff --git a/pkg/kv/kvserver/replica_application_result.go b/pkg/kv/kvserver/replica_application_result.go index 2bb4a2e4294f..55a21c37c3eb 100644 --- a/pkg/kv/kvserver/replica_application_result.go +++ b/pkg/kv/kvserver/replica_application_result.go @@ -13,8 +13,8 @@ package kvserver import ( "context" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/closedts/ctpb" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" "github.com/cockroachdb/cockroach/pkg/roachpb" diff --git a/pkg/kv/kvserver/replica_application_state_machine.go b/pkg/kv/kvserver/replica_application_state_machine.go index e64e07e0986f..395f7b52989a 100644 --- a/pkg/kv/kvserver/replica_application_state_machine.go +++ b/pkg/kv/kvserver/replica_application_state_machine.go @@ -16,9 +16,9 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/clusterversion" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/apply" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" "github.com/cockroachdb/cockroach/pkg/roachpb" diff --git a/pkg/kv/kvserver/replica_command.go b/pkg/kv/kvserver/replica_command.go index ae24b62e6a3d..9bf25d491786 100644 --- a/pkg/kv/kvserver/replica_command.go +++ b/pkg/kv/kvserver/replica_command.go @@ -21,9 +21,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/clusterversion" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" "github.com/cockroachdb/cockroach/pkg/roachpb" diff --git a/pkg/kv/kvserver/replica_consistency.go b/pkg/kv/kvserver/replica_consistency.go index 0d124b6b7476..dbe400066605 100644 --- a/pkg/kv/kvserver/replica_consistency.go +++ b/pkg/kv/kvserver/replica_consistency.go @@ -22,11 +22,11 @@ import ( "sync/atomic" "time" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/rditer" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/stateloader" "github.com/cockroachdb/cockroach/pkg/roachpb" diff --git a/pkg/kv/kvserver/replica_consistency_diff.go b/pkg/kv/kvserver/replica_consistency_diff.go index 0e90064685e2..d4a39cfae324 100644 --- a/pkg/kv/kvserver/replica_consistency_diff.go +++ b/pkg/kv/kvserver/replica_consistency_diff.go @@ -15,7 +15,7 @@ import ( "fmt" "io" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" ) diff --git a/pkg/kv/kvserver/replica_destroy.go b/pkg/kv/kvserver/replica_destroy.go index 2683645ba1ac..6e51db7c493f 100644 --- a/pkg/kv/kvserver/replica_destroy.go +++ b/pkg/kv/kvserver/replica_destroy.go @@ -15,9 +15,9 @@ import ( "fmt" "math" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/kvserver/replica_eval_context_span.go b/pkg/kv/kvserver/replica_eval_context_span.go index 95892e977695..337718ede7d1 100644 --- a/pkg/kv/kvserver/replica_eval_context_span.go +++ b/pkg/kv/kvserver/replica_eval_context_span.go @@ -13,14 +13,14 @@ package kvserver import ( "context" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/abortspan" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/cloud" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/roachpb" diff --git a/pkg/kv/kvserver/replica_evaluate.go b/pkg/kv/kvserver/replica_evaluate.go index 49b8ef5929f2..160cf5c4ad86 100644 --- a/pkg/kv/kvserver/replica_evaluate.go +++ b/pkg/kv/kvserver/replica_evaluate.go @@ -14,10 +14,10 @@ import ( "bytes" "context" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/log" diff --git a/pkg/kv/kvserver/replica_evaluate_test.go b/pkg/kv/kvserver/replica_evaluate_test.go index 4686ade965d0..8bd2c514ab4b 100644 --- a/pkg/kv/kvserver/replica_evaluate_test.go +++ b/pkg/kv/kvserver/replica_evaluate_test.go @@ -15,10 +15,10 @@ import ( "fmt" "testing" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/kvserver/replica_proposal.go b/pkg/kv/kvserver/replica_proposal.go index 91981fe919b3..e31e88fd7b36 100644 --- a/pkg/kv/kvserver/replica_proposal.go +++ b/pkg/kv/kvserver/replica_proposal.go @@ -22,11 +22,11 @@ import ( "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/clusterversion" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/stateloader" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" diff --git a/pkg/kv/kvserver/replica_raft.go b/pkg/kv/kvserver/replica_raft.go index 186ea51d8fab..05d0b9f46d01 100644 --- a/pkg/kv/kvserver/replica_raft.go +++ b/pkg/kv/kvserver/replica_raft.go @@ -17,10 +17,10 @@ import ( "sort" "time" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/apply" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/stateloader" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" diff --git a/pkg/kv/kvserver/replica_raft_truncation_test.go b/pkg/kv/kvserver/replica_raft_truncation_test.go index 8245b6580636..d2a723e6aaaa 100644 --- a/pkg/kv/kvserver/replica_raft_truncation_test.go +++ b/pkg/kv/kvserver/replica_raft_truncation_test.go @@ -16,8 +16,8 @@ import ( "fmt" "testing" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/stateloader" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/kvserver/replica_raftstorage.go b/pkg/kv/kvserver/replica_raftstorage.go index d81d323e74b8..d04381cbff57 100644 --- a/pkg/kv/kvserver/replica_raftstorage.go +++ b/pkg/kv/kvserver/replica_raftstorage.go @@ -17,9 +17,9 @@ import ( "sync/atomic" "time" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/raftentry" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/rditer" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/stateloader" diff --git a/pkg/kv/kvserver/replica_rangefeed.go b/pkg/kv/kvserver/replica_rangefeed.go index e86f9644b0b6..7e708b8b1a8a 100644 --- a/pkg/kv/kvserver/replica_rangefeed.go +++ b/pkg/kv/kvserver/replica_rangefeed.go @@ -16,11 +16,11 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/base" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/closedts" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/intentresolver" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/rangefeed" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" diff --git a/pkg/kv/kvserver/replica_sideload_disk.go b/pkg/kv/kvserver/replica_sideload_disk.go index 6c903d4a584e..b81fc5c355b2 100644 --- a/pkg/kv/kvserver/replica_sideload_disk.go +++ b/pkg/kv/kvserver/replica_sideload_disk.go @@ -18,7 +18,7 @@ import ( "strconv" "strings" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/pkg/errors" diff --git a/pkg/kv/kvserver/replica_sideload_inmem.go b/pkg/kv/kvserver/replica_sideload_inmem.go index 18c04119936a..ab5232665edf 100644 --- a/pkg/kv/kvserver/replica_sideload_inmem.go +++ b/pkg/kv/kvserver/replica_sideload_inmem.go @@ -15,7 +15,7 @@ import ( "fmt" "path/filepath" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings/cluster" ) diff --git a/pkg/kv/kvserver/replica_sideload_test.go b/pkg/kv/kvserver/replica_sideload_test.go index 881693d1767f..64e0db732a49 100644 --- a/pkg/kv/kvserver/replica_sideload_test.go +++ b/pkg/kv/kvserver/replica_sideload_test.go @@ -26,8 +26,8 @@ import ( "testing" "github.com/cockroachdb/cockroach/pkg/base" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/internal/client" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/raftentry" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/stateloader" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" diff --git a/pkg/kv/kvserver/replica_sst_snapshot_storage.go b/pkg/kv/kvserver/replica_sst_snapshot_storage.go index ded300913b02..2668ac5f8479 100644 --- a/pkg/kv/kvserver/replica_sst_snapshot_storage.go +++ b/pkg/kv/kvserver/replica_sst_snapshot_storage.go @@ -17,8 +17,8 @@ import ( "path/filepath" "strconv" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/fs" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/fs" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/uuid" "github.com/pkg/errors" diff --git a/pkg/kv/kvserver/replica_sst_snapshot_storage_test.go b/pkg/kv/kvserver/replica_sst_snapshot_storage_test.go index af54d2d99339..b71ac867f520 100644 --- a/pkg/kv/kvserver/replica_sst_snapshot_storage_test.go +++ b/pkg/kv/kvserver/replica_sst_snapshot_storage_test.go @@ -15,7 +15,7 @@ import ( "os" "testing" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/rditer" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/leaktest" diff --git a/pkg/kv/kvserver/replica_test.go b/pkg/kv/kvserver/replica_test.go index 9597e5dcc9a7..dea66774d4ca 100644 --- a/pkg/kv/kvserver/replica_test.go +++ b/pkg/kv/kvserver/replica_test.go @@ -31,6 +31,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/clusterversion" "github.com/cockroachdb/cockroach/pkg/config" "github.com/cockroachdb/cockroach/pkg/config/zonepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/gossip" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" @@ -38,8 +40,6 @@ import ( "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/intentresolver" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/rditer" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" diff --git a/pkg/kv/kvserver/replica_write.go b/pkg/kv/kvserver/replica_write.go index 46848cd41cc0..ca00377a73f5 100644 --- a/pkg/kv/kvserver/replica_write.go +++ b/pkg/kv/kvserver/replica_write.go @@ -16,12 +16,12 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/base" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval/result" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/closedts/ctpb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" diff --git a/pkg/kv/kvserver/scanner_test.go b/pkg/kv/kvserver/scanner_test.go index 1e721fb82823..058ff9dccf7b 100644 --- a/pkg/kv/kvserver/scanner_test.go +++ b/pkg/kv/kvserver/scanner_test.go @@ -16,7 +16,7 @@ import ( "testing" "time" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/kvserver/spanset/batch.go b/pkg/kv/kvserver/spanset/batch.go index de3764ace0a5..acf8aed952ed 100644 --- a/pkg/kv/kvserver/spanset/batch.go +++ b/pkg/kv/kvserver/spanset/batch.go @@ -11,8 +11,8 @@ package spanset import ( - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/protoutil" diff --git a/pkg/kv/kvserver/split_queue.go b/pkg/kv/kvserver/split_queue.go index 83a2688a6959..bb3702e47eee 100644 --- a/pkg/kv/kvserver/split_queue.go +++ b/pkg/kv/kvserver/split_queue.go @@ -16,9 +16,9 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/config" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/gossip" "github.com/cockroachdb/cockroach/pkg/internal/client" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/server/telemetry" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/kvserver/split_queue_test.go b/pkg/kv/kvserver/split_queue_test.go index bc103dfb41d0..8a65072e7c10 100644 --- a/pkg/kv/kvserver/split_queue_test.go +++ b/pkg/kv/kvserver/split_queue_test.go @@ -17,8 +17,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/config" "github.com/cockroachdb/cockroach/pkg/config/zonepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/stop" diff --git a/pkg/kv/kvserver/stateloader/initial.go b/pkg/kv/kvserver/stateloader/initial.go index 41dfe4510c61..268b603d17a1 100644 --- a/pkg/kv/kvserver/stateloader/initial.go +++ b/pkg/kv/kvserver/stateloader/initial.go @@ -13,8 +13,8 @@ package stateloader import ( "context" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/kvserver/stateloader/initial_test.go b/pkg/kv/kvserver/stateloader/initial_test.go index c72d6d458980..bf2a704bc423 100644 --- a/pkg/kv/kvserver/stateloader/initial_test.go +++ b/pkg/kv/kvserver/stateloader/initial_test.go @@ -15,7 +15,7 @@ import ( "reflect" "testing" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/util/leaktest" diff --git a/pkg/kv/kvserver/stateloader/stateloader.go b/pkg/kv/kvserver/stateloader/stateloader.go index 486bc3713144..ef2e8c2f36d5 100644 --- a/pkg/kv/kvserver/stateloader/stateloader.go +++ b/pkg/kv/kvserver/stateloader/stateloader.go @@ -14,9 +14,9 @@ import ( "context" "math" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/encoding" diff --git a/pkg/kv/kvserver/stats_test.go b/pkg/kv/kvserver/stats_test.go index 36c49d437526..1e8ffb978c4c 100644 --- a/pkg/kv/kvserver/stats_test.go +++ b/pkg/kv/kvserver/stats_test.go @@ -15,7 +15,7 @@ import ( "reflect" "testing" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/stateloader" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/stop" diff --git a/pkg/kv/kvserver/storagepb/proposer_kv.pb.go b/pkg/kv/kvserver/storagepb/proposer_kv.pb.go index d3b7bbdf525b..3fd069f699cf 100644 --- a/pkg/kv/kvserver/storagepb/proposer_kv.pb.go +++ b/pkg/kv/kvserver/storagepb/proposer_kv.pb.go @@ -9,7 +9,7 @@ import ( io "io" math "math" - enginepb "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + enginepb "github.com/cockroachdb/cockroach/pkg/engine/enginepb" github_com_cockroachdb_cockroach_pkg_roachpb "github.com/cockroachdb/cockroach/pkg/roachpb" roachpb "github.com/cockroachdb/cockroach/pkg/roachpb" hlc "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/kvserver/storagepb/state.pb.go b/pkg/kv/kvserver/storagepb/state.pb.go index f200a1edd778..8f7fef270f2c 100644 --- a/pkg/kv/kvserver/storagepb/state.pb.go +++ b/pkg/kv/kvserver/storagepb/state.pb.go @@ -8,7 +8,7 @@ import ( io "io" math "math" - enginepb "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + enginepb "github.com/cockroachdb/cockroach/pkg/engine/enginepb" github_com_cockroachdb_cockroach_pkg_roachpb "github.com/cockroachdb/cockroach/pkg/roachpb" roachpb "github.com/cockroachdb/cockroach/pkg/roachpb" hlc "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/kvserver/store.go b/pkg/kv/kvserver/store.go index 205e362ef343..726239f17036 100644 --- a/pkg/kv/kvserver/store.go +++ b/pkg/kv/kvserver/store.go @@ -29,6 +29,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/clusterversion" "github.com/cockroachdb/cockroach/pkg/config" "github.com/cockroachdb/cockroach/pkg/config/zonepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/gossip" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" @@ -38,8 +40,6 @@ import ( "github.com/cockroachdb/cockroach/pkg/kv/kvserver/closedts/ctpb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/cloud" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/compactor" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/idalloc" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/intentresolver" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/protectedts" diff --git a/pkg/kv/kvserver/store_bootstrap.go b/pkg/kv/kvserver/store_bootstrap.go index acde12523ca5..38767992e996 100644 --- a/pkg/kv/kvserver/store_bootstrap.go +++ b/pkg/kv/kvserver/store_bootstrap.go @@ -14,9 +14,9 @@ import ( "context" "github.com/cockroachdb/cockroach/pkg/clusterversion" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/rditer" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/stateloader" "github.com/cockroachdb/cockroach/pkg/roachpb" diff --git a/pkg/kv/kvserver/store_create_replica.go b/pkg/kv/kvserver/store_create_replica.go index 4476386dfc8b..ea0a7fce70db 100644 --- a/pkg/kv/kvserver/store_create_replica.go +++ b/pkg/kv/kvserver/store_create_replica.go @@ -15,8 +15,8 @@ import ( "time" "unsafe" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/log" diff --git a/pkg/kv/kvserver/store_pool_test.go b/pkg/kv/kvserver/store_pool_test.go index c8f7525ed1ca..6af0b957b1d3 100644 --- a/pkg/kv/kvserver/store_pool_test.go +++ b/pkg/kv/kvserver/store_pool_test.go @@ -21,9 +21,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/config/zonepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/gossip" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/rpc" diff --git a/pkg/kv/kvserver/store_rebalancer_test.go b/pkg/kv/kvserver/store_rebalancer_test.go index e5cf10659d8c..3f9b9f9fe99d 100644 --- a/pkg/kv/kvserver/store_rebalancer_test.go +++ b/pkg/kv/kvserver/store_rebalancer_test.go @@ -16,7 +16,7 @@ import ( "sort" "testing" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils/gossiputil" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/kvserver/store_snapshot.go b/pkg/kv/kvserver/store_snapshot.go index 0bae84ebf8b0..cc19ff29208f 100644 --- a/pkg/kv/kvserver/store_snapshot.go +++ b/pkg/kv/kvserver/store_snapshot.go @@ -17,7 +17,7 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/base" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/rditer" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings" diff --git a/pkg/kv/kvserver/store_split.go b/pkg/kv/kvserver/store_split.go index f0258e863c8e..03a6bfc74faf 100644 --- a/pkg/kv/kvserver/store_split.go +++ b/pkg/kv/kvserver/store_split.go @@ -14,8 +14,8 @@ import ( "bytes" "context" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/stateloader" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/log" diff --git a/pkg/kv/kvserver/store_test.go b/pkg/kv/kvserver/store_test.go index 93df111c3a9d..0057067fbc83 100644 --- a/pkg/kv/kvserver/store_test.go +++ b/pkg/kv/kvserver/store_test.go @@ -27,12 +27,12 @@ import ( "github.com/cockroachdb/cockroach/pkg/clusterversion" "github.com/cockroachdb/cockroach/pkg/config" "github.com/cockroachdb/cockroach/pkg/config/zonepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/gossip" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/rditer" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/stateloader" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" diff --git a/pkg/kv/kvserver/stores.go b/pkg/kv/kvserver/stores.go index 9c5c7a7218fe..d45153dc9feb 100644 --- a/pkg/kv/kvserver/stores.go +++ b/pkg/kv/kvserver/stores.go @@ -16,10 +16,10 @@ import ( "unsafe" "github.com/cockroachdb/cockroach/pkg/clusterversion" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/gossip" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/log" diff --git a/pkg/kv/kvserver/stores_server.go b/pkg/kv/kvserver/stores_server.go index 2cb7075a2bf4..e49249954608 100644 --- a/pkg/kv/kvserver/stores_server.go +++ b/pkg/kv/kvserver/stores_server.go @@ -15,7 +15,7 @@ import ( "context" "time" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/retry" diff --git a/pkg/kv/kvserver/stores_test.go b/pkg/kv/kvserver/stores_test.go index 2bc2d0cd230a..b1d9639f1f9c 100644 --- a/pkg/kv/kvserver/stores_test.go +++ b/pkg/kv/kvserver/stores_test.go @@ -18,8 +18,8 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/clusterversion" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/gossip" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/util" diff --git a/pkg/kv/kvserver/syncing_write.go b/pkg/kv/kvserver/syncing_write.go index 9233d9d32284..5040a9ff7fe1 100644 --- a/pkg/kv/kvserver/syncing_write.go +++ b/pkg/kv/kvserver/syncing_write.go @@ -17,7 +17,7 @@ import ( "strings" "time" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/settings" "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/util/log" diff --git a/pkg/kv/kvserver/track_raft_protos.go b/pkg/kv/kvserver/track_raft_protos.go index eacfcd6e7bae..d14c6947c199 100644 --- a/pkg/kv/kvserver/track_raft_protos.go +++ b/pkg/kv/kvserver/track_raft_protos.go @@ -16,10 +16,10 @@ import ( "runtime" "strings" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/gossip" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/apply" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/compactor" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/protoutil" diff --git a/pkg/kv/kvserver/ts_maintenance_queue.go b/pkg/kv/kvserver/ts_maintenance_queue.go index 271bb5ea7023..6a976fbd71f6 100644 --- a/pkg/kv/kvserver/ts_maintenance_queue.go +++ b/pkg/kv/kvserver/ts_maintenance_queue.go @@ -15,9 +15,9 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/config" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/gossip" "github.com/cockroachdb/cockroach/pkg/internal/client" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/log" diff --git a/pkg/kv/kvserver/ts_maintenance_queue_test.go b/pkg/kv/kvserver/ts_maintenance_queue_test.go index d3092aa033da..3d2b186d2b1c 100644 --- a/pkg/kv/kvserver/ts_maintenance_queue_test.go +++ b/pkg/kv/kvserver/ts_maintenance_queue_test.go @@ -20,9 +20,9 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/base" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/server" "github.com/cockroachdb/cockroach/pkg/settings/cluster" diff --git a/pkg/kv/kvserver/txn_wait_queue_test.go b/pkg/kv/kvserver/txn_wait_queue_test.go index ab04f8c2f7fe..bb340c42edcb 100644 --- a/pkg/kv/kvserver/txn_wait_queue_test.go +++ b/pkg/kv/kvserver/txn_wait_queue_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/txnwait" "github.com/cockroachdb/cockroach/pkg/roachpb" diff --git a/pkg/kv/kvserver/txnwait/queue.go b/pkg/kv/kvserver/txnwait/queue.go index b3c8d375b486..17a6268e033a 100644 --- a/pkg/kv/kvserver/txnwait/queue.go +++ b/pkg/kv/kvserver/txnwait/queue.go @@ -17,8 +17,8 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/base" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/internal/client" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/envutil" diff --git a/pkg/kv/kvserver/txnwait/queue_test.go b/pkg/kv/kvserver/txnwait/queue_test.go index f592cdf89daa..c3425ce3118c 100644 --- a/pkg/kv/kvserver/txnwait/queue_test.go +++ b/pkg/kv/kvserver/txnwait/queue_test.go @@ -17,8 +17,8 @@ import ( "testing" "time" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/internal/client" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/split_test.go b/pkg/kv/split_test.go index 9af6896d92f5..73b807554542 100644 --- a/pkg/kv/split_test.go +++ b/pkg/kv/split_test.go @@ -20,10 +20,10 @@ import ( "github.com/cockroachdb/cockroach/pkg/config" "github.com/cockroachdb/cockroach/pkg/config/zonepb" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/testutils/localtestcluster" diff --git a/pkg/kv/truncate_test.go b/pkg/kv/truncate_test.go index cafbbb994444..8040d3b99b05 100644 --- a/pkg/kv/truncate_test.go +++ b/pkg/kv/truncate_test.go @@ -15,8 +15,8 @@ import ( "reflect" "testing" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/util/leaktest" diff --git a/pkg/kv/txn_coord_sender.go b/pkg/kv/txn_coord_sender.go index d4effe752e69..cb89af4bcf1a 100644 --- a/pkg/kv/txn_coord_sender.go +++ b/pkg/kv/txn_coord_sender.go @@ -17,9 +17,9 @@ import ( "runtime/debug" "time" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/duration" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/txn_coord_sender_savepoints.go b/pkg/kv/txn_coord_sender_savepoints.go index 3dbdc0494daa..85ebdeb3dba0 100644 --- a/pkg/kv/txn_coord_sender_savepoints.go +++ b/pkg/kv/txn_coord_sender_savepoints.go @@ -13,8 +13,8 @@ package kv import ( "context" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/internal/client" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/errorutil/unimplemented" "github.com/cockroachdb/cockroach/pkg/util/uuid" diff --git a/pkg/kv/txn_coord_sender_test.go b/pkg/kv/txn_coord_sender_test.go index 479e448e9aed..7827e0a799c8 100644 --- a/pkg/kv/txn_coord_sender_test.go +++ b/pkg/kv/txn_coord_sender_test.go @@ -20,10 +20,10 @@ import ( "testing" "time" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/testutils" diff --git a/pkg/kv/txn_correctness_test.go b/pkg/kv/txn_correctness_test.go index 200ddd9900bd..9ae22cc16dee 100644 --- a/pkg/kv/txn_correctness_test.go +++ b/pkg/kv/txn_correctness_test.go @@ -23,9 +23,9 @@ import ( "sync" "testing" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/testutils/localtestcluster" diff --git a/pkg/kv/txn_interceptor_pipeliner.go b/pkg/kv/txn_interceptor_pipeliner.go index 3faee3621631..9fa08768df7a 100644 --- a/pkg/kv/txn_interceptor_pipeliner.go +++ b/pkg/kv/txn_interceptor_pipeliner.go @@ -15,8 +15,8 @@ import ( "fmt" "sort" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings" "github.com/cockroachdb/cockroach/pkg/settings/cluster" diff --git a/pkg/kv/txn_interceptor_pipeliner_test.go b/pkg/kv/txn_interceptor_pipeliner_test.go index ff89d552e37a..f6f455b20383 100644 --- a/pkg/kv/txn_interceptor_pipeliner_test.go +++ b/pkg/kv/txn_interceptor_pipeliner_test.go @@ -17,7 +17,7 @@ import ( "strings" "testing" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/util/hlc" diff --git a/pkg/kv/txn_interceptor_seq_num_allocator.go b/pkg/kv/txn_interceptor_seq_num_allocator.go index de320cdad0d0..3d529a3d9051 100644 --- a/pkg/kv/txn_interceptor_seq_num_allocator.go +++ b/pkg/kv/txn_interceptor_seq_num_allocator.go @@ -13,8 +13,8 @@ package kv import ( "context" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/internal/client" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/errors" ) diff --git a/pkg/kv/txn_interceptor_seq_num_allocator_test.go b/pkg/kv/txn_interceptor_seq_num_allocator_test.go index 97ad2ac4eeae..d56725fdc439 100644 --- a/pkg/kv/txn_interceptor_seq_num_allocator_test.go +++ b/pkg/kv/txn_interceptor_seq_num_allocator_test.go @@ -15,7 +15,7 @@ import ( "fmt" "testing" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/stretchr/testify/require" diff --git a/pkg/kv/txn_test.go b/pkg/kv/txn_test.go index 62caf2f23fd8..feade4b199d7 100644 --- a/pkg/kv/txn_test.go +++ b/pkg/kv/txn_test.go @@ -17,10 +17,10 @@ import ( "testing" "time" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/tscache" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils" diff --git a/pkg/roachpb/api.pb.go b/pkg/roachpb/api.pb.go index c6fa7db980be..9e658e5bcfbe 100644 --- a/pkg/roachpb/api.pb.go +++ b/pkg/roachpb/api.pb.go @@ -11,7 +11,7 @@ import ( io "io" math "math" - github_com_cockroachdb_cockroach_pkg_storage_engine_enginepb "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + github_com_cockroachdb_cockroach_pkg_storage_engine_enginepb "github.com/cockroachdb/cockroach/pkg/engine/enginepb" hlc "github.com/cockroachdb/cockroach/pkg/util/hlc" tracing "github.com/cockroachdb/cockroach/pkg/util/tracing" github_com_cockroachdb_cockroach_pkg_util_uuid "github.com/cockroachdb/cockroach/pkg/util/uuid" diff --git a/pkg/roachpb/batch.go b/pkg/roachpb/batch.go index 2883a95f6aeb..211e1855aa6a 100644 --- a/pkg/roachpb/batch.go +++ b/pkg/roachpb/batch.go @@ -16,7 +16,7 @@ import ( "fmt" "strings" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/errors" ) diff --git a/pkg/roachpb/batch_test.go b/pkg/roachpb/batch_test.go index e46ac2fb15f9..4a76b85d2a9a 100644 --- a/pkg/roachpb/batch_test.go +++ b/pkg/roachpb/batch_test.go @@ -14,7 +14,7 @@ import ( "reflect" "testing" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/kr/pretty" "github.com/stretchr/testify/require" diff --git a/pkg/roachpb/data.go b/pkg/roachpb/data.go index d149d1af47a8..020abd1e6c08 100644 --- a/pkg/roachpb/data.go +++ b/pkg/roachpb/data.go @@ -27,8 +27,8 @@ import ( "time" "github.com/cockroachdb/apd" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency/lock" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/util" "github.com/cockroachdb/cockroach/pkg/util/bitarray" "github.com/cockroachdb/cockroach/pkg/util/duration" diff --git a/pkg/roachpb/data.pb.go b/pkg/roachpb/data.pb.go index 3a915974efa3..9226c4444084 100644 --- a/pkg/roachpb/data.pb.go +++ b/pkg/roachpb/data.pb.go @@ -9,8 +9,8 @@ import ( io "io" math "math" + github_com_cockroachdb_cockroach_pkg_storage_engine_enginepb "github.com/cockroachdb/cockroach/pkg/engine/enginepb" lock "github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency/lock" - github_com_cockroachdb_cockroach_pkg_storage_engine_enginepb "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" hlc "github.com/cockroachdb/cockroach/pkg/util/hlc" github_com_cockroachdb_cockroach_pkg_util_uuid "github.com/cockroachdb/cockroach/pkg/util/uuid" proto "github.com/gogo/protobuf/proto" diff --git a/pkg/roachpb/data_test.go b/pkg/roachpb/data_test.go index 9d73f5b8d93a..66e74c3831c9 100644 --- a/pkg/roachpb/data_test.go +++ b/pkg/roachpb/data_test.go @@ -21,8 +21,8 @@ import ( "time" "github.com/cockroachdb/apd" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency/lock" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/testutils/zerofields" "github.com/cockroachdb/cockroach/pkg/util" "github.com/cockroachdb/cockroach/pkg/util/bitarray" diff --git a/pkg/roachpb/ignored_seqnums.go b/pkg/roachpb/ignored_seqnums.go index 201c31c96667..dd5386707166 100644 --- a/pkg/roachpb/ignored_seqnums.go +++ b/pkg/roachpb/ignored_seqnums.go @@ -10,7 +10,7 @@ package roachpb -import "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" +import "github.com/cockroachdb/cockroach/pkg/engine/enginepb" // AddIgnoredSeqNumRange adds the given range to the given list of // ignored seqnum ranges. diff --git a/pkg/roachpb/ignored_seqnums_test.go b/pkg/roachpb/ignored_seqnums_test.go index 814460120a34..c0b86e4e56ac 100644 --- a/pkg/roachpb/ignored_seqnums_test.go +++ b/pkg/roachpb/ignored_seqnums_test.go @@ -13,7 +13,7 @@ package roachpb import ( "testing" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/stretchr/testify/require" ) diff --git a/pkg/roachpb/string_test.go b/pkg/roachpb/string_test.go index c0e0ca39a53d..29dd0babbb99 100644 --- a/pkg/roachpb/string_test.go +++ b/pkg/roachpb/string_test.go @@ -14,9 +14,9 @@ import ( "fmt" "testing" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" // Hook up the pretty printer. _ "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/uuid" diff --git a/pkg/server/config.go b/pkg/server/config.go index 4be21cf6a5fb..f4860f986e3c 100644 --- a/pkg/server/config.go +++ b/pkg/server/config.go @@ -22,10 +22,10 @@ import ( "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/config/zonepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/gossip/resolver" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/server/status" "github.com/cockroachdb/cockroach/pkg/settings/cluster" diff --git a/pkg/server/config_unix.go b/pkg/server/config_unix.go index 2adf0cae9406..22a84c72b150 100644 --- a/pkg/server/config_unix.go +++ b/pkg/server/config_unix.go @@ -16,7 +16,7 @@ import ( "context" "fmt" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/pkg/errors" ) diff --git a/pkg/server/config_windows.go b/pkg/server/config_windows.go index 91bd667c081e..d6dec09e1128 100644 --- a/pkg/server/config_windows.go +++ b/pkg/server/config_windows.go @@ -10,7 +10,7 @@ package server -import "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" +import "github.com/cockroachdb/cockroach/pkg/engine" func setOpenFileLimitInner(physicalStoreCount int) (uint64, error) { return engine.RecommendedMaxOpenFiles, nil diff --git a/pkg/server/node.go b/pkg/server/node.go index dca6c6fe6111..91716a5c7846 100644 --- a/pkg/server/node.go +++ b/pkg/server/node.go @@ -22,12 +22,12 @@ import ( "github.com/cockroachdb/cockroach/pkg/clusterversion" "github.com/cockroachdb/cockroach/pkg/config" "github.com/cockroachdb/cockroach/pkg/config/zonepb" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/gossip" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/server/status" "github.com/cockroachdb/cockroach/pkg/settings" diff --git a/pkg/server/node_engine_health.go b/pkg/server/node_engine_health.go index 95e1680df1a9..a06843ad5efd 100644 --- a/pkg/server/node_engine_health.go +++ b/pkg/server/node_engine_health.go @@ -15,7 +15,7 @@ import ( "fmt" "time" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/util/envutil" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/timeutil" diff --git a/pkg/server/node_test.go b/pkg/server/node_test.go index 0230668240c0..45b0814cdb07 100644 --- a/pkg/server/node_test.go +++ b/pkg/server/node_test.go @@ -24,13 +24,13 @@ import ( "github.com/cockroachdb/cockroach/pkg/clusterversion" "github.com/cockroachdb/cockroach/pkg/config" "github.com/cockroachdb/cockroach/pkg/config/zonepb" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/gossip" "github.com/cockroachdb/cockroach/pkg/gossip/resolver" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/rpc" "github.com/cockroachdb/cockroach/pkg/rpc/nodedialer" diff --git a/pkg/server/server.go b/pkg/server/server.go index a0b7e273c74c..24a88397eed8 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -33,6 +33,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/blobs" "github.com/cockroachdb/cockroach/pkg/blobs/blobspb" "github.com/cockroachdb/cockroach/pkg/clusterversion" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/gossip" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/jobs" @@ -43,8 +45,6 @@ import ( "github.com/cockroachdb/cockroach/pkg/kv/kvserver/bulk" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/closedts/container" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/cloud" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/protectedts" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/protectedts/ptprovider" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/protectedts/ptreconcile" diff --git a/pkg/server/server_test.go b/pkg/server/server_test.go index 09ea22ced370..e933ba5e3e06 100644 --- a/pkg/server/server_test.go +++ b/pkg/server/server_test.go @@ -30,10 +30,10 @@ import ( "github.com/cockroachdb/cockroach/pkg/build" "github.com/cockroachdb/cockroach/pkg/config" "github.com/cockroachdb/cockroach/pkg/config/zonepb" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/server/serverpb" "github.com/cockroachdb/cockroach/pkg/server/status/statuspb" diff --git a/pkg/server/serverpb/admin.pb.go b/pkg/server/serverpb/admin.pb.go index d7f636774c32..1f2aec5ab37d 100644 --- a/pkg/server/serverpb/admin.pb.go +++ b/pkg/server/serverpb/admin.pb.go @@ -12,8 +12,8 @@ import ( time "time" zonepb "github.com/cockroachdb/cockroach/pkg/config/zonepb" + enginepb "github.com/cockroachdb/cockroach/pkg/engine/enginepb" jobspb "github.com/cockroachdb/cockroach/pkg/jobs/jobspb" - enginepb "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" storagepb "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" github_com_cockroachdb_cockroach_pkg_roachpb "github.com/cockroachdb/cockroach/pkg/roachpb" github_com_cockroachdb_cockroach_pkg_sql_sqlbase "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" diff --git a/pkg/server/serverpb/status.pb.go b/pkg/server/serverpb/status.pb.go index b5ae9b99fe65..2b6525cce5e0 100644 --- a/pkg/server/serverpb/status.pb.go +++ b/pkg/server/serverpb/status.pb.go @@ -12,9 +12,9 @@ import ( time "time" build "github.com/cockroachdb/cockroach/pkg/build" + enginepb "github.com/cockroachdb/cockroach/pkg/engine/enginepb" gossip "github.com/cockroachdb/cockroach/pkg/gossip" jobspb "github.com/cockroachdb/cockroach/pkg/jobs/jobspb" - enginepb "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" storagepb "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" github_com_cockroachdb_cockroach_pkg_roachpb "github.com/cockroachdb/cockroach/pkg/roachpb" roachpb "github.com/cockroachdb/cockroach/pkg/roachpb" diff --git a/pkg/server/status.go b/pkg/server/status.go index 74be6a5f916c..5830aefbacf8 100644 --- a/pkg/server/status.go +++ b/pkg/server/status.go @@ -34,11 +34,11 @@ import ( "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/build" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/gossip" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/rpc" diff --git a/pkg/server/status_test.go b/pkg/server/status_test.go index 0a91c2eb8cc0..08f9282f09b5 100644 --- a/pkg/server/status_test.go +++ b/pkg/server/status_test.go @@ -28,10 +28,10 @@ import ( "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/build" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/gossip" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/rpc" "github.com/cockroachdb/cockroach/pkg/security" diff --git a/pkg/server/sticky_engine.go b/pkg/server/sticky_engine.go index a39f7fc03e6e..66c2c31916e6 100644 --- a/pkg/server/sticky_engine.go +++ b/pkg/server/sticky_engine.go @@ -13,8 +13,8 @@ package server import ( "context" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/syncutil" diff --git a/pkg/server/sticky_engine_test.go b/pkg/server/sticky_engine_test.go index 19838d994921..3ce12523458f 100644 --- a/pkg/server/sticky_engine_test.go +++ b/pkg/server/sticky_engine_test.go @@ -14,8 +14,8 @@ import ( "context" "testing" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/stretchr/testify/require" diff --git a/pkg/server/testserver.go b/pkg/server/testserver.go index 40246013c582..5ca23adeebe4 100644 --- a/pkg/server/testserver.go +++ b/pkg/server/testserver.go @@ -25,12 +25,12 @@ import ( "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/config" "github.com/cockroachdb/cockroach/pkg/config/zonepb" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/gossip" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/tscache" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/rpc" diff --git a/pkg/sql/colcontainer/diskqueue.go b/pkg/sql/colcontainer/diskqueue.go index 7b484185c58d..d5f83fb5e894 100644 --- a/pkg/sql/colcontainer/diskqueue.go +++ b/pkg/sql/colcontainer/diskqueue.go @@ -19,7 +19,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/col/coldata" "github.com/cockroachdb/cockroach/pkg/col/colserde" "github.com/cockroachdb/cockroach/pkg/col/coltypes" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/fs" + "github.com/cockroachdb/cockroach/pkg/engine/fs" "github.com/cockroachdb/cockroach/pkg/util/uuid" "github.com/cockroachdb/errors" "github.com/golang/snappy" diff --git a/pkg/sql/colcontainer/partitionedqueue_test.go b/pkg/sql/colcontainer/partitionedqueue_test.go index 4ce27d3bc838..62a5efcf2dc7 100644 --- a/pkg/sql/colcontainer/partitionedqueue_test.go +++ b/pkg/sql/colcontainer/partitionedqueue_test.go @@ -17,7 +17,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/col/coldata" "github.com/cockroachdb/cockroach/pkg/col/coltypes" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/fs" + "github.com/cockroachdb/cockroach/pkg/engine/fs" "github.com/cockroachdb/cockroach/pkg/sql/colcontainer" "github.com/cockroachdb/cockroach/pkg/sql/colexec" "github.com/cockroachdb/cockroach/pkg/testutils/colcontainerutils" diff --git a/pkg/sql/colflow/vectorized_flow_test.go b/pkg/sql/colflow/vectorized_flow_test.go index 83ad66089f08..2968ad04d323 100644 --- a/pkg/sql/colflow/vectorized_flow_test.go +++ b/pkg/sql/colflow/vectorized_flow_test.go @@ -16,7 +16,7 @@ import ( "testing" "github.com/cockroachdb/cockroach/pkg/col/coltypes" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/sql/colcontainer" diff --git a/pkg/sql/distsql/columnar_utils_test.go b/pkg/sql/distsql/columnar_utils_test.go index 3a4cbae8fc72..044b7e5eb57a 100644 --- a/pkg/sql/distsql/columnar_utils_test.go +++ b/pkg/sql/distsql/columnar_utils_test.go @@ -17,7 +17,7 @@ import ( "strconv" "github.com/cockroachdb/cockroach/pkg/base" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/sql/colcontainer" "github.com/cockroachdb/cockroach/pkg/sql/colexec" diff --git a/pkg/sql/execinfra/server_config.go b/pkg/sql/execinfra/server_config.go index ed16acbb1b47..0f570ad78f35 100644 --- a/pkg/sql/execinfra/server_config.go +++ b/pkg/sql/execinfra/server_config.go @@ -14,12 +14,12 @@ package execinfra import ( "github.com/cockroachdb/cockroach/pkg/base" + "github.com/cockroachdb/cockroach/pkg/engine/fs" "github.com/cockroachdb/cockroach/pkg/gossip" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/jobs" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/cloud" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/diskmap" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/fs" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/rpc" diff --git a/pkg/sql/row/fetcher_mvcc_test.go b/pkg/sql/row/fetcher_mvcc_test.go index 6ed3f3525f9b..299e060a8b58 100644 --- a/pkg/sql/row/fetcher_mvcc_test.go +++ b/pkg/sql/row/fetcher_mvcc_test.go @@ -16,9 +16,9 @@ import ( "testing" "github.com/cockroachdb/cockroach/pkg/base" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/sql/row" "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" diff --git a/pkg/sql/row/kv_fetcher.go b/pkg/sql/row/kv_fetcher.go index f7c035e38be7..dfc1aae79708 100644 --- a/pkg/sql/row/kv_fetcher.go +++ b/pkg/sql/row/kv_fetcher.go @@ -13,8 +13,8 @@ package row import ( "context" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/internal/client" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" ) diff --git a/pkg/sql/rowcontainer/disk_row_container_test.go b/pkg/sql/rowcontainer/disk_row_container_test.go index 2b0d1a909087..d01928f3c338 100644 --- a/pkg/sql/rowcontainer/disk_row_container_test.go +++ b/pkg/sql/rowcontainer/disk_row_container_test.go @@ -18,7 +18,7 @@ import ( "testing" "github.com/cockroachdb/cockroach/pkg/base" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgcode" "github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgerror" diff --git a/pkg/sql/rowcontainer/hash_row_container_test.go b/pkg/sql/rowcontainer/hash_row_container_test.go index 1da188ca2cd7..a0d9a4c480df 100644 --- a/pkg/sql/rowcontainer/hash_row_container_test.go +++ b/pkg/sql/rowcontainer/hash_row_container_test.go @@ -17,7 +17,7 @@ import ( "testing" "github.com/cockroachdb/cockroach/pkg/base" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgcode" "github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgerror" diff --git a/pkg/sql/rowcontainer/row_container_test.go b/pkg/sql/rowcontainer/row_container_test.go index 49abae8e2408..b232174bdc56 100644 --- a/pkg/sql/rowcontainer/row_container_test.go +++ b/pkg/sql/rowcontainer/row_container_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/cockroachdb/cockroach/pkg/base" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgcode" "github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgerror" diff --git a/pkg/sql/rowexec/hashjoiner_test.go b/pkg/sql/rowexec/hashjoiner_test.go index 868b28b0c209..8b3103579b9c 100644 --- a/pkg/sql/rowexec/hashjoiner_test.go +++ b/pkg/sql/rowexec/hashjoiner_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/cockroachdb/cockroach/pkg/base" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/sql/execinfra" "github.com/cockroachdb/cockroach/pkg/sql/execinfrapb" diff --git a/pkg/sql/rowexec/joinreader_test.go b/pkg/sql/rowexec/joinreader_test.go index 271e70c22c5f..9d8ebafbc08e 100644 --- a/pkg/sql/rowexec/joinreader_test.go +++ b/pkg/sql/rowexec/joinreader_test.go @@ -21,8 +21,8 @@ import ( "testing" "github.com/cockroachdb/cockroach/pkg/base" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/internal/client" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/sql/execinfra" "github.com/cockroachdb/cockroach/pkg/sql/execinfrapb" diff --git a/pkg/sql/rowexec/sorter_test.go b/pkg/sql/rowexec/sorter_test.go index 862d0c080e61..a09ec28fe56e 100644 --- a/pkg/sql/rowexec/sorter_test.go +++ b/pkg/sql/rowexec/sorter_test.go @@ -18,7 +18,7 @@ import ( "testing" "github.com/cockroachdb/cockroach/pkg/base" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/sql/execinfra" "github.com/cockroachdb/cockroach/pkg/sql/execinfrapb" diff --git a/pkg/sql/rowexec/windower_test.go b/pkg/sql/rowexec/windower_test.go index 3d3efc4ee044..6aa27cd1c36b 100644 --- a/pkg/sql/rowexec/windower_test.go +++ b/pkg/sql/rowexec/windower_test.go @@ -18,7 +18,7 @@ import ( "testing" "github.com/cockroachdb/cockroach/pkg/base" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/sql/execinfra" "github.com/cockroachdb/cockroach/pkg/sql/execinfrapb" diff --git a/pkg/sql/rowflow/routers_test.go b/pkg/sql/rowflow/routers_test.go index d1fc767fb18b..78c78b033371 100644 --- a/pkg/sql/rowflow/routers_test.go +++ b/pkg/sql/rowflow/routers_test.go @@ -22,8 +22,8 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/base" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/sql/execinfra" "github.com/cockroachdb/cockroach/pkg/sql/execinfrapb" diff --git a/pkg/testutils/colcontainerutils/diskqueuecfg.go b/pkg/testutils/colcontainerutils/diskqueuecfg.go index 2270a96b6011..4f803ce641e3 100644 --- a/pkg/testutils/colcontainerutils/diskqueuecfg.go +++ b/pkg/testutils/colcontainerutils/diskqueuecfg.go @@ -14,8 +14,8 @@ import ( "testing" "github.com/cockroachdb/cockroach/pkg/base" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/fs" + "github.com/cockroachdb/cockroach/pkg/engine" + "github.com/cockroachdb/cockroach/pkg/engine/fs" "github.com/cockroachdb/cockroach/pkg/sql/colcontainer" "github.com/cockroachdb/cockroach/pkg/testutils" ) diff --git a/pkg/testutils/localtestcluster/local_test_cluster.go b/pkg/testutils/localtestcluster/local_test_cluster.go index 842ba33804e6..f357375d676a 100644 --- a/pkg/testutils/localtestcluster/local_test_cluster.go +++ b/pkg/testutils/localtestcluster/local_test_cluster.go @@ -20,10 +20,10 @@ import ( "github.com/cockroachdb/cockroach/pkg/clusterversion" "github.com/cockroachdb/cockroach/pkg/config" "github.com/cockroachdb/cockroach/pkg/config/zonepb" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/gossip" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/tscache" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/rpc" diff --git a/pkg/ts/db_test.go b/pkg/ts/db_test.go index 466a648a2e56..1987f94ca2a8 100644 --- a/pkg/ts/db_test.go +++ b/pkg/ts/db_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/testutils" diff --git a/pkg/ts/maintenance.go b/pkg/ts/maintenance.go index 86a129a6c0ef..10bb77293d7c 100644 --- a/pkg/ts/maintenance.go +++ b/pkg/ts/maintenance.go @@ -13,9 +13,9 @@ package ts import ( "context" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/mon" diff --git a/pkg/ts/pruning.go b/pkg/ts/pruning.go index 7f4ad5656869..9926d21304e0 100644 --- a/pkg/ts/pruning.go +++ b/pkg/ts/pruning.go @@ -13,9 +13,9 @@ package ts import ( "context" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/internal/client" "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" ) diff --git a/pkg/ts/timeseries_test.go b/pkg/ts/timeseries_test.go index e5cca31d7a6d..26ff5832db5d 100644 --- a/pkg/ts/timeseries_test.go +++ b/pkg/ts/timeseries_test.go @@ -15,7 +15,7 @@ import ( "testing" "time" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine" + "github.com/cockroachdb/cockroach/pkg/engine" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/ts/tspb" diff --git a/pkg/util/protoutil/clone_test.go b/pkg/util/protoutil/clone_test.go index 0478ce08e678..a1c88e223092 100644 --- a/pkg/util/protoutil/clone_test.go +++ b/pkg/util/protoutil/clone_test.go @@ -17,8 +17,8 @@ import ( "testing" "github.com/cockroachdb/cockroach/pkg/config/zonepb" + "github.com/cockroachdb/cockroach/pkg/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/gossip" - "github.com/cockroachdb/cockroach/pkg/kv/kvserver/engine/enginepb" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/sql/sqlbase"