From f5d747d43b34297aa1a8a6cd738781a3a2660ca0 Mon Sep 17 00:00:00 2001 From: Radu Berinde Date: Tue, 21 Jan 2025 12:59:26 -0800 Subject: [PATCH] pebble-release-2.0: change path to v2 A go module with version `v2.0` must have a path that ends in `/v2`; otherwise `go get` gives you a "module path must match major version" error. This commit enacts this change for the `pebble-release-2.0` branch. In the future we will consider making this change on master as well so we don't have inconsistency between the branches. Fixes #4271 --- Makefile | 2 +- README.md | 14 +- batch.go | 22 +-- batch_test.go | 16 +- batchrepr/reader.go | 2 +- batchrepr/writer.go | 2 +- batchrepr/writer_test.go | 4 +- bloom/bloom.go | 4 +- bloom/bloom_test.go | 2 +- cache.go | 2 +- checkpoint.go | 10 +- checkpoint_test.go | 6 +- cmd/pebble/db.go | 14 +- cmd/pebble/fsbench.go | 2 +- cmd/pebble/main.go | 12 +- cmd/pebble/mvcc.go | 6 +- cmd/pebble/queue.go | 6 +- cmd/pebble/random.go | 4 +- cmd/pebble/replay.go | 14 +- cmd/pebble/replay_test.go | 4 +- cmd/pebble/scan.go | 6 +- cmd/pebble/sync.go | 6 +- cmd/pebble/test.go | 2 +- cmd/pebble/tombstone.go | 2 +- cmd/pebble/write_bench.go | 6 +- cmd/pebble/ycsb.go | 8 +- commit.go | 6 +- commit_test.go | 10 +- compaction.go | 22 +-- compaction_picker.go | 8 +- compaction_picker_test.go | 10 +- compaction_test.go | 22 +-- comparer.go | 2 +- data_test.go | 26 ++-- db.go | 36 ++--- db_test.go | 18 +-- docs/RFCS/20211018_range_keys.md | 6 +- ...20220112_pebble_sstable_format_versions.md | 10 +- ...20311_pebble_flushable_ingested_sstable.md | 6 +- docs/RFCS/20221122_virtual_sstable.md | 4 +- .../20240701_tombstone_density_heuristic.md | 14 +- docs/index.html | 4 +- docs/io_profiling.md | 28 ++-- download.go | 6 +- download_test.go | 12 +- error_iter.go | 6 +- error_test.go | 6 +- event.go | 10 +- event_listener_test.go | 8 +- example_test.go | 4 +- external_iterator.go | 8 +- external_iterator_test.go | 8 +- external_test.go | 6 +- filenames.go | 2 +- filenames_test.go | 4 +- flush_test.go | 2 +- flushable.go | 10 +- flushable_test.go | 4 +- format_major_version.go | 8 +- format_major_version_test.go | 6 +- get_iter.go | 8 +- get_iter_test.go | 8 +- go.mod | 2 +- ingest.go | 24 +-- ingest_test.go | 28 ++-- internal.go | 2 +- internal/arenaskl/arena.go | 4 +- internal/arenaskl/arena_test.go | 2 +- internal/arenaskl/flush_iterator.go | 2 +- internal/arenaskl/iterator.go | 4 +- internal/arenaskl/node.go | 2 +- internal/arenaskl/skl.go | 4 +- internal/arenaskl/skl_test.go | 2 +- internal/base/cleaner.go | 2 +- internal/base/error.go | 2 +- internal/base/filenames.go | 2 +- internal/base/filenames_test.go | 2 +- internal/base/internal.go | 4 +- internal/base/iterator.go | 6 +- internal/base/key_bounds.go | 2 +- internal/base/lazy_value.go | 2 +- internal/base/logger.go | 2 +- internal/base/test_utils.go | 2 +- internal/batchskl/iterator.go | 2 +- internal/batchskl/skl.go | 6 +- internal/batchskl/skl_test.go | 2 +- internal/binfmt/binfmt.go | 2 +- internal/bytealloc/bytealloc.go | 2 +- internal/cache/block_map.go | 4 +- internal/cache/block_map_test.go | 2 +- internal/cache/clockpro.go | 6 +- internal/cache/clockpro_test.go | 2 +- internal/cache/entry_invariants.go | 2 +- internal/cache/entry_normal.go | 4 +- internal/cache/value_cgo.go | 2 +- internal/cache/value_invariants.go | 4 +- internal/compact/iterator.go | 10 +- internal/compact/iterator_test.go | 6 +- internal/compact/run.go | 10 +- internal/compact/run_test.go | 6 +- internal/compact/snapshots.go | 2 +- internal/compact/snapshots_test.go | 2 +- internal/compact/spans.go | 10 +- internal/compact/spans_test.go | 12 +- internal/compact/splitting.go | 6 +- internal/compact/splitting_test.go | 6 +- internal/compact/tombstone_elision.go | 6 +- internal/compact/tombstone_elision_test.go | 6 +- internal/crc/crc.go | 2 +- internal/crdbtest/crdb.go | 6 +- internal/crdbtest/crdb_bench_test.go | 14 +- internal/crdbtest/crdb_test.go | 8 +- internal/crdbtest/key_schema_test.go | 10 +- internal/crdbtest/rowblk_bench_test.go | 6 +- internal/datatest/datatest.go | 2 +- internal/devtools/go.mod | 2 +- internal/intern/intern_test.go | 2 +- internal/invalidating/iter.go | 6 +- internal/itertest/datadriven.go | 6 +- internal/itertest/dsl.go | 6 +- internal/itertest/probe.go | 6 +- internal/itertest/probe_test.go | 4 +- internal/keyspan/assert_iter.go | 6 +- internal/keyspan/assert_iter_test.go | 4 +- internal/keyspan/bounded.go | 4 +- internal/keyspan/bounded_test.go | 2 +- internal/keyspan/defragment.go | 8 +- internal/keyspan/defragment_test.go | 4 +- internal/keyspan/filter.go | 4 +- internal/keyspan/filter_test.go | 4 +- internal/keyspan/fragmenter.go | 4 +- internal/keyspan/fragmenter_test.go | 2 +- internal/keyspan/get.go | 2 +- internal/keyspan/get_test.go | 2 +- internal/keyspan/interleaving_iter.go | 6 +- internal/keyspan/interleaving_iter_test.go | 6 +- internal/keyspan/iter.go | 4 +- internal/keyspan/iter_test.go | 2 +- internal/keyspan/keyspanimpl/level_iter.go | 10 +- .../keyspan/keyspanimpl/level_iter_test.go | 6 +- internal/keyspan/keyspanimpl/merging_iter.go | 10 +- .../keyspan/keyspanimpl/merging_iter_test.go | 6 +- internal/keyspan/logging_iter.go | 4 +- internal/keyspan/logging_iter_test.go | 2 +- internal/keyspan/seek.go | 2 +- internal/keyspan/seek_test.go | 2 +- internal/keyspan/span.go | 4 +- internal/keyspan/span_test.go | 2 +- internal/keyspan/test_utils.go | 4 +- internal/keyspan/transformer.go | 2 +- internal/keyspan/truncate.go | 6 +- internal/keyspan/truncate_test.go | 2 +- internal/lint/lint_test.go | 4 +- internal/manifest/annotator.go | 2 +- internal/manifest/annotator_test.go | 2 +- internal/manifest/btree.go | 4 +- internal/manifest/btree_test.go | 4 +- internal/manifest/l0_sublevels.go | 4 +- internal/manifest/l0_sublevels_test.go | 6 +- internal/manifest/level_metadata.go | 4 +- internal/manifest/level_metadata_test.go | 2 +- internal/manifest/manifest_test.go | 12 +- internal/manifest/testutils.go | 2 +- internal/manifest/version.go | 8 +- internal/manifest/version_edit.go | 6 +- internal/manifest/version_edit_test.go | 6 +- internal/manifest/version_test.go | 4 +- internal/manifest/virtual_backings.go | 2 +- internal/manifest/virtual_backings_test.go | 2 +- internal/manual/manual.go | 2 +- .../crossversion/crossversion_test.go | 4 +- internal/metamorphic/meta_test.go | 4 +- internal/metamorphic/metaflags/meta_flags.go | 6 +- internal/metamorphic/metarunner/main.go | 4 +- internal/metamorphic/reduce_test.go | 2 +- internal/overlap/checker.go | 6 +- internal/overlap/checker_test.go | 6 +- internal/pacertoy/pebble/main.go | 2 +- internal/pacertoy/rocksdb/main.go | 2 +- internal/private/batch.go | 4 +- internal/rangedel/rangedel.go | 6 +- internal/rangekey/coalesce.go | 6 +- internal/rangekey/coalesce_test.go | 4 +- internal/rangekey/rangekey.go | 6 +- internal/rangekey/rangekey_test.go | 2 +- internal/rangekeystack/user_iterator.go | 12 +- internal/rangekeystack/user_iterator_test.go | 10 +- internal/rate/rate.go | 2 +- internal/sstableinternal/options.go | 4 +- internal/testkeys/testkeys.go | 2 +- internal/testkeys/testkeys_test.go | 2 +- .../testutils/indenttree/indent_tree_test.go | 2 +- internal/treesteps/data.go | 2 +- internal/treesteps/tree_steps.go | 2 +- iterator.go | 24 +-- iterator_example_test.go | 4 +- iterator_histories_test.go | 10 +- iterator_test.go | 18 +-- keyspan_probe_test.go | 6 +- level_checker.go | 6 +- level_checker_test.go | 22 +-- level_iter.go | 12 +- level_iter_test.go | 24 +-- logger.go | 2 +- lsm_view.go | 8 +- mem_table.go | 12 +- mem_table_test.go | 8 +- merger.go | 2 +- merging_iter.go | 8 +- merging_iter_test.go | 24 +-- metamorphic/build.go | 18 +-- metamorphic/config.go | 2 +- metamorphic/example_test.go | 2 +- metamorphic/generator.go | 6 +- metamorphic/generator_test.go | 2 +- metamorphic/key_generator.go | 4 +- metamorphic/key_generator_test.go | 4 +- metamorphic/key_manager.go | 6 +- metamorphic/key_manager_test.go | 2 +- metamorphic/meta.go | 10 +- metamorphic/ops.go | 22 +-- metamorphic/options.go | 20 +-- metamorphic/options_test.go | 8 +- metamorphic/parser.go | 2 +- metamorphic/parser_test.go | 2 +- metamorphic/retryable.go | 4 +- metamorphic/simplify.go | 2 +- metamorphic/test.go | 10 +- metrics.go | 16 +- metrics_test.go | 16 +- objstorage/objstorage.go | 8 +- .../objiotracing/obj_io_tracing.go | 2 +- .../objiotracing/obj_io_tracing_off.go | 6 +- .../objiotracing/obj_io_tracing_on.go | 6 +- .../objiotracing/obj_io_tracing_test.go | 8 +- objstorage/objstorageprovider/provider.go | 16 +- .../objstorageprovider/provider_test.go | 8 +- objstorage/objstorageprovider/readahead.go | 2 +- objstorage/objstorageprovider/remote.go | 12 +- .../objstorageprovider/remote_backing.go | 6 +- .../objstorageprovider/remote_backing_test.go | 8 +- .../objstorageprovider/remote_obj_name.go | 4 +- .../remote_obj_name_test.go | 4 +- .../objstorageprovider/remote_readable.go | 8 +- .../remote_readable_test.go | 2 +- .../remoteobjcat/catalog.go | 12 +- .../remoteobjcat/catalog_test.go | 10 +- .../remoteobjcat/version_edit.go | 8 +- .../remoteobjcat/version_edit_test.go | 4 +- .../objstorageprovider/shared_writable.go | 2 +- .../sharedcache/shared_cache.go | 10 +- .../sharedcache/shared_cache_test.go | 12 +- objstorage/objstorageprovider/vfs.go | 6 +- objstorage/objstorageprovider/vfs_readable.go | 6 +- objstorage/objstorageprovider/vfs_writable.go | 4 +- objstorage/remote/localfs.go | 4 +- obsolete_files.go | 8 +- obsolete_files_test.go | 4 +- open.go | 30 ++-- open_test.go | 24 +-- options.go | 28 ++-- options_test.go | 8 +- overlap.go | 8 +- range_del_test.go | 12 +- range_keys.go | 12 +- rangekey/rangekey.go | 6 +- read_compaction_queue.go | 2 +- read_state_test.go | 2 +- record/log_writer.go | 4 +- record/log_writer_test.go | 8 +- record/record.go | 4 +- record/record_test.go | 2 +- replay/replay.go | 18 +-- replay/replay_test.go | 18 +-- replay/workload_capture.go | 6 +- replay/workload_capture_test.go | 8 +- scan_internal.go | 18 +-- scan_internal_test.go | 20 +-- scripts/code-coverage.sh | 6 +- scripts/pr-codecov-run-tests.sh | 2 +- scripts/stress.sh | 2 +- snapshot.go | 8 +- snapshot_test.go | 4 +- sstable/block/block.go | 4 +- sstable/block/buffer_pool.go | 4 +- sstable/block/compression.go | 6 +- sstable/block/compression_test.go | 2 +- sstable/block/flush_governor.go | 2 +- sstable/block/flush_governor_test.go | 4 +- sstable/block/kv.go | 2 +- sstable/block/kv_test.go | 2 +- sstable/block/transforms.go | 2 +- sstable/block_property.go | 6 +- sstable/block_property_obsolete.go | 2 +- sstable/block_property_test.go | 8 +- sstable/block_property_test_utils.go | 2 +- sstable/colblk/bitmap.go | 6 +- sstable/colblk/bitmap_test.go | 4 +- sstable/colblk/block.go | 4 +- sstable/colblk/data_block.go | 12 +- sstable/colblk/data_block_test.go | 12 +- sstable/colblk/index_block.go | 10 +- sstable/colblk/index_block_test.go | 8 +- sstable/colblk/keyspan.go | 12 +- sstable/colblk/keyspan_test.go | 10 +- sstable/colblk/prefix_bytes.go | 8 +- sstable/colblk/prefix_bytes_test.go | 8 +- sstable/colblk/raw_bytes.go | 4 +- sstable/colblk/raw_bytes_test.go | 4 +- sstable/colblk/uints.go | 6 +- sstable/colblk/uints_test.go | 4 +- sstable/colblk_writer.go | 16 +- sstable/colblk_writer_test.go | 8 +- sstable/comparer.go | 2 +- sstable/copier.go | 10 +- sstable/copier_test.go | 14 +- sstable/data_test.go | 20 +-- sstable/format.go | 8 +- sstable/format_test.go | 2 +- sstable/internal.go | 4 +- sstable/layout.go | 18 +-- sstable/options.go | 10 +- sstable/properties.go | 4 +- sstable/properties_test.go | 4 +- sstable/random_test.go | 16 +- sstable/reader.go | 28 ++-- sstable/reader_common.go | 6 +- sstable/reader_iter.go | 10 +- sstable/reader_iter_single_lvl.go | 12 +- sstable/reader_iter_test.go | 10 +- sstable/reader_iter_two_lvl.go | 16 +- sstable/reader_test.go | 22 +-- sstable/reader_virtual.go | 8 +- sstable/rowblk/rowblk_bench_test.go | 6 +- sstable/rowblk/rowblk_fragment_iter.go | 14 +- sstable/rowblk/rowblk_fragment_iter_test.go | 16 +- sstable/rowblk/rowblk_index_iter.go | 4 +- sstable/rowblk/rowblk_iter.go | 10 +- sstable/rowblk/rowblk_iter_test.go | 8 +- sstable/rowblk/rowblk_rewrite.go | 6 +- sstable/rowblk/rowblk_writer.go | 4 +- sstable/rowblk/rowblk_writer_test.go | 4 +- sstable/rowblk_writer.go | 18 +-- sstable/suffix_rewriter.go | 10 +- sstable/suffix_rewriter_test.go | 10 +- sstable/table.go | 8 +- sstable/table_test.go | 12 +- sstable/test_fixtures.go | 10 +- sstable/test_utils.go | 8 +- sstable/testdata/make-table.go | 4 +- sstable/testdata/reader_bpf/Pebblev2/iter | 2 +- sstable/testdata/reader_bpf/Pebblev3/iter | 10 +- sstable/unsafe.go | 2 +- sstable/value_block.go | 20 +-- sstable/value_block_test.go | 2 +- sstable/write_queue.go | 4 +- sstable/writer.go | 8 +- sstable/writer_fixture_test.go | 4 +- sstable/writer_rangekey_test.go | 8 +- sstable/writer_test.go | 22 +-- table_cache.go | 20 +-- table_cache_test.go | 14 +- table_stats.go | 14 +- table_stats_test.go | 12 +- testdata/excise | 2 +- testdata/ingest | 2 +- testdata/ingest_shared | 2 +- testdata/iter_histories/next_prefix | 4 +- testdata/make-db.go | 2 +- tool/data_test.go | 8 +- tool/db.go | 22 +-- tool/db_io_bench.go | 6 +- tool/find.go | 18 +-- tool/logs/compaction.go | 26 ++-- tool/logs/compaction_test.go | 34 ++--- tool/logs/testdata/compactions-23-1 | 142 +++++++++--------- tool/logs/testdata/compactions-latest | 142 +++++++++--------- tool/lsm.go | 10 +- tool/make_incorrect_manifests.go | 6 +- tool/make_test_find_db.go | 10 +- tool/make_test_remotecat.go | 8 +- tool/make_test_sstables.go | 8 +- tool/manifest.go | 12 +- tool/remotecat.go | 10 +- tool/sstable.go | 16 +- tool/testdata/make-broken-external.go | 10 +- tool/testdata/mixed/main.go | 6 +- tool/tool.go | 14 +- tool/util.go | 8 +- tool/wal.go | 14 +- version_set.go | 14 +- version_set_test.go | 16 +- vfs/atomicfs/marker.go | 2 +- vfs/atomicfs/marker_test.go | 4 +- vfs/errorfs/dsl.go | 2 +- vfs/errorfs/errorfs.go | 4 +- vfs/errorfs/latency.go | 2 +- vfs/file_lock_test.go | 2 +- vfs/mem_fs.go | 4 +- vfs/vfstest/open_files.go | 2 +- vfs/vfstest/open_files_test.go | 2 +- vfs/vfstest/vfstest.go | 2 +- wal/failover_manager.go | 6 +- wal/failover_manager_test.go | 4 +- wal/failover_writer.go | 8 +- wal/failover_writer_test.go | 10 +- wal/log_recycler.go | 2 +- wal/log_recycler_test.go | 2 +- wal/reader.go | 8 +- wal/reader_test.go | 10 +- wal/standalone_manager.go | 6 +- wal/wal.go | 6 +- 412 files changed, 1651 insertions(+), 1651 deletions(-) diff --git a/Makefile b/Makefile index d30825eae2..6ca59622c0 100644 --- a/Makefile +++ b/Makefile @@ -79,7 +79,7 @@ gen-bazel: @echo "Generating WORKSPACE" @echo 'workspace(name = "com_github_cockroachdb_pebble")' > WORKSPACE @echo 'Running gazelle...' - ${GO} run github.com/bazelbuild/bazel-gazelle/cmd/gazelle@v0.37.0 update --go_prefix=github.com/cockroachdb/pebble --repo_root=. + ${GO} run github.com/bazelbuild/bazel-gazelle/cmd/gazelle@v0.37.0 update --go_prefix=github.com/cockroachdb/pebble/v2 --repo_root=. @echo 'You should now be able to build Cockroach using:' @echo ' ./dev build short -- --override_repository=com_github_cockroachdb_pebble=${CURDIR}' diff --git a/README.md b/README.md index c591a6afe8..d22b4feb5f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Pebble [![Build Status](https://github.com/cockroachdb/pebble/actions/workflows/ci.yaml/badge.svg?branch=master)](https://github.com/cockroachdb/pebble/actions/workflows/ci.yaml) [![GoDoc](https://godoc.org/github.com/cockroachdb/pebble?status.svg)](https://godoc.org/github.com/cockroachdb/pebble) [Coverage](https://storage.googleapis.com/crl-codecover-public/pebble/index.html) +# Pebble [![Build Status](https://github.com/cockroachdb/pebble/v2/actions/workflows/ci.yaml/badge.svg?branch=master)](https://github.com/cockroachdb/pebble/v2/actions/workflows/ci.yaml) [![GoDoc](https://godoc.org/github.com/cockroachdb/pebble/v2?status.svg)](https://godoc.org/github.com/cockroachdb/pebble/v2) [Coverage](https://storage.googleapis.com/crl-codecover-public/pebble/index.html) #### [Nightly benchmarks](https://cockroachdb.github.io/pebble/) @@ -118,7 +118,7 @@ incompatibilities. * SSTable format version 3 and 4. Pebble does not support version 3 and version 4 format sstables. The sstable format version is controlled by the `BlockBasedTableOptions::format_version` option. - See [#97](https://github.com/cockroachdb/pebble/issues/97). + See [#97](https://github.com/cockroachdb/pebble/v2/issues/97). ## Format major versions @@ -134,11 +134,11 @@ to a compatible format major version before running newer Pebble versions. Newer Pebble versions will refuse to open databases in no longer supported formats. To opt into new formats, a user may set `FormatMajorVersion` on the -[`Options`](https://pkg.go.dev/github.com/cockroachdb/pebble#Options) +[`Options`](https://pkg.go.dev/github.com/cockroachdb/pebble/v2#Options) supplied to -[`Open`](https://pkg.go.dev/github.com/cockroachdb/pebble#Open), or +[`Open`](https://pkg.go.dev/github.com/cockroachdb/pebble/v2#Open), or upgrade the format major version at runtime using -[`DB.RatchetFormatMajorVersion`](https://pkg.go.dev/github.com/cockroachdb/pebble#DB.RatchetFormatMajorVersion). +[`DB.RatchetFormatMajorVersion`](https://pkg.go.dev/github.com/cockroachdb/pebble/v2#DB.RatchetFormatMajorVersion). Format major version upgrades are permanent; There is no option to return to an earlier format. @@ -180,7 +180,7 @@ property collectors, the `pebble` tool can also be used, at the latest version that supports the format. For example: ``` # WARNING: only use if no custom comparer/merger/property collector are necessary. -go run github.com/cockroachdb/pebble/cmd/pebble@v1.1.3 db upgrade +go run github.com/cockroachdb/pebble/v2/cmd/pebble@v1.1.3 db upgrade ``` For reference, the table below lists the range of supported Pebble format major @@ -224,7 +224,7 @@ import ( "fmt" "log" - "github.com/cockroachdb/pebble" + "github.com/cockroachdb/pebble/v2" ) func main() { diff --git a/batch.go b/batch.go index 1c95d4ef97..ccf5a3bad1 100644 --- a/batch.go +++ b/batch.go @@ -18,17 +18,17 @@ import ( "unsafe" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/batchrepr" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/batchskl" - "github.com/cockroachdb/pebble/internal/humanize" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/private" - "github.com/cockroachdb/pebble/internal/rangedel" - "github.com/cockroachdb/pebble/internal/rangekey" - "github.com/cockroachdb/pebble/internal/rawalloc" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/batchrepr" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/batchskl" + "github.com/cockroachdb/pebble/v2/internal/humanize" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/private" + "github.com/cockroachdb/pebble/v2/internal/rangedel" + "github.com/cockroachdb/pebble/v2/internal/rangekey" + "github.com/cockroachdb/pebble/v2/internal/rawalloc" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" ) const ( diff --git a/batch_test.go b/batch_test.go index dd208c241b..1b9f695085 100644 --- a/batch_test.go +++ b/batch_test.go @@ -19,14 +19,14 @@ import ( "github.com/cockroachdb/datadriven" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/batchrepr" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/batchskl" - "github.com/cockroachdb/pebble/internal/datadrivenutil" - "github.com/cockroachdb/pebble/internal/itertest" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/batchrepr" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/batchskl" + "github.com/cockroachdb/pebble/v2/internal/datadrivenutil" + "github.com/cockroachdb/pebble/v2/internal/itertest" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" ) diff --git a/batchrepr/reader.go b/batchrepr/reader.go index cceb2be397..cdbbe27645 100644 --- a/batchrepr/reader.go +++ b/batchrepr/reader.go @@ -12,7 +12,7 @@ import ( "fmt" "unsafe" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" "github.com/pkg/errors" ) diff --git a/batchrepr/writer.go b/batchrepr/writer.go index cd68ef1c39..9e7b6c0f2a 100644 --- a/batchrepr/writer.go +++ b/batchrepr/writer.go @@ -7,7 +7,7 @@ package batchrepr import ( "encoding/binary" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" ) // SetSeqNum mutates the provided batch representation, storing the provided diff --git a/batchrepr/writer_test.go b/batchrepr/writer_test.go index 4efea07a8c..ad77894652 100644 --- a/batchrepr/writer_test.go +++ b/batchrepr/writer_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/binfmt" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/binfmt" ) func TestWriter(t *testing.T) { diff --git a/bloom/bloom.go b/bloom/bloom.go index 2aa51d7b3d..c08daac9ee 100644 --- a/bloom/bloom.go +++ b/bloom/bloom.go @@ -3,14 +3,14 @@ // the LICENSE file. // Package bloom implements Bloom filters. -package bloom // import "github.com/cockroachdb/pebble/bloom" +package bloom // import "github.com/cockroachdb/pebble/v2/bloom" import ( "encoding/binary" "fmt" "sync" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" ) const ( diff --git a/bloom/bloom_test.go b/bloom/bloom_test.go index 74a6f6259d..9f014a4e26 100644 --- a/bloom/bloom_test.go +++ b/bloom/bloom_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" "github.com/stretchr/testify/require" ) diff --git a/cache.go b/cache.go index 91f5532164..f96e377175 100644 --- a/cache.go +++ b/cache.go @@ -4,7 +4,7 @@ package pebble -import "github.com/cockroachdb/pebble/internal/cache" +import "github.com/cockroachdb/pebble/v2/internal/cache" // Cache exports the cache.Cache type. type Cache = cache.Cache diff --git a/checkpoint.go b/checkpoint.go index fb42114914..2093df40b2 100644 --- a/checkpoint.go +++ b/checkpoint.go @@ -11,11 +11,11 @@ import ( "github.com/cockroachdb/errors" "github.com/cockroachdb/errors/oserror" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/record" - "github.com/cockroachdb/pebble/vfs" - "github.com/cockroachdb/pebble/vfs/atomicfs" - "github.com/cockroachdb/pebble/wal" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/record" + "github.com/cockroachdb/pebble/v2/vfs" + "github.com/cockroachdb/pebble/v2/vfs/atomicfs" + "github.com/cockroachdb/pebble/v2/wal" ) // checkpointOptions hold the optional parameters to construct checkpoint diff --git a/checkpoint_test.go b/checkpoint_test.go index 112d37b738..9b256bb672 100644 --- a/checkpoint_test.go +++ b/checkpoint_test.go @@ -17,9 +17,9 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/objstorage/remote" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/objstorage/remote" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" ) diff --git a/cmd/pebble/db.go b/cmd/pebble/db.go index 0bf7ec11f8..d6ebb82932 100644 --- a/cmd/pebble/db.go +++ b/cmd/pebble/db.go @@ -7,13 +7,13 @@ package main import ( "log" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/bloom" - "github.com/cockroachdb/pebble/internal/bytealloc" - "github.com/cockroachdb/pebble/internal/crdbtest" - "github.com/cockroachdb/pebble/objstorage/remote" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/bloom" + "github.com/cockroachdb/pebble/v2/internal/bytealloc" + "github.com/cockroachdb/pebble/v2/internal/crdbtest" + "github.com/cockroachdb/pebble/v2/objstorage/remote" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/vfs" ) // DB specifies the minimal interfaces that need to be implemented to support diff --git a/cmd/pebble/fsbench.go b/cmd/pebble/fsbench.go index 39c4605526..98f67164d7 100644 --- a/cmd/pebble/fsbench.go +++ b/cmd/pebble/fsbench.go @@ -11,7 +11,7 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/spf13/cobra" ) diff --git a/cmd/pebble/main.go b/cmd/pebble/main.go index 41ef34d3a5..6ca5ac1a41 100644 --- a/cmd/pebble/main.go +++ b/cmd/pebble/main.go @@ -10,12 +10,12 @@ import ( "os" "time" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/crdbtest" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/sstable/colblk" - "github.com/cockroachdb/pebble/tool" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/crdbtest" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/sstable/colblk" + "github.com/cockroachdb/pebble/v2/tool" "github.com/spf13/cobra" ) diff --git a/cmd/pebble/mvcc.go b/cmd/pebble/mvcc.go index ef4cdd509c..1715be03a0 100644 --- a/cmd/pebble/mvcc.go +++ b/cmd/pebble/mvcc.go @@ -7,9 +7,9 @@ package main import ( "bytes" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/internal/bytealloc" - "github.com/cockroachdb/pebble/internal/crdbtest" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/internal/bytealloc" + "github.com/cockroachdb/pebble/v2/internal/crdbtest" ) // MVCC routines adapted from CockroachDB sources. Used to perform diff --git a/cmd/pebble/queue.go b/cmd/pebble/queue.go index 43c565c408..d9346b306f 100644 --- a/cmd/pebble/queue.go +++ b/cmd/pebble/queue.go @@ -12,9 +12,9 @@ import ( "sync/atomic" "time" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/internal/crdbtest" - "github.com/cockroachdb/pebble/internal/randvar" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/internal/crdbtest" + "github.com/cockroachdb/pebble/v2/internal/randvar" "github.com/spf13/cobra" ) diff --git a/cmd/pebble/random.go b/cmd/pebble/random.go index c098b740b1..ee8702dc19 100644 --- a/cmd/pebble/random.go +++ b/cmd/pebble/random.go @@ -10,8 +10,8 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/randvar" - "github.com/cockroachdb/pebble/internal/rate" + "github.com/cockroachdb/pebble/v2/internal/randvar" + "github.com/cockroachdb/pebble/v2/internal/rate" ) type rateFlag struct { diff --git a/cmd/pebble/replay.go b/cmd/pebble/replay.go index 07fa5e855e..4964fc5cff 100644 --- a/cmd/pebble/replay.go +++ b/cmd/pebble/replay.go @@ -20,13 +20,13 @@ import ( "unicode" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/bloom" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/cache" - "github.com/cockroachdb/pebble/internal/crdbtest" - "github.com/cockroachdb/pebble/replay" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/bloom" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/cache" + "github.com/cockroachdb/pebble/v2/internal/crdbtest" + "github.com/cockroachdb/pebble/v2/replay" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/spf13/cobra" ) diff --git a/cmd/pebble/replay_test.go b/cmd/pebble/replay_test.go index b3f6225558..19e0c8e085 100644 --- a/cmd/pebble/replay_test.go +++ b/cmd/pebble/replay_test.go @@ -8,8 +8,8 @@ import ( "fmt" "testing" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/internal/cache" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/internal/cache" "github.com/stretchr/testify/require" ) diff --git a/cmd/pebble/scan.go b/cmd/pebble/scan.go index e185745906..bcfce9c248 100644 --- a/cmd/pebble/scan.go +++ b/cmd/pebble/scan.go @@ -13,9 +13,9 @@ import ( "sync/atomic" "time" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/internal/crdbtest" - "github.com/cockroachdb/pebble/internal/randvar" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/internal/crdbtest" + "github.com/cockroachdb/pebble/v2/internal/randvar" "github.com/spf13/cobra" ) diff --git a/cmd/pebble/sync.go b/cmd/pebble/sync.go index 4c1bc1f3e1..ada92c74c4 100644 --- a/cmd/pebble/sync.go +++ b/cmd/pebble/sync.go @@ -12,9 +12,9 @@ import ( "sync/atomic" "time" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/internal/crdbtest" - "github.com/cockroachdb/pebble/internal/randvar" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/internal/crdbtest" + "github.com/cockroachdb/pebble/v2/internal/randvar" "github.com/spf13/cobra" ) diff --git a/cmd/pebble/test.go b/cmd/pebble/test.go index c8d707b867..25e241da88 100644 --- a/cmd/pebble/test.go +++ b/cmd/pebble/test.go @@ -18,7 +18,7 @@ import ( "time" "github.com/HdrHistogram/hdrhistogram-go" - "github.com/cockroachdb/pebble" + "github.com/cockroachdb/pebble/v2" ) const ( diff --git a/cmd/pebble/tombstone.go b/cmd/pebble/tombstone.go index bbe0e3bc23..e26e91dd7c 100644 --- a/cmd/pebble/tombstone.go +++ b/cmd/pebble/tombstone.go @@ -11,7 +11,7 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/humanize" + "github.com/cockroachdb/pebble/v2/internal/humanize" "github.com/spf13/cobra" ) diff --git a/cmd/pebble/write_bench.go b/cmd/pebble/write_bench.go index 397a5361b5..c0cf98347e 100644 --- a/cmd/pebble/write_bench.go +++ b/cmd/pebble/write_bench.go @@ -10,9 +10,9 @@ import ( "sync" "time" - "github.com/cockroachdb/pebble/internal/ackseq" - "github.com/cockroachdb/pebble/internal/randvar" - "github.com/cockroachdb/pebble/internal/rate" + "github.com/cockroachdb/pebble/v2/internal/ackseq" + "github.com/cockroachdb/pebble/v2/internal/randvar" + "github.com/cockroachdb/pebble/v2/internal/rate" "github.com/spf13/cobra" ) diff --git a/cmd/pebble/ycsb.go b/cmd/pebble/ycsb.go index 126560b68c..ab906cf794 100644 --- a/cmd/pebble/ycsb.go +++ b/cmd/pebble/ycsb.go @@ -15,10 +15,10 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/internal/ackseq" - "github.com/cockroachdb/pebble/internal/randvar" - "github.com/cockroachdb/pebble/internal/rate" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/internal/ackseq" + "github.com/cockroachdb/pebble/v2/internal/randvar" + "github.com/cockroachdb/pebble/v2/internal/rate" "github.com/spf13/cobra" ) diff --git a/commit.go b/commit.go index a75ba0c31b..7fefd8ed14 100644 --- a/commit.go +++ b/commit.go @@ -10,9 +10,9 @@ import ( "sync/atomic" "time" - "github.com/cockroachdb/pebble/batchrepr" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/record" + "github.com/cockroachdb/pebble/v2/batchrepr" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/record" ) // commitQueue is a lock-free fixed-size single-producer, multi-consumer diff --git a/commit_test.go b/commit_test.go index e647c94393..dee23252a3 100644 --- a/commit_test.go +++ b/commit_test.go @@ -14,11 +14,11 @@ import ( "testing" "time" - "github.com/cockroachdb/pebble/internal/arenaskl" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/record" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/arenaskl" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/record" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" ) diff --git a/compaction.go b/compaction.go index 5612d6a175..b30bf20d8d 100644 --- a/compaction.go +++ b/compaction.go @@ -16,17 +16,17 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/compact" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/keyspan/keyspanimpl" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/internal/sstableinternal" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider/objiotracing" - "github.com/cockroachdb/pebble/objstorage/remote" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/compact" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/keyspan/keyspanimpl" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/sstableinternal" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider/objiotracing" + "github.com/cockroachdb/pebble/v2/objstorage/remote" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/vfs" ) var errEmptyTable = errors.New("pebble: empty table") diff --git a/compaction_picker.go b/compaction_picker.go index d2b108fd8d..ed59d6fb5c 100644 --- a/compaction_picker.go +++ b/compaction_picker.go @@ -12,10 +12,10 @@ import ( "strings" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/humanize" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/humanize" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/manifest" ) // The minimum count for an intra-L0 compaction. This matches the RocksDB diff --git a/compaction_picker_test.go b/compaction_picker_test.go index c0bc74151d..2618b98705 100644 --- a/compaction_picker_test.go +++ b/compaction_picker_test.go @@ -18,11 +18,11 @@ import ( "github.com/cockroachdb/crlib/crstrings" "github.com/cockroachdb/datadriven" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/humanize" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/humanize" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" ) diff --git a/compaction_test.go b/compaction_test.go index 89b82606eb..3cf0393fd0 100644 --- a/compaction_test.go +++ b/compaction_test.go @@ -24,17 +24,17 @@ import ( "github.com/cockroachdb/datadriven" "github.com/cockroachdb/errors" "github.com/cockroachdb/errors/oserror" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/compact" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/internal/testutils" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/objstorage/remote" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/vfs" - "github.com/cockroachdb/pebble/vfs/errorfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/compact" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/internal/testutils" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/objstorage/remote" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/vfs" + "github.com/cockroachdb/pebble/v2/vfs/errorfs" "github.com/stretchr/testify/require" ) diff --git a/comparer.go b/comparer.go index 5f31d240e8..42359b8881 100644 --- a/comparer.go +++ b/comparer.go @@ -4,7 +4,7 @@ package pebble -import "github.com/cockroachdb/pebble/internal/base" +import "github.com/cockroachdb/pebble/v2/internal/base" // Compare exports the base.Compare type. type Compare = base.Compare diff --git a/data_test.go b/data_test.go index c43aff8e1e..c72aade148 100644 --- a/data_test.go +++ b/data_test.go @@ -21,19 +21,19 @@ import ( "github.com/cockroachdb/datadriven" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/bloom" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/humanize" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/rangekey" - "github.com/cockroachdb/pebble/internal/sstableinternal" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/objstorage/remote" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/vfs" - "github.com/cockroachdb/pebble/vfs/errorfs" - "github.com/cockroachdb/pebble/wal" + "github.com/cockroachdb/pebble/v2/bloom" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/humanize" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/rangekey" + "github.com/cockroachdb/pebble/v2/internal/sstableinternal" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/objstorage/remote" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/vfs" + "github.com/cockroachdb/pebble/v2/vfs/errorfs" + "github.com/cockroachdb/pebble/v2/wal" "github.com/ghemawat/stream" "github.com/stretchr/testify/require" ) diff --git a/db.go b/db.go index 3adb2d5e07..e3ffb329ff 100644 --- a/db.go +++ b/db.go @@ -3,7 +3,7 @@ // the LICENSE file. // Package pebble provides an ordered key/value store. -package pebble // import "github.com/cockroachdb/pebble" +package pebble // import "github.com/cockroachdb/pebble/v2" import ( "context" @@ -15,23 +15,23 @@ import ( "unsafe" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/arenaskl" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/cache" - "github.com/cockroachdb/pebble/internal/invalidating" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/keyspan/keyspanimpl" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/internal/manual" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/remote" - "github.com/cockroachdb/pebble/rangekey" - "github.com/cockroachdb/pebble/record" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/vfs" - "github.com/cockroachdb/pebble/vfs/atomicfs" - "github.com/cockroachdb/pebble/wal" + "github.com/cockroachdb/pebble/v2/internal/arenaskl" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/cache" + "github.com/cockroachdb/pebble/v2/internal/invalidating" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/keyspan/keyspanimpl" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/manual" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/remote" + "github.com/cockroachdb/pebble/v2/rangekey" + "github.com/cockroachdb/pebble/v2/record" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/vfs" + "github.com/cockroachdb/pebble/v2/vfs/atomicfs" + "github.com/cockroachdb/pebble/v2/wal" "github.com/cockroachdb/tokenbucket" "github.com/prometheus/client_golang/prometheus" ) diff --git a/db_test.go b/db_test.go index fee5482afe..35c2241937 100644 --- a/db_test.go +++ b/db_test.go @@ -24,15 +24,15 @@ import ( "github.com/cockroachdb/datadriven" "github.com/cockroachdb/errors" "github.com/cockroachdb/fifo" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/cache" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/internal/testutils" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/vfs" - "github.com/cockroachdb/pebble/vfs/errorfs" - "github.com/cockroachdb/pebble/wal" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/cache" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/internal/testutils" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/vfs" + "github.com/cockroachdb/pebble/v2/vfs/errorfs" + "github.com/cockroachdb/pebble/v2/wal" "github.com/stretchr/testify/require" ) diff --git a/docs/RFCS/20211018_range_keys.md b/docs/RFCS/20211018_range_keys.md index 890fa58bf3..06fce9e6c2 100644 --- a/docs/RFCS/20211018_range_keys.md +++ b/docs/RFCS/20211018_range_keys.md @@ -4,7 +4,7 @@ - Authors: Sumeer Bhola, Jackson Owens - RFC PR: #1341 - Pebble Issues: - https://github.com/cockroachdb/pebble/issues/1339 + https://github.com/cockroachdb/pebble/v2/issues/1339 - Cockroach Issues: https://github.com/cockroachdb/cockroach/issues/70429 https://github.com/cockroachdb/cockroach/issues/70412 @@ -133,7 +133,7 @@ range keys within their span at all suffix values. The optional suffix in `RangeKeySet` and `RangeKeyUnset` operations is related to the pebble `Comparer.Split` operation which is explicitly documented as being for [MVCC -keys](https://github.com/cockroachdb/pebble/blob/e95e73745ce8a85d605ef311d29a6574db8ed3bf/internal/base/comparer.go#L69-L88), +keys](https://github.com/cockroachdb/pebble/v2/blob/e95e73745ce8a85d605ef311d29a6574db8ed3bf/internal/base/comparer.go#L69-L88), without mandating exactly how the versions are represented. `RangeKeySet` and `RangeKeyUnset` keys with different suffixes do not interact logically, although Pebble will observably fragment ranges at intersection points. @@ -568,7 +568,7 @@ We have created three versions of `b` in this example. In previous versions, Pebble could split output sstables during a compaction such that the different `b` versions span more than one sstable. This creates problems for `RANGEDEL`s which span these two sstables which are discussed in the section on [improperly -truncated RANGEDELS](https://github.com/cockroachdb/pebble/blob/master/docs/range_deletions.md#improperly-truncated-range-deletes). +truncated RANGEDELS](https://github.com/cockroachdb/pebble/v2/blob/master/docs/range_deletions.md#improperly-truncated-range-deletes). We manage to tolerate this for `RANGEDEL`s since their semantics are defined by the system, which is not true for these range keys where the actual semantics are up to the user. diff --git a/docs/RFCS/20220112_pebble_sstable_format_versions.md b/docs/RFCS/20220112_pebble_sstable_format_versions.md index c2f792f58b..e3ca70b1ea 100644 --- a/docs/RFCS/20220112_pebble_sstable_format_versions.md +++ b/docs/RFCS/20220112_pebble_sstable_format_versions.md @@ -2,10 +2,10 @@ - Status: completed - Start Date: 2022-01-12 - Authors: Nick Travers -- RFC PR: https://github.com/cockroachdb/pebble/pull/1450 +- RFC PR: https://github.com/cockroachdb/pebble/v2/pull/1450 - Pebble Issues: - https://github.com/cockroachdb/pebble/issues/1409 - https://github.com/cockroachdb/pebble/issues/1339 + https://github.com/cockroachdb/pebble/v2/issues/1409 + https://github.com/cockroachdb/pebble/v2/issues/1339 - Cockroach Issues: # Summary @@ -25,7 +25,7 @@ opened, before any SSTables are opened. The versions indicate points of backwards incompatibility for a store. For example, the introduction of the `SetWithDelete` key kind is gated behind a version, as is block property collection. This format major version scheme was introduced in -[#1227](https://github.com/cockroachdb/pebble/issues/1227). +[#1227](https://github.com/cockroachdb/pebble/v2/issues/1227). While Pebble can use the format major version to infer how to load and interpret data in the LSM, the SSTables that make up the store itself have @@ -83,7 +83,7 @@ supported table format. The remainder of this document outlines a new table format for Pebble. This new table format will be used for new table-level features such as block properties and range keys (see -[#1339](https://github.com/cockroachdb/pebble/issues/1339)), but also for +[#1339](https://github.com/cockroachdb/pebble/v2/issues/1339)), but also for backporting table-level features from RocksDB that would be useful to Pebble (e.g. version 3 avoids encoding sequence numbers in the index, and version 4 uses delta encoding for the block offsets in the index, both of which are diff --git a/docs/RFCS/20220311_pebble_flushable_ingested_sstable.md b/docs/RFCS/20220311_pebble_flushable_ingested_sstable.md index fb6ff7f46d..8f652a4b42 100644 --- a/docs/RFCS/20220311_pebble_flushable_ingested_sstable.md +++ b/docs/RFCS/20220311_pebble_flushable_ingested_sstable.md @@ -2,8 +2,8 @@ - Status: in-progress - Start Date: 2022-03-11 - Authors: Mufeez Amjad -- RFC PR: [#1586](https://github.com/cockroachdb/pebble/pull/1586) -- Pebble Issues: [#25](https://github.com/cockroachdb/pebble/issues/25) +- RFC PR: [#1586](https://github.com/cockroachdb/pebble/v2/pull/1586) +- Pebble Issues: [#25](https://github.com/cockroachdb/pebble/v2/issues/25) - Cockroach Issues: ## Summary @@ -20,7 +20,7 @@ the ingestion in the event of a crash. Currently, if any of the SSTs that need to be ingested have an overlap with a memtable, we -[wait](https://github.com/cockroachdb/pebble/blob/56c5aebe151977964db7e464bb6c87ebd3451bd5/ingest.go#L671) +[wait](https://github.com/cockroachdb/pebble/v2/blob/56c5aebe151977964db7e464bb6c87ebd3451bd5/ingest.go#L671) for the memtable to be flushed before the ingestion can proceed. This is to satisfy the invariant that newer entries (those in the ingested SSTs) in the LSM have a higher sequence number than old entries (those in the memtables). This diff --git a/docs/RFCS/20221122_virtual_sstable.md b/docs/RFCS/20221122_virtual_sstable.md index f2fc0737ba..f9cfb2615e 100644 --- a/docs/RFCS/20221122_virtual_sstable.md +++ b/docs/RFCS/20221122_virtual_sstable.md @@ -2,9 +2,9 @@ - Status: in-progress - Start Date: 2022-10-27 - Authors: Arjun Nair -- RFC PR: https://github.com/cockroachdb/pebble/pull/2116 +- RFC PR: https://github.com/cockroachdb/pebble/v2/pull/2116 - Pebble Issues: - https://github.com/cockroachdb/pebble/issues/1683 + https://github.com/cockroachdb/pebble/v2/issues/1683 ** Design Draft** diff --git a/docs/RFCS/20240701_tombstone_density_heuristic.md b/docs/RFCS/20240701_tombstone_density_heuristic.md index a9828a2133..a43e95efbb 100644 --- a/docs/RFCS/20240701_tombstone_density_heuristic.md +++ b/docs/RFCS/20240701_tombstone_density_heuristic.md @@ -3,7 +3,7 @@ - Start Date: 2024-06-28 - Authors: Anish Shanbhag - RFC PR: cockroachdb#3719 -- Pebble Issues: https://github.com/cockroachdb/pebble/issues/918 +- Pebble Issues: https://github.com/cockroachdb/pebble/v2/issues/918 # Summary @@ -15,14 +15,14 @@ The new heuristic was introduced in cockroachdb#3790. Pebble currently contains a variety of compaction heuristics which are mostly based on SSTable file size. One weak point in the compaction heuristics involves the case where we have a large buildup of close-together point tombstones, which causes reads for keys after the tombstone cluster to become extremely slow. -As identified [here](https://github.com/cockroachdb/pebble/issues/918#issuecomment-1564714073), uncompacted point tombstones reduce read performance in two ways: the extra CPU cycles needed to iterate over them during a seek, and the extra I/O needed to load more blocks which contain live keys. +As identified [here](https://github.com/cockroachdb/pebble/v2/issues/918#issuecomment-1564714073), uncompacted point tombstones reduce read performance in two ways: the extra CPU cycles needed to iterate over them during a seek, and the extra I/O needed to load more blocks which contain live keys. It's important that we reduce tombstone density before the tombstones are read because there are many cases where tombstones are written for very long periods before any reads are triggered. Even though our current heuristics take the potential amount of reclaimed space from compacting point tombstones into account, there are specific situations where this is not sufficient to prevent point tombstone buildup. Specifically, these are some of the factors that lead to this issue: 1. Tombstone buildup usually only happens in large stores (> 10 GB) once multiple levels of the LSM start to be populated. -2. The LSM is "too well shaped" in that the size ratio between levels is at the proper value, so [compaction scores](https://github.com/cockroachdb/pebble/blob/3ef2e5b1f693dfbf78785e14f603a443af3c674b/compaction_picker.go#L919) for each level are all calculated to be <1 and thus no compactions are scheduled. +2. The LSM is "too well shaped" in that the size ratio between levels is at the proper value, so [compaction scores](https://github.com/cockroachdb/pebble/v2/blob/3ef2e5b1f693dfbf78785e14f603a443af3c674b/compaction_picker.go#L919) for each level are all calculated to be <1 and thus no compactions are scheduled. - Observed in [this escalation](https://github.com/cockroachlabs/support/issues/2628) (internal only) 3. Read performance becomes especially bad when we have a high density of point tombstones in higher levels (L0-3) which span many SSTables in the bottommost levels (L4-6). 4. The problem is especially apparent when there's one key range which we write to/delete from frequently and an adjacent key range which we read frequently. @@ -91,7 +91,7 @@ In this case, we want the ability to query if a certain key range `a->b` is "tom Given this method to query tombstone stats for arbitrary key ranges, here's a sketch of how the overall compaction process could look: - After writing an SSTable, add this SSTable and all SSTables which overlap with its key range (using `version.Overlaps`) to a global set `needsTombstoneCheck` which marks them as possibly eligible for a tombstone density compaction - If the logic below ends up being fast enough, we could avoid having `needsTombstoneCheck` entirely and check whether compaction is needed during a write itself. But if not, we should defer the check in order to keep writes fast -- Inside [`pickAuto`](https://github.com/cockroachdb/pebble/blob/4981bd0e5e9538a032a4caf3a12d4571abb8c206/compaction_picker.go#L1324), we'll check whether any SSTable in `needsTombstoneCheck` should be compacted +- Inside [`pickAuto`](https://github.com/cockroachdb/pebble/v2/blob/4981bd0e5e9538a032a4caf3a12d4571abb8c206/compaction_picker.go#L1324), we'll check whether any SSTable in `needsTombstoneCheck` should be compacted - For each SSTable `T` in `needsTombstoneCheck`, we can get the following info using the `Annotator` and the table statistics we already have (assuming this SSTable spans the key range `a->b`: - This SSTable - number of tombstones in `T` @@ -107,13 +107,13 @@ Given this method to query tombstone stats for arbitrary key ranges, here's a sk ### 4. Maximum Granularity -If we find that the key range statistics method above works well but we want even more granularity for key ranges, i.e. because the overestimate of whole-LSM stats above becomes an issue, then we could include per-block tombstone/key counts in the index block of each SSTable, which would allow us to get a more precise count of tombstones for a given key range. This would look pretty similar to the logic separating partial vs. full overlaps in [`estimateReclaimedSizesBeneath`](https://github.com/cockroachdb/pebble/blob/master/table_stats.go#L606), except we'd be checking tombstone/key count instead of disk usage. +If we find that the key range statistics method above works well but we want even more granularity for key ranges, i.e. because the overestimate of whole-LSM stats above becomes an issue, then we could include per-block tombstone/key counts in the index block of each SSTable, which would allow us to get a more precise count of tombstones for a given key range. This would look pretty similar to the logic separating partial vs. full overlaps in [`estimateReclaimedSizesBeneath`](https://github.com/cockroachdb/pebble/v2/blob/master/table_stats.go#L606), except we'd be checking tombstone/key count instead of disk usage. - If we store a running total of the tombstones for each block in the index entry, making this query would be O(log n) or faster, not including the I/O overhead of reading the index block # Testing -Testing methodology and results can be found [here](https://github.com/cockroachdb/pebble/pull/3790#issuecomment-2251439492). Tombstone buildup has been frequently observed in queue-based workloads and the benchmark introduced in cockroachdb#3744 is meant to capture this case. Below are some further ideas for testing in case they're needed: -- Idea from [here](https://github.com/cockroachdb/pebble/issues/918#issuecomment-1599478862) - seed a new node with a replication snapshot, which has the tendency for tomstone buildup +Testing methodology and results can be found [here](https://github.com/cockroachdb/pebble/v2/pull/3790#issuecomment-2251439492). Tombstone buildup has been frequently observed in queue-based workloads and the benchmark introduced in cockroachdb#3744 is meant to capture this case. Below are some further ideas for testing in case they're needed: +- Idea from [here](https://github.com/cockroachdb/pebble/v2/issues/918#issuecomment-1599478862) - seed a new node with a replication snapshot, which has the tendency for tomstone buildup - cockroachdb/cockroach#113069 measures performance of liveness range scans since those were often slowed down by tombstones. Even though it looks like liveness logic has changed since then to avoid this, we could adapt the test to induce slow reads. - Create reproduction roachtests for past slowdown scenarios we've observed diff --git a/docs/index.html b/docs/index.html index 007090dbee..fdf6222f02 100644 --- a/docs/index.html +++ b/docs/index.html @@ -17,7 +17,7 @@
Benchmarks are run nightly using pebble + href="https://github.com/cockroachdb/pebble/v2/blob/master/cmd/pebble/ycsb.go">pebble bench ycsb on AWS machines equipped with local SSD storage. The AWS instances show remarkably high instance to instance performance variability. In order to smooth @@ -150,7 +150,7 @@ fails (currently a mixture of number of L0 sublevels, L0 files, and whether the DB has experienced a write stall). These benchmarks are run nightly using pebble + href="https://github.com/cockroachdb/pebble/v2/blob/master/cmd/pebble/write.go">pebble bench write on GCP n2-standard-32 machines equipped with 16 local SSDs in a RAID 0 array.
diff --git a/docs/io_profiling.md b/docs/io_profiling.md index 8fd6230805..382e9aada7 100644 --- a/docs/io_profiling.md +++ b/docs/io_profiling.md @@ -88,14 +88,14 @@ As an example, `perf report --stdio` from perf data gathered using | ---runtime.goexit | - |--85.58%-- github.com/cockroachdb/pebble/internal/record.NewLogWriter.func2 + |--85.58%-- github.com/cockroachdb/pebble/v2/internal/record.NewLogWriter.func2 | runtime/pprof.Do - | github.com/cockroachdb/pebble/internal/record.(*LogWriter).flushLoop-fm - | github.com/cockroachdb/pebble/internal/record.(*LogWriter).flushLoop - | github.com/cockroachdb/pebble/internal/record.(*LogWriter).flushPending - | github.com/cockroachdb/pebble/vfs.(*syncingFile).Sync - | github.com/cockroachdb/pebble/vfs.(*syncingFile).syncFdatasync-fm - | github.com/cockroachdb/pebble/vfs.(*syncingFile).syncFdatasync + | github.com/cockroachdb/pebble/v2/internal/record.(*LogWriter).flushLoop-fm + | github.com/cockroachdb/pebble/v2/internal/record.(*LogWriter).flushLoop + | github.com/cockroachdb/pebble/v2/internal/record.(*LogWriter).flushPending + | github.com/cockroachdb/pebble/v2/vfs.(*syncingFile).Sync + | github.com/cockroachdb/pebble/v2/vfs.(*syncingFile).syncFdatasync-fm + | github.com/cockroachdb/pebble/v2/vfs.(*syncingFile).syncFdatasync | syscall.Syscall | entry_SYSCALL_64_fastpath | sys_fdatasync @@ -142,14 +142,14 @@ pebble 6019/6019 [008] 16492.555957: block:block_rq_insert: 259,0 WS 0 () 3970 7fff81245243 sys_fdatasync 7fff8181ae6d entry_SYSCALL_64_fastpath 3145e0 syscall.Syscall - 6eddf3 github.com/cockroachdb/pebble/vfs.(*syncingFile).syncFdatasync - 6f069a github.com/cockroachdb/pebble/vfs.(*syncingFile).syncFdatasync-fm - 6ed8d2 github.com/cockroachdb/pebble/vfs.(*syncingFile).Sync - 72542f github.com/cockroachdb/pebble/internal/record.(*LogWriter).flushPending - 724f5c github.com/cockroachdb/pebble/internal/record.(*LogWriter).flushLoop - 72855e github.com/cockroachdb/pebble/internal/record.(*LogWriter).flushLoop-fm + 6eddf3 github.com/cockroachdb/pebble/v2/vfs.(*syncingFile).syncFdatasync + 6f069a github.com/cockroachdb/pebble/v2/vfs.(*syncingFile).syncFdatasync-fm + 6ed8d2 github.com/cockroachdb/pebble/v2/vfs.(*syncingFile).Sync + 72542f github.com/cockroachdb/pebble/v2/internal/record.(*LogWriter).flushPending + 724f5c github.com/cockroachdb/pebble/v2/internal/record.(*LogWriter).flushLoop + 72855e github.com/cockroachdb/pebble/v2/internal/record.(*LogWriter).flushLoop-fm 7231d8 runtime/pprof.Do - 727b09 github.com/cockroachdb/pebble/internal/record.NewLogWriter.func2 + 727b09 github.com/cockroachdb/pebble/v2/internal/record.NewLogWriter.func2 2c0281 runtime.goexit ``` diff --git a/download.go b/download.go index f0f31bebfb..8f0406c025 100644 --- a/download.go +++ b/download.go @@ -11,9 +11,9 @@ import ( "slices" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/objstorage" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/objstorage" ) // DownloadSpan is a key range passed to the Download method. diff --git a/download_test.go b/download_test.go index dbc95e7632..da01c38ca1 100644 --- a/download_test.go +++ b/download_test.go @@ -13,12 +13,12 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/objstorage/remote" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/objstorage/remote" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" ) diff --git a/error_iter.go b/error_iter.go index 3c741f862a..cab08c874b 100644 --- a/error_iter.go +++ b/error_iter.go @@ -7,9 +7,9 @@ package pebble import ( "context" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" ) type errorIter struct { diff --git a/error_test.go b/error_test.go index 9a128c20a3..1152251ec8 100644 --- a/error_test.go +++ b/error_test.go @@ -16,9 +16,9 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/vfs" - "github.com/cockroachdb/pebble/vfs/errorfs" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/vfs" + "github.com/cockroachdb/pebble/v2/vfs/errorfs" "github.com/stretchr/testify/require" ) diff --git a/event.go b/event.go index 8314380ffd..04f717bd73 100644 --- a/event.go +++ b/event.go @@ -10,11 +10,11 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/humanize" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/humanize" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/cockroachdb/redact" ) diff --git a/event_listener_test.go b/event_listener_test.go index 4746570a96..85384e1f9e 100644 --- a/event_listener_test.go +++ b/event_listener_test.go @@ -17,10 +17,10 @@ import ( "github.com/cockroachdb/datadriven" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/cockroachdb/redact" "github.com/stretchr/testify/require" ) diff --git a/example_test.go b/example_test.go index 5c13df1a47..5338afa5b3 100644 --- a/example_test.go +++ b/example_test.go @@ -8,8 +8,8 @@ import ( "fmt" "log" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/vfs" ) func Example() { diff --git a/external_iterator.go b/external_iterator.go index 03dca9782c..6ae3a4219c 100644 --- a/external_iterator.go +++ b/external_iterator.go @@ -8,10 +8,10 @@ import ( "context" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/sstable" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/sstable" ) // NewExternalIter takes an input 2d array of sstable files which may overlap diff --git a/external_iterator_test.go b/external_iterator_test.go index 66fa57fff0..bb2efb7097 100644 --- a/external_iterator_test.go +++ b/external_iterator_test.go @@ -10,10 +10,10 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" ) diff --git a/external_test.go b/external_test.go index 2e84e2f03d..a8eac4511d 100644 --- a/external_test.go +++ b/external_test.go @@ -12,9 +12,9 @@ import ( "testing" "time" - "github.com/cockroachdb/pebble/metamorphic" - "github.com/cockroachdb/pebble/vfs" - "github.com/cockroachdb/pebble/vfs/errorfs" + "github.com/cockroachdb/pebble/v2/metamorphic" + "github.com/cockroachdb/pebble/v2/vfs" + "github.com/cockroachdb/pebble/v2/vfs/errorfs" "github.com/stretchr/testify/require" ) diff --git a/filenames.go b/filenames.go index 86e7ed1d37..dca76c56bc 100644 --- a/filenames.go +++ b/filenames.go @@ -4,7 +4,7 @@ package pebble -import "github.com/cockroachdb/pebble/internal/base" +import "github.com/cockroachdb/pebble/v2/internal/base" type fileType = base.FileType diff --git a/filenames_test.go b/filenames_test.go index b8dcba0ce2..1c8f7d9185 100644 --- a/filenames_test.go +++ b/filenames_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" ) diff --git a/flush_test.go b/flush_test.go index 0031420e9b..e1686efa6b 100644 --- a/flush_test.go +++ b/flush_test.go @@ -11,7 +11,7 @@ import ( "github.com/cockroachdb/datadriven" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" ) diff --git a/flushable.go b/flushable.go index 7662983f20..8940baf1b8 100644 --- a/flushable.go +++ b/flushable.go @@ -11,11 +11,11 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/keyspan/keyspanimpl" - "github.com/cockroachdb/pebble/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/keyspan/keyspanimpl" + "github.com/cockroachdb/pebble/v2/internal/manifest" ) // flushable defines the interface for immutable memtables. diff --git a/flushable_test.go b/flushable_test.go index 982757a5ed..8c54105720 100644 --- a/flushable_test.go +++ b/flushable_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" ) diff --git a/format_major_version.go b/format_major_version.go index 203222a53f..939457d176 100644 --- a/format_major_version.go +++ b/format_major_version.go @@ -9,10 +9,10 @@ import ( "strconv" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/vfs" - "github.com/cockroachdb/pebble/vfs/atomicfs" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/vfs" + "github.com/cockroachdb/pebble/v2/vfs/atomicfs" ) // FormatMajorVersion is a constant controlling the format of persisted diff --git a/format_major_version_test.go b/format_major_version_test.go index ba64dc551f..6da210d924 100644 --- a/format_major_version_test.go +++ b/format_major_version_test.go @@ -8,9 +8,9 @@ import ( "fmt" "testing" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/vfs" - "github.com/cockroachdb/pebble/vfs/atomicfs" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/vfs" + "github.com/cockroachdb/pebble/v2/vfs/atomicfs" "github.com/stretchr/testify/require" ) diff --git a/get_iter.go b/get_iter.go index 0410feb015..f3560899fd 100644 --- a/get_iter.go +++ b/get_iter.go @@ -8,10 +8,10 @@ import ( "context" "fmt" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" ) // getIter is an internal iterator used to perform gets. It iterates through diff --git a/get_iter_test.go b/get_iter_test.go index 68be1e64ef..041767ca46 100644 --- a/get_iter_test.go +++ b/get_iter_test.go @@ -10,10 +10,10 @@ import ( "testing" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/sstable" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/sstable" ) func TestGetIter(t *testing.T) { diff --git a/go.mod b/go.mod index 8c8518a3a9..4d1b8fe841 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/cockroachdb/pebble +module github.com/cockroachdb/pebble/v2 require ( github.com/DataDog/zstd v1.5.6-0.20230824185856-869dae002e5e diff --git a/ingest.go b/ingest.go index 3fe0aae727..6654c80f0f 100644 --- a/ingest.go +++ b/ingest.go @@ -12,15 +12,15 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/cache" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/internal/overlap" - "github.com/cockroachdb/pebble/internal/sstableinternal" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/remote" - "github.com/cockroachdb/pebble/sstable" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/cache" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/overlap" + "github.com/cockroachdb/pebble/v2/internal/sstableinternal" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/remote" + "github.com/cockroachdb/pebble/v2/sstable" ) func sstableKeyCompare(userCmp Compare, a, b InternalKey) int { @@ -1001,7 +1001,7 @@ func ingestTargetLevel( // platform-and-FS-agnostic way, ensure that all sstables in the input are // properly synced to disk. Opening new file handles and Sync()-ing them // does not always guarantee durability; see the discussion here on that: -// https://github.com/cockroachdb/pebble/pull/835#issuecomment-663075379 +// https://github.com/cockroachdb/pebble/v2/pull/835#issuecomment-663075379 // // Ingestion loads each sstable into the lowest level of the LSM which it // doesn't overlap (see ingestTargetLevel). If an sstable overlaps a memtable, @@ -1035,7 +1035,7 @@ func ingestTargetLevel( // mutations that get sequence numbers larger than the ingestion sequence // number get queued up behind the ingestion waiting for it to complete. This // can produce a noticeable hiccup in performance. See -// https://github.com/cockroachdb/pebble/issues/25 for an idea for how to fix +// https://github.com/cockroachdb/pebble/v2/issues/25 for an idea for how to fix // this hiccup. func (d *DB) Ingest(ctx context.Context, paths []string) error { if err := d.closed.Load(); err != nil { @@ -1784,7 +1784,7 @@ func (d *DB) excise( // lock; we could grab one currentVersion, release the lock, calculate excised // files, then grab the lock again and recalculate for just the files that // have changed since our previous calculation. Do this optimiaztino as part of - // https://github.com/cockroachdb/pebble/issues/2112 . + // https://github.com/cockroachdb/pebble/v2/issues/2112 . if d.cmp(m.Smallest.UserKey, exciseSpan.Start) < 0 { leftFile := &fileMetadata{ Virtual: true, diff --git a/ingest_test.go b/ingest_test.go index e8f5da5032..58db2549e6 100644 --- a/ingest_test.go +++ b/ingest_test.go @@ -26,20 +26,20 @@ import ( "github.com/cockroachdb/datadriven" "github.com/cockroachdb/errors" "github.com/cockroachdb/errors/oserror" - "github.com/cockroachdb/pebble/bloom" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/internal/rangekey" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/objstorage/remote" - "github.com/cockroachdb/pebble/record" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/sstable/block" - "github.com/cockroachdb/pebble/vfs" - "github.com/cockroachdb/pebble/vfs/errorfs" + "github.com/cockroachdb/pebble/v2/bloom" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/rangekey" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/objstorage/remote" + "github.com/cockroachdb/pebble/v2/record" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/sstable/block" + "github.com/cockroachdb/pebble/v2/vfs" + "github.com/cockroachdb/pebble/v2/vfs/errorfs" "github.com/kr/pretty" "github.com/stretchr/testify/require" ) diff --git a/internal.go b/internal.go index d6997c6bce..fcd7a690d6 100644 --- a/internal.go +++ b/internal.go @@ -4,7 +4,7 @@ package pebble -import "github.com/cockroachdb/pebble/internal/base" +import "github.com/cockroachdb/pebble/v2/internal/base" // SeqNum exports the base.SeqNum type. type SeqNum = base.SeqNum diff --git a/internal/arenaskl/arena.go b/internal/arenaskl/arena.go index 011c3b0247..9355457f76 100644 --- a/internal/arenaskl/arena.go +++ b/internal/arenaskl/arena.go @@ -22,8 +22,8 @@ import ( "unsafe" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/constants" - "github.com/cockroachdb/pebble/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/constants" + "github.com/cockroachdb/pebble/v2/internal/invariants" ) // Arena is lock-free. diff --git a/internal/arenaskl/arena_test.go b/internal/arenaskl/arena_test.go index f264b8de4f..05e8ea9025 100644 --- a/internal/arenaskl/arena_test.go +++ b/internal/arenaskl/arena_test.go @@ -21,7 +21,7 @@ import ( "math" "testing" - "github.com/cockroachdb/pebble/internal/constants" + "github.com/cockroachdb/pebble/v2/internal/constants" "github.com/stretchr/testify/require" ) diff --git a/internal/arenaskl/flush_iterator.go b/internal/arenaskl/flush_iterator.go index 20baa0d32e..f6279ee0ae 100644 --- a/internal/arenaskl/flush_iterator.go +++ b/internal/arenaskl/flush_iterator.go @@ -17,7 +17,7 @@ package arenaskl -import "github.com/cockroachdb/pebble/internal/base" +import "github.com/cockroachdb/pebble/v2/internal/base" // flushIterator is an iterator over the skiplist object. Use Skiplist.NewFlushIter // to construct an iterator. The current state of the iterator can be cloned by diff --git a/internal/arenaskl/iterator.go b/internal/arenaskl/iterator.go index 21176c0efd..0fb1523ffc 100644 --- a/internal/arenaskl/iterator.go +++ b/internal/arenaskl/iterator.go @@ -21,8 +21,8 @@ import ( "context" "sync" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" ) type splice struct { diff --git a/internal/arenaskl/node.go b/internal/arenaskl/node.go index ad66d2fe17..3fe44e64b2 100644 --- a/internal/arenaskl/node.go +++ b/internal/arenaskl/node.go @@ -21,7 +21,7 @@ import ( "math" "sync/atomic" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" ) // MaxNodeSize returns the maximum space needed for a node with the specified diff --git a/internal/arenaskl/skl.go b/internal/arenaskl/skl.go index 0db67e3eff..186ebf2c71 100644 --- a/internal/arenaskl/skl.go +++ b/internal/arenaskl/skl.go @@ -41,7 +41,7 @@ Key differences: - Iterator includes mutator functions. */ -package arenaskl // import "github.com/cockroachdb/pebble/internal/arenaskl" +package arenaskl // import "github.com/cockroachdb/pebble/v2/internal/arenaskl" import ( "math" @@ -51,7 +51,7 @@ import ( "unsafe" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" ) const ( diff --git a/internal/arenaskl/skl_test.go b/internal/arenaskl/skl_test.go index db30bc84a1..4170c8bbff 100644 --- a/internal/arenaskl/skl_test.go +++ b/internal/arenaskl/skl_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" "github.com/stretchr/testify/require" ) diff --git a/internal/base/cleaner.go b/internal/base/cleaner.go index 1582ac80b0..3767fec81f 100644 --- a/internal/base/cleaner.go +++ b/internal/base/cleaner.go @@ -4,7 +4,7 @@ package base -import "github.com/cockroachdb/pebble/vfs" +import "github.com/cockroachdb/pebble/v2/vfs" // Cleaner cleans obsolete files. type Cleaner interface { diff --git a/internal/base/error.go b/internal/base/error.go index fa56e7c38a..04e7aa593d 100644 --- a/internal/base/error.go +++ b/internal/base/error.go @@ -6,7 +6,7 @@ package base import ( "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/invariants" ) // ErrNotFound means that a get or delete call did not find the requested key. diff --git a/internal/base/filenames.go b/internal/base/filenames.go index 3b75d6c5d3..3814d14583 100644 --- a/internal/base/filenames.go +++ b/internal/base/filenames.go @@ -11,7 +11,7 @@ import ( "strings" "github.com/cockroachdb/errors/oserror" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/cockroachdb/redact" ) diff --git a/internal/base/filenames_test.go b/internal/base/filenames_test.go index df07bb8b3c..ea7182c067 100644 --- a/internal/base/filenames_test.go +++ b/internal/base/filenames_test.go @@ -10,7 +10,7 @@ import ( "os" "testing" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/cockroachdb/redact" "github.com/stretchr/testify/require" ) diff --git a/internal/base/internal.go b/internal/base/internal.go index 0c123eb4ce..21cbfad52d 100644 --- a/internal/base/internal.go +++ b/internal/base/internal.go @@ -2,7 +2,7 @@ // of this source code is governed by a BSD-style license that can be found in // the LICENSE file. -package base // import "github.com/cockroachdb/pebble/internal/base" +package base // import "github.com/cockroachdb/pebble/v2/internal/base" import ( "cmp" @@ -109,7 +109,7 @@ const ( // InternalKeyKindSetWithDelete keys are SET keys that have met with a // DELETE or SINGLEDEL key in a prior compaction. This key kind is // specific to Pebble. See - // https://github.com/cockroachdb/pebble/issues/1255. + // https://github.com/cockroachdb/pebble/v2/issues/1255. InternalKeyKindSetWithDelete InternalKeyKind = 18 // InternalKeyKindRangeKeyDelete removes all range keys within a key range. diff --git a/internal/base/iterator.go b/internal/base/iterator.go index 3c2041445b..18a71a2140 100644 --- a/internal/base/iterator.go +++ b/internal/base/iterator.go @@ -9,8 +9,8 @@ import ( "fmt" "time" - "github.com/cockroachdb/pebble/internal/humanize" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/humanize" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" "github.com/cockroachdb/redact" ) @@ -395,7 +395,7 @@ type InternalIteratorStats struct { PointCount uint64 // Points that were iterated over that were covered by range tombstones. It // can be useful for discovering instances of - // https://github.com/cockroachdb/pebble/issues/1070. + // https://github.com/cockroachdb/pebble/v2/issues/1070. PointsCoveredByRangeTombstones uint64 // Stats related to points in value blocks encountered during iteration. diff --git a/internal/base/key_bounds.go b/internal/base/key_bounds.go index 7a41f786e3..d94114f1a0 100644 --- a/internal/base/key_bounds.go +++ b/internal/base/key_bounds.go @@ -7,7 +7,7 @@ package base import ( "fmt" - "github.com/cockroachdb/pebble/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/invariants" ) // BoundaryKind indicates if a boundary is exclusive or inclusive. diff --git a/internal/base/lazy_value.go b/internal/base/lazy_value.go index ebeb62ba4f..5bfa2c16e2 100644 --- a/internal/base/lazy_value.go +++ b/internal/base/lazy_value.go @@ -7,7 +7,7 @@ package base import ( "context" - "github.com/cockroachdb/pebble/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/invariants" ) // A value can have user-defined attributes that are a function of the value diff --git a/internal/base/logger.go b/internal/base/logger.go index 3d47564866..a0308e9e8d 100644 --- a/internal/base/logger.go +++ b/internal/base/logger.go @@ -12,7 +12,7 @@ import ( "os" "sync" - "github.com/cockroachdb/pebble/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/invariants" ) // Logger defines an interface for writing log messages. diff --git a/internal/base/test_utils.go b/internal/base/test_utils.go index b68b5817a1..f6cab13b41 100644 --- a/internal/base/test_utils.go +++ b/internal/base/test_utils.go @@ -11,7 +11,7 @@ import ( "strconv" "strings" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" ) // NewDeletableSumValueMerger return a ValueMerger which computes the sum of its diff --git a/internal/batchskl/iterator.go b/internal/batchskl/iterator.go index ec55607a66..67989c173f 100644 --- a/internal/batchskl/iterator.go +++ b/internal/batchskl/iterator.go @@ -17,7 +17,7 @@ package batchskl -import "github.com/cockroachdb/pebble/internal/base" +import "github.com/cockroachdb/pebble/v2/internal/base" type splice struct { prev uint32 diff --git a/internal/batchskl/skl.go b/internal/batchskl/skl.go index 1ea29f0473..5dd87cec7e 100644 --- a/internal/batchskl/skl.go +++ b/internal/batchskl/skl.go @@ -51,7 +51,7 @@ Key differences: - Node storage grows to an arbitrary size. */ -package batchskl // import "github.com/cockroachdb/pebble/internal/batchskl" +package batchskl // import "github.com/cockroachdb/pebble/v2/internal/batchskl" import ( "bytes" @@ -63,8 +63,8 @@ import ( "unsafe" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/constants" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/constants" ) const ( diff --git a/internal/batchskl/skl_test.go b/internal/batchskl/skl_test.go index bc7d65fe1f..bba5bdb8f6 100644 --- a/internal/batchskl/skl_test.go +++ b/internal/batchskl/skl_test.go @@ -25,7 +25,7 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" "github.com/stretchr/testify/require" ) diff --git a/internal/binfmt/binfmt.go b/internal/binfmt/binfmt.go index acb5ee3741..5b84b86e1d 100644 --- a/internal/binfmt/binfmt.go +++ b/internal/binfmt/binfmt.go @@ -15,7 +15,7 @@ import ( "strings" "unsafe" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" ) // New constructs a new binary formatter. diff --git a/internal/bytealloc/bytealloc.go b/internal/bytealloc/bytealloc.go index b90527044d..52f6c7c9c1 100644 --- a/internal/bytealloc/bytealloc.go +++ b/internal/bytealloc/bytealloc.go @@ -14,7 +14,7 @@ package bytealloc -import "github.com/cockroachdb/pebble/internal/rawalloc" +import "github.com/cockroachdb/pebble/v2/internal/rawalloc" // An A provides chunk allocation of []byte, amortizing the overhead of each // allocation. Because the underlying storage for the slices is shared, they diff --git a/internal/cache/block_map.go b/internal/cache/block_map.go index 62d50a7316..d58219d243 100644 --- a/internal/cache/block_map.go +++ b/internal/cache/block_map.go @@ -9,8 +9,8 @@ import ( "os" "unsafe" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/manual" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/manual" "github.com/cockroachdb/swiss" ) diff --git a/internal/cache/block_map_test.go b/internal/cache/block_map_test.go index 3b637b68f3..6e3d123e87 100644 --- a/internal/cache/block_map_test.go +++ b/internal/cache/block_map_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" ) // The Pebble block cache can be configured with a capacity of GBs or 10s of diff --git a/internal/cache/clockpro.go b/internal/cache/clockpro.go index 1100baabd5..a93a95a103 100644 --- a/internal/cache/clockpro.go +++ b/internal/cache/clockpro.go @@ -15,7 +15,7 @@ // The original paper: http://static.usenix.org/event/usenix05/tech/general/full_papers/jiang/jiang_html/html.html // // It is MIT licensed, like the original. -package cache // import "github.com/cockroachdb/pebble/internal/cache" +package cache // import "github.com/cockroachdb/pebble/v2/internal/cache" import ( "fmt" @@ -26,8 +26,8 @@ import ( "sync" "sync/atomic" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" ) type fileKey struct { diff --git a/internal/cache/clockpro_test.go b/internal/cache/clockpro_test.go index e177f2addc..d300b4a9a9 100644 --- a/internal/cache/clockpro_test.go +++ b/internal/cache/clockpro_test.go @@ -15,7 +15,7 @@ import ( "testing" "time" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" "github.com/stretchr/testify/require" ) diff --git a/internal/cache/entry_invariants.go b/internal/cache/entry_invariants.go index bd326ed79e..f9f01321ec 100644 --- a/internal/cache/entry_invariants.go +++ b/internal/cache/entry_invariants.go @@ -11,7 +11,7 @@ import ( "fmt" "os" - "github.com/cockroachdb/pebble/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/invariants" ) // When the "invariants" or "tracing" build tags are enabled, we need to diff --git a/internal/cache/entry_normal.go b/internal/cache/entry_normal.go index 2fab844f4d..a9cec2a532 100644 --- a/internal/cache/entry_normal.go +++ b/internal/cache/entry_normal.go @@ -12,8 +12,8 @@ import ( "sync" "unsafe" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/manual" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/manual" ) const ( diff --git a/internal/cache/value_cgo.go b/internal/cache/value_cgo.go index 3af21cbc18..15b459d467 100644 --- a/internal/cache/value_cgo.go +++ b/internal/cache/value_cgo.go @@ -11,7 +11,7 @@ package cache import ( "unsafe" - "github.com/cockroachdb/pebble/internal/manual" + "github.com/cockroachdb/pebble/v2/internal/manual" ) func newValue(n int) *Value { diff --git a/internal/cache/value_invariants.go b/internal/cache/value_invariants.go index a6d1750e6b..1a9217ffac 100644 --- a/internal/cache/value_invariants.go +++ b/internal/cache/value_invariants.go @@ -11,8 +11,8 @@ import ( "fmt" "os" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/manual" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/manual" ) // newValue creates a Value with a manually managed buffer of size n. diff --git a/internal/compact/iterator.go b/internal/compact/iterator.go index d660c93816..dbc679d599 100644 --- a/internal/compact/iterator.go +++ b/internal/compact/iterator.go @@ -10,11 +10,11 @@ import ( "strconv" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invalidating" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/rangekey" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invalidating" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/rangekey" "github.com/cockroachdb/redact" ) diff --git a/internal/compact/iterator_test.go b/internal/compact/iterator_test.go index ba3376280c..274ff257d9 100644 --- a/internal/compact/iterator_test.go +++ b/internal/compact/iterator_test.go @@ -15,9 +15,9 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/rangekey" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/rangekey" "github.com/stretchr/testify/require" ) diff --git a/internal/compact/run.go b/internal/compact/run.go index 5fcc04e3e5..160cb4391d 100644 --- a/internal/compact/run.go +++ b/internal/compact/run.go @@ -9,11 +9,11 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/sstable" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/sstable" ) // Result stores the result of a compaction - more specifically, the "data" part diff --git a/internal/compact/run_test.go b/internal/compact/run_test.go index 260d664386..57c8fa465b 100644 --- a/internal/compact/run_test.go +++ b/internal/compact/run_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/internal/testutils" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/testutils" ) func TestTableSplitLimit(t *testing.T) { diff --git a/internal/compact/snapshots.go b/internal/compact/snapshots.go index 51939870e7..76d1b41c2f 100644 --- a/internal/compact/snapshots.go +++ b/internal/compact/snapshots.go @@ -7,7 +7,7 @@ package compact import ( "sort" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" ) // Snapshots stores a list of snapshot sequence numbers, in ascending order. diff --git a/internal/compact/snapshots_test.go b/internal/compact/snapshots_test.go index 4cf1f12c8c..64f187d0ea 100644 --- a/internal/compact/snapshots_test.go +++ b/internal/compact/snapshots_test.go @@ -7,7 +7,7 @@ package compact import ( "testing" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" ) func TestSnapshotIndex(t *testing.T) { diff --git a/internal/compact/spans.go b/internal/compact/spans.go index e1b76d034c..b86ca2ce35 100644 --- a/internal/compact/spans.go +++ b/internal/compact/spans.go @@ -5,11 +5,11 @@ package compact import ( - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/rangekey" - "github.com/cockroachdb/pebble/sstable" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/rangekey" + "github.com/cockroachdb/pebble/v2/sstable" ) // RangeDelSpanCompactor coalesces RANGEDELs within snapshot stripes and elides diff --git a/internal/compact/spans_test.go b/internal/compact/spans_test.go index cddd3dfb36..c96f8b255a 100644 --- a/internal/compact/spans_test.go +++ b/internal/compact/spans_test.go @@ -10,12 +10,12 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/sstable/colblk" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/sstable/colblk" "github.com/stretchr/testify/require" ) diff --git a/internal/compact/splitting.go b/internal/compact/splitting.go index c1558a1edf..bcd0110075 100644 --- a/internal/compact/splitting.go +++ b/internal/compact/splitting.go @@ -9,9 +9,9 @@ import ( "fmt" "slices" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/manifest" ) // ShouldSplit indicates whether a compaction should split between output files. diff --git a/internal/compact/splitting_test.go b/internal/compact/splitting_test.go index fb316367e0..af3110550e 100644 --- a/internal/compact/splitting_test.go +++ b/internal/compact/splitting_test.go @@ -12,9 +12,9 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/internal/testkeys" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/testkeys" ) func TestOutputSplitter(t *testing.T) { diff --git a/internal/compact/tombstone_elision.go b/internal/compact/tombstone_elision.go index da525d0202..fb9bf062ed 100644 --- a/internal/compact/tombstone_elision.go +++ b/internal/compact/tombstone_elision.go @@ -7,9 +7,9 @@ package compact import ( "strings" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/manifest" ) // TombstoneElision is the information required to determine which tombstones diff --git a/internal/compact/tombstone_elision_test.go b/internal/compact/tombstone_elision_test.go index 05f83a1256..66bff6cbbe 100644 --- a/internal/compact/tombstone_elision_test.go +++ b/internal/compact/tombstone_elision_test.go @@ -12,9 +12,9 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/internal/testkeys" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/testkeys" ) func TestTombstoneElider(t *testing.T) { diff --git a/internal/crc/crc.go b/internal/crc/crc.go index 4021a2edbc..faf2e4c6e8 100644 --- a/internal/crc/crc.go +++ b/internal/crc/crc.go @@ -14,7 +14,7 @@ // var u uint32 = crc.New(data).Value() // // In pebble, the uint32 value is then stored in little-endian format. -package crc // import "github.com/cockroachdb/pebble/internal/crc" +package crc // import "github.com/cockroachdb/pebble/v2/internal/crc" import "hash/crc32" diff --git a/internal/crdbtest/crdb.go b/internal/crdbtest/crdb.go index dc6cbba146..7cf3844709 100644 --- a/internal/crdbtest/crdb.go +++ b/internal/crdbtest/crdb.go @@ -17,9 +17,9 @@ import ( "github.com/cockroachdb/crlib/crbytes" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/sstable/colblk" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/sstable/colblk" ) const ( diff --git a/internal/crdbtest/crdb_bench_test.go b/internal/crdbtest/crdb_bench_test.go index bf8776dc30..a8bbb31fe5 100644 --- a/internal/crdbtest/crdb_bench_test.go +++ b/internal/crdbtest/crdb_bench_test.go @@ -13,13 +13,13 @@ import ( "time" "github.com/cockroachdb/crlib/crstrings" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/cache" - "github.com/cockroachdb/pebble/internal/sstableinternal" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/sstable/block" - "github.com/cockroachdb/pebble/sstable/colblk" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/cache" + "github.com/cockroachdb/pebble/v2/internal/sstableinternal" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/sstable/block" + "github.com/cockroachdb/pebble/v2/sstable/colblk" "github.com/stretchr/testify/require" ) diff --git a/internal/crdbtest/crdb_test.go b/internal/crdbtest/crdb_test.go index 2a7e33ace8..aa38b74f7d 100644 --- a/internal/crdbtest/crdb_test.go +++ b/internal/crdbtest/crdb_test.go @@ -16,10 +16,10 @@ import ( "github.com/cockroachdb/crlib/crstrings" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/testutils" - "github.com/cockroachdb/pebble/sstable/block" - "github.com/cockroachdb/pebble/sstable/colblk" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/testutils" + "github.com/cockroachdb/pebble/v2/sstable/block" + "github.com/cockroachdb/pebble/v2/sstable/colblk" "github.com/stretchr/testify/require" ) diff --git a/internal/crdbtest/key_schema_test.go b/internal/crdbtest/key_schema_test.go index 786ad16870..cce220410a 100644 --- a/internal/crdbtest/key_schema_test.go +++ b/internal/crdbtest/key_schema_test.go @@ -8,11 +8,11 @@ import ( "github.com/cockroachdb/crlib/crstrings" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/binfmt" - "github.com/cockroachdb/pebble/internal/treeprinter" - "github.com/cockroachdb/pebble/sstable/block" - "github.com/cockroachdb/pebble/sstable/colblk" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/binfmt" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/sstable/block" + "github.com/cockroachdb/pebble/v2/sstable/colblk" "github.com/stretchr/testify/require" ) diff --git a/internal/crdbtest/rowblk_bench_test.go b/internal/crdbtest/rowblk_bench_test.go index bfdb3bbba8..780e7e27e9 100644 --- a/internal/crdbtest/rowblk_bench_test.go +++ b/internal/crdbtest/rowblk_bench_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/sstable/block" - "github.com/cockroachdb/pebble/sstable/rowblk" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/sstable/block" + "github.com/cockroachdb/pebble/v2/sstable/rowblk" ) func BenchmarkCockroachDataRowBlockWriter(b *testing.B) { diff --git a/internal/datatest/datatest.go b/internal/datatest/datatest.go index 40f78d59da..9ab92d09cc 100644 --- a/internal/datatest/datatest.go +++ b/internal/datatest/datatest.go @@ -12,7 +12,7 @@ import ( "github.com/cockroachdb/datadriven" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble" + "github.com/cockroachdb/pebble/v2" ) // TODO(jackson): Consider a refactoring that can consolidate this package and diff --git a/internal/devtools/go.mod b/internal/devtools/go.mod index 6ff8e85c51..fe7f96b068 100644 --- a/internal/devtools/go.mod +++ b/internal/devtools/go.mod @@ -1,4 +1,4 @@ -module github.com/cockroachdb/pebble/internal/devtools +module github.com/cockroachdb/pebble/v2/internal/devtools go 1.22.1 diff --git a/internal/intern/intern_test.go b/internal/intern/intern_test.go index 1db6581971..41f9703ad3 100644 --- a/internal/intern/intern_test.go +++ b/internal/intern/intern_test.go @@ -8,7 +8,7 @@ import ( "bytes" "testing" - "github.com/cockroachdb/pebble/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/invariants" ) func TestBytes(t *testing.T) { diff --git a/internal/invalidating/iter.go b/internal/invalidating/iter.go index 82b50276d4..84bd863365 100644 --- a/internal/invalidating/iter.go +++ b/internal/invalidating/iter.go @@ -7,9 +7,9 @@ package invalidating import ( "context" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" ) // MaybeWrapIfInvariants wraps some iterators with an invalidating iterator. diff --git a/internal/itertest/datadriven.go b/internal/itertest/datadriven.go index 16b90375fa..57d49ab507 100644 --- a/internal/itertest/datadriven.go +++ b/internal/itertest/datadriven.go @@ -15,9 +15,9 @@ import ( "github.com/cockroachdb/crlib/crstrings" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/testkeys" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/testkeys" "github.com/stretchr/testify/require" ) diff --git a/internal/itertest/dsl.go b/internal/itertest/dsl.go index e2ba75ccc8..87ab0fd03e 100644 --- a/internal/itertest/dsl.go +++ b/internal/itertest/dsl.go @@ -9,9 +9,9 @@ import ( "go/token" "strings" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/dsl" - "github.com/cockroachdb/pebble/vfs/errorfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/dsl" + "github.com/cockroachdb/pebble/v2/vfs/errorfs" ) // Predicate encodes conditional logic that yields a boolean. diff --git a/internal/itertest/probe.go b/internal/itertest/probe.go index 70622ac023..7125481e64 100644 --- a/internal/itertest/probe.go +++ b/internal/itertest/probe.go @@ -9,9 +9,9 @@ import ( "fmt" "io" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/dsl" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/dsl" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" ) // OpKind indicates the type of iterator operation being performed. diff --git a/internal/itertest/probe_test.go b/internal/itertest/probe_test.go index cb184565f3..a459917292 100644 --- a/internal/itertest/probe_test.go +++ b/internal/itertest/probe_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/testkeys" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/testkeys" ) func TestProbes(t *testing.T) { diff --git a/internal/keyspan/assert_iter.go b/internal/keyspan/assert_iter.go index ded00db934..6ea90292ca 100644 --- a/internal/keyspan/assert_iter.go +++ b/internal/keyspan/assert_iter.go @@ -9,9 +9,9 @@ import ( "fmt" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" ) // Assert wraps an iterator which asserts that operations return sane results. diff --git a/internal/keyspan/assert_iter_test.go b/internal/keyspan/assert_iter_test.go index 2bfc1be4ec..02071b2770 100644 --- a/internal/keyspan/assert_iter_test.go +++ b/internal/keyspan/assert_iter_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/testkeys" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/testkeys" "github.com/stretchr/testify/require" ) diff --git a/internal/keyspan/bounded.go b/internal/keyspan/bounded.go index 379676b719..03f6f3f143 100644 --- a/internal/keyspan/bounded.go +++ b/internal/keyspan/bounded.go @@ -7,8 +7,8 @@ package keyspan import ( "context" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" ) // TODO(jackson): Consider removing this type and adding bounds enforcement diff --git a/internal/keyspan/bounded_test.go b/internal/keyspan/bounded_test.go index 33f7fc7b08..f3d1dbec00 100644 --- a/internal/keyspan/bounded_test.go +++ b/internal/keyspan/bounded_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/testkeys" + "github.com/cockroachdb/pebble/v2/internal/testkeys" ) func TestBoundedIter(t *testing.T) { diff --git a/internal/keyspan/defragment.go b/internal/keyspan/defragment.go index a8a17320b5..4cac770110 100644 --- a/internal/keyspan/defragment.go +++ b/internal/keyspan/defragment.go @@ -8,10 +8,10 @@ import ( "bytes" "context" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/bytealloc" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/bytealloc" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" ) // BufferReuseMaxCapacity is the maximum capacity of a DefragmentingIter buffer diff --git a/internal/keyspan/defragment_test.go b/internal/keyspan/defragment_test.go index 45ba05c4d6..0f53801bb2 100644 --- a/internal/keyspan/defragment_test.go +++ b/internal/keyspan/defragment_test.go @@ -13,8 +13,8 @@ import ( "time" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/testkeys" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/testkeys" "github.com/pmezard/go-difflib/difflib" ) diff --git a/internal/keyspan/filter.go b/internal/keyspan/filter.go index 8b09b2fdd0..b1116f6d4a 100644 --- a/internal/keyspan/filter.go +++ b/internal/keyspan/filter.go @@ -7,8 +7,8 @@ package keyspan import ( "context" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" ) // FilterFunc is a callback that allows filtering keys from a Span. The result diff --git a/internal/keyspan/filter_test.go b/internal/keyspan/filter_test.go index d82d2f1120..91c84ad694 100644 --- a/internal/keyspan/filter_test.go +++ b/internal/keyspan/filter_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/testkeys" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/testkeys" ) func TestFilteringIter(t *testing.T) { diff --git a/internal/keyspan/fragmenter.go b/internal/keyspan/fragmenter.go index 6bb5db6199..bd0f596d34 100644 --- a/internal/keyspan/fragmenter.go +++ b/internal/keyspan/fragmenter.go @@ -7,8 +7,8 @@ package keyspan import ( "fmt" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" ) // Fragmenter fragments a set of spans such that overlapping spans are diff --git a/internal/keyspan/fragmenter_test.go b/internal/keyspan/fragmenter_test.go index 9502ba0a81..ff06d82371 100644 --- a/internal/keyspan/fragmenter_test.go +++ b/internal/keyspan/fragmenter_test.go @@ -12,7 +12,7 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" "github.com/stretchr/testify/require" ) diff --git a/internal/keyspan/get.go b/internal/keyspan/get.go index 4561dc89fe..26f1e11e0d 100644 --- a/internal/keyspan/get.go +++ b/internal/keyspan/get.go @@ -4,7 +4,7 @@ package keyspan -import "github.com/cockroachdb/pebble/internal/base" +import "github.com/cockroachdb/pebble/v2/internal/base" // Get returns the newest span that contains the target key. If no span contains // the target key, an empty span is returned. The iterator must contain diff --git a/internal/keyspan/get_test.go b/internal/keyspan/get_test.go index 84cb2b2b97..2d2df31adc 100644 --- a/internal/keyspan/get_test.go +++ b/internal/keyspan/get_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/testkeys" + "github.com/cockroachdb/pebble/v2/internal/testkeys" ) func TestGet(t *testing.T) { diff --git a/internal/keyspan/interleaving_iter.go b/internal/keyspan/interleaving_iter.go index 39a3759fdd..f913f878be 100644 --- a/internal/keyspan/interleaving_iter.go +++ b/internal/keyspan/interleaving_iter.go @@ -9,9 +9,9 @@ import ( "fmt" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" ) // A SpanMask may be used to configure an interleaving iterator to skip point diff --git a/internal/keyspan/interleaving_iter_test.go b/internal/keyspan/interleaving_iter_test.go index 45f331fb54..2c3d28859e 100644 --- a/internal/keyspan/interleaving_iter_test.go +++ b/internal/keyspan/interleaving_iter_test.go @@ -14,9 +14,9 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" "github.com/stretchr/testify/require" ) diff --git a/internal/keyspan/iter.go b/internal/keyspan/iter.go index 5d13e06520..88e7c8be6d 100644 --- a/internal/keyspan/iter.go +++ b/internal/keyspan/iter.go @@ -7,8 +7,8 @@ package keyspan import ( "context" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" ) // FragmentIterator defines an iterator interface over spans. The spans diff --git a/internal/keyspan/iter_test.go b/internal/keyspan/iter_test.go index bc60147341..a63cfa97b9 100644 --- a/internal/keyspan/iter_test.go +++ b/internal/keyspan/iter_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" ) func TestIter(t *testing.T) { diff --git a/internal/keyspan/keyspanimpl/level_iter.go b/internal/keyspan/keyspanimpl/level_iter.go index 9334a92090..b60bfd591e 100644 --- a/internal/keyspan/keyspanimpl/level_iter.go +++ b/internal/keyspan/keyspanimpl/level_iter.go @@ -8,11 +8,11 @@ import ( "context" "fmt" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" ) // TableNewSpanIter creates a new iterator for range key spans for the given diff --git a/internal/keyspan/keyspanimpl/level_iter_test.go b/internal/keyspan/keyspanimpl/level_iter_test.go index decff7ca91..5f2bdf027e 100644 --- a/internal/keyspan/keyspanimpl/level_iter_test.go +++ b/internal/keyspan/keyspanimpl/level_iter_test.go @@ -11,9 +11,9 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/manifest" "github.com/stretchr/testify/require" ) diff --git a/internal/keyspan/keyspanimpl/merging_iter.go b/internal/keyspan/keyspanimpl/merging_iter.go index 3636760dc6..f6141d3bbd 100644 --- a/internal/keyspan/keyspanimpl/merging_iter.go +++ b/internal/keyspan/keyspanimpl/merging_iter.go @@ -11,11 +11,11 @@ import ( "fmt" "slices" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" ) // TODO(jackson): Consider implementing an optimization to seek lower levels diff --git a/internal/keyspan/keyspanimpl/merging_iter_test.go b/internal/keyspan/keyspanimpl/merging_iter_test.go index 8bc03cbb9a..f5c019d3b4 100644 --- a/internal/keyspan/keyspanimpl/merging_iter_test.go +++ b/internal/keyspan/keyspanimpl/merging_iter_test.go @@ -15,9 +15,9 @@ import ( "time" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/testkeys" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/testkeys" "github.com/stretchr/testify/require" ) diff --git a/internal/keyspan/logging_iter.go b/internal/keyspan/logging_iter.go index 250d669101..a66bd6f095 100644 --- a/internal/keyspan/logging_iter.go +++ b/internal/keyspan/logging_iter.go @@ -8,8 +8,8 @@ import ( "context" "fmt" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" ) // WrapFn is the prototype for a function that wraps a FragmentIterator. diff --git a/internal/keyspan/logging_iter_test.go b/internal/keyspan/logging_iter_test.go index 162a68b424..5dabf5da65 100644 --- a/internal/keyspan/logging_iter_test.go +++ b/internal/keyspan/logging_iter_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" ) func TestLoggingIter(t *testing.T) { diff --git a/internal/keyspan/seek.go b/internal/keyspan/seek.go index aef293f4d1..2eafc06dbb 100644 --- a/internal/keyspan/seek.go +++ b/internal/keyspan/seek.go @@ -4,7 +4,7 @@ package keyspan -import "github.com/cockroachdb/pebble/internal/base" +import "github.com/cockroachdb/pebble/v2/internal/base" // SeekLE seeks to the span that contains or is before the target key. If an // error occurs while seeking iter, a nil span and non-nil error is returned. diff --git a/internal/keyspan/seek_test.go b/internal/keyspan/seek_test.go index 93f2a66393..6454d71721 100644 --- a/internal/keyspan/seek_test.go +++ b/internal/keyspan/seek_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" ) func TestSeek(t *testing.T) { diff --git a/internal/keyspan/span.go b/internal/keyspan/span.go index fd840b0a68..4db835e884 100644 --- a/internal/keyspan/span.go +++ b/internal/keyspan/span.go @@ -2,7 +2,7 @@ // of this source code is governed by a BSD-style license that can be found in // the LICENSE file. -package keyspan // import "github.com/cockroachdb/pebble/internal/keyspan" +package keyspan // import "github.com/cockroachdb/pebble/v2/internal/keyspan" import ( "bytes" @@ -12,7 +12,7 @@ import ( "strings" "unicode" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" ) // Span represents a set of keys over a span of user key space. All of the keys diff --git a/internal/keyspan/span_test.go b/internal/keyspan/span_test.go index 8603545e12..3e909b2bb6 100644 --- a/internal/keyspan/span_test.go +++ b/internal/keyspan/span_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" ) // TODO(jackson): Add unit tests for all of the various Span methods. diff --git a/internal/keyspan/test_utils.go b/internal/keyspan/test_utils.go index 060aadd30f..d588839554 100644 --- a/internal/keyspan/test_utils.go +++ b/internal/keyspan/test_utils.go @@ -15,8 +15,8 @@ import ( "strings" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/dsl" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/dsl" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" ) // This file contains testing facilities for Spans and FragmentIterators. It's diff --git a/internal/keyspan/transformer.go b/internal/keyspan/transformer.go index 9510cf26c7..7d789a152b 100644 --- a/internal/keyspan/transformer.go +++ b/internal/keyspan/transformer.go @@ -4,7 +4,7 @@ package keyspan -import "github.com/cockroachdb/pebble/internal/base" +import "github.com/cockroachdb/pebble/v2/internal/base" // Transformer defines a transformation to be applied to a Span. type Transformer interface { diff --git a/internal/keyspan/truncate.go b/internal/keyspan/truncate.go index 721d514f38..78fcfa9470 100644 --- a/internal/keyspan/truncate.go +++ b/internal/keyspan/truncate.go @@ -7,9 +7,9 @@ package keyspan import ( "context" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" ) // Truncate creates a new iterator where every span in the supplied iterator is diff --git a/internal/keyspan/truncate_test.go b/internal/keyspan/truncate_test.go index c70c6057dd..d9f955097f 100644 --- a/internal/keyspan/truncate_test.go +++ b/internal/keyspan/truncate_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" "github.com/stretchr/testify/require" ) diff --git a/internal/lint/lint_test.go b/internal/lint/lint_test.go index 8d430ed2b5..995487e280 100644 --- a/internal/lint/lint_test.go +++ b/internal/lint/lint_test.go @@ -16,7 +16,7 @@ import ( "testing" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/invariants" "github.com/ghemawat/stream" "github.com/stretchr/testify/require" ) @@ -67,7 +67,7 @@ func TestLint(t *testing.T) { t.Skip("lint checks skipped on race builds") } - const root = "github.com/cockroachdb/pebble" + const root = "github.com/cockroachdb/pebble/v2" pkg, err := build.Import(root, "../..", 0) require.NoError(t, err) diff --git a/internal/manifest/annotator.go b/internal/manifest/annotator.go index d84564db66..f9f93dcf48 100644 --- a/internal/manifest/annotator.go +++ b/internal/manifest/annotator.go @@ -8,7 +8,7 @@ import ( "sort" "sync/atomic" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" ) // The Annotator type defined below is used by other packages to lazily diff --git a/internal/manifest/annotator_test.go b/internal/manifest/annotator_test.go index 9d5355a678..8560387b5d 100644 --- a/internal/manifest/annotator_test.go +++ b/internal/manifest/annotator_test.go @@ -8,7 +8,7 @@ import ( "math/rand/v2" "testing" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" "github.com/stretchr/testify/require" ) diff --git a/internal/manifest/btree.go b/internal/manifest/btree.go index 74ee966e0c..700e2a8d41 100644 --- a/internal/manifest/btree.go +++ b/internal/manifest/btree.go @@ -14,8 +14,8 @@ import ( "unsafe" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" ) type btreeCmp func(*FileMetadata, *FileMetadata) int diff --git a/internal/manifest/btree_test.go b/internal/manifest/btree_test.go index 9c797143b7..5ee23ca9b5 100644 --- a/internal/manifest/btree_test.go +++ b/internal/manifest/btree_test.go @@ -15,8 +15,8 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" "github.com/stretchr/testify/require" ) diff --git a/internal/manifest/l0_sublevels.go b/internal/manifest/l0_sublevels.go index 3185b95b3d..6ab8a4cd92 100644 --- a/internal/manifest/l0_sublevels.go +++ b/internal/manifest/l0_sublevels.go @@ -14,8 +14,8 @@ import ( "strings" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" ) // errInvalidL0SublevelsOpt is for use in AddL0Files when the incremental diff --git a/internal/manifest/l0_sublevels_test.go b/internal/manifest/l0_sublevels_test.go index 8cdf199bbb..caf47c9c85 100644 --- a/internal/manifest/l0_sublevels_test.go +++ b/internal/manifest/l0_sublevels_test.go @@ -19,9 +19,9 @@ import ( "time" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/record" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/record" "github.com/stretchr/testify/require" ) diff --git a/internal/manifest/level_metadata.go b/internal/manifest/level_metadata.go index abe4a13cb3..7f0918e2e6 100644 --- a/internal/manifest/level_metadata.go +++ b/internal/manifest/level_metadata.go @@ -9,8 +9,8 @@ import ( "fmt" "reflect" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" ) // LevelMetadata contains metadata for all of the files within diff --git a/internal/manifest/level_metadata_test.go b/internal/manifest/level_metadata_test.go index 875a6c35bb..596b647f4f 100644 --- a/internal/manifest/level_metadata_test.go +++ b/internal/manifest/level_metadata_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" "github.com/stretchr/testify/require" ) diff --git a/internal/manifest/manifest_test.go b/internal/manifest/manifest_test.go index 4d3a61e8b2..46cd5acbfb 100644 --- a/internal/manifest/manifest_test.go +++ b/internal/manifest/manifest_test.go @@ -11,12 +11,12 @@ import ( "time" "github.com/cockroachdb/errors/oserror" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/metamorphic" - "github.com/cockroachdb/pebble/record" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/metamorphic" + "github.com/cockroachdb/pebble/v2/record" "github.com/stretchr/testify/require" ) diff --git a/internal/manifest/testutils.go b/internal/manifest/testutils.go index d6d72164fa..f65ddfa165 100644 --- a/internal/manifest/testutils.go +++ b/internal/manifest/testutils.go @@ -11,7 +11,7 @@ import ( "strings" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" ) // debugParser is a helper used to implement parsing of debug strings, like diff --git a/internal/manifest/version.go b/internal/manifest/version.go index 3af2fa0b0e..959df02ba2 100644 --- a/internal/manifest/version.go +++ b/internal/manifest/version.go @@ -15,10 +15,10 @@ import ( "sync/atomic" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/sstable/block" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/sstable/block" ) // Compare exports the base.Compare type. diff --git a/internal/manifest/version_edit.go b/internal/manifest/version_edit.go index 28b2799b9d..d91f648be7 100644 --- a/internal/manifest/version_edit.go +++ b/internal/manifest/version_edit.go @@ -16,9 +16,9 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/sstable" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/sstable" ) // TODO(peter): describe the MANIFEST file format, independently of the C++ diff --git a/internal/manifest/version_edit_test.go b/internal/manifest/version_edit_test.go index 615f7a2347..c864da6362 100644 --- a/internal/manifest/version_edit_test.go +++ b/internal/manifest/version_edit_test.go @@ -16,9 +16,9 @@ import ( "github.com/cockroachdb/datadriven" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/record" - "github.com/cockroachdb/pebble/sstable" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/record" + "github.com/cockroachdb/pebble/v2/sstable" "github.com/kr/pretty" "github.com/stretchr/testify/require" ) diff --git a/internal/manifest/version_test.go b/internal/manifest/version_test.go index 9704578150..0c3222b849 100644 --- a/internal/manifest/version_test.go +++ b/internal/manifest/version_test.go @@ -16,8 +16,8 @@ import ( "time" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/testkeys" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/testkeys" "github.com/stretchr/testify/require" ) diff --git a/internal/manifest/virtual_backings.go b/internal/manifest/virtual_backings.go index e3aa97a3ef..eb9e869e99 100644 --- a/internal/manifest/virtual_backings.go +++ b/internal/manifest/virtual_backings.go @@ -11,7 +11,7 @@ import ( "slices" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" ) // VirtualBackings maintains information about the set of backings that support diff --git a/internal/manifest/virtual_backings_test.go b/internal/manifest/virtual_backings_test.go index 9252e17b55..78c1ceb2bc 100644 --- a/internal/manifest/virtual_backings_test.go +++ b/internal/manifest/virtual_backings_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" ) func TestVirtualBackings(t *testing.T) { diff --git a/internal/manual/manual.go b/internal/manual/manual.go index 24f02574b6..114f984295 100644 --- a/internal/manual/manual.go +++ b/internal/manual/manual.go @@ -8,7 +8,7 @@ import ( "fmt" "sync/atomic" - "github.com/cockroachdb/pebble/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/invariants" ) // Purpose identifies the use-case for an allocation. diff --git a/internal/metamorphic/crossversion/crossversion_test.go b/internal/metamorphic/crossversion/crossversion_test.go index 7285465e9f..e1919d01a2 100644 --- a/internal/metamorphic/crossversion/crossversion_test.go +++ b/internal/metamorphic/crossversion/crossversion_test.go @@ -25,8 +25,8 @@ import ( "unicode" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/metamorphic" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/metamorphic" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" ) diff --git a/internal/metamorphic/meta_test.go b/internal/metamorphic/meta_test.go index ad2a51e824..03d4168ad5 100644 --- a/internal/metamorphic/meta_test.go +++ b/internal/metamorphic/meta_test.go @@ -8,8 +8,8 @@ import ( "path/filepath" "testing" - "github.com/cockroachdb/pebble/internal/metamorphic/metaflags" - "github.com/cockroachdb/pebble/metamorphic" + "github.com/cockroachdb/pebble/v2/internal/metamorphic/metaflags" + "github.com/cockroachdb/pebble/v2/metamorphic" ) // TODO(peter): diff --git a/internal/metamorphic/metaflags/meta_flags.go b/internal/metamorphic/metaflags/meta_flags.go index 863164665b..c19655b65c 100644 --- a/internal/metamorphic/metaflags/meta_flags.go +++ b/internal/metamorphic/metaflags/meta_flags.go @@ -16,9 +16,9 @@ import ( "strings" "time" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/randvar" - "github.com/cockroachdb/pebble/metamorphic" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/randvar" + "github.com/cockroachdb/pebble/v2/metamorphic" ) // CommonFlags contains flags that apply to both metamorphic.Run and diff --git a/internal/metamorphic/metarunner/main.go b/internal/metamorphic/metarunner/main.go index 2b0026863a..dbce53f009 100644 --- a/internal/metamorphic/metarunner/main.go +++ b/internal/metamorphic/metarunner/main.go @@ -13,8 +13,8 @@ import ( "os" "path/filepath" - "github.com/cockroachdb/pebble/internal/metamorphic/metaflags" - "github.com/cockroachdb/pebble/metamorphic" + "github.com/cockroachdb/pebble/v2/internal/metamorphic/metaflags" + "github.com/cockroachdb/pebble/v2/metamorphic" ) var runOnceFlags = metaflags.InitRunOnceFlags() diff --git a/internal/metamorphic/reduce_test.go b/internal/metamorphic/reduce_test.go index 2acbfc15e7..c1e82d7d8f 100644 --- a/internal/metamorphic/reduce_test.go +++ b/internal/metamorphic/reduce_test.go @@ -16,7 +16,7 @@ import ( "testing" "time" - "github.com/cockroachdb/pebble/metamorphic" + "github.com/cockroachdb/pebble/v2/metamorphic" "github.com/stretchr/testify/require" ) diff --git a/internal/overlap/checker.go b/internal/overlap/checker.go index c219b553a1..9b5fa2e1a4 100644 --- a/internal/overlap/checker.go +++ b/internal/overlap/checker.go @@ -9,9 +9,9 @@ package overlap import ( "context" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/manifest" ) // WithLSM stores the result of checking for boundary and data overlap between a diff --git a/internal/overlap/checker_test.go b/internal/overlap/checker_test.go index d9a636d1ec..c21416b353 100644 --- a/internal/overlap/checker_test.go +++ b/internal/overlap/checker_test.go @@ -13,9 +13,9 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/manifest" "github.com/stretchr/testify/require" ) diff --git a/internal/pacertoy/pebble/main.go b/internal/pacertoy/pebble/main.go index 005e155bcc..6c5b445f9d 100644 --- a/internal/pacertoy/pebble/main.go +++ b/internal/pacertoy/pebble/main.go @@ -13,7 +13,7 @@ import ( "sync/atomic" "time" - "github.com/cockroachdb/pebble/internal/rate" + "github.com/cockroachdb/pebble/v2/internal/rate" ) const ( diff --git a/internal/pacertoy/rocksdb/main.go b/internal/pacertoy/rocksdb/main.go index fc7d6431b3..90e8cefdd9 100644 --- a/internal/pacertoy/rocksdb/main.go +++ b/internal/pacertoy/rocksdb/main.go @@ -12,7 +12,7 @@ import ( "sync/atomic" "time" - "github.com/cockroachdb/pebble/internal/rate" + "github.com/cockroachdb/pebble/v2/internal/rate" ) const ( diff --git a/internal/private/batch.go b/internal/private/batch.go index dcdd1f1a0e..51560328f7 100644 --- a/internal/private/batch.go +++ b/internal/private/batch.go @@ -5,8 +5,8 @@ package private import ( - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/keyspan" ) // BatchSort is a hook for constructing iterators over the point and range diff --git a/internal/rangedel/rangedel.go b/internal/rangedel/rangedel.go index 7184d95b42..2ea9b08237 100644 --- a/internal/rangedel/rangedel.go +++ b/internal/rangedel/rangedel.go @@ -5,9 +5,9 @@ package rangedel import ( - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/keyspan" ) // Encode takes a Span containing only range deletions. It invokes the provided diff --git a/internal/rangekey/coalesce.go b/internal/rangekey/coalesce.go index 8c3445df70..ac5fb7f438 100644 --- a/internal/rangekey/coalesce.go +++ b/internal/rangekey/coalesce.go @@ -8,9 +8,9 @@ import ( "math" "slices" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/keyspan" ) // Coalesce imposes range key semantics and coalesces range keys with the same diff --git a/internal/rangekey/coalesce_test.go b/internal/rangekey/coalesce_test.go index 285e4f730e..9a349dc76a 100644 --- a/internal/rangekey/coalesce_test.go +++ b/internal/rangekey/coalesce_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/testkeys" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/testkeys" ) func TestCoalesce(t *testing.T) { diff --git a/internal/rangekey/rangekey.go b/internal/rangekey/rangekey.go index 59d555d078..20d3d89e00 100644 --- a/internal/rangekey/rangekey.go +++ b/internal/rangekey/rangekey.go @@ -52,9 +52,9 @@ package rangekey import ( "encoding/binary" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/keyspan" ) // Encode takes a Span containing only range keys. It invokes the provided diff --git a/internal/rangekey/rangekey_test.go b/internal/rangekey/rangekey_test.go index b4cb3efb84..e1db8d96cc 100644 --- a/internal/rangekey/rangekey_test.go +++ b/internal/rangekey/rangekey_test.go @@ -3,7 +3,7 @@ package rangekey import ( "testing" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" "github.com/stretchr/testify/require" ) diff --git a/internal/rangekeystack/user_iterator.go b/internal/rangekeystack/user_iterator.go index 3d793510a6..039e0e4469 100644 --- a/internal/rangekeystack/user_iterator.go +++ b/internal/rangekeystack/user_iterator.go @@ -7,12 +7,12 @@ package rangekeystack import ( "bytes" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/keyspan/keyspanimpl" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/internal/rangekey" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/keyspan/keyspanimpl" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/rangekey" ) // UserIteratorConfig holds state for constructing the range key iterator stack diff --git a/internal/rangekeystack/user_iterator_test.go b/internal/rangekeystack/user_iterator_test.go index 71e44b03ac..617805c3f9 100644 --- a/internal/rangekeystack/user_iterator_test.go +++ b/internal/rangekeystack/user_iterator_test.go @@ -15,11 +15,11 @@ import ( "time" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/keyspan/keyspanimpl" - "github.com/cockroachdb/pebble/internal/rangekey" - "github.com/cockroachdb/pebble/internal/testkeys" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/keyspan/keyspanimpl" + "github.com/cockroachdb/pebble/v2/internal/rangekey" + "github.com/cockroachdb/pebble/v2/internal/testkeys" "github.com/pmezard/go-difflib/difflib" "github.com/stretchr/testify/require" ) diff --git a/internal/rate/rate.go b/internal/rate/rate.go index f5f801cbb0..5cca57a64e 100644 --- a/internal/rate/rate.go +++ b/internal/rate/rate.go @@ -3,7 +3,7 @@ // the LICENSE file. // Package rate provides a rate limiter. -package rate // import "github.com/cockroachdb/pebble/internal/rate" +package rate // import "github.com/cockroachdb/pebble/v2/internal/rate" import ( "sync" diff --git a/internal/sstableinternal/options.go b/internal/sstableinternal/options.go index 3dccebdb33..1035c30b39 100644 --- a/internal/sstableinternal/options.go +++ b/internal/sstableinternal/options.go @@ -5,8 +5,8 @@ package sstableinternal import ( - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/cache" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/cache" ) // CacheOptions contains the information needed to interact with the block diff --git a/internal/testkeys/testkeys.go b/internal/testkeys/testkeys.go index 35eb614477..2e747d9c2c 100644 --- a/internal/testkeys/testkeys.go +++ b/internal/testkeys/testkeys.go @@ -22,7 +22,7 @@ import ( "strconv" "strings" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" ) const alpha = "abcdefghijklmnopqrstuvwxyz" diff --git a/internal/testkeys/testkeys_test.go b/internal/testkeys/testkeys_test.go index 5616410a0a..7b3debd5ce 100644 --- a/internal/testkeys/testkeys_test.go +++ b/internal/testkeys/testkeys_test.go @@ -12,7 +12,7 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" "github.com/stretchr/testify/require" ) diff --git a/internal/testutils/indenttree/indent_tree_test.go b/internal/testutils/indenttree/indent_tree_test.go index 9a1b355cf3..496ca531af 100644 --- a/internal/testutils/indenttree/indent_tree_test.go +++ b/internal/testutils/indenttree/indent_tree_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" ) func TestIndentTree(t *testing.T) { diff --git a/internal/treesteps/data.go b/internal/treesteps/data.go index b6a0ac9b7c..1319e3f3d2 100644 --- a/internal/treesteps/data.go +++ b/internal/treesteps/data.go @@ -13,7 +13,7 @@ import ( "net/url" "strings" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" ) // Steps contains the result of a recording: the full details of the hierarchy diff --git a/internal/treesteps/tree_steps.go b/internal/treesteps/tree_steps.go index f428f2e476..ef351f68fe 100644 --- a/internal/treesteps/tree_steps.go +++ b/internal/treesteps/tree_steps.go @@ -11,7 +11,7 @@ import ( "strings" "unicode" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" ) // StartRecording starts a new recording that captures step-by-step propagation diff --git a/iterator.go b/iterator.go index a2aa77e4cf..fc88c54663 100644 --- a/iterator.go +++ b/iterator.go @@ -13,16 +13,16 @@ import ( "unsafe" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/bytealloc" - "github.com/cockroachdb/pebble/internal/humanize" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/keyspan/keyspanimpl" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/internal/rangekeystack" - "github.com/cockroachdb/pebble/internal/treeprinter" - "github.com/cockroachdb/pebble/sstable" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/bytealloc" + "github.com/cockroachdb/pebble/v2/internal/humanize" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/keyspan/keyspanimpl" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/rangekeystack" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/sstable" "github.com/cockroachdb/redact" ) @@ -83,7 +83,7 @@ const ( // Approximate gap in bytes between samples of data read during iteration. // This is multiplied with a default ReadSamplingMultiplier of 1 << 4 to yield // 1 << 20 (1MB). The 1MB factor comes from: -// https://github.com/cockroachdb/pebble/issues/29#issuecomment-494477985 +// https://github.com/cockroachdb/pebble/v2/issues/29#issuecomment-494477985 const readBytesPeriod uint64 = 1 << 16 var errReversePrefixIteration = errors.New("pebble: unsupported reverse prefix iteration") @@ -857,7 +857,7 @@ func (i *Iterator) sampleRead() { // doing that are significant enough to negate the benefits // of read sampling in the first place. See the discussion // at: - // https://github.com/cockroachdb/pebble/pull/1041#issuecomment-763226492 + // https://github.com/cockroachdb/pebble/v2/pull/1041#issuecomment-763226492 if containsKey { numOverlappingLevels++ if numOverlappingLevels >= 2 { diff --git a/iterator_example_test.go b/iterator_example_test.go index 341c668ccf..cd99de5dc7 100644 --- a/iterator_example_test.go +++ b/iterator_example_test.go @@ -8,8 +8,8 @@ import ( "fmt" "log" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/vfs" ) func ExampleIterator() { diff --git a/iterator_histories_test.go b/iterator_histories_test.go index e22fa18e0b..77535163c8 100644 --- a/iterator_histories_test.go +++ b/iterator_histories_test.go @@ -14,11 +14,11 @@ import ( "github.com/cockroachdb/datadriven" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" ) diff --git a/iterator_test.go b/iterator_test.go index ec1addbb31..ad831a5c41 100644 --- a/iterator_test.go +++ b/iterator_test.go @@ -22,15 +22,15 @@ import ( "github.com/cockroachdb/datadriven" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/bytealloc" - "github.com/cockroachdb/pebble/internal/cache" - "github.com/cockroachdb/pebble/internal/invalidating" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/bytealloc" + "github.com/cockroachdb/pebble/v2/internal/cache" + "github.com/cockroachdb/pebble/v2/internal/invalidating" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" "golang.org/x/sync/errgroup" ) diff --git a/keyspan_probe_test.go b/keyspan_probe_test.go index afee56a40b..ed4911d3c7 100644 --- a/keyspan_probe_test.go +++ b/keyspan_probe_test.go @@ -14,9 +14,9 @@ import ( "strings" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/dsl" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/dsl" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" ) // This file contains testing facilities for Spans and FragmentIterators. It's diff --git a/level_checker.go b/level_checker.go index 49d518aff9..d612443034 100644 --- a/level_checker.go +++ b/level_checker.go @@ -11,9 +11,9 @@ import ( "sort" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/manifest" ) // This file implements DB.CheckLevels() which checks that every entry in the diff --git a/level_checker_test.go b/level_checker_test.go index dd2ac48c02..7162965369 100644 --- a/level_checker_test.go +++ b/level_checker_test.go @@ -15,17 +15,17 @@ import ( "github.com/cockroachdb/datadriven" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invalidating" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/internal/sstableinternal" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/sstable/colblk" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invalidating" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/sstableinternal" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/sstable/colblk" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" ) diff --git a/level_iter.go b/level_iter.go index 7f4b6f853c..5c96e1a16d 100644 --- a/level_iter.go +++ b/level_iter.go @@ -10,12 +10,12 @@ import ( "runtime/debug" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/internal/treeprinter" - "github.com/cockroachdb/pebble/sstable" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/sstable" ) type internalIterOpts struct { diff --git a/level_iter_test.go b/level_iter_test.go index 8a7f51d7e4..bfbfa99e29 100644 --- a/level_iter_test.go +++ b/level_iter_test.go @@ -15,18 +15,18 @@ import ( "github.com/cockroachdb/datadriven" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/bloom" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/itertest" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/internal/rangedel" - "github.com/cockroachdb/pebble/internal/rangekey" - "github.com/cockroachdb/pebble/internal/sstableinternal" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/bloom" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/itertest" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/rangedel" + "github.com/cockroachdb/pebble/v2/internal/rangekey" + "github.com/cockroachdb/pebble/v2/internal/sstableinternal" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" ) diff --git a/logger.go b/logger.go index 5e3e92ecd7..e14684df94 100644 --- a/logger.go +++ b/logger.go @@ -4,7 +4,7 @@ package pebble -import "github.com/cockroachdb/pebble/internal/base" +import "github.com/cockroachdb/pebble/v2/internal/base" // Logger defines an interface for writing log messages. type Logger = base.Logger diff --git a/lsm_view.go b/lsm_view.go index e1dd2c9789..349e1233e9 100644 --- a/lsm_view.go +++ b/lsm_view.go @@ -10,10 +10,10 @@ import ( "slices" "strings" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/humanize" - "github.com/cockroachdb/pebble/internal/lsmview" - "github.com/cockroachdb/pebble/objstorage" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/humanize" + "github.com/cockroachdb/pebble/v2/internal/lsmview" + "github.com/cockroachdb/pebble/v2/objstorage" ) // LSMViewURL returns an URL which shows a diagram of the LSM. diff --git a/mem_table.go b/mem_table.go index 277a83537d..785a260985 100644 --- a/mem_table.go +++ b/mem_table.go @@ -12,12 +12,12 @@ import ( "sync/atomic" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/arenaskl" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/manual" - "github.com/cockroachdb/pebble/internal/rangedel" - "github.com/cockroachdb/pebble/internal/rangekey" + "github.com/cockroachdb/pebble/v2/internal/arenaskl" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/manual" + "github.com/cockroachdb/pebble/v2/internal/rangedel" + "github.com/cockroachdb/pebble/v2/internal/rangekey" ) func memTableEntrySize(keyBytes, valueBytes int) uint64 { diff --git a/mem_table_test.go b/mem_table_test.go index 5d98d55f7a..60e26f1aea 100644 --- a/mem_table_test.go +++ b/mem_table_test.go @@ -17,10 +17,10 @@ import ( "github.com/cockroachdb/datadriven" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/arenaskl" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/itertest" - "github.com/cockroachdb/pebble/internal/rangekey" + "github.com/cockroachdb/pebble/v2/internal/arenaskl" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/itertest" + "github.com/cockroachdb/pebble/v2/internal/rangekey" "github.com/stretchr/testify/require" "golang.org/x/sync/errgroup" ) diff --git a/merger.go b/merger.go index 26f6ee64a3..e4d27f221a 100644 --- a/merger.go +++ b/merger.go @@ -7,7 +7,7 @@ package pebble import ( "io" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" ) // Merge exports the base.Merge type. diff --git a/merging_iter.go b/merging_iter.go index 7b994d6ec8..c4bd4c8006 100644 --- a/merging_iter.go +++ b/merging_iter.go @@ -12,10 +12,10 @@ import ( "unsafe" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" ) type mergingIterLevel struct { diff --git a/merging_iter_test.go b/merging_iter_test.go index d8378ee555..c9c8088e18 100644 --- a/merging_iter_test.go +++ b/merging_iter_test.go @@ -16,17 +16,17 @@ import ( "github.com/cockroachdb/datadriven" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/bloom" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/itertest" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/internal/sstableinternal" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/internal/testutils/indenttree" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/bloom" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/itertest" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/sstableinternal" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/internal/testutils/indenttree" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" ) @@ -309,7 +309,7 @@ func TestMergingIterDataDriven(t *testing.T) { defer miter.Close() miter.forceEnableSeekOpt = true // Exercise SetContext for fun - // (https://github.com/cockroachdb/pebble/pull/3037 caused a SIGSEGV due + // (https://github.com/cockroachdb/pebble/v2/pull/3037 caused a SIGSEGV due // to a nil pointer dereference). miter.SetContext(context.Background()) itertest.RunInternalIterCmdWriter(t, &buf, d, miter, diff --git a/metamorphic/build.go b/metamorphic/build.go index fbbfff2ad9..714fee0c83 100644 --- a/metamorphic/build.go +++ b/metamorphic/build.go @@ -9,15 +9,15 @@ import ( "fmt" "slices" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/private" - "github.com/cockroachdb/pebble/internal/rangekey" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/private" + "github.com/cockroachdb/pebble/v2/internal/rangekey" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/vfs" ) // writeSSTForIngestion writes an SST that is to be ingested, either directly or diff --git a/metamorphic/config.go b/metamorphic/config.go index 04d941dc52..2f7b205cd4 100644 --- a/metamorphic/config.go +++ b/metamorphic/config.go @@ -4,7 +4,7 @@ package metamorphic -import "github.com/cockroachdb/pebble/internal/randvar" +import "github.com/cockroachdb/pebble/v2/internal/randvar" // OpType is an enum of possible operation types. type OpType int diff --git a/metamorphic/example_test.go b/metamorphic/example_test.go index d111d6fd39..d665460f64 100644 --- a/metamorphic/example_test.go +++ b/metamorphic/example_test.go @@ -9,7 +9,7 @@ import ( "io" "math/rand/v2" - "github.com/cockroachdb/pebble/metamorphic" + "github.com/cockroachdb/pebble/v2/metamorphic" ) func ExampleExecute() { diff --git a/metamorphic/generator.go b/metamorphic/generator.go index bc654f120e..0482567278 100644 --- a/metamorphic/generator.go +++ b/metamorphic/generator.go @@ -12,9 +12,9 @@ import ( "os" "slices" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/internal/randvar" - "github.com/cockroachdb/pebble/sstable" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/internal/randvar" + "github.com/cockroachdb/pebble/v2/sstable" ) const maxValueSize = 20 diff --git a/metamorphic/generator_test.go b/metamorphic/generator_test.go index e7f2ab1892..2e618182f7 100644 --- a/metamorphic/generator_test.go +++ b/metamorphic/generator_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/cockroachdb/pebble/internal/randvar" + "github.com/cockroachdb/pebble/v2/internal/randvar" "github.com/pmezard/go-difflib/difflib" "github.com/stretchr/testify/require" ) diff --git a/metamorphic/key_generator.go b/metamorphic/key_generator.go index f4744499af..34f4d5b733 100644 --- a/metamorphic/key_generator.go +++ b/metamorphic/key_generator.go @@ -10,8 +10,8 @@ import ( "math/rand/v2" "slices" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/internal/testkeys" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/internal/testkeys" ) type keyGenerator struct { diff --git a/metamorphic/key_generator_test.go b/metamorphic/key_generator_test.go index 4b8c2446fe..f0ffa3294e 100644 --- a/metamorphic/key_generator_test.go +++ b/metamorphic/key_generator_test.go @@ -7,8 +7,8 @@ package metamorphic import ( "testing" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/internal/randvar" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/internal/randvar" ) func TestGenerateRandKeyInRange(t *testing.T) { diff --git a/metamorphic/key_manager.go b/metamorphic/key_manager.go index 4373ad35e4..ab942809e7 100644 --- a/metamorphic/key_manager.go +++ b/metamorphic/key_manager.go @@ -11,9 +11,9 @@ import ( "unsafe" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/testkeys" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/testkeys" "github.com/stretchr/testify/require" ) diff --git a/metamorphic/key_manager_test.go b/metamorphic/key_manager_test.go index 9c5bf328d5..0e40a5749c 100644 --- a/metamorphic/key_manager_test.go +++ b/metamorphic/key_manager_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/randvar" + "github.com/cockroachdb/pebble/v2/internal/randvar" "github.com/stretchr/testify/require" ) diff --git a/metamorphic/meta.go b/metamorphic/meta.go index 72a9a0b9d4..d33bd8b5e1 100644 --- a/metamorphic/meta.go +++ b/metamorphic/meta.go @@ -24,11 +24,11 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/dsl" - "github.com/cockroachdb/pebble/internal/randvar" - "github.com/cockroachdb/pebble/vfs" - "github.com/cockroachdb/pebble/vfs/errorfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/dsl" + "github.com/cockroachdb/pebble/v2/internal/randvar" + "github.com/cockroachdb/pebble/v2/vfs" + "github.com/cockroachdb/pebble/v2/vfs/errorfs" "github.com/pmezard/go-difflib/difflib" "github.com/stretchr/testify/require" "golang.org/x/sync/errgroup" diff --git a/metamorphic/ops.go b/metamorphic/ops.go index 3d3438ffdb..3795a9352b 100644 --- a/metamorphic/ops.go +++ b/metamorphic/ops.go @@ -17,16 +17,16 @@ import ( "strings" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/private" - "github.com/cockroachdb/pebble/internal/rangekey" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/vfs" - "github.com/cockroachdb/pebble/vfs/errorfs" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/private" + "github.com/cockroachdb/pebble/v2/internal/rangekey" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/vfs" + "github.com/cockroachdb/pebble/v2/vfs/errorfs" ) // Ops holds a sequence of operations to be executed by the metamorphic tests. @@ -143,7 +143,7 @@ func (o *checkpointOp) run(t *Test, h historyRecorder) { // by setting the weight that generator.go uses to zero, or similar. // But IIUC the ops are shared for ALL the metamorphic test runs, so // not sure how to do that easily: - // https://github.com/cockroachdb/pebble/blob/master/metamorphic/meta.go#L177 + // https://github.com/cockroachdb/pebble/v2/blob/master/metamorphic/meta.go#L177 if t.testOpts.sharedStorageEnabled || t.testOpts.externalStorageEnabled { h.Recordf("%s // %v", o, nil) return diff --git a/metamorphic/options.go b/metamorphic/options.go index 3e4377ceb0..d815bdcfa6 100644 --- a/metamorphic/options.go +++ b/metamorphic/options.go @@ -18,16 +18,16 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/bloom" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/cache" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/objstorage/remote" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/sstable/block" - "github.com/cockroachdb/pebble/vfs" - "github.com/cockroachdb/pebble/wal" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/bloom" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/cache" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/objstorage/remote" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/sstable/block" + "github.com/cockroachdb/pebble/v2/vfs" + "github.com/cockroachdb/pebble/v2/wal" ) const ( diff --git a/metamorphic/options_test.go b/metamorphic/options_test.go index c53e902e60..4a141ab715 100644 --- a/metamorphic/options_test.go +++ b/metamorphic/options_test.go @@ -15,10 +15,10 @@ import ( "testing" "time" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/kr/pretty" "github.com/stretchr/testify/require" ) diff --git a/metamorphic/parser.go b/metamorphic/parser.go index 46924a7787..9719b0a9c6 100644 --- a/metamorphic/parser.go +++ b/metamorphic/parser.go @@ -14,7 +14,7 @@ import ( "strconv" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble" + "github.com/cockroachdb/pebble/v2" ) type methodInfo struct { diff --git a/metamorphic/parser_test.go b/metamorphic/parser_test.go index 2b2352af64..770c8eb7ee 100644 --- a/metamorphic/parser_test.go +++ b/metamorphic/parser_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/randvar" + "github.com/cockroachdb/pebble/v2/internal/randvar" "github.com/stretchr/testify/require" ) diff --git a/metamorphic/retryable.go b/metamorphic/retryable.go index 36747c6af2..16fc2617b0 100644 --- a/metamorphic/retryable.go +++ b/metamorphic/retryable.go @@ -6,8 +6,8 @@ package metamorphic import ( "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/vfs/errorfs" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/vfs/errorfs" ) // A RetryPolicy determines what error values should trigger a retry of an diff --git a/metamorphic/simplify.go b/metamorphic/simplify.go index dc317a94c3..9cf6380cf7 100644 --- a/metamorphic/simplify.go +++ b/metamorphic/simplify.go @@ -7,7 +7,7 @@ package metamorphic import ( "sort" - "github.com/cockroachdb/pebble/internal/testkeys" + "github.com/cockroachdb/pebble/v2/internal/testkeys" ) // TryToSimplifyKeys parses the operations data and tries to reassign keys to diff --git a/metamorphic/test.go b/metamorphic/test.go index add8f3f7f5..ad8f86872a 100644 --- a/metamorphic/test.go +++ b/metamorphic/test.go @@ -16,11 +16,11 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/objstorage/remote" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/vfs" - "github.com/cockroachdb/pebble/vfs/errorfs" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/objstorage/remote" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/vfs" + "github.com/cockroachdb/pebble/v2/vfs/errorfs" ) // New constructs a new metamorphic test that runs the provided operations diff --git a/metrics.go b/metrics.go index 0a5257dff6..a4668ce79a 100644 --- a/metrics.go +++ b/metrics.go @@ -9,14 +9,14 @@ import ( "math" "time" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/cache" - "github.com/cockroachdb/pebble/internal/humanize" - "github.com/cockroachdb/pebble/internal/manual" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider/sharedcache" - "github.com/cockroachdb/pebble/record" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/wal" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/cache" + "github.com/cockroachdb/pebble/v2/internal/humanize" + "github.com/cockroachdb/pebble/v2/internal/manual" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider/sharedcache" + "github.com/cockroachdb/pebble/v2/record" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/wal" "github.com/cockroachdb/redact" "github.com/prometheus/client_golang/prometheus" ) diff --git a/metrics_test.go b/metrics_test.go index cb55f58bfc..b06c5876ef 100644 --- a/metrics_test.go +++ b/metrics_test.go @@ -16,14 +16,14 @@ import ( "time" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/cache" - "github.com/cockroachdb/pebble/internal/humanize" - "github.com/cockroachdb/pebble/internal/manual" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/objstorage/remote" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/vfs" - "github.com/cockroachdb/pebble/vfs/errorfs" + "github.com/cockroachdb/pebble/v2/internal/cache" + "github.com/cockroachdb/pebble/v2/internal/humanize" + "github.com/cockroachdb/pebble/v2/internal/manual" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/objstorage/remote" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/vfs" + "github.com/cockroachdb/pebble/v2/vfs/errorfs" "github.com/cockroachdb/redact" "github.com/stretchr/testify/require" ) diff --git a/objstorage/objstorage.go b/objstorage/objstorage.go index c747055f85..454672eef0 100644 --- a/objstorage/objstorage.go +++ b/objstorage/objstorage.go @@ -9,10 +9,10 @@ import ( "fmt" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider/sharedcache" - "github.com/cockroachdb/pebble/objstorage/remote" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider/sharedcache" + "github.com/cockroachdb/pebble/v2/objstorage/remote" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/cockroachdb/redact" ) diff --git a/objstorage/objstorageprovider/objiotracing/obj_io_tracing.go b/objstorage/objstorageprovider/objiotracing/obj_io_tracing.go index e334ce2f33..dd02d59f6e 100644 --- a/objstorage/objstorageprovider/objiotracing/obj_io_tracing.go +++ b/objstorage/objstorageprovider/objiotracing/obj_io_tracing.go @@ -4,7 +4,7 @@ package objiotracing -import "github.com/cockroachdb/pebble/internal/base" +import "github.com/cockroachdb/pebble/v2/internal/base" // OpType indicates the type of operation. type OpType uint8 diff --git a/objstorage/objstorageprovider/objiotracing/obj_io_tracing_off.go b/objstorage/objstorageprovider/objiotracing/obj_io_tracing_off.go index a4923ab60e..17b36806a7 100644 --- a/objstorage/objstorageprovider/objiotracing/obj_io_tracing_off.go +++ b/objstorage/objstorageprovider/objiotracing/obj_io_tracing_off.go @@ -10,9 +10,9 @@ package objiotracing import ( "context" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/vfs" ) // Enabled is used to short circuit tracing-related code in regular builds. diff --git a/objstorage/objstorageprovider/objiotracing/obj_io_tracing_on.go b/objstorage/objstorageprovider/objiotracing/obj_io_tracing_on.go index d3f8b1bb93..1277edb48a 100644 --- a/objstorage/objstorageprovider/objiotracing/obj_io_tracing_on.go +++ b/objstorage/objstorageprovider/objiotracing/obj_io_tracing_on.go @@ -17,9 +17,9 @@ import ( "time" "unsafe" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/vfs" ) // Enabled is used to short circuit tracing-related code in regular builds. diff --git a/objstorage/objstorageprovider/objiotracing/obj_io_tracing_test.go b/objstorage/objstorageprovider/objiotracing/obj_io_tracing_test.go index 4bdfaef1e9..ba32b0c1b0 100644 --- a/objstorage/objstorageprovider/objiotracing/obj_io_tracing_test.go +++ b/objstorage/objstorageprovider/objiotracing/obj_io_tracing_test.go @@ -10,10 +10,10 @@ import ( "testing" "unsafe" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider/objiotracing" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider/objiotracing" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" ) diff --git a/objstorage/objstorageprovider/provider.go b/objstorage/objstorageprovider/provider.go index 953a9d33dd..0ecc303f25 100644 --- a/objstorage/objstorageprovider/provider.go +++ b/objstorage/objstorageprovider/provider.go @@ -15,14 +15,14 @@ import ( "github.com/cockroachdb/errors" "github.com/cockroachdb/errors/oserror" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider/objiotracing" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider/remoteobjcat" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider/sharedcache" - "github.com/cockroachdb/pebble/objstorage/remote" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider/objiotracing" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider/remoteobjcat" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider/sharedcache" + "github.com/cockroachdb/pebble/v2/objstorage/remote" + "github.com/cockroachdb/pebble/v2/vfs" ) // provider is the implementation of objstorage.Provider. diff --git a/objstorage/objstorageprovider/provider_test.go b/objstorage/objstorageprovider/provider_test.go index 0c8f9f0290..8c39deba5f 100644 --- a/objstorage/objstorageprovider/provider_test.go +++ b/objstorage/objstorageprovider/provider_test.go @@ -15,10 +15,10 @@ import ( "time" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/remote" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/remote" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" ) diff --git a/objstorage/objstorageprovider/readahead.go b/objstorage/objstorageprovider/readahead.go index 703765912b..cfd44adfcf 100644 --- a/objstorage/objstorageprovider/readahead.go +++ b/objstorage/objstorageprovider/readahead.go @@ -4,7 +4,7 @@ package objstorageprovider -import "github.com/cockroachdb/pebble/internal/invariants" +import "github.com/cockroachdb/pebble/v2/internal/invariants" const ( // Constants for dynamic readahead of data blocks. Note that the size values diff --git a/objstorage/objstorageprovider/remote.go b/objstorage/objstorageprovider/remote.go index 26d79ad0b8..50fd017464 100644 --- a/objstorage/objstorageprovider/remote.go +++ b/objstorage/objstorageprovider/remote.go @@ -13,12 +13,12 @@ import ( "sync/atomic" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider/remoteobjcat" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider/sharedcache" - "github.com/cockroachdb/pebble/objstorage/remote" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider/remoteobjcat" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider/sharedcache" + "github.com/cockroachdb/pebble/v2/objstorage/remote" "github.com/cockroachdb/redact" ) diff --git a/objstorage/objstorageprovider/remote_backing.go b/objstorage/objstorageprovider/remote_backing.go index 98c4f47297..3315128914 100644 --- a/objstorage/objstorageprovider/remote_backing.go +++ b/objstorage/objstorageprovider/remote_backing.go @@ -10,9 +10,9 @@ import ( "io" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/remote" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/remote" ) const ( diff --git a/objstorage/objstorageprovider/remote_backing_test.go b/objstorage/objstorageprovider/remote_backing_test.go index eb17cd4c5f..80d0cae5a6 100644 --- a/objstorage/objstorageprovider/remote_backing_test.go +++ b/objstorage/objstorageprovider/remote_backing_test.go @@ -8,10 +8,10 @@ import ( "encoding/binary" "testing" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/remote" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/remote" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" ) diff --git a/objstorage/objstorageprovider/remote_obj_name.go b/objstorage/objstorageprovider/remote_obj_name.go index 7063490028..826dcc9335 100644 --- a/objstorage/objstorageprovider/remote_obj_name.go +++ b/objstorage/objstorageprovider/remote_obj_name.go @@ -7,8 +7,8 @@ package objstorageprovider import ( "fmt" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/objstorage" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/objstorage" ) // remoteObjectName returns the name of an object on remote storage. diff --git a/objstorage/objstorageprovider/remote_obj_name_test.go b/objstorage/objstorageprovider/remote_obj_name_test.go index 7a66b39cab..078998aafe 100644 --- a/objstorage/objstorageprovider/remote_obj_name_test.go +++ b/objstorage/objstorageprovider/remote_obj_name_test.go @@ -9,8 +9,8 @@ import ( "math/rand/v2" "testing" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/objstorage" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/objstorage" "github.com/stretchr/testify/require" ) diff --git a/objstorage/objstorageprovider/remote_readable.go b/objstorage/objstorageprovider/remote_readable.go index 737d1213c4..5ad962cc04 100644 --- a/objstorage/objstorageprovider/remote_readable.go +++ b/objstorage/objstorageprovider/remote_readable.go @@ -9,10 +9,10 @@ import ( "io" "sync" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider/sharedcache" - "github.com/cockroachdb/pebble/objstorage/remote" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider/sharedcache" + "github.com/cockroachdb/pebble/v2/objstorage/remote" ) // NewRemoteReadable creates an objstorage.Readable out of a remote.ObjectReader. diff --git a/objstorage/objstorageprovider/remote_readable_test.go b/objstorage/objstorageprovider/remote_readable_test.go index 66134ae117..781da9a423 100644 --- a/objstorage/objstorageprovider/remote_readable_test.go +++ b/objstorage/objstorageprovider/remote_readable_test.go @@ -13,7 +13,7 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage" "github.com/stretchr/testify/require" ) diff --git a/objstorage/objstorageprovider/remoteobjcat/catalog.go b/objstorage/objstorageprovider/remoteobjcat/catalog.go index b975dd4572..f01ef38deb 100644 --- a/objstorage/objstorageprovider/remoteobjcat/catalog.go +++ b/objstorage/objstorageprovider/remoteobjcat/catalog.go @@ -13,12 +13,12 @@ import ( "sync" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/remote" - "github.com/cockroachdb/pebble/record" - "github.com/cockroachdb/pebble/vfs" - "github.com/cockroachdb/pebble/vfs/atomicfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/remote" + "github.com/cockroachdb/pebble/v2/record" + "github.com/cockroachdb/pebble/v2/vfs" + "github.com/cockroachdb/pebble/v2/vfs/atomicfs" ) // Catalog is used to manage the on-disk remote object catalog. diff --git a/objstorage/objstorageprovider/remoteobjcat/catalog_test.go b/objstorage/objstorageprovider/remoteobjcat/catalog_test.go index 9cf96215b5..3a2862f4bb 100644 --- a/objstorage/objstorageprovider/remoteobjcat/catalog_test.go +++ b/objstorage/objstorageprovider/remoteobjcat/catalog_test.go @@ -14,11 +14,11 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider/remoteobjcat" - "github.com/cockroachdb/pebble/vfs" - "github.com/cockroachdb/pebble/vfs/vfstest" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider/remoteobjcat" + "github.com/cockroachdb/pebble/v2/vfs" + "github.com/cockroachdb/pebble/v2/vfs/vfstest" ) func TestCatalog(t *testing.T) { diff --git a/objstorage/objstorageprovider/remoteobjcat/version_edit.go b/objstorage/objstorageprovider/remoteobjcat/version_edit.go index db8fd8ee89..18eee45427 100644 --- a/objstorage/objstorageprovider/remoteobjcat/version_edit.go +++ b/objstorage/objstorageprovider/remoteobjcat/version_edit.go @@ -10,10 +10,10 @@ import ( "io" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/remote" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/remote" ) // VersionEdit is a modification to the remote object state which can be encoded diff --git a/objstorage/objstorageprovider/remoteobjcat/version_edit_test.go b/objstorage/objstorageprovider/remoteobjcat/version_edit_test.go index 8fe1f78393..b7848aceec 100644 --- a/objstorage/objstorageprovider/remoteobjcat/version_edit_test.go +++ b/objstorage/objstorageprovider/remoteobjcat/version_edit_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/objstorage" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/objstorage" "github.com/kr/pretty" ) diff --git a/objstorage/objstorageprovider/shared_writable.go b/objstorage/objstorageprovider/shared_writable.go index 5e8d45ad2f..e03fd12f93 100644 --- a/objstorage/objstorageprovider/shared_writable.go +++ b/objstorage/objstorageprovider/shared_writable.go @@ -7,7 +7,7 @@ package objstorageprovider import ( "io" - "github.com/cockroachdb/pebble/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage" ) // NewRemoteWritable creates an objstorage.Writable out of an io.WriteCloser. diff --git a/objstorage/objstorageprovider/sharedcache/shared_cache.go b/objstorage/objstorageprovider/sharedcache/shared_cache.go index f558803679..f58eab0689 100644 --- a/objstorage/objstorageprovider/sharedcache/shared_cache.go +++ b/objstorage/objstorageprovider/sharedcache/shared_cache.go @@ -14,10 +14,10 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/objstorage/remote" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/objstorage/remote" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/prometheus/client_golang/prometheus" ) @@ -568,7 +568,7 @@ func (s *shard) get(fileNum base.DiskFileNum, p []byte, ofs int64) (n int, _ err // than blob storage read latency) that miss on the same logical block ID will not necessarily // be rare. We may want to do only one read, with the later readers blocking on the first read // completing. This could be implemented either here or in the primary block cache. See - // https://github.com/cockroachdb/pebble/pull/2586 for additional discussion. + // https://github.com/cockroachdb/pebble/v2/pull/2586 for additional discussion. if !ok { s.mu.Unlock() return n, nil diff --git a/objstorage/objstorageprovider/sharedcache/shared_cache_test.go b/objstorage/objstorageprovider/sharedcache/shared_cache_test.go index a49db4b265..d7f770b32f 100644 --- a/objstorage/objstorageprovider/sharedcache/shared_cache_test.go +++ b/objstorage/objstorageprovider/sharedcache/shared_cache_test.go @@ -11,12 +11,12 @@ import ( "time" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider/sharedcache" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider/sharedcache" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" ) diff --git a/objstorage/objstorageprovider/vfs.go b/objstorage/objstorageprovider/vfs.go index 6e842dcef8..6e9066b0cc 100644 --- a/objstorage/objstorageprovider/vfs.go +++ b/objstorage/objstorageprovider/vfs.go @@ -8,9 +8,9 @@ import ( "context" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/vfs" ) func (p *provider) vfsPath(fileType base.FileType, fileNum base.DiskFileNum) string { diff --git a/objstorage/objstorageprovider/vfs_readable.go b/objstorage/objstorageprovider/vfs_readable.go index f61eea03b6..f92c89447e 100644 --- a/objstorage/objstorageprovider/vfs_readable.go +++ b/objstorage/objstorageprovider/vfs_readable.go @@ -10,9 +10,9 @@ import ( "os" "sync" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/vfs" ) const fileMaxReadaheadSize = 256 * 1024 /* 256KB */ diff --git a/objstorage/objstorageprovider/vfs_writable.go b/objstorage/objstorageprovider/vfs_writable.go index c9b207cc86..867c215871 100644 --- a/objstorage/objstorageprovider/vfs_writable.go +++ b/objstorage/objstorageprovider/vfs_writable.go @@ -7,8 +7,8 @@ package objstorageprovider import ( "bufio" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/vfs" ) // NewFileWritable returns a Writable that uses a file as underlying storage. diff --git a/objstorage/remote/localfs.go b/objstorage/remote/localfs.go index a421d40714..8e5a7f6783 100644 --- a/objstorage/remote/localfs.go +++ b/objstorage/remote/localfs.go @@ -10,7 +10,7 @@ import ( "os" "path" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/vfs" ) // NewLocalFS returns a vfs-backed implementation of the remote.Storage @@ -89,7 +89,7 @@ func (s *localFSStore) List(prefix, delimiter string) ([]string, error) { // TODO(josh): For the intended use case of localfs.go of running 'pebble bench', // List can always return , since this indicates a file has only one ref, // and since `pebble bench` implies running in a single-pebble-instance context. - // https://github.com/cockroachdb/pebble/blob/a9a079d4fb6bf4a9ebc52e4d83a76ad4cbf676cb/objstorage/objstorageprovider/shared.go#L292 + // https://github.com/cockroachdb/pebble/v2/blob/a9a079d4fb6bf4a9ebc52e4d83a76ad4cbf676cb/objstorage/objstorageprovider/shared.go#L292 return nil, nil } diff --git a/obsolete_files.go b/obsolete_files.go index 8852455fa8..d8f017b20a 100644 --- a/obsolete_files.go +++ b/obsolete_files.go @@ -13,10 +13,10 @@ import ( "time" "github.com/cockroachdb/errors/oserror" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/vfs" - "github.com/cockroachdb/pebble/wal" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/vfs" + "github.com/cockroachdb/pebble/v2/wal" "github.com/cockroachdb/tokenbucket" ) diff --git a/obsolete_files_test.go b/obsolete_files_test.go index 1e7ea2f195..ffb3fabfc7 100644 --- a/obsolete_files_test.go +++ b/obsolete_files_test.go @@ -11,8 +11,8 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" ) diff --git a/open.go b/open.go index 48a5723389..74e917859b 100644 --- a/open.go +++ b/open.go @@ -18,21 +18,21 @@ import ( "github.com/cockroachdb/errors" "github.com/cockroachdb/errors/oserror" - "github.com/cockroachdb/pebble/batchrepr" - "github.com/cockroachdb/pebble/internal/arenaskl" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/cache" - "github.com/cockroachdb/pebble/internal/constants" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/internal/manual" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/objstorage/remote" - "github.com/cockroachdb/pebble/record" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/vfs" - "github.com/cockroachdb/pebble/wal" + "github.com/cockroachdb/pebble/v2/batchrepr" + "github.com/cockroachdb/pebble/v2/internal/arenaskl" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/cache" + "github.com/cockroachdb/pebble/v2/internal/constants" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/manual" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/objstorage/remote" + "github.com/cockroachdb/pebble/v2/record" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/vfs" + "github.com/cockroachdb/pebble/v2/wal" "github.com/prometheus/client_golang/prometheus" ) diff --git a/open_test.go b/open_test.go index a9e9f0d273..f321a3e911 100644 --- a/open_test.go +++ b/open_test.go @@ -31,17 +31,17 @@ import ( "github.com/cockroachdb/datadriven" "github.com/cockroachdb/errors" "github.com/cockroachdb/metamorphic" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/cache" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/objstorage/remote" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/vfs" - "github.com/cockroachdb/pebble/vfs/atomicfs" - "github.com/cockroachdb/pebble/vfs/errorfs" - "github.com/cockroachdb/pebble/wal" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/cache" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/objstorage/remote" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/vfs" + "github.com/cockroachdb/pebble/v2/vfs/atomicfs" + "github.com/cockroachdb/pebble/v2/vfs/errorfs" + "github.com/cockroachdb/pebble/v2/wal" "github.com/cockroachdb/redact" "github.com/ghemawat/stream" "github.com/kr/pretty" @@ -750,7 +750,7 @@ func TestOpenWALReplay(t *testing.T) { } } -// Reproduction for https://github.com/cockroachdb/pebble/issues/2234. +// Reproduction for https://github.com/cockroachdb/pebble/v2/issues/2234. func TestWALReplaySequenceNumBug(t *testing.T) { mem := vfs.NewMem() d, err := Open("", testingRandomized(t, &Options{ diff --git a/options.go b/options.go index 4ae6ab04a9..3dc5f91085 100644 --- a/options.go +++ b/options.go @@ -16,20 +16,20 @@ import ( "github.com/cockroachdb/errors" "github.com/cockroachdb/fifo" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/cache" - "github.com/cockroachdb/pebble/internal/humanize" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/objstorage/remote" - "github.com/cockroachdb/pebble/rangekey" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/sstable/block" - "github.com/cockroachdb/pebble/sstable/colblk" - "github.com/cockroachdb/pebble/vfs" - "github.com/cockroachdb/pebble/wal" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/cache" + "github.com/cockroachdb/pebble/v2/internal/humanize" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/objstorage/remote" + "github.com/cockroachdb/pebble/v2/rangekey" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/sstable/block" + "github.com/cockroachdb/pebble/v2/sstable/colblk" + "github.com/cockroachdb/pebble/v2/vfs" + "github.com/cockroachdb/pebble/v2/wal" ) const ( diff --git a/options_test.go b/options_test.go index 566a3e8337..789c50440f 100644 --- a/options_test.go +++ b/options_test.go @@ -12,10 +12,10 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/vfs" - "github.com/cockroachdb/pebble/wal" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/vfs" + "github.com/cockroachdb/pebble/v2/wal" "github.com/stretchr/testify/require" ) diff --git a/overlap.go b/overlap.go index 23cd4e8df2..657f1959cd 100644 --- a/overlap.go +++ b/overlap.go @@ -7,10 +7,10 @@ package pebble import ( "context" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/internal/overlap" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/overlap" ) // An overlapChecker provides facilities for checking whether any keys within a diff --git a/range_del_test.go b/range_del_test.go index 7ddc076219..76f193bd37 100644 --- a/range_del_test.go +++ b/range_del_test.go @@ -16,11 +16,11 @@ import ( "time" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" ) @@ -616,7 +616,7 @@ func benchmarkRangeDelIterate(b *testing.B, entries, deleted int, snapshotCompac // Some benchmarks test snapshots that force the range tombstone into the // same level as the covered data. - // See https://github.com/cockroachdb/pebble/issues/1070. + // See https://github.com/cockroachdb/pebble/v2/issues/1070. if snapshotCompact { s := d.NewSnapshot() defer func() { require.NoError(b, s.Close()) }() diff --git a/range_keys.go b/range_keys.go index 1fe7c32c8f..176c38ab8a 100644 --- a/range_keys.go +++ b/range_keys.go @@ -8,12 +8,12 @@ import ( "context" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/internal/treeprinter" - "github.com/cockroachdb/pebble/sstable" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/sstable" ) // constructRangeKeyIter constructs the range-key iterator stack, populating diff --git a/rangekey/rangekey.go b/rangekey/rangekey.go index 93e7fbe189..f6e0f4a6c0 100644 --- a/rangekey/rangekey.go +++ b/rangekey/rangekey.go @@ -6,9 +6,9 @@ package rangekey import ( - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/rangekey" - "github.com/cockroachdb/pebble/sstable" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/rangekey" + "github.com/cockroachdb/pebble/v2/sstable" ) // Fragmenter exports the keyspan.Fragmenter type. diff --git a/read_compaction_queue.go b/read_compaction_queue.go index 450b7e9c60..7ceb6c8cc5 100644 --- a/read_compaction_queue.go +++ b/read_compaction_queue.go @@ -1,6 +1,6 @@ package pebble -import "github.com/cockroachdb/pebble/internal/base" +import "github.com/cockroachdb/pebble/v2/internal/base" // The maximum number of elements in the readCompactions queue. // We want to limit the number of elements so that we only do diff --git a/read_state_test.go b/read_state_test.go index eed241f475..1a5961846e 100644 --- a/read_state_test.go +++ b/read_state_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/vfs" ) func BenchmarkReadState(b *testing.B) { diff --git a/record/log_writer.go b/record/log_writer.go index 45fa14e709..0103822e8f 100644 --- a/record/log_writer.go +++ b/record/log_writer.go @@ -14,8 +14,8 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/crc" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/crc" "github.com/prometheus/client_golang/prometheus" ) diff --git a/record/log_writer_test.go b/record/log_writer_test.go index 5cf740b4ae..1ea5e966b9 100644 --- a/record/log_writer_test.go +++ b/record/log_writer_test.go @@ -16,10 +16,10 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/humanize" - "github.com/cockroachdb/pebble/vfs" - "github.com/cockroachdb/pebble/vfs/errorfs" - "github.com/cockroachdb/pebble/vfs/vfstest" + "github.com/cockroachdb/pebble/v2/internal/humanize" + "github.com/cockroachdb/pebble/v2/vfs" + "github.com/cockroachdb/pebble/v2/vfs/errorfs" + "github.com/cockroachdb/pebble/v2/vfs/vfstest" "github.com/prometheus/client_golang/prometheus" prometheusgo "github.com/prometheus/client_model/go" "github.com/stretchr/testify/require" diff --git a/record/record.go b/record/record.go index 7b6d525897..c9776716bc 100644 --- a/record/record.go +++ b/record/record.go @@ -109,8 +109,8 @@ import ( "io" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/crc" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/crc" ) // These constants are part of the wire format and should not be changed. diff --git a/record/record_test.go b/record/record_test.go index 885d221f36..dc8d9f741d 100644 --- a/record/record_test.go +++ b/record/record_test.go @@ -16,7 +16,7 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" ) diff --git a/replay/replay.go b/replay/replay.go index 7a1eb40ff4..dddc54d2dc 100644 --- a/replay/replay.go +++ b/replay/replay.go @@ -23,15 +23,15 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/bytealloc" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/internal/rangedel" - "github.com/cockroachdb/pebble/internal/rangekey" - "github.com/cockroachdb/pebble/record" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/bytealloc" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/rangedel" + "github.com/cockroachdb/pebble/v2/internal/rangekey" + "github.com/cockroachdb/pebble/v2/record" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/vfs" "golang.org/x/perf/benchfmt" "golang.org/x/sync/errgroup" ) diff --git a/replay/replay_test.go b/replay/replay_test.go index 7f1fdb9b24..0f7236cbb9 100644 --- a/replay/replay_test.go +++ b/replay/replay_test.go @@ -18,15 +18,15 @@ import ( "time" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/batchrepr" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/datatest" - "github.com/cockroachdb/pebble/internal/humanize" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/rangekey" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/batchrepr" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/datatest" + "github.com/cockroachdb/pebble/v2/internal/humanize" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/rangekey" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" ) diff --git a/replay/workload_capture.go b/replay/workload_capture.go index fded3d363f..b1ee220c9c 100644 --- a/replay/workload_capture.go +++ b/replay/workload_capture.go @@ -10,9 +10,9 @@ import ( "sync" "sync/atomic" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/vfs" ) type workloadCaptureState uint8 diff --git a/replay/workload_capture_test.go b/replay/workload_capture_test.go index b5f8c6e665..acddc02eeb 100644 --- a/replay/workload_capture_test.go +++ b/replay/workload_capture_test.go @@ -13,10 +13,10 @@ import ( "github.com/cockroachdb/crlib/crstrings" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/humanize" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/humanize" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" ) diff --git a/scan_internal.go b/scan_internal.go index 810295c0d8..283dc7b6e9 100644 --- a/scan_internal.go +++ b/scan_internal.go @@ -10,15 +10,15 @@ import ( "slices" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/keyspan/keyspanimpl" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/internal/treeprinter" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/remote" - "github.com/cockroachdb/pebble/sstable" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/keyspan/keyspanimpl" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/remote" + "github.com/cockroachdb/pebble/v2/sstable" ) const ( diff --git a/scan_internal_test.go b/scan_internal_test.go index e8e6255a9e..b1a1d5dbfd 100644 --- a/scan_internal_test.go +++ b/scan_internal_test.go @@ -16,16 +16,16 @@ import ( "github.com/cockroachdb/datadriven" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/bloom" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/itertest" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/objstorage/remote" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/bloom" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/itertest" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/objstorage/remote" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" ) diff --git a/scripts/code-coverage.sh b/scripts/code-coverage.sh index e234f6268e..e3826c38df 100755 --- a/scripts/code-coverage.sh +++ b/scripts/code-coverage.sh @@ -32,15 +32,15 @@ go tool covdata textfmt -i "${tmpdir}/metacover" -o artifacts/profile-meta.gocov # TODO(radu): make the crossversion metamorphic test work. go run github.com/cockroachdb/code-cov-utils/convert@v1.1.0 -out artifacts/profile-tests.lcov \ - -trim-prefix github.com/cockroachdb/pebble/ \ + -trim-prefix github.com/cockroachdb/pebble/v2/ \ artifacts/profile-tests.gocov go run github.com/cockroachdb/code-cov-utils/convert@v1.1.0 -out artifacts/profile-meta.lcov \ - -trim-prefix github.com/cockroachdb/pebble/ \ + -trim-prefix github.com/cockroachdb/pebble/v2/ \ artifacts/profile-meta.gocov go run github.com/cockroachdb/code-cov-utils/convert@v1.1.0 -out artifacts/profile-tests-and-meta.lcov \ - -trim-prefix github.com/cockroachdb/pebble/ \ + -trim-prefix github.com/cockroachdb/pebble/v2/ \ artifacts/profile-tests.gocov artifacts/profile-meta.gocov if [ $test_failed -eq 1 ]; then diff --git a/scripts/pr-codecov-run-tests.sh b/scripts/pr-codecov-run-tests.sh index eb8c72a424..1ea43116ff 100755 --- a/scripts/pr-codecov-run-tests.sh +++ b/scripts/pr-codecov-run-tests.sh @@ -40,5 +40,5 @@ trap 'rm -f "${tmpfile}"' EXIT make testcoverage COVER_PROFILE="${tmpfile}" PKG="$paths" go run github.com/cockroachdb/code-cov-utils/gocover2json@v1.0.0 \ - --trim-prefix github.com/cockroachdb/pebble/ \ + --trim-prefix github.com/cockroachdb/pebble/v2/ \ "${tmpfile}" "${output_json_file}" diff --git a/scripts/stress.sh b/scripts/stress.sh index ac203c0a8e..63da1ac28a 100755 --- a/scripts/stress.sh +++ b/scripts/stress.sh @@ -3,7 +3,7 @@ set -euo pipefail # Stress all packages, one at a time. This allows for a more useful output. -for p in $(go list ./... | sed 's#github.com/cockroachdb/pebble#.#'); do +for p in $(go list ./... | sed 's#github.com/cockroachdb/pebble/v2#.#'); do echo echo "" echo "" diff --git a/snapshot.go b/snapshot.go index 1be35931c4..7b14cdcf62 100644 --- a/snapshot.go +++ b/snapshot.go @@ -11,10 +11,10 @@ import ( "sync" "time" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/rangekey" - "github.com/cockroachdb/pebble/sstable" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/rangekey" + "github.com/cockroachdb/pebble/v2/sstable" ) // Snapshot provides a read-only point-in-time view of the DB state. diff --git a/snapshot_test.go b/snapshot_test.go index 7d999bdfc3..184fdadee7 100644 --- a/snapshot_test.go +++ b/snapshot_test.go @@ -18,8 +18,8 @@ import ( "github.com/cockroachdb/crlib/crstrings" "github.com/cockroachdb/datadriven" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" ) diff --git a/sstable/block/block.go b/sstable/block/block.go index 71a23bae67..fcc0e289ed 100644 --- a/sstable/block/block.go +++ b/sstable/block/block.go @@ -9,8 +9,8 @@ import ( "github.com/cespare/xxhash/v2" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/crc" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/crc" ) // Handle is the file offset and length of a block. diff --git a/sstable/block/buffer_pool.go b/sstable/block/buffer_pool.go index 38809b41ed..99e1eade89 100644 --- a/sstable/block/buffer_pool.go +++ b/sstable/block/buffer_pool.go @@ -6,8 +6,8 @@ package block import ( "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/cache" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/cache" ) // Alloc allocates a new Value for a block of length n (excluding the block diff --git a/sstable/block/compression.go b/sstable/block/compression.go index f6b91540ef..a22ce5f0cd 100644 --- a/sstable/block/compression.go +++ b/sstable/block/compression.go @@ -8,9 +8,9 @@ import ( "encoding/binary" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/bytealloc" - "github.com/cockroachdb/pebble/objstorage" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/bytealloc" + "github.com/cockroachdb/pebble/v2/objstorage" "github.com/golang/snappy" ) diff --git a/sstable/block/compression_test.go b/sstable/block/compression_test.go index 23a950a52b..3439e6aaf1 100644 --- a/sstable/block/compression_test.go +++ b/sstable/block/compression_test.go @@ -11,7 +11,7 @@ import ( "time" "github.com/cockroachdb/crlib/testutils/leaktest" - "github.com/cockroachdb/pebble/internal/cache" + "github.com/cockroachdb/pebble/v2/internal/cache" "github.com/stretchr/testify/require" ) diff --git a/sstable/block/flush_governor.go b/sstable/block/flush_governor.go index 9d8b54c660..a6ca5acd76 100644 --- a/sstable/block/flush_governor.go +++ b/sstable/block/flush_governor.go @@ -8,7 +8,7 @@ import ( "fmt" "slices" - "github.com/cockroachdb/pebble/internal/cache" + "github.com/cockroachdb/pebble/v2/internal/cache" ) // FlushGovernor is used to decide when to flush a block. It takes into diff --git a/sstable/block/flush_governor_test.go b/sstable/block/flush_governor_test.go index 3ef5a20581..830c2db730 100644 --- a/sstable/block/flush_governor_test.go +++ b/sstable/block/flush_governor_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/sstable/block" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/sstable/block" ) func TestFlushGovernor(t *testing.T) { diff --git a/sstable/block/kv.go b/sstable/block/kv.go index d27dd80dd9..df48ac2300 100644 --- a/sstable/block/kv.go +++ b/sstable/block/kv.go @@ -4,7 +4,7 @@ package block -import "github.com/cockroachdb/pebble/internal/base" +import "github.com/cockroachdb/pebble/v2/internal/base" // ValuePrefix is the single byte prefix in values indicating either an in-place // value or a value encoding a valueHandle. It encodes multiple kinds of diff --git a/sstable/block/kv_test.go b/sstable/block/kv_test.go index a169336945..a5638237fd 100644 --- a/sstable/block/kv_test.go +++ b/sstable/block/kv_test.go @@ -8,7 +8,7 @@ import ( "fmt" "testing" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" "github.com/stretchr/testify/require" ) diff --git a/sstable/block/transforms.go b/sstable/block/transforms.go index bc823cbea1..03e6cede59 100644 --- a/sstable/block/transforms.go +++ b/sstable/block/transforms.go @@ -9,7 +9,7 @@ import ( "fmt" "unsafe" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" ) // IterTransforms allow on-the-fly transformation of data at iteration time. diff --git a/sstable/block_property.go b/sstable/block_property.go index 29b469235f..cc8b664ff2 100644 --- a/sstable/block_property.go +++ b/sstable/block_property.go @@ -11,9 +11,9 @@ import ( "sync" "unsafe" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/keyspan" ) // Block properties are an optional user-facing feature that can be used to diff --git a/sstable/block_property_obsolete.go b/sstable/block_property_obsolete.go index c89268f127..3646745519 100644 --- a/sstable/block_property_obsolete.go +++ b/sstable/block_property_obsolete.go @@ -6,7 +6,7 @@ package sstable import ( "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" ) // obsoleteKeyBlockPropertyCollector is a block property collector used to diff --git a/sstable/block_property_test.go b/sstable/block_property_test.go index 67208eaf50..7d6c235e01 100644 --- a/sstable/block_property_test.go +++ b/sstable/block_property_test.go @@ -22,10 +22,10 @@ import ( "github.com/cockroachdb/crlib/testutils/leaktest" "github.com/cockroachdb/datadriven" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/rangekey" - "github.com/cockroachdb/pebble/internal/testkeys" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/rangekey" + "github.com/cockroachdb/pebble/v2/internal/testkeys" "github.com/stretchr/testify/require" ) diff --git a/sstable/block_property_test_utils.go b/sstable/block_property_test_utils.go index fcef1cd092..acd3ee06af 100644 --- a/sstable/block_property_test_utils.go +++ b/sstable/block_property_test_utils.go @@ -8,7 +8,7 @@ import ( "fmt" "math" - "github.com/cockroachdb/pebble/internal/testkeys" + "github.com/cockroachdb/pebble/v2/internal/testkeys" ) // Code in this file contains utils for testing. It implements interval block diff --git a/sstable/colblk/bitmap.go b/sstable/colblk/bitmap.go index 14f28389a1..f3972cfee3 100644 --- a/sstable/colblk/bitmap.go +++ b/sstable/colblk/bitmap.go @@ -13,9 +13,9 @@ import ( "unsafe" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/binfmt" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/binfmt" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" ) // Bitmap is a bitmap structure built on a []uint64. A bitmap utilizes ~1 diff --git a/sstable/colblk/bitmap_test.go b/sstable/colblk/bitmap_test.go index e484646865..0ccef49332 100644 --- a/sstable/colblk/bitmap_test.go +++ b/sstable/colblk/bitmap_test.go @@ -15,8 +15,8 @@ import ( "unicode" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/binfmt" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/binfmt" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" "github.com/stretchr/testify/require" ) diff --git a/sstable/colblk/block.go b/sstable/colblk/block.go index 4e57860285..1d8929fbe3 100644 --- a/sstable/colblk/block.go +++ b/sstable/colblk/block.go @@ -140,8 +140,8 @@ import ( "github.com/cockroachdb/crlib/crbytes" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/binfmt" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/binfmt" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" ) // Version indicates the version of the columnar block format encoded. The diff --git a/sstable/colblk/data_block.go b/sstable/colblk/data_block.go index 66dd8243bd..4fa8dc0da5 100644 --- a/sstable/colblk/data_block.go +++ b/sstable/colblk/data_block.go @@ -16,12 +16,12 @@ import ( "github.com/cockroachdb/crlib/crbytes" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/binfmt" - "github.com/cockroachdb/pebble/internal/bytealloc" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/treeprinter" - "github.com/cockroachdb/pebble/sstable/block" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/binfmt" + "github.com/cockroachdb/pebble/v2/internal/bytealloc" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/sstable/block" ) // KeySchema defines the schema of a user key, as defined by the user's diff --git a/sstable/colblk/data_block_test.go b/sstable/colblk/data_block_test.go index daf703275d..250e7ede35 100644 --- a/sstable/colblk/data_block_test.go +++ b/sstable/colblk/data_block_test.go @@ -14,12 +14,12 @@ import ( "time" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/binfmt" - "github.com/cockroachdb/pebble/internal/itertest" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/internal/treeprinter" - "github.com/cockroachdb/pebble/sstable/block" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/binfmt" + "github.com/cockroachdb/pebble/v2/internal/itertest" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/sstable/block" ) var testKeysSchema = DefaultKeySchema(testkeys.Comparer, 16) diff --git a/sstable/colblk/index_block.go b/sstable/colblk/index_block.go index b12a60fe09..f85d059019 100644 --- a/sstable/colblk/index_block.go +++ b/sstable/colblk/index_block.go @@ -9,11 +9,11 @@ import ( "unsafe" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/binfmt" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/treeprinter" - "github.com/cockroachdb/pebble/sstable/block" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/binfmt" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/sstable/block" ) const indexBlockCustomHeaderSize = 0 diff --git a/sstable/colblk/index_block_test.go b/sstable/colblk/index_block_test.go index 86acd048ce..edcc26bc9f 100644 --- a/sstable/colblk/index_block_test.go +++ b/sstable/colblk/index_block_test.go @@ -14,10 +14,10 @@ import ( "unsafe" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/cache" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/sstable/block" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/cache" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/sstable/block" "github.com/stretchr/testify/require" ) diff --git a/sstable/colblk/keyspan.go b/sstable/colblk/keyspan.go index 4e7c660ed1..cde40abde7 100644 --- a/sstable/colblk/keyspan.go +++ b/sstable/colblk/keyspan.go @@ -14,12 +14,12 @@ import ( "unsafe" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/binfmt" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/treeprinter" - "github.com/cockroachdb/pebble/sstable/block" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/binfmt" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/sstable/block" ) // the keyspan header encodes a 32-bit count of the number of unique boundary diff --git a/sstable/colblk/keyspan_test.go b/sstable/colblk/keyspan_test.go index 9592dabcc1..080dedf9c6 100644 --- a/sstable/colblk/keyspan_test.go +++ b/sstable/colblk/keyspan_test.go @@ -16,11 +16,11 @@ import ( "unsafe" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/cache" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/sstable/block" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/cache" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/sstable/block" "github.com/stretchr/testify/require" ) diff --git a/sstable/colblk/prefix_bytes.go b/sstable/colblk/prefix_bytes.go index ee9c749ba6..31c67038e7 100644 --- a/sstable/colblk/prefix_bytes.go +++ b/sstable/colblk/prefix_bytes.go @@ -15,10 +15,10 @@ import ( "github.com/cockroachdb/crlib/crbytes" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/binfmt" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/treeprinter" - "github.com/cockroachdb/pebble/sstable/block" + "github.com/cockroachdb/pebble/v2/internal/binfmt" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/sstable/block" ) // PrefixBytes holds an array of lexicographically ordered byte slices. It diff --git a/sstable/colblk/prefix_bytes_test.go b/sstable/colblk/prefix_bytes_test.go index 10c721a3d1..4d0c2f5586 100644 --- a/sstable/colblk/prefix_bytes_test.go +++ b/sstable/colblk/prefix_bytes_test.go @@ -16,10 +16,10 @@ import ( "github.com/cockroachdb/crlib/crbytes" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/binfmt" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/binfmt" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" "github.com/stretchr/testify/require" ) diff --git a/sstable/colblk/raw_bytes.go b/sstable/colblk/raw_bytes.go index 2854d6c965..0aa7c08dbe 100644 --- a/sstable/colblk/raw_bytes.go +++ b/sstable/colblk/raw_bytes.go @@ -10,8 +10,8 @@ import ( "io" "unsafe" - "github.com/cockroachdb/pebble/internal/binfmt" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/binfmt" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" ) // RawBytes holds an array of byte slices, stored as a concatenated data section diff --git a/sstable/colblk/raw_bytes_test.go b/sstable/colblk/raw_bytes_test.go index 0d90dee7e0..63ffa50857 100644 --- a/sstable/colblk/raw_bytes_test.go +++ b/sstable/colblk/raw_bytes_test.go @@ -14,8 +14,8 @@ import ( "github.com/cockroachdb/crlib/crbytes" "github.com/cockroachdb/crlib/crstrings" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/binfmt" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/binfmt" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" "github.com/stretchr/testify/require" ) diff --git a/sstable/colblk/uints.go b/sstable/colblk/uints.go index bfafd87ee3..9eccaf0c38 100644 --- a/sstable/colblk/uints.go +++ b/sstable/colblk/uints.go @@ -13,9 +13,9 @@ import ( "unsafe" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/binfmt" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/binfmt" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" "golang.org/x/exp/constraints" ) diff --git a/sstable/colblk/uints_test.go b/sstable/colblk/uints_test.go index 5c313f4e0a..1279ccf2fa 100644 --- a/sstable/colblk/uints_test.go +++ b/sstable/colblk/uints_test.go @@ -14,8 +14,8 @@ import ( "github.com/cockroachdb/crlib/crbytes" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/binfmt" - "github.com/cockroachdb/pebble/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/internal/binfmt" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" ) func TestByteWidth(t *testing.T) { diff --git a/sstable/colblk_writer.go b/sstable/colblk_writer.go index 90ea32611e..2262b03d94 100644 --- a/sstable/colblk_writer.go +++ b/sstable/colblk_writer.go @@ -14,14 +14,14 @@ import ( "sync" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/bytealloc" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/sstable/block" - "github.com/cockroachdb/pebble/sstable/colblk" - "github.com/cockroachdb/pebble/sstable/rowblk" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/bytealloc" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/sstable/block" + "github.com/cockroachdb/pebble/v2/sstable/colblk" + "github.com/cockroachdb/pebble/v2/sstable/rowblk" ) // RawColumnWriter is a sstable RawWriter that writes sstables with diff --git a/sstable/colblk_writer_test.go b/sstable/colblk_writer_test.go index 61267c59fa..ca5ae9cacc 100644 --- a/sstable/colblk_writer_test.go +++ b/sstable/colblk_writer_test.go @@ -11,10 +11,10 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/sstable/block" - "github.com/cockroachdb/pebble/sstable/colblk" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/sstable/block" + "github.com/cockroachdb/pebble/v2/sstable/colblk" "github.com/stretchr/testify/require" ) diff --git a/sstable/comparer.go b/sstable/comparer.go index 66a20b51e7..04c15d2924 100644 --- a/sstable/comparer.go +++ b/sstable/comparer.go @@ -4,7 +4,7 @@ package sstable -import "github.com/cockroachdb/pebble/internal/base" +import "github.com/cockroachdb/pebble/v2/internal/base" // Compare exports the base.Compare type. type Compare = base.Compare diff --git a/sstable/copier.go b/sstable/copier.go index a917f7c8bc..bf7f7f2481 100644 --- a/sstable/copier.go +++ b/sstable/copier.go @@ -8,11 +8,11 @@ import ( "context" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/bytealloc" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/sstable/block" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/bytealloc" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/sstable/block" ) // CopySpan produces a copy of a approximate subset of an input sstable. diff --git a/sstable/copier_test.go b/sstable/copier_test.go index f5b7ce3724..8cc8aae2a0 100644 --- a/sstable/copier_test.go +++ b/sstable/copier_test.go @@ -12,13 +12,13 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/cache" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/sstable/block" - "github.com/cockroachdb/pebble/sstable/colblk" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/cache" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/sstable/block" + "github.com/cockroachdb/pebble/v2/sstable/colblk" + "github.com/cockroachdb/pebble/v2/vfs" ) func TestCopySpan(t *testing.T) { diff --git a/sstable/data_test.go b/sstable/data_test.go index 452f17d65b..13cd119ad6 100644 --- a/sstable/data_test.go +++ b/sstable/data_test.go @@ -15,16 +15,16 @@ import ( "github.com/cockroachdb/crlib/crstrings" "github.com/cockroachdb/datadriven" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/bloom" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/cache" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/sstableinternal" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/sstable/colblk" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/bloom" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/cache" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/sstableinternal" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/sstable/colblk" + "github.com/cockroachdb/pebble/v2/vfs" ) func optsFromArgs(td *datadriven.TestData, writerOpts *WriterOptions) error { diff --git a/sstable/format.go b/sstable/format.go index fddcbdf403..6f50438a1b 100644 --- a/sstable/format.go +++ b/sstable/format.go @@ -6,10 +6,10 @@ package sstable import ( "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/sstable/block" - "github.com/cockroachdb/pebble/sstable/colblk" - "github.com/cockroachdb/pebble/sstable/rowblk" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/sstable/block" + "github.com/cockroachdb/pebble/v2/sstable/colblk" + "github.com/cockroachdb/pebble/v2/sstable/rowblk" ) // TableFormat specifies the format version for sstables. The legacy LevelDB diff --git a/sstable/format_test.go b/sstable/format_test.go index 6095de13b5..80a8dfd77a 100644 --- a/sstable/format_test.go +++ b/sstable/format_test.go @@ -9,7 +9,7 @@ import ( "github.com/cockroachdb/crlib/testutils/leaktest" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" "github.com/stretchr/testify/require" ) diff --git a/sstable/internal.go b/sstable/internal.go index 55787e3e4b..99914c1738 100644 --- a/sstable/internal.go +++ b/sstable/internal.go @@ -5,8 +5,8 @@ package sstable import ( - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/keyspan" ) // These constants are part of the file format, and should not be changed. diff --git a/sstable/layout.go b/sstable/layout.go index 708c593079..2b688ab927 100644 --- a/sstable/layout.go +++ b/sstable/layout.go @@ -15,15 +15,15 @@ import ( "unsafe" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/binfmt" - "github.com/cockroachdb/pebble/internal/bytealloc" - "github.com/cockroachdb/pebble/internal/sstableinternal" - "github.com/cockroachdb/pebble/internal/treeprinter" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/sstable/block" - "github.com/cockroachdb/pebble/sstable/colblk" - "github.com/cockroachdb/pebble/sstable/rowblk" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/binfmt" + "github.com/cockroachdb/pebble/v2/internal/bytealloc" + "github.com/cockroachdb/pebble/v2/internal/sstableinternal" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/sstable/block" + "github.com/cockroachdb/pebble/v2/sstable/colblk" + "github.com/cockroachdb/pebble/v2/sstable/rowblk" ) // Layout describes the block organization of an sstable. diff --git a/sstable/options.go b/sstable/options.go index ac06af983c..5bd79287df 100644 --- a/sstable/options.go +++ b/sstable/options.go @@ -8,11 +8,11 @@ import ( "fmt" "github.com/cockroachdb/fifo" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/sstableinternal" - "github.com/cockroachdb/pebble/sstable/block" - "github.com/cockroachdb/pebble/sstable/colblk" - "github.com/cockroachdb/pebble/sstable/rowblk" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/sstableinternal" + "github.com/cockroachdb/pebble/v2/sstable/block" + "github.com/cockroachdb/pebble/v2/sstable/colblk" + "github.com/cockroachdb/pebble/v2/sstable/rowblk" ) const ( diff --git a/sstable/properties.go b/sstable/properties.go index bf65b8c83b..7b112ca9ef 100644 --- a/sstable/properties.go +++ b/sstable/properties.go @@ -14,8 +14,8 @@ import ( "strings" "unsafe" - "github.com/cockroachdb/pebble/internal/intern" - "github.com/cockroachdb/pebble/sstable/rowblk" + "github.com/cockroachdb/pebble/v2/internal/intern" + "github.com/cockroachdb/pebble/v2/sstable/rowblk" ) const propertiesBlockRestartInterval = math.MaxInt32 diff --git a/sstable/properties_test.go b/sstable/properties_test.go index 3c7dc2a9e9..ba68219747 100644 --- a/sstable/properties_test.go +++ b/sstable/properties_test.go @@ -14,8 +14,8 @@ import ( "time" "github.com/cockroachdb/crlib/testutils/leaktest" - "github.com/cockroachdb/pebble/sstable/rowblk" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/sstable/rowblk" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/kr/pretty" "github.com/stretchr/testify/require" ) diff --git a/sstable/random_test.go b/sstable/random_test.go index 36bc9ae0ed..aaf3a97fa2 100644 --- a/sstable/random_test.go +++ b/sstable/random_test.go @@ -17,14 +17,14 @@ import ( "github.com/cockroachdb/crlib/testutils/leaktest" "github.com/cockroachdb/metamorphic" - "github.com/cockroachdb/pebble/bloom" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/bytealloc" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/sstable/colblk" - "github.com/cockroachdb/pebble/vfs" - "github.com/cockroachdb/pebble/vfs/errorfs" + "github.com/cockroachdb/pebble/v2/bloom" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/bytealloc" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/sstable/colblk" + "github.com/cockroachdb/pebble/v2/vfs" + "github.com/cockroachdb/pebble/v2/vfs/errorfs" "github.com/stretchr/testify/require" ) diff --git a/sstable/reader.go b/sstable/reader.go index 2e383272be..e7863f13a2 100644 --- a/sstable/reader.go +++ b/sstable/reader.go @@ -18,20 +18,20 @@ import ( "github.com/cespare/xxhash/v2" "github.com/cockroachdb/errors" "github.com/cockroachdb/fifo" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/bytealloc" - "github.com/cockroachdb/pebble/internal/cache" - "github.com/cockroachdb/pebble/internal/crc" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/sstableinternal" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider/objiotracing" - "github.com/cockroachdb/pebble/sstable/block" - "github.com/cockroachdb/pebble/sstable/colblk" - "github.com/cockroachdb/pebble/sstable/rowblk" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/bytealloc" + "github.com/cockroachdb/pebble/v2/internal/cache" + "github.com/cockroachdb/pebble/v2/internal/crc" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/sstableinternal" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider/objiotracing" + "github.com/cockroachdb/pebble/v2/sstable/block" + "github.com/cockroachdb/pebble/v2/sstable/colblk" + "github.com/cockroachdb/pebble/v2/sstable/rowblk" + "github.com/cockroachdb/pebble/v2/vfs" ) var errReaderClosed = errors.New("pebble/table: reader is closed") diff --git a/sstable/reader_common.go b/sstable/reader_common.go index f8db26278c..6e8b98d27a 100644 --- a/sstable/reader_common.go +++ b/sstable/reader_common.go @@ -8,9 +8,9 @@ import ( "context" "math" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/sstable/block" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/sstable/block" ) // CommonReader abstracts functionality over a Reader or a VirtualReader. This diff --git a/sstable/reader_iter.go b/sstable/reader_iter.go index c12a84bcb8..87cd6b60b0 100644 --- a/sstable/reader_iter.go +++ b/sstable/reader_iter.go @@ -9,11 +9,11 @@ import ( "os" "sync" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/sstable/block" - "github.com/cockroachdb/pebble/sstable/colblk" - "github.com/cockroachdb/pebble/sstable/rowblk" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/sstable/block" + "github.com/cockroachdb/pebble/v2/sstable/colblk" + "github.com/cockroachdb/pebble/v2/sstable/rowblk" ) // dataBlockIterator extends the block.IndexBlockIterator interface with a diff --git a/sstable/reader_iter_single_lvl.go b/sstable/reader_iter_single_lvl.go index 47bfbfa7a2..712db7bb52 100644 --- a/sstable/reader_iter_single_lvl.go +++ b/sstable/reader_iter_single_lvl.go @@ -12,12 +12,12 @@ import ( "unsafe" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/treeprinter" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/sstable/block" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/sstable/block" ) // singleLevelIterator iterates over an entire table of data. To seek for a given diff --git a/sstable/reader_iter_test.go b/sstable/reader_iter_test.go index 28fae7ebc4..88645cb7a7 100644 --- a/sstable/reader_iter_test.go +++ b/sstable/reader_iter_test.go @@ -10,11 +10,11 @@ import ( "testing" "github.com/cockroachdb/crlib/testutils/leaktest" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/testutils" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/sstable/block" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/testutils" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/sstable/block" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" ) diff --git a/sstable/reader_iter_two_lvl.go b/sstable/reader_iter_two_lvl.go index bae4674200..434f6cdfea 100644 --- a/sstable/reader_iter_two_lvl.go +++ b/sstable/reader_iter_two_lvl.go @@ -11,12 +11,12 @@ import ( "sync" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/treeprinter" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/sstable/block" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/sstable/block" ) type twoLevelIterator[I any, PI indexBlockIterator[I], D any, PD dataBlockIterator[D]] struct { @@ -408,7 +408,7 @@ func (i *twoLevelIterator[I, PI, D, PD]) SeekGE( } // Else flags.TrySeekUsingNext(). The i.exhaustedBounds is important to // preserve for singleLevelIterator, and twoLevelIterator.skipForward. See - // bug https://github.com/cockroachdb/pebble/issues/2036. + // bug https://github.com/cockroachdb/pebble/v2/issues/2036. } if !dontSeekWithinSingleLevelIter { @@ -575,7 +575,7 @@ func (i *twoLevelIterator[I, PI, D, PD]) SeekPrefixGE( } // Else flags.TrySeekUsingNext(). The i.exhaustedBounds is important to // preserve for singleLevelIterator, and twoLevelIterator.skipForward. See - // bug https://github.com/cockroachdb/pebble/issues/2036. + // bug https://github.com/cockroachdb/pebble/v2/issues/2036. } if !dontSeekWithinSingleLevelIter { diff --git a/sstable/reader_test.go b/sstable/reader_test.go index bcaba235fc..6334a25b98 100644 --- a/sstable/reader_test.go +++ b/sstable/reader_test.go @@ -24,17 +24,17 @@ import ( "github.com/cockroachdb/crlib/testutils/leaktest" "github.com/cockroachdb/datadriven" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/bloom" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/cache" - "github.com/cockroachdb/pebble/internal/humanize" - "github.com/cockroachdb/pebble/internal/sstableinternal" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/sstable/block" - "github.com/cockroachdb/pebble/vfs" - "github.com/cockroachdb/pebble/vfs/errorfs" + "github.com/cockroachdb/pebble/v2/bloom" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/cache" + "github.com/cockroachdb/pebble/v2/internal/humanize" + "github.com/cockroachdb/pebble/v2/internal/sstableinternal" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/sstable/block" + "github.com/cockroachdb/pebble/v2/vfs" + "github.com/cockroachdb/pebble/v2/vfs/errorfs" "github.com/stretchr/testify/require" ) diff --git a/sstable/reader_virtual.go b/sstable/reader_virtual.go index c37c8963a1..bc0fb5dd4b 100644 --- a/sstable/reader_virtual.go +++ b/sstable/reader_virtual.go @@ -7,10 +7,10 @@ package sstable import ( "context" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/rangekey" - "github.com/cockroachdb/pebble/sstable/block" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/rangekey" + "github.com/cockroachdb/pebble/v2/sstable/block" ) // VirtualReader wraps Reader. Its purpose is to restrict functionality of the diff --git a/sstable/rowblk/rowblk_bench_test.go b/sstable/rowblk/rowblk_bench_test.go index 7d47a18ca3..30b4d52d43 100644 --- a/sstable/rowblk/rowblk_bench_test.go +++ b/sstable/rowblk/rowblk_bench_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/sstable/block" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/sstable/block" ) var ( diff --git a/sstable/rowblk/rowblk_fragment_iter.go b/sstable/rowblk/rowblk_fragment_iter.go index b426f0f166..e86acc50cd 100644 --- a/sstable/rowblk/rowblk_fragment_iter.go +++ b/sstable/rowblk/rowblk_fragment_iter.go @@ -11,13 +11,13 @@ import ( "os" "sync" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/rangedel" - "github.com/cockroachdb/pebble/internal/rangekey" - "github.com/cockroachdb/pebble/internal/treeprinter" - "github.com/cockroachdb/pebble/sstable/block" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/rangedel" + "github.com/cockroachdb/pebble/v2/internal/rangekey" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/sstable/block" ) // fragmentIter wraps an Iter, implementing the keyspan.FragmentIterator diff --git a/sstable/rowblk/rowblk_fragment_iter_test.go b/sstable/rowblk/rowblk_fragment_iter_test.go index 9ef2e0377b..195c027d32 100644 --- a/sstable/rowblk/rowblk_fragment_iter_test.go +++ b/sstable/rowblk/rowblk_fragment_iter_test.go @@ -10,14 +10,14 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/cache" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/rangedel" - "github.com/cockroachdb/pebble/internal/rangekey" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/sstable/block" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/cache" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/rangedel" + "github.com/cockroachdb/pebble/v2/internal/rangekey" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/sstable/block" "github.com/stretchr/testify/require" ) diff --git a/sstable/rowblk/rowblk_index_iter.go b/sstable/rowblk/rowblk_index_iter.go index d7eafcd119..84fbc87301 100644 --- a/sstable/rowblk/rowblk_index_iter.go +++ b/sstable/rowblk/rowblk_index_iter.go @@ -5,8 +5,8 @@ package rowblk import ( - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/sstable/block" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/sstable/block" ) // IndexIter is a lightweight adapter that implements block.IndexIterator for a diff --git a/sstable/rowblk/rowblk_iter.go b/sstable/rowblk/rowblk_iter.go index dacfa1ebb5..ae01d19b3c 100644 --- a/sstable/rowblk/rowblk_iter.go +++ b/sstable/rowblk/rowblk_iter.go @@ -14,11 +14,11 @@ import ( "unsafe" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/manual" - "github.com/cockroachdb/pebble/internal/treeprinter" - "github.com/cockroachdb/pebble/sstable/block" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/manual" + "github.com/cockroachdb/pebble/v2/internal/treeprinter" + "github.com/cockroachdb/pebble/v2/sstable/block" ) // Iter is an iterator over a single block of data. diff --git a/sstable/rowblk/rowblk_iter_test.go b/sstable/rowblk/rowblk_iter_test.go index c76639ae04..4faa25beca 100644 --- a/sstable/rowblk/rowblk_iter_test.go +++ b/sstable/rowblk/rowblk_iter_test.go @@ -16,10 +16,10 @@ import ( "unsafe" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/itertest" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/sstable/block" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/itertest" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/sstable/block" "github.com/stretchr/testify/require" ) diff --git a/sstable/rowblk/rowblk_rewrite.go b/sstable/rowblk/rowblk_rewrite.go index d1667ee113..c3a74772bf 100644 --- a/sstable/rowblk/rowblk_rewrite.go +++ b/sstable/rowblk/rowblk_rewrite.go @@ -8,9 +8,9 @@ import ( "bytes" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/bytealloc" - "github.com/cockroachdb/pebble/sstable/block" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/bytealloc" + "github.com/cockroachdb/pebble/v2/sstable/block" ) // NewRewriter constructs a new rewriter. diff --git a/sstable/rowblk/rowblk_writer.go b/sstable/rowblk/rowblk_writer.go index bdba3662c9..91b3a50508 100644 --- a/sstable/rowblk/rowblk_writer.go +++ b/sstable/rowblk/rowblk_writer.go @@ -10,8 +10,8 @@ import ( "unsafe" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/sstable/block" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/sstable/block" ) const ( diff --git a/sstable/rowblk/rowblk_writer_test.go b/sstable/rowblk/rowblk_writer_test.go index 8c91ba68af..6a141f67ff 100644 --- a/sstable/rowblk/rowblk_writer_test.go +++ b/sstable/rowblk/rowblk_writer_test.go @@ -8,8 +8,8 @@ import ( "bytes" "testing" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/sstable/block" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/sstable/block" "github.com/stretchr/testify/require" ) diff --git a/sstable/rowblk_writer.go b/sstable/rowblk_writer.go index 92785ca1e7..a1ef6f1d6a 100644 --- a/sstable/rowblk_writer.go +++ b/sstable/rowblk_writer.go @@ -14,15 +14,15 @@ import ( "sync" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/bytealloc" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/rangedel" - "github.com/cockroachdb/pebble/internal/rangekey" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/sstable/block" - "github.com/cockroachdb/pebble/sstable/rowblk" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/bytealloc" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/rangedel" + "github.com/cockroachdb/pebble/v2/internal/rangekey" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/sstable/block" + "github.com/cockroachdb/pebble/v2/sstable/rowblk" ) // encodedBHPEstimatedSize estimates the size of the encoded BlockHandleWithProperties. diff --git a/sstable/suffix_rewriter.go b/sstable/suffix_rewriter.go index dc2260f489..9e148b19a9 100644 --- a/sstable/suffix_rewriter.go +++ b/sstable/suffix_rewriter.go @@ -14,11 +14,11 @@ import ( "unsafe" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/bytealloc" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/sstable/block" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/bytealloc" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/sstable/block" ) // RewriteKeySuffixesAndReturnFormat copies the content of the passed SSTable diff --git a/sstable/suffix_rewriter_test.go b/sstable/suffix_rewriter_test.go index 90055f9383..269fb8d056 100644 --- a/sstable/suffix_rewriter_test.go +++ b/sstable/suffix_rewriter_test.go @@ -10,11 +10,11 @@ import ( "time" "github.com/cockroachdb/crlib/testutils/leaktest" - "github.com/cockroachdb/pebble/bloom" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/sstable/block" + "github.com/cockroachdb/pebble/v2/bloom" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/sstable/block" "github.com/stretchr/testify/require" ) diff --git a/sstable/table.go b/sstable/table.go index a37415da6c..59caa89cce 100644 --- a/sstable/table.go +++ b/sstable/table.go @@ -65,7 +65,7 @@ // return err // } // return w.Close() -package sstable // import "github.com/cockroachdb/pebble/sstable" +package sstable // import "github.com/cockroachdb/pebble/v2/sstable" import ( "context" @@ -73,9 +73,9 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/sstable/block" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/sstable/block" ) /* diff --git a/sstable/table_test.go b/sstable/table_test.go index df2052fe81..fd292ae00e 100644 --- a/sstable/table_test.go +++ b/sstable/table_test.go @@ -19,12 +19,12 @@ import ( "github.com/cockroachdb/crlib/testutils/leaktest" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/bloom" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/sstable/block" - "github.com/cockroachdb/pebble/sstable/rowblk" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/bloom" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/sstable/block" + "github.com/cockroachdb/pebble/v2/sstable/rowblk" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/kr/pretty" "github.com/stretchr/testify/require" ) diff --git a/sstable/test_fixtures.go b/sstable/test_fixtures.go index db8c5326fd..d3d93a00c6 100644 --- a/sstable/test_fixtures.go +++ b/sstable/test_fixtures.go @@ -15,11 +15,11 @@ import ( "strings" "sync" - "github.com/cockroachdb/pebble/bloom" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/sstable/block" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/bloom" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/sstable/block" + "github.com/cockroachdb/pebble/v2/vfs" ) // testKVs is a key-value map holding test data. diff --git a/sstable/test_utils.go b/sstable/test_utils.go index 578fdf6faa..f74944d726 100644 --- a/sstable/test_utils.go +++ b/sstable/test_utils.go @@ -7,10 +7,10 @@ package sstable import ( "context" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/testutils" - "github.com/cockroachdb/pebble/objstorage" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/testutils" + "github.com/cockroachdb/pebble/v2/objstorage" ) // ReadAll returns all point keys, range del spans, and range key spans from an diff --git a/sstable/testdata/make-table.go b/sstable/testdata/make-table.go index 473289d4e4..dfd1ea4001 100644 --- a/sstable/testdata/make-table.go +++ b/sstable/testdata/make-table.go @@ -9,8 +9,8 @@ import ( "os" "path/filepath" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/vfs" ) func main() { diff --git a/sstable/testdata/reader_bpf/Pebblev2/iter b/sstable/testdata/reader_bpf/Pebblev2/iter index 304353dcc6..55640e038f 100644 --- a/sstable/testdata/reader_bpf/Pebblev2/iter +++ b/sstable/testdata/reader_bpf/Pebblev2/iter @@ -1,4 +1,4 @@ -# Test case for bug https://github.com/cockroachdb/pebble/issues/2036 Build +# Test case for bug https://github.com/cockroachdb/pebble/v2/issues/2036 Build # sstable with two-level index, with two data blocks in each lower-level index # block. build block-size=1 index-block-size=40 print-layout=true diff --git a/sstable/testdata/reader_bpf/Pebblev3/iter b/sstable/testdata/reader_bpf/Pebblev3/iter index 9df510cf58..449ced7570 100644 --- a/sstable/testdata/reader_bpf/Pebblev3/iter +++ b/sstable/testdata/reader_bpf/Pebblev3/iter @@ -1,4 +1,4 @@ -# Test case for bug https://github.com/cockroachdb/pebble/issues/2036 Build +# Test case for bug https://github.com/cockroachdb/pebble/v2/issues/2036 Build # sstable with two-level index, with two data blocks in each lower-level index # block. build block-size=1 index-block-size=40 print-layout=true @@ -94,7 +94,7 @@ next ---- set-bounds lower=v upper=v: . seek-ge wz@8: . -| *sstable.twoLevelIterator[github.com/cockroachdb/pebble/sstable/rowblk.IndexIter,*github.com/cockroachdb/pebble/sstable/rowblk.IndexIter,github.com/cockroachdb/pebble/sstable/rowblk.Iter,*github.com/cockroachdb/pebble/sstable/rowblk.Iter]: +| *sstable.twoLevelIterator[github.com/cockroachdb/pebble/v2/sstable/rowblk.IndexIter,*github.com/cockroachdb/pebble/v2/sstable/rowblk.IndexIter,github.com/cockroachdb/pebble/v2/sstable/rowblk.Iter,*github.com/cockroachdb/pebble/v2/sstable/rowblk.Iter]: | topLevelIndex.Key() = "x" | topLevelIndex.BlockHandleWithProperties() = (Offset: 193, Length: 26, Props: 00020801) | topLevelIndex.isDataInvalidated()=false @@ -107,7 +107,7 @@ set-bounds lower=v upper=v: . | (boundsCmp,positionedUsingLatestBounds) = (0,true) | exhaustedBounds = 1 seek-ge wb@2: . -| *sstable.twoLevelIterator[github.com/cockroachdb/pebble/sstable/rowblk.IndexIter,*github.com/cockroachdb/pebble/sstable/rowblk.IndexIter,github.com/cockroachdb/pebble/sstable/rowblk.Iter,*github.com/cockroachdb/pebble/sstable/rowblk.Iter]: +| *sstable.twoLevelIterator[github.com/cockroachdb/pebble/v2/sstable/rowblk.IndexIter,*github.com/cockroachdb/pebble/v2/sstable/rowblk.IndexIter,github.com/cockroachdb/pebble/v2/sstable/rowblk.Iter,*github.com/cockroachdb/pebble/v2/sstable/rowblk.Iter]: | topLevelIndex.Key() = "wc" | topLevelIndex.BlockHandleWithProperties() = (Offset: 161, Length: 27, Props: 00020201) | topLevelIndex.isDataInvalidated()=false @@ -119,7 +119,7 @@ set-bounds lower=v upper=v: . | (boundsCmp,positionedUsingLatestBounds) = (0,true) | exhaustedBounds = 1 set-bounds lower=v upper=z: . -| *sstable.twoLevelIterator[github.com/cockroachdb/pebble/sstable/rowblk.IndexIter,*github.com/cockroachdb/pebble/sstable/rowblk.IndexIter,github.com/cockroachdb/pebble/sstable/rowblk.Iter,*github.com/cockroachdb/pebble/sstable/rowblk.Iter]: +| *sstable.twoLevelIterator[github.com/cockroachdb/pebble/v2/sstable/rowblk.IndexIter,*github.com/cockroachdb/pebble/v2/sstable/rowblk.IndexIter,github.com/cockroachdb/pebble/v2/sstable/rowblk.Iter,*github.com/cockroachdb/pebble/v2/sstable/rowblk.Iter]: | topLevelIndex.Key() = "wc" | topLevelIndex.BlockHandleWithProperties() = (Offset: 161, Length: 27, Props: 00020201) | topLevelIndex.isDataInvalidated()=false @@ -131,7 +131,7 @@ set-bounds lower=v upper=z: . | (boundsCmp,positionedUsingLatestBounds) = (1,false) | exhaustedBounds = 1 seek-ge wc: -| *sstable.twoLevelIterator[github.com/cockroachdb/pebble/sstable/rowblk.IndexIter,*github.com/cockroachdb/pebble/sstable/rowblk.IndexIter,github.com/cockroachdb/pebble/sstable/rowblk.Iter,*github.com/cockroachdb/pebble/sstable/rowblk.Iter]: +| *sstable.twoLevelIterator[github.com/cockroachdb/pebble/v2/sstable/rowblk.IndexIter,*github.com/cockroachdb/pebble/v2/sstable/rowblk.IndexIter,github.com/cockroachdb/pebble/v2/sstable/rowblk.Iter,*github.com/cockroachdb/pebble/v2/sstable/rowblk.Iter]: | topLevelIndex.Key() = "x" | topLevelIndex.BlockHandleWithProperties() = (Offset: 193, Length: 26, Props: 00020801) | topLevelIndex.isDataInvalidated()=false diff --git a/sstable/unsafe.go b/sstable/unsafe.go index 11ec068914..5c8d297934 100644 --- a/sstable/unsafe.go +++ b/sstable/unsafe.go @@ -7,7 +7,7 @@ package sstable import ( "unsafe" - "github.com/cockroachdb/pebble/internal/manual" + "github.com/cockroachdb/pebble/v2/internal/manual" ) func getBytes(ptr unsafe.Pointer, length int) []byte { diff --git a/sstable/value_block.go b/sstable/value_block.go index 09b76fba85..f2f2988927 100644 --- a/sstable/value_block.go +++ b/sstable/value_block.go @@ -12,10 +12,10 @@ import ( "unsafe" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider/objiotracing" - "github.com/cockroachdb/pebble/sstable/block" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider/objiotracing" + "github.com/cockroachdb/pebble/v2/sstable/block" ) // Value blocks are supported in TableFormatPebblev3. @@ -49,7 +49,7 @@ import ( // which makes stepping from one key prefix to the next prefix (i.e., skipping // over older versions of a MVCC key) more efficient by avoiding key // comparisons and key decoding. See the results in -// https://github.com/cockroachdb/pebble/pull/2149 and more details in the +// https://github.com/cockroachdb/pebble/v2/pull/2149 and more details in the // comment inside BenchmarkIteratorScanNextPrefix. These improvements are also // visible in end-to-end CockroachDB tests, as outlined in // https://github.com/cockroachdb/cockroach/pull/96652. @@ -83,8 +83,8 @@ import ( // including the memory lifetime management. // // For historical discussions about this feature, see the issue -// https://github.com/cockroachdb/pebble/issues/1170 and the prototype in -// https://github.com/cockroachdb/pebble/pull/1443. +// https://github.com/cockroachdb/pebble/v2/issues/1170 and the prototype in +// https://github.com/cockroachdb/pebble/v2/pull/1443. // // The code in this file mainly covers value block and related encodings. We // discuss these in the next section. @@ -129,7 +129,7 @@ import ( // there are multiple use cases in CockroachDB that need the value length but // not the value, for which we can avoid reading the value in the value block // (see -// https://github.com/cockroachdb/pebble/issues/1170#issuecomment-958203245). +// https://github.com/cockroachdb/pebble/v2/issues/1170#issuecomment-958203245). // // A value block has a checksum like other blocks, and is optionally // compressed. An uncompressed value block is a sequence of values with no @@ -191,7 +191,7 @@ type valueHandle struct { // valueHandle fields are varint encoded, so maximum 5 bytes each, plus 1 byte // for the valuePrefix. This could alternatively be group varint encoded, but // experiments were inconclusive -// (https://github.com/cockroachdb/pebble/pull/1443#issuecomment-1270298802). +// (https://github.com/cockroachdb/pebble/v2/pull/1443#issuecomment-1270298802). const valueHandleMaxLen = 5*3 + 1 // Assert blockHandleLikelyMaxLen >= valueHandleMaxLen. @@ -682,7 +682,7 @@ func (bpwc blockProviderWhenClosed) readBlockForVBR( // for tracing. // // TODO(sumeer): consider fixing this. See - // https://github.com/cockroachdb/pebble/pull/3065#issue-1991175365 for an + // https://github.com/cockroachdb/pebble/v2/pull/3065#issue-1991175365 for an // alternative. ctx := objiotracing.WithBlockType(context.Background(), objiotracing.ValueBlock) // TODO(jackson,sumeer): Consider whether to use a buffer pool in this case. diff --git a/sstable/value_block_test.go b/sstable/value_block_test.go index bcce7a393d..e3fcb29a5f 100644 --- a/sstable/value_block_test.go +++ b/sstable/value_block_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/cockroachdb/crlib/testutils/leaktest" - "github.com/cockroachdb/pebble/sstable/block" + "github.com/cockroachdb/pebble/v2/sstable/block" "github.com/stretchr/testify/require" ) diff --git a/sstable/write_queue.go b/sstable/write_queue.go index e00d0b8a01..d8dd34d3a1 100644 --- a/sstable/write_queue.go +++ b/sstable/write_queue.go @@ -3,8 +3,8 @@ package sstable import ( "sync" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/sstable/block" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/sstable/block" ) type writeTask struct { diff --git a/sstable/writer.go b/sstable/writer.go index 48ca8cb254..0034eafb1d 100644 --- a/sstable/writer.go +++ b/sstable/writer.go @@ -8,10 +8,10 @@ import ( "context" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/sstable/block" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/sstable/block" ) // NewRawWriter returns a new table writer for the file. Closing the writer will diff --git a/sstable/writer_fixture_test.go b/sstable/writer_fixture_test.go index 64307bff9d..0cb431c9c2 100644 --- a/sstable/writer_fixture_test.go +++ b/sstable/writer_fixture_test.go @@ -22,8 +22,8 @@ import ( "github.com/cockroachdb/crlib/testutils/leaktest" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/sstable/block" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/sstable/block" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" ) diff --git a/sstable/writer_rangekey_test.go b/sstable/writer_rangekey_test.go index 232eec6121..62f311e3fe 100644 --- a/sstable/writer_rangekey_test.go +++ b/sstable/writer_rangekey_test.go @@ -11,10 +11,10 @@ import ( "github.com/cockroachdb/crlib/testutils/leaktest" "github.com/cockroachdb/datadriven" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/sstable/colblk" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/sstable/colblk" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" ) diff --git a/sstable/writer_test.go b/sstable/writer_test.go index 19605bfd40..f1b956aadd 100644 --- a/sstable/writer_test.go +++ b/sstable/writer_test.go @@ -20,17 +20,17 @@ import ( "github.com/cockroachdb/crlib/testutils/leaktest" "github.com/cockroachdb/datadriven" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/bloom" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/cache" - "github.com/cockroachdb/pebble/internal/humanize" - "github.com/cockroachdb/pebble/internal/sstableinternal" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/sstable/block" - "github.com/cockroachdb/pebble/sstable/rowblk" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/bloom" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/cache" + "github.com/cockroachdb/pebble/v2/internal/humanize" + "github.com/cockroachdb/pebble/v2/internal/sstableinternal" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/sstable/block" + "github.com/cockroachdb/pebble/v2/sstable/rowblk" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" ) diff --git a/table_cache.go b/table_cache.go index d0d4e361d9..bb27b552b2 100644 --- a/table_cache.go +++ b/table_cache.go @@ -16,16 +16,16 @@ import ( "unsafe" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/cache" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/keyspan/keyspanimpl" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/internal/sstableinternal" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider/objiotracing" - "github.com/cockroachdb/pebble/sstable" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/cache" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/keyspan/keyspanimpl" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/sstableinternal" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider/objiotracing" + "github.com/cockroachdb/pebble/v2/sstable" ) var emptyIter = &errorIter{err: nil} diff --git a/table_cache_test.go b/table_cache_test.go index 33070d6f40..1f9b201981 100644 --- a/table_cache_test.go +++ b/table_cache_test.go @@ -19,13 +19,13 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" ) diff --git a/table_stats.go b/table_stats.go index 9b616b06e8..24495bbe7b 100644 --- a/table_stats.go +++ b/table_stats.go @@ -10,13 +10,13 @@ import ( "math" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/keyspan/keyspanimpl" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/sstable/block" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/keyspan/keyspanimpl" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/sstable/block" ) // In-memory statistics about tables help inform compaction picking, but may diff --git a/table_stats_test.go b/table_stats_test.go index 4dbb7562b5..0f36a9aaae 100644 --- a/table_stats_test.go +++ b/table_stats_test.go @@ -12,12 +12,12 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/sstable/colblk" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/sstable/colblk" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" ) diff --git a/testdata/excise b/testdata/excise index fa614a91d8..3451ee690b 100644 --- a/testdata/excise +++ b/testdata/excise @@ -226,7 +226,7 @@ L0.0: L6: 000006:[z#15,SET-z#15,SET] -# Regression test for https://github.com/cockroachdb/pebble/issues/2947. +# Regression test for https://github.com/cockroachdb/pebble/v2/issues/2947. reset ---- diff --git a/testdata/ingest b/testdata/ingest index 29eb2e3b9a..4774e2e607 100644 --- a/testdata/ingest +++ b/testdata/ingest @@ -707,7 +707,7 @@ L6: 000004:[a#10,RANGEDEL-b#inf,RANGEDEL] # Check for range key ingestion bug fix in -# https://github.com/cockroachdb/pebble/pull/2082. Without the fix, we expect +# https://github.com/cockroachdb/pebble/v2/pull/2082. Without the fix, we expect # the range key associated with the table ext3 to get elided. This test checks # that the elision does not happen. reset diff --git a/testdata/ingest_shared b/testdata/ingest_shared index 452b20cf59..5d3c816814 100644 --- a/testdata/ingest_shared +++ b/testdata/ingest_shared @@ -1251,7 +1251,7 @@ dd: (., [dd-e) @7=foo UPDATED) . . -# Regression test for https://github.com/cockroachdb/pebble/issues/3225 +# Regression test for https://github.com/cockroachdb/pebble/v2/issues/3225 # Handle cases where an sstable starts and ends at the same user key but different # internal key, and the ordering of internal key kinds changes due to seqnum # substitution. diff --git a/testdata/iter_histories/next_prefix b/testdata/iter_histories/next_prefix index 368b9bde0d..2561f471a8 100644 --- a/testdata/iter_histories/next_prefix +++ b/testdata/iter_histories/next_prefix @@ -250,7 +250,7 @@ lsm L0.0: 000005:[a@100#12,SET-z@1#85,SET] -# Test for https://github.com/cockroachdb/pebble/issues/2260. Triggered the +# Test for https://github.com/cockroachdb/pebble/v2/issues/2260. Triggered the # bug. The second call to first would return c@100 instead of the correct key, # b@1. combined-iter upper=b@1 @@ -270,7 +270,7 @@ b@1: (b@1, .) c@100: (c@100, .) b@1: (b@1, .) -# Did not trigger https://github.com/cockroachdb/pebble/issues/2260 since +# Did not trigger https://github.com/cockroachdb/pebble/v2/issues/2260 since # Iterator.NextPrefix first does a Next. So the second call to NextPrefix # returned after the Next, since the upper bound was reached, which left the # Iterator positioned at b@1. diff --git a/testdata/make-db.go b/testdata/make-db.go index 1369f5ea27..f5c4506bed 100644 --- a/testdata/make-db.go +++ b/testdata/make-db.go @@ -10,7 +10,7 @@ import ( "os" "strconv" - "github.com/cockroachdb/pebble" + "github.com/cockroachdb/pebble/v2" ) const version = pebble.FormatFlushableIngest diff --git a/tool/data_test.go b/tool/data_test.go index 121b238be9..7628568cf6 100644 --- a/tool/data_test.go +++ b/tool/data_test.go @@ -15,10 +15,10 @@ import ( "github.com/cockroachdb/datadriven" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/spf13/cobra" "github.com/stretchr/testify/require" ) diff --git a/tool/db.go b/tool/db.go index ee2348177e..2819b6bef4 100644 --- a/tool/db.go +++ b/tool/db.go @@ -15,17 +15,17 @@ import ( "github.com/cockroachdb/errors" "github.com/cockroachdb/errors/oserror" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/humanize" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/internal/sstableinternal" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/record" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/tool/logs" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/humanize" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/sstableinternal" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/record" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/tool/logs" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/spf13/cobra" ) diff --git a/tool/db_io_bench.go b/tool/db_io_bench.go index 6a29ba88d6..65eb16c80b 100644 --- a/tool/db_io_bench.go +++ b/tool/db_io_bench.go @@ -18,9 +18,9 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/objstorage" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/objstorage" "github.com/spf13/cobra" ) diff --git a/tool/find.go b/tool/find.go index a7cd02cb80..ed64ca3a7e 100644 --- a/tool/find.go +++ b/tool/find.go @@ -14,15 +14,15 @@ import ( "slices" "sort" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/internal/rangedel" - "github.com/cockroachdb/pebble/internal/sstableinternal" - "github.com/cockroachdb/pebble/record" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/wal" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/rangedel" + "github.com/cockroachdb/pebble/v2/internal/sstableinternal" + "github.com/cockroachdb/pebble/v2/record" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/wal" "github.com/spf13/cobra" ) diff --git a/tool/logs/compaction.go b/tool/logs/compaction.go index cffe1daf11..9149cfa9f2 100644 --- a/tool/logs/compaction.go +++ b/tool/logs/compaction.go @@ -20,8 +20,8 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/humanize" - "github.com/cockroachdb/pebble/internal/manifest" + "github.com/cockroachdb/pebble/v2/internal/humanize" + "github.com/cockroachdb/pebble/v2/internal/manifest" "github.com/spf13/cobra" ) @@ -31,7 +31,7 @@ var ( // Captures a common logging prefix that can be used as the context for the // surrounding information captured by other expressions. Example: // - // I211215 14:26:56.012382 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [T1,n5,pebble,s5] ... + // I211215 14:26:56.012382 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [T1,n5,pebble,s5] ... // logContextPattern = regexp.MustCompile( `^.*` + @@ -58,11 +58,11 @@ var ( // Example compaction start and end log lines: // 23.1 and older: - // I211215 14:26:56.012382 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n5,pebble,s5] 1216510 [JOB 284925] compacting(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) - // I211215 14:26:56.318543 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n5,pebble,s5] 1216554 [JOB 284925] compacted(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -> L3 [445883 445887] (13 M), in 0.3s, output rate 42 M/s + // I211215 14:26:56.012382 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n5,pebble,s5] 1216510 [JOB 284925] compacting(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) + // I211215 14:26:56.318543 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n5,pebble,s5] 1216554 [JOB 284925] compacted(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -> L3 [445883 445887] (13 M), in 0.3s, output rate 42 M/s // current: - // I211215 14:26:56.012382 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n5,pebble,s5] 1216510 [JOB 284925] compacting(default) L2 [442555] (4.2MB) + L3 [445853] (8.4MB) - // I211215 14:26:56.318543 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n5,pebble,s5] 1216554 [JOB 284925] compacted(default) L2 [442555] (4.2MB) + L3 [445853] (8.4MB) -> L3 [445883 445887] (13MB), in 0.3s, output rate 42MB/s + // I211215 14:26:56.012382 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n5,pebble,s5] 1216510 [JOB 284925] compacting(default) L2 [442555] (4.2MB) + L3 [445853] (8.4MB) + // I211215 14:26:56.318543 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n5,pebble,s5] 1216554 [JOB 284925] compacted(default) L2 [442555] (4.2MB) + L3 [445853] (8.4MB) -> L3 [445883 445887] (13MB), in 0.3s, output rate 42MB/s // // NOTE: we use the log timestamp to compute the compaction duration rather // than the Pebble log output. @@ -92,13 +92,13 @@ var ( // Example memtable flush log lines: // 23.1 and older: - // I211213 16:23:48.903751 21136 3@vendor/github.com/cockroachdb/pebble/event.go:599 ⋮ [n9,pebble,s9] 24 [JOB 10] flushing 2 memtables to L0 - // I211213 16:23:49.134464 21136 3@vendor/github.com/cockroachdb/pebble/event.go:603 ⋮ [n9,pebble,s9] 26 [JOB 10] flushed 2 memtables to L0 [1535806] (1.3 M), in 0.2s, output rate 5.8 M/s + // I211213 16:23:48.903751 21136 3@vendor/github.com/cockroachdb/pebble/v2/event.go:599 ⋮ [n9,pebble,s9] 24 [JOB 10] flushing 2 memtables to L0 + // I211213 16:23:49.134464 21136 3@vendor/github.com/cockroachdb/pebble/v2/event.go:603 ⋮ [n9,pebble,s9] 26 [JOB 10] flushed 2 memtables to L0 [1535806] (1.3 M), in 0.2s, output rate 5.8 M/s // current: // I211213 16:23:48.903751 21136 - // 3@vendor/github.com/cockroachdb/pebble/event.go:599 ⋮ [n9,pebble,s9] 24 [JOB 10] flushing 2 memtables (1.4MB) to L0 + // 3@vendor/github.com/cockroachdb/pebble/v2/event.go:599 ⋮ [n9,pebble,s9] 24 [JOB 10] flushing 2 memtables (1.4MB) to L0 // I211213 16:23:49.134464 21136 - // 3@vendor/github.com/cockroachdb/pebble/event.go:603 ⋮ [n9,pebble,s9] 26 [JOB 10] flushed 2 memtables (1.4MB) to L0 [1535806] (1.3MB), in 0.2s, output rate 5.8MB/s + // 3@vendor/github.com/cockroachdb/pebble/v2/event.go:603 ⋮ [n9,pebble,s9] 26 [JOB 10] flushed 2 memtables (1.4MB) to L0 [1535806] (1.3MB), in 0.2s, output rate 5.8MB/s // // NOTE: we use the log timestamp to compute the flush duration rather than // the Pebble log output. @@ -115,9 +115,9 @@ var ( // Example ingested log lines: // 23.1 and older: - // I220228 16:01:22.487906 18476248525 3@vendor/github.com/cockroachdb/pebble/ingest.go:637 ⋮ [n24,pebble,s24] 33430782 [JOB 10211226] ingested L0:21818678 (1.8 K), L0:21818683 (1.2 K), L0:21818679 (1.6 K), L0:21818680 (1.1 K), L0:21818681 (1.1 K), L0:21818682 (160 M) + // I220228 16:01:22.487906 18476248525 3@vendor/github.com/cockroachdb/pebble/v2/ingest.go:637 ⋮ [n24,pebble,s24] 33430782 [JOB 10211226] ingested L0:21818678 (1.8 K), L0:21818683 (1.2 K), L0:21818679 (1.6 K), L0:21818680 (1.1 K), L0:21818681 (1.1 K), L0:21818682 (160 M) // current: - // I220228 16:01:22.487906 18476248525 3@vendor/github.com/cockroachdb/pebble/ingest.go:637 ⋮ [n24,pebble,s24] 33430782 [JOB 10211226] ingested L0:21818678 (1.8KB), L0:21818683 (1.2KB), L0:21818679 (1.6KB), L0:21818680 (1.1KB), L0:21818681 (1.1KB), L0:21818682 (160MB) + // I220228 16:01:22.487906 18476248525 3@vendor/github.com/cockroachdb/pebble/v2/ingest.go:637 ⋮ [n24,pebble,s24] 33430782 [JOB 10211226] ingested L0:21818678 (1.8KB), L0:21818683 (1.2KB), L0:21818679 (1.6KB), L0:21818680 (1.1KB), L0:21818681 (1.1KB), L0:21818682 (160MB) // ingestedPattern = regexp.MustCompile( `^.*` + diff --git a/tool/logs/compaction_test.go b/tool/logs/compaction_test.go index 36c3a80ebb..2c8345720b 100644 --- a/tool/logs/compaction_test.go +++ b/tool/logs/compaction_test.go @@ -20,26 +20,26 @@ import ( ) const ( - compactionStartLine23_1 = `I211215 14:26:56.012382 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n5,pebble,s6] 1216510 [JOB 284925] compacting(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M)` - compactionStartLine = `I211215 14:26:56.012382 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n5,pebble,s6] 1216510 [JOB 284925] compacting(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=0.99; OverlappingRatio: Single 8.03, Multi 25.05;` + compactionStartLine23_1 = `I211215 14:26:56.012382 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n5,pebble,s6] 1216510 [JOB 284925] compacting(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M)` + compactionStartLine = `I211215 14:26:56.012382 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n5,pebble,s6] 1216510 [JOB 284925] compacting(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=0.99; OverlappingRatio: Single 8.03, Multi 25.05;` - compactionEndLine23_1 = `I211215 14:26:56.318543 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n5,pebble,s6] 1216554 [JOB 284925] compacted(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -> L3 [445883 445887] (13 M), in 0.3s, output rate 42 M/s` - compactionEndLine = `I211215 14:26:56.318543 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n5,pebble,s6] 1216554 [JOB 284925] compacted(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=1.01 -> L3 [445883 445887] (13MB), in 0.3s, output rate 42MB/s` + compactionEndLine23_1 = `I211215 14:26:56.318543 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n5,pebble,s6] 1216554 [JOB 284925] compacted(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -> L3 [445883 445887] (13 M), in 0.3s, output rate 42 M/s` + compactionEndLine = `I211215 14:26:56.318543 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n5,pebble,s6] 1216554 [JOB 284925] compacted(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=1.01 -> L3 [445883 445887] (13MB), in 0.3s, output rate 42MB/s` - compactionMultiLevelStartLine = `I211215 14:26:56.318543 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n5,pebble,s6] 1216554 [JOB 11] compacting(default) [multilevel] L2 [250858] (2.1MB) Score=1.09 + L3 [247985 247989 247848] (17MB) Score=0.99 + L4 [250817 250834 238396] (28MB) Score=1.00; OverlappingRatio: Single 3.77, Multi 1.46;` - compactionMultiLevelEndline = `I211215 14:26:56.318543 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n5,pebble,s6] 1216554 [JOB 11] compacted(default) [multilevel] L2 [250858] (2.1MB) Score=1.09 + L3 [247985 247989 247848] (17MB) Score=0.99 + L4 [250817 250834 238396] (28MB) Score=1.00 -> L4 [250859 250860 250861 250862 250863] (46MB), in 0.2s (0.2s total), output rate 185MB/s` + compactionMultiLevelStartLine = `I211215 14:26:56.318543 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n5,pebble,s6] 1216554 [JOB 11] compacting(default) [multilevel] L2 [250858] (2.1MB) Score=1.09 + L3 [247985 247989 247848] (17MB) Score=0.99 + L4 [250817 250834 238396] (28MB) Score=1.00; OverlappingRatio: Single 3.77, Multi 1.46;` + compactionMultiLevelEndline = `I211215 14:26:56.318543 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n5,pebble,s6] 1216554 [JOB 11] compacted(default) [multilevel] L2 [250858] (2.1MB) Score=1.09 + L3 [247985 247989 247848] (17MB) Score=0.99 + L4 [250817 250834 238396] (28MB) Score=1.00 -> L4 [250859 250860 250861 250862 250863] (46MB), in 0.2s (0.2s total), output rate 185MB/s` - flushStartLine = `I211213 16:23:48.903751 21136 3@vendor/github.com/cockroachdb/pebble/event.go:599 ⋮ [n9,pebble,s8] 24 [JOB 10] flushing 2 memtables to L0` + flushStartLine = `I211213 16:23:48.903751 21136 3@vendor/github.com/cockroachdb/pebble/v2/event.go:599 ⋮ [n9,pebble,s8] 24 [JOB 10] flushing 2 memtables to L0` - flushEndLine23_1 = `I211213 16:23:49.134464 21136 3@vendor/github.com/cockroachdb/pebble/event.go:603 ⋮ [n9,pebble,s8] 26 [JOB 10] flushed 2 memtables to L0 [1535806] (1.3 M), in 0.2s, output rate 5.8 M/s` - flushEndLine = `I211213 16:23:49.134464 21136 3@vendor/github.com/cockroachdb/pebble/event.go:603 ⋮ [n9,pebble,s8] 26 [JOB 10] flushed 2 memtables to L0 [1535806] (1.3MB), in 0.2s, output rate 5.8MB/s` + flushEndLine23_1 = `I211213 16:23:49.134464 21136 3@vendor/github.com/cockroachdb/pebble/v2/event.go:603 ⋮ [n9,pebble,s8] 26 [JOB 10] flushed 2 memtables to L0 [1535806] (1.3 M), in 0.2s, output rate 5.8 M/s` + flushEndLine = `I211213 16:23:49.134464 21136 3@vendor/github.com/cockroachdb/pebble/v2/event.go:603 ⋮ [n9,pebble,s8] 26 [JOB 10] flushed 2 memtables to L0 [1535806] (1.3MB), in 0.2s, output rate 5.8MB/s` readAmpLine23_1 = ` total 31766 188 G - 257 G 187 G 48 K 3.6 G 744 536 G 49 K 278 G 5 2.1` readAmpLine = `total | 32K 188GB 0B | - | 257GB | 48K 187GB | 744 3.6GB | 49K 536GB | 278GB | 5 2.1` - compactionStartNoNodeStoreLine23_1 = `I211215 14:26:56.012382 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n?,pebble,s?] 1216510 [JOB 284925] compacting(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M)` - compactionStartNoNodeStoreLine = `I211215 14:26:56.012382 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n?,pebble,s?] 1216510 [JOB 284925] compacting(default) L2 [442555] (4.2 M) + L3 [445853] (8.4MB)` - flushStartNoNodeStoreLine = `I211213 16:23:48.903751 21136 3@vendor/github.com/cockroachdb/pebble/event.go:599 ⋮ [n?,pebble,s?] 24 [JOB 10] flushing 2 memtables to L0` + compactionStartNoNodeStoreLine23_1 = `I211215 14:26:56.012382 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n?,pebble,s?] 1216510 [JOB 284925] compacting(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M)` + compactionStartNoNodeStoreLine = `I211215 14:26:56.012382 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n?,pebble,s?] 1216510 [JOB 284925] compacting(default) L2 [442555] (4.2 M) + L3 [445853] (8.4MB)` + flushStartNoNodeStoreLine = `I211213 16:23:48.903751 21136 3@vendor/github.com/cockroachdb/pebble/v2/event.go:599 ⋮ [n?,pebble,s?] 24 [JOB 10] flushing 2 memtables to L0` flushableIngestionLine23_1 = `I230831 04:13:28.824280 3780 3@pebble/event.go:685 ⋮ [n10,s10,pebble] 365 [JOB 226] flushed 6 ingested flushables L0:024334 (1.5 K) + L0:024339 (1.0 K) + L0:024335 (1.9 K) + L0:024336 (1.1 K) + L0:024337 (1.1 K) + L0:024338 (12 K) in 0.0s (0.0s total), output rate 67 M/s` flushableIngestionLine = `I230831 04:13:28.824280 3780 3@pebble/event.go:685 ⋮ [n10,s10,pebble] 365 [JOB 226] flushed 6 ingested flushables L0:024334 (1.5KB) + L0:024339 (1.0KB) + L0:024335 (1.9KB) + L0:024336 (1.1KB) + L0:024337 (1.1KB) + L0:024338 (12KB) in 0.0s (0.0s total), output rate 67MB/s` @@ -297,31 +297,31 @@ func TestParseLogContext(t *testing.T) { store int }{ { - line: `I211215 14:26:56.012382 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n5,pebble,s6] foo`, + line: `I211215 14:26:56.012382 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n5,pebble,s6] foo`, timestamp: "211215 14:26:56.012382", node: 5, store: 6, }, { - line: `I211215 14:26:56.012382 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [T?,n5,pebble,s6] foo`, + line: `I211215 14:26:56.012382 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [T?,n5,pebble,s6] foo`, timestamp: "211215 14:26:56.012382", node: 5, store: 6, }, { - line: `I211215 14:26:56.012382 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [T15,n5,pebble,s6] foo`, + line: `I211215 14:26:56.012382 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [T15,n5,pebble,s6] foo`, timestamp: "211215 14:26:56.012382", node: 5, store: 6, }, { - line: `I211215 14:26:56.012382 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [T1,n?,pebble,s6] foo`, + line: `I211215 14:26:56.012382 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [T1,n?,pebble,s6] foo`, timestamp: "211215 14:26:56.012382", node: -1, store: 6, }, { - line: `I211215 14:26:56.012382 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n5,pebble,s?] foo`, + line: `I211215 14:26:56.012382 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n5,pebble,s?] foo`, timestamp: "211215 14:26:56.012382", node: 5, store: -1, diff --git a/tool/logs/testdata/compactions-23-1 b/tool/logs/testdata/compactions-23-1 index 718b286675..3cdddb6e6e 100644 --- a/tool/logs/testdata/compactions-23-1 +++ b/tool/logs/testdata/compactions-23-1 @@ -5,11 +5,11 @@ log -I211215 00:00:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n1,pebble,s1] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -I211215 00:00:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n1,s1,pebble] 1216554 [JOB 1] compacted(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -> L3 [445883 445887] (13 M), in 0.3s, output rate 42 M/s +I211215 00:00:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n1,pebble,s1] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) +I211215 00:00:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n1,s1,pebble] 1216554 [JOB 1] compacted(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -> L3 [445883 445887] (13 M), in 0.3s, output rate 42 M/s -I211215 00:01:10.000000 21136 3@vendor/github.com/cockroachdb/pebble/event.go:599 ⋮ [n1,s1,pebble] 24 [JOB 2] flushing 2 memtables to L0 -I211215 00:01:20.000000 21136 3@vendor/github.com/cockroachdb/pebble/event.go:603 ⋮ [n1,pebble,s1] 26 [JOB 2] flushed 2 memtables to L0 [1535806] (1.3 M), in 0.2s, output rate 5.8 M/s +I211215 00:01:10.000000 21136 3@vendor/github.com/cockroachdb/pebble/v2/event.go:599 ⋮ [n1,s1,pebble] 24 [JOB 2] flushing 2 memtables to L0 +I211215 00:01:20.000000 21136 3@vendor/github.com/cockroachdb/pebble/v2/event.go:603 ⋮ [n1,pebble,s1] 26 [JOB 2] flushed 2 memtables to L0 [1535806] (1.3 M), in 0.2s, output rate 5.8 M/s ---- 0.log @@ -37,22 +37,22 @@ reset ---- log -I211215 00:00:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n1,bars,s1,foos] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) +I211215 00:00:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n1,bars,s1,foos] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) ---- 0.log log -I211215 00:00:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n1,s1,foos] 1216554 [JOB 1] compacted(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -> L3 [445883 445887] (13 M), in 0.3s, output rate 42 M/s +I211215 00:00:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n1,s1,foos] 1216554 [JOB 1] compacted(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -> L3 [445883 445887] (13 M), in 0.3s, output rate 42 M/s ---- 1.log log -I211215 00:01:10.000000 21136 3@vendor/github.com/cockroachdb/pebble/event.go:599 ⋮ [n1,s1] 24 [JOB 2] flushing 2 memtables to L0 +I211215 00:01:10.000000 21136 3@vendor/github.com/cockroachdb/pebble/v2/event.go:599 ⋮ [n1,s1] 24 [JOB 2] flushing 2 memtables to L0 ---- 2.log log -I211215 00:01:20.000000 21136 3@vendor/github.com/cockroachdb/pebble/event.go:603 ⋮ [n1,pebble,s1] 26 [JOB 2] flushed 2 memtables to L0 [1535806] (1.3 M), in 0.2s, output rate 5.8 M/s +I211215 00:01:20.000000 21136 3@vendor/github.com/cockroachdb/pebble/v2/event.go:603 ⋮ [n1,pebble,s1] 26 [JOB 2] flushed 2 memtables to L0 [1535806] (1.3 M), in 0.2s, output rate 5.8 M/s ---- 3.log @@ -80,8 +80,8 @@ reset ---- log -I211215 00:00:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n1,pebble,s1] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -I211215 00:00:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n1,pebble,s1] 1216554 [JOB 1] compacted(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -> L3 [445883 445887] (13 M), in 0.3s, output rate 42 M/s +I211215 00:00:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n1,pebble,s1] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) +I211215 00:00:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n1,pebble,s1] 1216554 [JOB 1] compacted(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -> L3 [445883 445887] (13 M), in 0.3s, output rate 42 M/s ---- 0.log @@ -127,8 +127,8 @@ reset ---- log -I211215 00:01:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n1,s1,pebble] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -I211215 00:03:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n1,pebble,s1] 1216554 [JOB 1] compacted(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -> L3 [445883 445887] (13 M), in 0.3s, output rate 42 M/s +I211215 00:01:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n1,s1,pebble] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) +I211215 00:03:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n1,pebble,s1] 1216554 [JOB 1] compacted(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -> L3 [445883 445887] (13 M), in 0.3s, output rate 42 M/s ---- 0.log @@ -151,11 +151,11 @@ reset ---- log -I211215 00:01:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n1,pebble,s1] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -I211215 00:01:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n1,pebble,s1] 1216554 [JOB 1] compacted(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -> L3 [445883 445887] (13 M), in 0.3s, output rate 42 M/s +I211215 00:01:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n1,pebble,s1] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) +I211215 00:01:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n1,pebble,s1] 1216554 [JOB 1] compacted(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -> L3 [445883 445887] (13 M), in 0.3s, output rate 42 M/s -I211215 00:01:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n1,pebble,s2] 1216510 [JOB 2] compacting(default) L3 [442555] (4.2 M) + L4 [445853] (8.4 M) -I211215 00:01:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n1,pebble,s2] 1216554 [JOB 2] compacted(default) L3 [442555] (4.2 M) + L4 [445853] (8.4 M) -> L4 [445883 445887] (13 M), in 0.3s, output rate 42 M/s +I211215 00:01:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n1,pebble,s2] 1216510 [JOB 2] compacting(default) L3 [442555] (4.2 M) + L4 [445853] (8.4 M) +I211215 00:01:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n1,pebble,s2] 1216554 [JOB 2] compacted(default) L3 [442555] (4.2 M) + L4 [445853] (8.4 M) -> L4 [445883 445887] (13 M), in 0.3s, output rate 42 M/s ---- 0.log @@ -182,14 +182,14 @@ reset ---- log -I211215 00:01:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n1,pebble,s1] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -I211215 00:01:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n1,pebble,s1] 1216554 [JOB 1] compacted(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -> L3 [445883 445887] (13 M), in 0.3s, output rate 42 M/s +I211215 00:01:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n1,pebble,s1] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) +I211215 00:01:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n1,pebble,s1] 1216554 [JOB 1] compacted(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -> L3 [445883 445887] (13 M), in 0.3s, output rate 42 M/s ---- 0.log log -I211215 00:01:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n2,pebble,s1] 1216510 [JOB 1] compacting(default) L3 [442555] (4.2 M) + L4 [445853] (8.4 M) -I211215 00:01:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n2,pebble,s1] 1216554 [JOB 1] compacted(default) L3 [442555] (4.2 M) + L4 [445853] (8.4 M) -> L4 [445883 445887] (13 M), in 0.3s, output rate 42 M/s +I211215 00:01:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n2,pebble,s1] 1216510 [JOB 1] compacting(default) L3 [442555] (4.2 M) + L4 [445853] (8.4 M) +I211215 00:01:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n2,pebble,s1] 1216554 [JOB 1] compacted(default) L3 [442555] (4.2 M) + L4 [445853] (8.4 M) -> L4 [445883 445887] (13 M), in 0.3s, output rate 42 M/s ---- 1.log @@ -217,20 +217,20 @@ reset ---- log -I211215 00:01:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n1,pebble,s1] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -I211215 00:01:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n1,pebble,s1] 1216554 [JOB 1] compacted(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -> L3 [445883 445887] (13 M), in 0.3s, output rate 42 M/s +I211215 00:01:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n1,pebble,s1] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) +I211215 00:01:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n1,pebble,s1] 1216554 [JOB 1] compacted(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -> L3 [445883 445887] (13 M), in 0.3s, output rate 42 M/s -I211215 00:02:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n1,pebble,s2] 1216510 [JOB 2] compacting(default) L1 [442555] (4.2 M) + L2 [445853] (8.4 M) -I211215 00:02:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n1,pebble,s2] 1216554 [JOB 2] compacted(default) L1 [442555] (4.2 M) + L2 [445853] (8.4 M) -> L2 [445883 445887] (13 M), in 0.3s, output rate 42 M/s +I211215 00:02:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n1,pebble,s2] 1216510 [JOB 2] compacting(default) L1 [442555] (4.2 M) + L2 [445853] (8.4 M) +I211215 00:02:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n1,pebble,s2] 1216554 [JOB 2] compacted(default) L1 [442555] (4.2 M) + L2 [445853] (8.4 M) -> L2 [445883 445887] (13 M), in 0.3s, output rate 42 M/s ---- 0.log log -I211215 00:00:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n2,pebble,s1] 1216510 [JOB 1] compacting(default) L3 [442555] (4.2 M) + L4 [445853] (8.4 M) -I211215 00:00:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n2,pebble,s1] 1216554 [JOB 1] compacted(default) L3 [442555] (4.2 M) + L4 [445853] (8.4 M) -> L4 [445883 445887] (13 M), in 0.3s, output rate 42 M/s +I211215 00:00:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n2,pebble,s1] 1216510 [JOB 1] compacting(default) L3 [442555] (4.2 M) + L4 [445853] (8.4 M) +I211215 00:00:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n2,pebble,s1] 1216554 [JOB 1] compacted(default) L3 [442555] (4.2 M) + L4 [445853] (8.4 M) -> L4 [445883 445887] (13 M), in 0.3s, output rate 42 M/s -I211215 00:02:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n2,pebble,s2] 1216510 [JOB 2] compacting(default) L4 [442555] (4.2 M) + L5 [445853] (8.4 M) -I211215 00:02:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n2,pebble,s2] 1216554 [JOB 2] compacted(default) L4 [442555] (4.2 M) + L5 [445853] (8.4 M) -> L5 [445883 445887] (13 M), in 0.3s, output rate 42 M/s +I211215 00:02:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n2,pebble,s2] 1216510 [JOB 2] compacting(default) L4 [442555] (4.2 M) + L5 [445853] (8.4 M) +I211215 00:02:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n2,pebble,s2] 1216554 [JOB 2] compacted(default) L4 [442555] (4.2 M) + L5 [445853] (8.4 M) -> L5 [445883 445887] (13 M), in 0.3s, output rate 42 M/s ---- 1.log @@ -271,8 +271,8 @@ reset ---- log -I211215 00:01:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n?,pebble,s?] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -I211215 00:01:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n?,pebble,s?] 1216554 [JOB 1] compacted(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -> L3 [445883 445887] (13 M), in 0.3s, output rate 42 M/s +I211215 00:01:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n?,pebble,s?] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) +I211215 00:01:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n?,pebble,s?] 1216554 [JOB 1] compacted(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -> L3 [445883 445887] (13 M), in 0.3s, output rate 42 M/s ---- 0.log @@ -307,10 +307,10 @@ reset ---- log -I211215 00:01:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n1,pebble,s1] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -I211215 00:02:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n2,pebble,s2] 1216510 [JOB 1] compacting(default) L4 [442555] (4.2 M) + L5 [445853] (8.4 M) -I211215 00:01:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n1,pebble,s1] 1216554 [JOB 1] compacted(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -> L3 [445883 445887] (13 M), in 0.3s, output rate 42 M/s -I211215 00:02:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n2,pebble,s2] 1216554 [JOB 1] compacted(default) L4 [442555] (4.2 M) + L5 [445853] (8.4 M) -> L5 [445883 445887] (13 M), in 0.3s, output rate 42 M/s +I211215 00:01:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n1,pebble,s1] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) +I211215 00:02:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n2,pebble,s2] 1216510 [JOB 1] compacting(default) L4 [442555] (4.2 M) + L5 [445853] (8.4 M) +I211215 00:01:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n1,pebble,s1] 1216554 [JOB 1] compacted(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -> L3 [445883 445887] (13 M), in 0.3s, output rate 42 M/s +I211215 00:02:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n2,pebble,s2] 1216554 [JOB 1] compacted(default) L4 [442555] (4.2 M) + L5 [445853] (8.4 M) -> L5 [445883 445887] (13 M), in 0.3s, output rate 42 M/s ---- 0.log @@ -337,8 +337,8 @@ reset ---- log -I220301 00:00:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n1,pebble,s1] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -I220301 00:00:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n1,pebble,s1] 1216554 [JOB 1] compacted(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -> L3 [445883 445887] (13 M), in 0.3s, output rate 42 M/s +I220301 00:00:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n1,pebble,s1] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) +I220301 00:00:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n1,pebble,s1] 1216554 [JOB 1] compacted(default) L2 [442555] (4.2 M) + L3 [445853] (8.4 M) -> L3 [445883 445887] (13 M), in 0.3s, output rate 42 M/s ---- 0.log @@ -384,33 +384,33 @@ reset ---- log -I220228 14:44:31.497272 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1366 ⋮ [n24,pebble,s24] 33267888 [JOB 10197855] flushing 1 memtable to L0 -I220228 14:44:31.497485 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267889 [JOB 10197855] flushing: sstable created 21731018 -I220228 14:44:31.527038 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267892 [JOB 10197855] flushing: sstable created 21731020 -I220228 14:44:31.542944 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267894 [JOB 10197855] flushing: sstable created 21731021 -I220228 14:44:31.553581 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267895 [JOB 10197855] flushing: sstable created 21731022 -I220228 14:44:31.554585 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267896 [JOB 10197855] flushing: sstable created 21731023 -I220228 14:44:31.569928 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267897 [JOB 10197855] flushing: sstable created 21731024 -I220228 14:44:31.624309 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267899 [JOB 10197855] flushing: sstable created 21731025 -I220228 14:44:31.685531 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267901 [JOB 10197855] flushing: sstable created 21731026 -I220228 14:44:31.686009 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267902 [JOB 10197855] flushing: sstable created 21731027 -I220228 14:44:31.686415 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267903 [JOB 10197855] flushing: sstable created 21731028 -I220228 14:44:31.780892 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267906 [JOB 10197855] flushing: sstable created 21731030 -I220228 14:44:31.790911 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267907 [JOB 10197855] flushing: sstable created 21731031 -I220228 14:44:31.904614 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267911 [JOB 10197855] flushing: sstable created 21731033 -I220228 14:44:31.905835 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267912 [JOB 10197855] flushing: sstable created 21731034 -I220228 14:44:31.906860 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267913 [JOB 10197855] flushing: sstable created 21731035 -I220228 14:44:31.907602 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267914 [JOB 10197855] flushing: sstable created 21731036 -I220228 14:44:32.019173 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267920 [JOB 10197855] flushing: sstable created 21731037 -I220228 14:44:32.019714 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267921 [JOB 10197855] flushing: sstable created 21731038 -I220228 14:44:32.020161 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267922 [JOB 10197855] flushing: sstable created 21731039 -I220228 14:44:32.100117 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267925 [JOB 10197855] flushing: sstable created 21731040 -I220228 14:44:32.100609 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267926 [JOB 10197855] flushing: sstable created 21731041 -I220228 14:44:32.101065 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267927 [JOB 10197855] flushing: sstable created 21731042 -I220228 14:44:32.101494 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267928 [JOB 10197855] flushing: sstable created 21731043 -I220228 14:44:32.102569 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267929 [JOB 10197855] flushing: sstable created 21731044 -I220228 14:44:32.106284 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267930 [JOB 10197855] flushing: sstable created 21731045 -I220228 14:44:32.138686 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1423 ⋮ [n24,pebble,s24] 33267931 [JOB 10197855] flushed 1 memtable to L0 [21731018 21731020 21731021 21731022 21731023 21731024 21731025 21731026 21731027 21731028 21731030 21731031 21731033 21731034 21731035 21731036 21731037 21731038 21731039 21731040 21731041 21731042 21731043 21731044 21731045] (19 M), in 0.6s, output rate 31 M/s +I220228 14:44:31.497272 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1366 ⋮ [n24,pebble,s24] 33267888 [JOB 10197855] flushing 1 memtable to L0 +I220228 14:44:31.497485 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267889 [JOB 10197855] flushing: sstable created 21731018 +I220228 14:44:31.527038 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267892 [JOB 10197855] flushing: sstable created 21731020 +I220228 14:44:31.542944 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267894 [JOB 10197855] flushing: sstable created 21731021 +I220228 14:44:31.553581 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267895 [JOB 10197855] flushing: sstable created 21731022 +I220228 14:44:31.554585 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267896 [JOB 10197855] flushing: sstable created 21731023 +I220228 14:44:31.569928 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267897 [JOB 10197855] flushing: sstable created 21731024 +I220228 14:44:31.624309 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267899 [JOB 10197855] flushing: sstable created 21731025 +I220228 14:44:31.685531 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267901 [JOB 10197855] flushing: sstable created 21731026 +I220228 14:44:31.686009 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267902 [JOB 10197855] flushing: sstable created 21731027 +I220228 14:44:31.686415 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267903 [JOB 10197855] flushing: sstable created 21731028 +I220228 14:44:31.780892 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267906 [JOB 10197855] flushing: sstable created 21731030 +I220228 14:44:31.790911 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267907 [JOB 10197855] flushing: sstable created 21731031 +I220228 14:44:31.904614 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267911 [JOB 10197855] flushing: sstable created 21731033 +I220228 14:44:31.905835 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267912 [JOB 10197855] flushing: sstable created 21731034 +I220228 14:44:31.906860 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267913 [JOB 10197855] flushing: sstable created 21731035 +I220228 14:44:31.907602 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267914 [JOB 10197855] flushing: sstable created 21731036 +I220228 14:44:32.019173 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267920 [JOB 10197855] flushing: sstable created 21731037 +I220228 14:44:32.019714 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267921 [JOB 10197855] flushing: sstable created 21731038 +I220228 14:44:32.020161 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267922 [JOB 10197855] flushing: sstable created 21731039 +I220228 14:44:32.100117 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267925 [JOB 10197855] flushing: sstable created 21731040 +I220228 14:44:32.100609 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267926 [JOB 10197855] flushing: sstable created 21731041 +I220228 14:44:32.101065 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267927 [JOB 10197855] flushing: sstable created 21731042 +I220228 14:44:32.101494 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267928 [JOB 10197855] flushing: sstable created 21731043 +I220228 14:44:32.102569 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267929 [JOB 10197855] flushing: sstable created 21731044 +I220228 14:44:32.106284 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267930 [JOB 10197855] flushing: sstable created 21731045 +I220228 14:44:32.138686 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1423 ⋮ [n24,pebble,s24] 33267931 [JOB 10197855] flushed 1 memtable to L0 [21731018 21731020 21731021 21731022 21731023 21731024 21731025 21731026 21731027 21731028 21731030 21731031 21731033 21731034 21731035 21731036 21731037 21731038 21731039 21731040 21731041 21731042 21731043 21731044 21731045] (19 M), in 0.6s, output rate 31 M/s ---- 0.log @@ -428,8 +428,8 @@ reset ---- log -I220228 16:01:22.487906 18476248525 3@vendor/github.com/cockroachdb/pebble/ingest.go:637 ⋮ [n24,pebble,s24] 33430782 [JOB 10211226] ingested L0:21818678 (1.8 K), L0:21818683 (1.2 K), L0:21818679 (1.6 K), L0:21818680 (1.1 K), L0:21818681 (1.1 K), L0:21818682 (160 M) -45127:I220228 15:58:45.538681 18475981755 3@vendor/github.com/cockroachdb/pebble/ingest.go:637 ⋮ [n24,pebble,s24] 33424719 [JOB 10210743] ingested L0:21814543 (1.4 K), L0:21814548 (1.2 K), L5:21814544 (1.4 K), L5:21814545 (1.1 K), L5:21814546 (1.1 K), L0:21814547 (140 M) +I220228 16:01:22.487906 18476248525 3@vendor/github.com/cockroachdb/pebble/v2/ingest.go:637 ⋮ [n24,pebble,s24] 33430782 [JOB 10211226] ingested L0:21818678 (1.8 K), L0:21818683 (1.2 K), L0:21818679 (1.6 K), L0:21818680 (1.1 K), L0:21818681 (1.1 K), L0:21818682 (160 M) +45127:I220228 15:58:45.538681 18475981755 3@vendor/github.com/cockroachdb/pebble/v2/ingest.go:637 ⋮ [n24,pebble,s24] 33424719 [JOB 10210743] ingested L0:21814543 (1.4 K), L0:21814548 (1.2 K), L5:21814544 (1.4 K), L5:21814545 (1.1 K), L5:21814546 (1.1 K), L0:21814547 (140 M) ---- 0.log @@ -455,14 +455,14 @@ reset ---- log -I220907 00:27:21.579807 15082709999 3@vendor/github.com/cockroachdb/pebble/event.go:587 ⋮ [n15,pebble,s15] 2736197 [JOB 743692] compacting(delete-only) L6 [18323385] (11 M) -I220907 00:27:21.580169 15082709999 3@vendor/github.com/cockroachdb/pebble/event.go:591 ⋮ [n15,pebble,s15] 2736198 [JOB 743692] compacted(delete-only) L6 [18323385] (11 M) -> L6 [] (0 B), in 0.0s, output rate 0 B/s +I220907 00:27:21.579807 15082709999 3@vendor/github.com/cockroachdb/pebble/v2/event.go:587 ⋮ [n15,pebble,s15] 2736197 [JOB 743692] compacting(delete-only) L6 [18323385] (11 M) +I220907 00:27:21.580169 15082709999 3@vendor/github.com/cockroachdb/pebble/v2/event.go:591 ⋮ [n15,pebble,s15] 2736198 [JOB 743692] compacted(delete-only) L6 [18323385] (11 M) -> L6 [] (0 B), in 0.0s, output rate 0 B/s -I220907 00:27:21.631145 15082710355 3@vendor/github.com/cockroachdb/pebble/event.go:587 ⋮ [n15,pebble,s15] 2736201 [JOB 743694] compacting(default) L5 [18323582] (1.8 K) + L6 [17770912] (128 M) -I220907 00:27:22.729839 15082710355 3@vendor/github.com/cockroachdb/pebble/event.go:591 ⋮ [n15,pebble,s15] 2736208 [JOB 743694] compacted(default) L5 [18323582] (1.8 K) + L6 [17770912] (128 M) -> L6 [18323586] (3.6 M), in 1.1s, output rate 3.3 M/s +I220907 00:27:21.631145 15082710355 3@vendor/github.com/cockroachdb/pebble/v2/event.go:587 ⋮ [n15,pebble,s15] 2736201 [JOB 743694] compacting(default) L5 [18323582] (1.8 K) + L6 [17770912] (128 M) +I220907 00:27:22.729839 15082710355 3@vendor/github.com/cockroachdb/pebble/v2/event.go:591 ⋮ [n15,pebble,s15] 2736208 [JOB 743694] compacted(default) L5 [18323582] (1.8 K) + L6 [17770912] (128 M) -> L6 [18323586] (3.6 M), in 1.1s, output rate 3.3 M/s -I220907 00:27:21.630546 15082710354 3@vendor/github.com/cockroachdb/pebble/event.go:587 ⋮ [n15,pebble,s15] 2736199 [JOB 743693] compacting(move) L5 [18323585] (4.0 M) + L6 [] (0 B) -I220907 00:27:21.631002 15082710354 3@vendor/github.com/cockroachdb/pebble/event.go:591 ⋮ [n15,pebble,s15] 2736200 [JOB 743693] compacted(move) L5 [18323585] (4.0 M) + L6 [] (0 B) -> L6 [18323585] (4.0 M), in 0.0s, output rate 50 G/s +I220907 00:27:21.630546 15082710354 3@vendor/github.com/cockroachdb/pebble/v2/event.go:587 ⋮ [n15,pebble,s15] 2736199 [JOB 743693] compacting(move) L5 [18323585] (4.0 M) + L6 [] (0 B) +I220907 00:27:21.631002 15082710354 3@vendor/github.com/cockroachdb/pebble/v2/event.go:591 ⋮ [n15,pebble,s15] 2736200 [JOB 743693] compacted(move) L5 [18323585] (4.0 M) + L6 [] (0 B) -> L6 [18323585] (4.0 M), in 0.0s, output rate 50 G/s ---- 0.log diff --git a/tool/logs/testdata/compactions-latest b/tool/logs/testdata/compactions-latest index 532b331113..494508dc3e 100644 --- a/tool/logs/testdata/compactions-latest +++ b/tool/logs/testdata/compactions-latest @@ -5,11 +5,11 @@ log -I211215 00:00:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n1,pebble,s1] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=0.99; OverlappingRatio: Single 8.03, Multi 25.05 -I211215 00:00:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n1,s1,pebble] 1216554 [JOB 1] [JOB 1] compacted(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=1.01 -> L3 [445883 445887] (13MB), in 0.3s, output rate 42MB/s +I211215 00:00:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n1,pebble,s1] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=0.99; OverlappingRatio: Single 8.03, Multi 25.05 +I211215 00:00:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n1,s1,pebble] 1216554 [JOB 1] [JOB 1] compacted(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=1.01 -> L3 [445883 445887] (13MB), in 0.3s, output rate 42MB/s -I211215 00:01:10.000000 21136 3@vendor/github.com/cockroachdb/pebble/event.go:599 ⋮ [n1,s1,pebble] 24 [JOB 2] flushing 2 memtables (1.5MB) to L0 -I211215 00:01:20.000000 21136 3@vendor/github.com/cockroachdb/pebble/event.go:603 ⋮ [n1,pebble,s1] 26 [JOB 2] flushed 2 memtables (1.5MB) to L0 [1535806] (1.3MB), in 0.2s, output rate 5.8MB/s +I211215 00:01:10.000000 21136 3@vendor/github.com/cockroachdb/pebble/v2/event.go:599 ⋮ [n1,s1,pebble] 24 [JOB 2] flushing 2 memtables (1.5MB) to L0 +I211215 00:01:20.000000 21136 3@vendor/github.com/cockroachdb/pebble/v2/event.go:603 ⋮ [n1,pebble,s1] 26 [JOB 2] flushed 2 memtables (1.5MB) to L0 [1535806] (1.3MB), in 0.2s, output rate 5.8MB/s ---- 0.log @@ -37,22 +37,22 @@ reset ---- log -I211215 00:00:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n1,bars,s1,foos] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=0.99; OverlappingRatio: Single 8.03, Multi 25.05 +I211215 00:00:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n1,bars,s1,foos] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=0.99; OverlappingRatio: Single 8.03, Multi 25.05 ---- 0.log log -I211215 00:00:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n1,s1,foos] 1216554 [JOB 1] [JOB 1] compacted(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=1.01 -> L3 [445883 445887] (13MB), in 0.3s, output rate 42MB/s +I211215 00:00:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n1,s1,foos] 1216554 [JOB 1] [JOB 1] compacted(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=1.01 -> L3 [445883 445887] (13MB), in 0.3s, output rate 42MB/s ---- 1.log log -I211215 00:01:10.000000 21136 3@vendor/github.com/cockroachdb/pebble/event.go:599 ⋮ [n1,s1] 24 [JOB 2] flushing 2 memtables (1.5MB) to L0 +I211215 00:01:10.000000 21136 3@vendor/github.com/cockroachdb/pebble/v2/event.go:599 ⋮ [n1,s1] 24 [JOB 2] flushing 2 memtables (1.5MB) to L0 ---- 2.log log -I211215 00:01:20.000000 21136 3@vendor/github.com/cockroachdb/pebble/event.go:603 ⋮ [n1,pebble,s1] 26 [JOB 2] flushed 2 memtables (1.5MB) to L0 [1535806] (1.3MB), in 0.2s, output rate 5.8MB/s +I211215 00:01:20.000000 21136 3@vendor/github.com/cockroachdb/pebble/v2/event.go:603 ⋮ [n1,pebble,s1] 26 [JOB 2] flushed 2 memtables (1.5MB) to L0 [1535806] (1.3MB), in 0.2s, output rate 5.8MB/s ---- 3.log @@ -80,8 +80,8 @@ reset ---- log -I211215 00:00:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n1,pebble,s1] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=0.99; OverlappingRatio: Single 8.03, Multi 25.05 -I211215 00:00:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n1,pebble,s1] 1216554 [JOB 1] [JOB 1] compacted(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=1.01 -> L3 [445883 445887] (13MB), in 0.3s, output rate 42MB/s +I211215 00:00:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n1,pebble,s1] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=0.99; OverlappingRatio: Single 8.03, Multi 25.05 +I211215 00:00:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n1,pebble,s1] 1216554 [JOB 1] [JOB 1] compacted(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=1.01 -> L3 [445883 445887] (13MB), in 0.3s, output rate 42MB/s ---- 0.log @@ -119,8 +119,8 @@ reset ---- log -I211215 00:01:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n1,s1,pebble] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=0.99; OverlappingRatio: Single 8.03, Multi 25.05 -I211215 00:03:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n1,pebble,s1] 1216554 [JOB 1] [JOB 1] compacted(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=1.01 -> L3 [445883 445887] (13MB), in 0.3s, output rate 42MB/s +I211215 00:01:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n1,s1,pebble] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=0.99; OverlappingRatio: Single 8.03, Multi 25.05 +I211215 00:03:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n1,pebble,s1] 1216554 [JOB 1] [JOB 1] compacted(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=1.01 -> L3 [445883 445887] (13MB), in 0.3s, output rate 42MB/s ---- 0.log @@ -143,11 +143,11 @@ reset ---- log -I211215 00:01:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n1,pebble,s1] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=0.99; OverlappingRatio: Single 8.03, Multi 25.05 -I211215 00:01:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n1,pebble,s1] 1216554 [JOB 1] [JOB 1] compacted(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=1.01 -> L3 [445883 445887] (13MB), in 0.3s, output rate 42MB/s +I211215 00:01:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n1,pebble,s1] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=0.99; OverlappingRatio: Single 8.03, Multi 25.05 +I211215 00:01:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n1,pebble,s1] 1216554 [JOB 1] [JOB 1] compacted(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=1.01 -> L3 [445883 445887] (13MB), in 0.3s, output rate 42MB/s -I211215 00:01:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n1,pebble,s2] 1216510 [JOB 2] compacting(default) L3 [442555] (4.2MB) + L4 [445853] (8.4MB) -I211215 00:01:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n1,pebble,s2] 1216554 [JOB 2] compacted(default) L3 [442555] (4.2MB) + L4 [445853] (8.4MB) -> L4 [445883 445887] (13MB), in 0.3s, output rate 42MB/s +I211215 00:01:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n1,pebble,s2] 1216510 [JOB 2] compacting(default) L3 [442555] (4.2MB) + L4 [445853] (8.4MB) +I211215 00:01:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n1,pebble,s2] 1216554 [JOB 2] compacted(default) L3 [442555] (4.2MB) + L4 [445853] (8.4MB) -> L4 [445883 445887] (13MB), in 0.3s, output rate 42MB/s ---- 0.log @@ -174,14 +174,14 @@ reset ---- log -I211215 00:01:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n1,pebble,s1] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=0.99; OverlappingRatio: Single 8.03, Multi 25.05 -I211215 00:01:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n1,pebble,s1] 1216554 [JOB 1] [JOB 1] compacted(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=1.01 -> L3 [445883 445887] (13MB), in 0.3s, output rate 42MB/s +I211215 00:01:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n1,pebble,s1] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=0.99; OverlappingRatio: Single 8.03, Multi 25.05 +I211215 00:01:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n1,pebble,s1] 1216554 [JOB 1] [JOB 1] compacted(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=1.01 -> L3 [445883 445887] (13MB), in 0.3s, output rate 42MB/s ---- 0.log log -I211215 00:01:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n2,pebble,s1] 1216510 [JOB 1] compacting(default) L3 [442555] (4.2MB) + L4 [445853] (8.4MB) -I211215 00:01:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n2,pebble,s1] 1216554 [JOB 1] compacted(default) L3 [442555] (4.2MB) + L4 [445853] (8.4MB) -> L4 [445883 445887] (13MB), in 0.3s, output rate 42MB/s +I211215 00:01:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n2,pebble,s1] 1216510 [JOB 1] compacting(default) L3 [442555] (4.2MB) + L4 [445853] (8.4MB) +I211215 00:01:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n2,pebble,s1] 1216554 [JOB 1] compacted(default) L3 [442555] (4.2MB) + L4 [445853] (8.4MB) -> L4 [445883 445887] (13MB), in 0.3s, output rate 42MB/s ---- 1.log @@ -209,20 +209,20 @@ reset ---- log -I211215 00:01:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n1,pebble,s1] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=0.99; OverlappingRatio: Single 8.03, Multi 25.05 -I211215 00:01:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n1,pebble,s1] 1216554 [JOB 1] [JOB 1] compacted(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=1.01 -> L3 [445883 445887] (13MB), in 0.3s, output rate 42MB/s +I211215 00:01:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n1,pebble,s1] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=0.99; OverlappingRatio: Single 8.03, Multi 25.05 +I211215 00:01:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n1,pebble,s1] 1216554 [JOB 1] [JOB 1] compacted(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=1.01 -> L3 [445883 445887] (13MB), in 0.3s, output rate 42MB/s -I211215 00:02:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n1,pebble,s2] 1216510 [JOB 2] compacting(default) L1 [442555] (4.2MB) + L2 [445853] (8.4MB) -I211215 00:02:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n1,pebble,s2] 1216554 [JOB 2] compacted(default) L1 [442555] (4.2MB) + L2 [445853] (8.4MB) -> L2 [445883 445887] (13MB), in 0.3s, output rate 42MB/s +I211215 00:02:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n1,pebble,s2] 1216510 [JOB 2] compacting(default) L1 [442555] (4.2MB) + L2 [445853] (8.4MB) +I211215 00:02:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n1,pebble,s2] 1216554 [JOB 2] compacted(default) L1 [442555] (4.2MB) + L2 [445853] (8.4MB) -> L2 [445883 445887] (13MB), in 0.3s, output rate 42MB/s ---- 0.log log -I211215 00:00:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n2,pebble,s1] 1216510 [JOB 1] compacting(default) L3 [442555] (4.2MB) + L4 [445853] (8.4MB) -I211215 00:00:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n2,pebble,s1] 1216554 [JOB 1] compacted(default) L3 [442555] (4.2MB) + L4 [445853] (8.4MB) -> L4 [445883 445887] (13MB), in 0.3s, output rate 42MB/s +I211215 00:00:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n2,pebble,s1] 1216510 [JOB 1] compacting(default) L3 [442555] (4.2MB) + L4 [445853] (8.4MB) +I211215 00:00:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n2,pebble,s1] 1216554 [JOB 1] compacted(default) L3 [442555] (4.2MB) + L4 [445853] (8.4MB) -> L4 [445883 445887] (13MB), in 0.3s, output rate 42MB/s -I211215 00:02:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n2,pebble,s2] 1216510 [JOB 2] compacting(default) L4 [442555] (4.2MB) + L5 [445853] (8.4MB) -I211215 00:02:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n2,pebble,s2] 1216554 [JOB 2] compacted(default) L4 [442555] (4.2MB) + L5 [445853] (8.4MB) -> L5 [445883 445887] (13MB), in 0.3s, output rate 42MB/s +I211215 00:02:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n2,pebble,s2] 1216510 [JOB 2] compacting(default) L4 [442555] (4.2MB) + L5 [445853] (8.4MB) +I211215 00:02:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n2,pebble,s2] 1216554 [JOB 2] compacted(default) L4 [442555] (4.2MB) + L5 [445853] (8.4MB) -> L5 [445883 445887] (13MB), in 0.3s, output rate 42MB/s ---- 1.log @@ -263,8 +263,8 @@ reset ---- log -I211215 00:01:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n?,pebble,s?] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=0.99; OverlappingRatio: Single 8.03, Multi 25.05 -I211215 00:01:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n?,pebble,s?] 1216554 [JOB 1] [JOB 1] compacted(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=1.01 -> L3 [445883 445887] (13MB), in 0.3s, output rate 42MB/s +I211215 00:01:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n?,pebble,s?] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=0.99; OverlappingRatio: Single 8.03, Multi 25.05 +I211215 00:01:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n?,pebble,s?] 1216554 [JOB 1] [JOB 1] compacted(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=1.01 -> L3 [445883 445887] (13MB), in 0.3s, output rate 42MB/s ---- 0.log @@ -302,10 +302,10 @@ reset ---- log -I211215 00:01:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n1,pebble,s1] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=0.99; OverlappingRatio: Single 8.03, Multi 25.05 -I211215 00:02:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n2,pebble,s2] 1216510 [JOB 1] compacting(default) L4 [442555] (4.2MB) Score=1.01 + L5 [445853] (8.4MB) Score=0.99; OverlappingRatio: Single 8.03, Multi 25.05 -I211215 00:01:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n1,pebble,s1] 1216554 [JOB 1] [JOB 1] compacted(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=1.01 -> L3 [445883 445887] (13MB), in 0.3s, output rate 42MB/s -I211215 00:02:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n2,pebble,s2] 1216554 [JOB 1] compacted(default) L4 [442555] (4.2MB) + L5 [445853] (8.4MB) -> L5 [445883 445887] (13MB), in 0.3s, output rate 42MB/s +I211215 00:01:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n1,pebble,s1] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=0.99; OverlappingRatio: Single 8.03, Multi 25.05 +I211215 00:02:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n2,pebble,s2] 1216510 [JOB 1] compacting(default) L4 [442555] (4.2MB) Score=1.01 + L5 [445853] (8.4MB) Score=0.99; OverlappingRatio: Single 8.03, Multi 25.05 +I211215 00:01:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n1,pebble,s1] 1216554 [JOB 1] [JOB 1] compacted(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=1.01 -> L3 [445883 445887] (13MB), in 0.3s, output rate 42MB/s +I211215 00:02:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n2,pebble,s2] 1216554 [JOB 1] compacted(default) L4 [442555] (4.2MB) + L5 [445853] (8.4MB) -> L5 [445883 445887] (13MB), in 0.3s, output rate 42MB/s ---- 0.log @@ -332,8 +332,8 @@ reset ---- log -I220301 00:00:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1845 ⋮ [n1,pebble,s1] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=0.99; OverlappingRatio: Single 8.03, Multi 25.05 -I220301 00:00:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/compaction.go:1886 ⋮ [n1,pebble,s1] 1216554 [JOB 1] [JOB 1] compacted(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=1.01 -> L3 [445883 445887] (13MB), in 0.3s, output rate 42MB/s +I220301 00:00:10.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1845 ⋮ [n1,pebble,s1] 1216510 [JOB 1] compacting(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=0.99; OverlappingRatio: Single 8.03, Multi 25.05 +I220301 00:00:20.000000 51831533 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1886 ⋮ [n1,pebble,s1] 1216554 [JOB 1] [JOB 1] compacted(default) L2 [442555] (4.2MB) Score=1.01 + L3 [445853] (8.4MB) Score=1.01 -> L3 [445883 445887] (13MB), in 0.3s, output rate 42MB/s ---- 0.log @@ -384,33 +384,33 @@ reset ---- log -I220228 14:44:31.497272 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1366 ⋮ [n24,pebble,s24] 33267888 [JOB 10197855] flushing 1 memtable (64MB) to L0 -I220228 14:44:31.497485 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267889 [JOB 10197855] flushing: sstable created 21731018 -I220228 14:44:31.527038 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267892 [JOB 10197855] flushing: sstable created 21731020 -I220228 14:44:31.542944 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267894 [JOB 10197855] flushing: sstable created 21731021 -I220228 14:44:31.553581 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267895 [JOB 10197855] flushing: sstable created 21731022 -I220228 14:44:31.554585 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267896 [JOB 10197855] flushing: sstable created 21731023 -I220228 14:44:31.569928 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267897 [JOB 10197855] flushing: sstable created 21731024 -I220228 14:44:31.624309 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267899 [JOB 10197855] flushing: sstable created 21731025 -I220228 14:44:31.685531 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267901 [JOB 10197855] flushing: sstable created 21731026 -I220228 14:44:31.686009 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267902 [JOB 10197855] flushing: sstable created 21731027 -I220228 14:44:31.686415 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267903 [JOB 10197855] flushing: sstable created 21731028 -I220228 14:44:31.780892 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267906 [JOB 10197855] flushing: sstable created 21731030 -I220228 14:44:31.790911 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267907 [JOB 10197855] flushing: sstable created 21731031 -I220228 14:44:31.904614 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267911 [JOB 10197855] flushing: sstable created 21731033 -I220228 14:44:31.905835 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267912 [JOB 10197855] flushing: sstable created 21731034 -I220228 14:44:31.906860 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267913 [JOB 10197855] flushing: sstable created 21731035 -I220228 14:44:31.907602 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267914 [JOB 10197855] flushing: sstable created 21731036 -I220228 14:44:32.019173 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267920 [JOB 10197855] flushing: sstable created 21731037 -I220228 14:44:32.019714 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267921 [JOB 10197855] flushing: sstable created 21731038 -I220228 14:44:32.020161 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267922 [JOB 10197855] flushing: sstable created 21731039 -I220228 14:44:32.100117 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267925 [JOB 10197855] flushing: sstable created 21731040 -I220228 14:44:32.100609 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267926 [JOB 10197855] flushing: sstable created 21731041 -I220228 14:44:32.101065 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267927 [JOB 10197855] flushing: sstable created 21731042 -I220228 14:44:32.101494 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267928 [JOB 10197855] flushing: sstable created 21731043 -I220228 14:44:32.102569 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267929 [JOB 10197855] flushing: sstable created 21731044 -I220228 14:44:32.106284 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1985 ⋮ [n24,pebble,s24] 33267930 [JOB 10197855] flushing: sstable created 21731045 -I220228 14:44:32.138686 18460916022 3@vendor/github.com/cockroachdb/pebble/compaction.go:1423 ⋮ [n24,pebble,s24] 33267931 [JOB 10197855] flushed 1 memtable to L0 [21731018 21731020 21731021 21731022 21731023 21731024 21731025 21731026 21731027 21731028 21731030 21731031 21731033 21731034 21731035 21731036 21731037 21731038 21731039 21731040 21731041 21731042 21731043 21731044 21731045] (19MB), in 0.6s, output rate 31MB/s +I220228 14:44:31.497272 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1366 ⋮ [n24,pebble,s24] 33267888 [JOB 10197855] flushing 1 memtable (64MB) to L0 +I220228 14:44:31.497485 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267889 [JOB 10197855] flushing: sstable created 21731018 +I220228 14:44:31.527038 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267892 [JOB 10197855] flushing: sstable created 21731020 +I220228 14:44:31.542944 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267894 [JOB 10197855] flushing: sstable created 21731021 +I220228 14:44:31.553581 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267895 [JOB 10197855] flushing: sstable created 21731022 +I220228 14:44:31.554585 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267896 [JOB 10197855] flushing: sstable created 21731023 +I220228 14:44:31.569928 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267897 [JOB 10197855] flushing: sstable created 21731024 +I220228 14:44:31.624309 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267899 [JOB 10197855] flushing: sstable created 21731025 +I220228 14:44:31.685531 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267901 [JOB 10197855] flushing: sstable created 21731026 +I220228 14:44:31.686009 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267902 [JOB 10197855] flushing: sstable created 21731027 +I220228 14:44:31.686415 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267903 [JOB 10197855] flushing: sstable created 21731028 +I220228 14:44:31.780892 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267906 [JOB 10197855] flushing: sstable created 21731030 +I220228 14:44:31.790911 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267907 [JOB 10197855] flushing: sstable created 21731031 +I220228 14:44:31.904614 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267911 [JOB 10197855] flushing: sstable created 21731033 +I220228 14:44:31.905835 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267912 [JOB 10197855] flushing: sstable created 21731034 +I220228 14:44:31.906860 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267913 [JOB 10197855] flushing: sstable created 21731035 +I220228 14:44:31.907602 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267914 [JOB 10197855] flushing: sstable created 21731036 +I220228 14:44:32.019173 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267920 [JOB 10197855] flushing: sstable created 21731037 +I220228 14:44:32.019714 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267921 [JOB 10197855] flushing: sstable created 21731038 +I220228 14:44:32.020161 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267922 [JOB 10197855] flushing: sstable created 21731039 +I220228 14:44:32.100117 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267925 [JOB 10197855] flushing: sstable created 21731040 +I220228 14:44:32.100609 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267926 [JOB 10197855] flushing: sstable created 21731041 +I220228 14:44:32.101065 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267927 [JOB 10197855] flushing: sstable created 21731042 +I220228 14:44:32.101494 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267928 [JOB 10197855] flushing: sstable created 21731043 +I220228 14:44:32.102569 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267929 [JOB 10197855] flushing: sstable created 21731044 +I220228 14:44:32.106284 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1985 ⋮ [n24,pebble,s24] 33267930 [JOB 10197855] flushing: sstable created 21731045 +I220228 14:44:32.138686 18460916022 3@vendor/github.com/cockroachdb/pebble/v2/compaction.go:1423 ⋮ [n24,pebble,s24] 33267931 [JOB 10197855] flushed 1 memtable to L0 [21731018 21731020 21731021 21731022 21731023 21731024 21731025 21731026 21731027 21731028 21731030 21731031 21731033 21731034 21731035 21731036 21731037 21731038 21731039 21731040 21731041 21731042 21731043 21731044 21731045] (19MB), in 0.6s, output rate 31MB/s ---- 0.log @@ -428,8 +428,8 @@ reset ---- log -I220228 16:01:22.487906 18476248525 3@vendor/github.com/cockroachdb/pebble/ingest.go:637 ⋮ [n24,pebble,s24] 33430782 [JOB 10211226] ingested L0:21818678 (1.8KB), L0:21818683 (1.2KB), L0:21818679 (1.6KB), L0:21818680 (1.1KB), L0:21818681 (1.1KB), L0:21818682 (160MB) -45127:I220228 15:58:45.538681 18475981755 3@vendor/github.com/cockroachdb/pebble/ingest.go:637 ⋮ [n24,pebble,s24] 33424719 [JOB 10210743] ingested L0:21814543 (1.4KB), L0:21814548 (1.2KB), L5:21814544 (1.4KB), L5:21814545 (1.1KB), L5:21814546 (1.1KB), L0:21814547 (140MB) +I220228 16:01:22.487906 18476248525 3@vendor/github.com/cockroachdb/pebble/v2/ingest.go:637 ⋮ [n24,pebble,s24] 33430782 [JOB 10211226] ingested L0:21818678 (1.8KB), L0:21818683 (1.2KB), L0:21818679 (1.6KB), L0:21818680 (1.1KB), L0:21818681 (1.1KB), L0:21818682 (160MB) +45127:I220228 15:58:45.538681 18475981755 3@vendor/github.com/cockroachdb/pebble/v2/ingest.go:637 ⋮ [n24,pebble,s24] 33424719 [JOB 10210743] ingested L0:21814543 (1.4KB), L0:21814548 (1.2KB), L5:21814544 (1.4KB), L5:21814545 (1.1KB), L5:21814546 (1.1KB), L0:21814547 (140MB) ---- 0.log @@ -455,14 +455,14 @@ reset ---- log -I220907 00:27:21.579807 15082709999 3@vendor/github.com/cockroachdb/pebble/event.go:587 ⋮ [n15,pebble,s15] 2736197 [JOB 743692] compacting(delete-only) L6 [18323385] (11MB) -I220907 00:27:21.580169 15082709999 3@vendor/github.com/cockroachdb/pebble/event.go:591 ⋮ [n15,pebble,s15] 2736198 [JOB 743692] compacted(delete-only) L6 [18323385] (11MB) -> L6 [] (0B), in 0.0s, output rate 0 B/s +I220907 00:27:21.579807 15082709999 3@vendor/github.com/cockroachdb/pebble/v2/event.go:587 ⋮ [n15,pebble,s15] 2736197 [JOB 743692] compacting(delete-only) L6 [18323385] (11MB) +I220907 00:27:21.580169 15082709999 3@vendor/github.com/cockroachdb/pebble/v2/event.go:591 ⋮ [n15,pebble,s15] 2736198 [JOB 743692] compacted(delete-only) L6 [18323385] (11MB) -> L6 [] (0B), in 0.0s, output rate 0 B/s -I220907 00:27:21.631145 15082710355 3@vendor/github.com/cockroachdb/pebble/event.go:587 ⋮ [n15,pebble,s15] 2736201 [JOB 743694] compacting(default) L5 [18323582] (1.8KB) + L6 [17770912] (128MB) -I220907 00:27:22.729839 15082710355 3@vendor/github.com/cockroachdb/pebble/event.go:591 ⋮ [n15,pebble,s15] 2736208 [JOB 743694] compacted(default) L5 [18323582] (1.8KB) + L6 [17770912] (128MB) -> L6 [18323586] (3.6MB), in 1.1s, output rate 3.3MB/s +I220907 00:27:21.631145 15082710355 3@vendor/github.com/cockroachdb/pebble/v2/event.go:587 ⋮ [n15,pebble,s15] 2736201 [JOB 743694] compacting(default) L5 [18323582] (1.8KB) + L6 [17770912] (128MB) +I220907 00:27:22.729839 15082710355 3@vendor/github.com/cockroachdb/pebble/v2/event.go:591 ⋮ [n15,pebble,s15] 2736208 [JOB 743694] compacted(default) L5 [18323582] (1.8KB) + L6 [17770912] (128MB) -> L6 [18323586] (3.6MB), in 1.1s, output rate 3.3MB/s -I220907 00:27:21.630546 15082710354 3@vendor/github.com/cockroachdb/pebble/event.go:587 ⋮ [n15,pebble,s15] 2736199 [JOB 743693] compacting(move) L5 [18323585] (4.0MB) + L6 [] (0B) -I220907 00:27:21.631002 15082710354 3@vendor/github.com/cockroachdb/pebble/event.go:591 ⋮ [n15,pebble,s15] 2736200 [JOB 743693] compacted(move) L5 [18323585] (4.0MB) + L6 [] (0B) -> L6 [18323585] (4.0MB), in 0.0s, output rate 50GB/s +I220907 00:27:21.630546 15082710354 3@vendor/github.com/cockroachdb/pebble/v2/event.go:587 ⋮ [n15,pebble,s15] 2736199 [JOB 743693] compacting(move) L5 [18323585] (4.0MB) + L6 [] (0B) +I220907 00:27:21.631002 15082710354 3@vendor/github.com/cockroachdb/pebble/v2/event.go:591 ⋮ [n15,pebble,s15] 2736200 [JOB 743693] compacted(move) L5 [18323585] (4.0MB) + L6 [] (0B) -> L6 [18323585] (4.0MB), in 0.0s, output rate 50GB/s ---- 0.log diff --git a/tool/lsm.go b/tool/lsm.go index a5dc528afc..19dcfac539 100644 --- a/tool/lsm.go +++ b/tool/lsm.go @@ -13,11 +13,11 @@ import ( "slices" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/record" - "github.com/cockroachdb/pebble/sstable" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/record" + "github.com/cockroachdb/pebble/v2/sstable" "github.com/spf13/cobra" ) diff --git a/tool/make_incorrect_manifests.go b/tool/make_incorrect_manifests.go index 90aa87d0e2..76a78be9a0 100644 --- a/tool/make_incorrect_manifests.go +++ b/tool/make_incorrect_manifests.go @@ -11,9 +11,9 @@ package main import ( "log" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/record" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/record" + "github.com/cockroachdb/pebble/v2/vfs" ) func writeVE(writer *record.Writer, ve *manifest.VersionEdit) { diff --git a/tool/make_test_find_db.go b/tool/make_test_find_db.go index 21f4f0b08a..eca8aac911 100644 --- a/tool/make_test_find_db.go +++ b/tool/make_test_find_db.go @@ -11,11 +11,11 @@ package main import ( "log" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/vfs" ) type db struct { diff --git a/tool/make_test_remotecat.go b/tool/make_test_remotecat.go index fb16accfc5..010f4c6add 100644 --- a/tool/make_test_remotecat.go +++ b/tool/make_test_remotecat.go @@ -13,10 +13,10 @@ import ( "os" "path/filepath" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider/remoteobjcat" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider/remoteobjcat" + "github.com/cockroachdb/pebble/v2/vfs" ) func main() { diff --git a/tool/make_test_sstables.go b/tool/make_test_sstables.go index 9070452f71..a242485773 100644 --- a/tool/make_test_sstables.go +++ b/tool/make_test_sstables.go @@ -11,10 +11,10 @@ package main import ( "log" - "github.com/cockroachdb/pebble/internal/private" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/private" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/vfs" ) func makeOutOfOrder() { diff --git a/tool/manifest.go b/tool/manifest.go index c9ba098ec6..b917a9d7f0 100644 --- a/tool/manifest.go +++ b/tool/manifest.go @@ -12,12 +12,12 @@ import ( "time" "github.com/HdrHistogram/hdrhistogram-go" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/humanize" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/record" - "github.com/cockroachdb/pebble/sstable" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/humanize" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/record" + "github.com/cockroachdb/pebble/v2/sstable" "github.com/spf13/cobra" ) diff --git a/tool/remotecat.go b/tool/remotecat.go index 01eabb9db0..c31b4db9ed 100644 --- a/tool/remotecat.go +++ b/tool/remotecat.go @@ -9,11 +9,11 @@ import ( "io" "slices" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider/remoteobjcat" - "github.com/cockroachdb/pebble/record" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider/remoteobjcat" + "github.com/cockroachdb/pebble/v2/record" "github.com/spf13/cobra" ) diff --git a/tool/sstable.go b/tool/sstable.go index 7e175bcf96..f1ef9d7514 100644 --- a/tool/sstable.go +++ b/tool/sstable.go @@ -15,14 +15,14 @@ import ( "strings" "text/tabwriter" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/humanize" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/internal/rangedel" - "github.com/cockroachdb/pebble/internal/sstableinternal" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/humanize" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/internal/rangedel" + "github.com/cockroachdb/pebble/v2/internal/sstableinternal" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/spf13/cobra" ) diff --git a/tool/testdata/make-broken-external.go b/tool/testdata/make-broken-external.go index 1e381df9a5..2101eda3b0 100644 --- a/tool/testdata/make-broken-external.go +++ b/tool/testdata/make-broken-external.go @@ -10,11 +10,11 @@ import ( "path/filepath" "strings" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/objstorage/remote" - "github.com/cockroachdb/pebble/sstable" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/objstorage/remote" + "github.com/cockroachdb/pebble/v2/sstable" ) const version = pebble.FormatSyntheticPrefixSuffix diff --git a/tool/testdata/mixed/main.go b/tool/testdata/mixed/main.go index a4ba3b51d4..46d4a8ae0e 100644 --- a/tool/testdata/mixed/main.go +++ b/tool/testdata/mixed/main.go @@ -20,9 +20,9 @@ import ( "os" "path/filepath" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/internal/testkeys" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/internal/testkeys" + "github.com/cockroachdb/pebble/v2/vfs" ) const outDir = "./tool/testdata/mixed" diff --git a/tool/tool.go b/tool/tool.go index f7995c61ee..f37d2791c2 100644 --- a/tool/tool.go +++ b/tool/tool.go @@ -5,13 +5,13 @@ package tool import ( - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/bloom" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/objstorage/remote" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/sstable/colblk" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/bloom" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/objstorage/remote" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/sstable/colblk" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/spf13/cobra" ) diff --git a/tool/util.go b/tool/util.go index 6747a1bff7..0e7e44d016 100644 --- a/tool/util.go +++ b/tool/util.go @@ -13,10 +13,10 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/keyspan" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/keyspan" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/vfs" ) var timeNow = time.Now diff --git a/tool/wal.go b/tool/wal.go index 4d0ffde5ab..152c89ae62 100644 --- a/tool/wal.go +++ b/tool/wal.go @@ -12,13 +12,13 @@ import ( "os" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble" - "github.com/cockroachdb/pebble/batchrepr" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/rangekey" - "github.com/cockroachdb/pebble/record" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/wal" + "github.com/cockroachdb/pebble/v2" + "github.com/cockroachdb/pebble/v2/batchrepr" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/rangekey" + "github.com/cockroachdb/pebble/v2/record" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/wal" "github.com/spf13/cobra" ) diff --git a/version_set.go b/version_set.go index 6e121a66fd..283f4b89cb 100644 --- a/version_set.go +++ b/version_set.go @@ -11,13 +11,13 @@ import ( "sync/atomic" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/record" - "github.com/cockroachdb/pebble/vfs" - "github.com/cockroachdb/pebble/vfs/atomicfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/record" + "github.com/cockroachdb/pebble/v2/vfs" + "github.com/cockroachdb/pebble/v2/vfs/atomicfs" ) const numLevels = manifest.NumLevels diff --git a/version_set_test.go b/version_set_test.go index 271279fa53..f3fa364f77 100644 --- a/version_set_test.go +++ b/version_set_test.go @@ -16,14 +16,14 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/manifest" - "github.com/cockroachdb/pebble/objstorage" - "github.com/cockroachdb/pebble/objstorage/objstorageprovider" - "github.com/cockroachdb/pebble/record" - "github.com/cockroachdb/pebble/sstable" - "github.com/cockroachdb/pebble/vfs" - "github.com/cockroachdb/pebble/vfs/atomicfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/manifest" + "github.com/cockroachdb/pebble/v2/objstorage" + "github.com/cockroachdb/pebble/v2/objstorage/objstorageprovider" + "github.com/cockroachdb/pebble/v2/record" + "github.com/cockroachdb/pebble/v2/sstable" + "github.com/cockroachdb/pebble/v2/vfs" + "github.com/cockroachdb/pebble/v2/vfs/atomicfs" "github.com/stretchr/testify/require" ) diff --git a/vfs/atomicfs/marker.go b/vfs/atomicfs/marker.go index 9624f14ff9..b62509d089 100644 --- a/vfs/atomicfs/marker.go +++ b/vfs/atomicfs/marker.go @@ -11,7 +11,7 @@ import ( "github.com/cockroachdb/errors" "github.com/cockroachdb/errors/oserror" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/vfs" ) // ReadMarker looks up the current state of a marker returning just the diff --git a/vfs/atomicfs/marker_test.go b/vfs/atomicfs/marker_test.go index 373103e327..e912c8be6f 100644 --- a/vfs/atomicfs/marker_test.go +++ b/vfs/atomicfs/marker_test.go @@ -16,8 +16,8 @@ import ( "github.com/cockroachdb/datadriven" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/vfs" - "github.com/cockroachdb/pebble/vfs/errorfs" + "github.com/cockroachdb/pebble/v2/vfs" + "github.com/cockroachdb/pebble/v2/vfs/errorfs" "github.com/stretchr/testify/require" ) diff --git a/vfs/errorfs/dsl.go b/vfs/errorfs/dsl.go index 68ed739743..673d9c9ca6 100644 --- a/vfs/errorfs/dsl.go +++ b/vfs/errorfs/dsl.go @@ -12,7 +12,7 @@ import ( "strconv" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/dsl" + "github.com/cockroachdb/pebble/v2/internal/dsl" ) // Predicate encodes conditional logic that determines whether to inject an diff --git a/vfs/errorfs/errorfs.go b/vfs/errorfs/errorfs.go index 31862095e8..4fec11ecb3 100644 --- a/vfs/errorfs/errorfs.go +++ b/vfs/errorfs/errorfs.go @@ -14,8 +14,8 @@ import ( "github.com/cockroachdb/errors" "github.com/cockroachdb/errors/oserror" - "github.com/cockroachdb/pebble/internal/dsl" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/dsl" + "github.com/cockroachdb/pebble/v2/vfs" ) // ErrInjected is an error artificially injected for testing fs error paths. diff --git a/vfs/errorfs/latency.go b/vfs/errorfs/latency.go index 02deac5dc5..20f1ea88ce 100644 --- a/vfs/errorfs/latency.go +++ b/vfs/errorfs/latency.go @@ -12,7 +12,7 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/dsl" + "github.com/cockroachdb/pebble/v2/internal/dsl" ) // RandomLatency constructs an Injector that does not inject errors but instead diff --git a/vfs/file_lock_test.go b/vfs/file_lock_test.go index 0b8cf1139e..48e8b92d4d 100644 --- a/vfs/file_lock_test.go +++ b/vfs/file_lock_test.go @@ -11,7 +11,7 @@ import ( "os/exec" "testing" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" ) diff --git a/vfs/mem_fs.go b/vfs/mem_fs.go index 9bc2d1ca74..7d91fb6ccf 100644 --- a/vfs/mem_fs.go +++ b/vfs/mem_fs.go @@ -2,7 +2,7 @@ // of this source code is governed by a BSD-style license that can be found in // the LICENSE file. -package vfs // import "github.com/cockroachdb/pebble/vfs" +package vfs // import "github.com/cockroachdb/pebble/v2/vfs" import ( "bytes" @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/errors" "github.com/cockroachdb/errors/oserror" - "github.com/cockroachdb/pebble/internal/invariants" + "github.com/cockroachdb/pebble/v2/internal/invariants" ) const sep = "/" diff --git a/vfs/vfstest/open_files.go b/vfs/vfstest/open_files.go index 4d23fe05a4..d4cc052dc8 100644 --- a/vfs/vfstest/open_files.go +++ b/vfs/vfstest/open_files.go @@ -11,7 +11,7 @@ import ( "runtime" "sync" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/vfs" ) // WithOpenFileTracking wraps a FS, returning an FS that will monitor open diff --git a/vfs/vfstest/open_files_test.go b/vfs/vfstest/open_files_test.go index a9d0d99e50..3a2b8d0725 100644 --- a/vfs/vfstest/open_files_test.go +++ b/vfs/vfstest/open_files_test.go @@ -9,7 +9,7 @@ import ( "os" "testing" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" ) diff --git a/vfs/vfstest/vfstest.go b/vfs/vfstest/vfstest.go index 247d2705fe..e18cf2e820 100644 --- a/vfs/vfstest/vfstest.go +++ b/vfs/vfstest/vfstest.go @@ -6,7 +6,7 @@ // filesystems during tests and benchmarks. package vfstest -import "github.com/cockroachdb/pebble/vfs" +import "github.com/cockroachdb/pebble/v2/vfs" // DiscardFile implements vfs.File but discards all written data and reads // without mutating input buffers. diff --git a/wal/failover_manager.go b/wal/failover_manager.go index 4bfcfa2180..ddc20cc5ff 100644 --- a/wal/failover_manager.go +++ b/wal/failover_manager.go @@ -13,9 +13,9 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/invariants" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/invariants" + "github.com/cockroachdb/pebble/v2/vfs" ) // dirProber probes the primary dir, until it is confirmed to be healthy. If diff --git a/wal/failover_manager_test.go b/wal/failover_manager_test.go index 770af4a97f..f18e5acd44 100644 --- a/wal/failover_manager_test.go +++ b/wal/failover_manager_test.go @@ -15,8 +15,8 @@ import ( "time" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/vfs" - "github.com/cockroachdb/pebble/vfs/errorfs" + "github.com/cockroachdb/pebble/v2/vfs" + "github.com/cockroachdb/pebble/v2/vfs/errorfs" "github.com/prometheus/client_golang/prometheus" io_prometheus_client "github.com/prometheus/client_model/go" "github.com/stretchr/testify/require" diff --git a/wal/failover_writer.go b/wal/failover_writer.go index 19ccb712f0..c55239b771 100644 --- a/wal/failover_writer.go +++ b/wal/failover_writer.go @@ -11,9 +11,9 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/record" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/record" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/prometheus/client_golang/prometheus" ) @@ -72,7 +72,7 @@ type recordQueue struct { // contents corresponding to poppedEntry), *before* it succeeds with the // atomic read-write. This introduced a false data race in the Golang data // race detector - // https://github.com/cockroachdb/pebble/issues/3380#issuecomment-1981188174. + // https://github.com/cockroachdb/pebble/v2/issues/3380#issuecomment-1981188174. // Consider the case where the queue is [10,20), and consumer C1 is trying // to pop [10,12) and consumer C2 is trying to pop [10,14). The following // interleaving can happen: diff --git a/wal/failover_writer_test.go b/wal/failover_writer_test.go index 9bbf81e511..30d22bfbec 100644 --- a/wal/failover_writer_test.go +++ b/wal/failover_writer_test.go @@ -18,11 +18,11 @@ import ( "github.com/cockroachdb/datadriven" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/testutils" - "github.com/cockroachdb/pebble/record" - "github.com/cockroachdb/pebble/vfs" - "github.com/cockroachdb/pebble/vfs/errorfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/testutils" + "github.com/cockroachdb/pebble/v2/record" + "github.com/cockroachdb/pebble/v2/vfs" + "github.com/cockroachdb/pebble/v2/vfs/errorfs" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" ) diff --git a/wal/log_recycler.go b/wal/log_recycler.go index cc327b5b98..e7bf142d51 100644 --- a/wal/log_recycler.go +++ b/wal/log_recycler.go @@ -8,7 +8,7 @@ import ( "sync" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" ) // TODO(sumeer): hide LogRecycler once rest of Pebble is using wal.Manager. diff --git a/wal/log_recycler_test.go b/wal/log_recycler_test.go index 9cb9876e73..b16199fe6d 100644 --- a/wal/log_recycler_test.go +++ b/wal/log_recycler_test.go @@ -7,7 +7,7 @@ package wal import ( "testing" - "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/v2/internal/base" "github.com/stretchr/testify/require" ) diff --git a/wal/reader.go b/wal/reader.go index a08e7f60f6..cf97298681 100644 --- a/wal/reader.go +++ b/wal/reader.go @@ -13,10 +13,10 @@ import ( "strings" "github.com/cockroachdb/errors" - "github.com/cockroachdb/pebble/batchrepr" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/record" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/batchrepr" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/record" + "github.com/cockroachdb/pebble/v2/vfs" ) // A LogicalLog identifies a logical WAL and its consituent segment files. diff --git a/wal/reader_test.go b/wal/reader_test.go index c45351579c..e3da2d7420 100644 --- a/wal/reader_test.go +++ b/wal/reader_test.go @@ -17,11 +17,11 @@ import ( "testing" "github.com/cockroachdb/datadriven" - "github.com/cockroachdb/pebble/batchrepr" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/internal/datadrivenutil" - "github.com/cockroachdb/pebble/record" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/batchrepr" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/internal/datadrivenutil" + "github.com/cockroachdb/pebble/v2/record" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/stretchr/testify/require" ) diff --git a/wal/standalone_manager.go b/wal/standalone_manager.go index 26dae5d5ca..02836b2b31 100644 --- a/wal/standalone_manager.go +++ b/wal/standalone_manager.go @@ -8,9 +8,9 @@ import ( "os" "sync" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/record" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/record" + "github.com/cockroachdb/pebble/v2/vfs" ) // StandaloneManager implements Manager with a single log file per WAL (no diff --git a/wal/wal.go b/wal/wal.go index 6df38a7e67..9686d79752 100644 --- a/wal/wal.go +++ b/wal/wal.go @@ -12,9 +12,9 @@ import ( "sync" "time" - "github.com/cockroachdb/pebble/internal/base" - "github.com/cockroachdb/pebble/record" - "github.com/cockroachdb/pebble/vfs" + "github.com/cockroachdb/pebble/v2/internal/base" + "github.com/cockroachdb/pebble/v2/record" + "github.com/cockroachdb/pebble/v2/vfs" "github.com/prometheus/client_golang/prometheus" )