From b6b3f0af512bf65f7b39e3350855fd46347c4922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=82=8E=E6=B3=BC?= Date: Fri, 22 Dec 2023 15:07:52 +0800 Subject: [PATCH] docs: add compatibility to meta/README.md (#14128) * chore: fix renamed method in the comment guide * docs: add compatibility to meta/README.md --- src/meta/README.md | 96 +++++++++++++++++++ .../tests/it/v002_share_account_meta.rs | 2 +- .../proto-conv/tests/it/v002_share_meta.rs | 2 +- .../proto-conv/tests/it/v002_table_meta.rs | 2 +- .../proto-conv/tests/it/v005_database_meta.rs | 2 +- .../proto-conv/tests/it/v005_share_meta.rs | 2 +- .../tests/it/v006_copied_file_info.rs | 2 +- .../proto-conv/tests/it/v010_table_meta.rs | 2 +- .../proto-conv/tests/it/v012_table_meta.rs | 2 +- .../proto-conv/tests/it/v023_table_meta.rs | 2 +- .../proto-conv/tests/it/v024_table_meta.rs | 2 +- src/meta/proto-conv/tests/it/v026_schema.rs | 2 +- src/meta/proto-conv/tests/it/v027_schema.rs | 2 +- src/meta/proto-conv/tests/it/v028_schema.rs | 2 +- src/meta/proto-conv/tests/it/v029_schema.rs | 2 +- .../proto-conv/tests/it/v033_table_meta.rs | 2 +- src/meta/proto-conv/tests/it/v034_schema.rs | 2 +- .../proto-conv/tests/it/v038_empty_proto.rs | 2 +- .../proto-conv/tests/it/v039_data_mask.rs | 2 +- .../proto-conv/tests/it/v040_table_meta.rs | 2 +- .../proto-conv/tests/it/v044_table_meta.rs | 2 +- .../proto-conv/tests/it/v045_background.rs | 2 +- .../proto-conv/tests/it/v048_background.rs | 2 +- .../tests/it/v049_network_policy.rs | 2 +- .../proto-conv/tests/it/v050_user_info.rs | 2 +- .../tests/it/v051_obs_and_cos_storage.rs | 2 +- .../proto-conv/tests/it/v057_hdfs_storage.rs | 2 +- src/meta/proto-conv/tests/it/v058_udf.rs | 2 +- .../proto-conv/tests/it/v063_connection.rs | 4 +- src/meta/service/tests/it/tests/service.rs | 3 +- 30 files changed, 126 insertions(+), 31 deletions(-) diff --git a/src/meta/README.md b/src/meta/README.md index bf97a3e7a6ab..d889601a979c 100644 --- a/src/meta/README.md +++ b/src/meta/README.md @@ -68,3 +68,99 @@ To add a new feature(add new type or update an type), the developer should do: - Add a compatibility test to ensure that compatibility will always be kept in future, a good example is: `src/meta/proto-conv/tests/it/v039_data_mask.rs` + + + + + +## Compatibility with Databend Query + +The following is an illustration of current query-meta compatibility: + +| `Meta\Query` | [0.7.59, 0.8.80) | [0.8.80, 0.9.41) | [0.9.41, 1.1.34) | [1.1.34, +∞) | +|:-----------------|:-----------------|:-----------------|:-----------------|:-------------| +| [0.8.30, 0.8.35) | ✅ | ❌ | ❌ | ❌ | +| [0.8.35, 0.9.23) | ✅ | ✅ | ✅ | ❌ | +| [0.9.23, 0.9.42) | ❌ | ✅ | ✅ | ❌ | +| [0.9.42, 1.1.32) | ❌ | ❌ | ✅ | ❌ | +| [1.1.32, 1.2.63) | ❌ | ❌ | ✅ | ✅ | +| [1.2.63, +∞) | ❌ | ❌ | ✅ | ✅ | + + +## Compatibility between databend-meta + +| Meta version | Backward compatible with | +|:------------------|:-------------------------| +| [0.9.41, 1.2.212) | [0.9.41, 1.2.212) | +| [1.2.212, +∞) | [0.9.41, +∞) | + + +- `1.2.53` Incompatible, rolling upgrade is allowed without snapshot transmitting. + Snapshot format changed thus during rolling upgrading, + it requires all node data to be up-to-date, ensure there is no need to replicate with snapshot. + +- `1.2.163` Feature: gRPC API: `kv_read_v1()` is added. For stream reading. + +- `1.2.212` Feature: raft API: `install_snapshot_v1()`. Compatible with old versions. + Rolling upgrade is supported. + In this version, databend-meta raft-server introduced a new API `install_snapshot_v1()`. + The raft-client will try to use either this new API or the original `install_snapshot()`. + + +## Compatibility of databend-meta on-disk data + +The on-disk data of Databend-meta evolves over time while maintaining backward compatibility. + +### Identifying the versions + +Upon startup, Databend-meta will display the on-disk data version: + +For example, running `databend-meta --single` produces: + +``` +Databend Metasrv + +Version: v1.1.33-nightly-... +Working DataVersion: V0 + +On Disk Data: + Dir: ./.databend/meta + Version: version=V0, upgrading=None +``` + +- `Working DataVersion` denotes the version Databend-meta operates on. +- `On Disk Data -- DataVersion` denotes the version of the on-disk data. + +The Working DataVersion must be greater than or equal to the on-disk DataVersion; otherwise, it will panic. + +The on-disk DataVersion must be compatible with the current Databend-meta version. +If not, the system will prompt the user to downgrade Databend-meta and quit with a panic. + +### Automatic upgrade + +When `databend-meta` starting up, the on-disk is upgraded if it is compatible with the working DataVersion. +The upgrade progress will be printed to `stderr` and to log file at INFO level, e.g.: + +```text +Upgrade on-disk data + From: V0(2023-04-21: compatible with openraft v07 and v08, using openraft::compat) + To: V001(2023-05-15: Get rid of compat, use only openraft v08 data types) +Begin upgrading: version: V0, upgrading: V001 +Write header: version: V0, upgrading: V001 +Upgraded 167 records +Finished upgrading: version: V001, upgrading: None +Write header: version: V001, upgrading: None +``` + +If `databend-meta` crashes before upgrading finishes, +it will clear partially upgraded data and resume the upgrade when it starts up again. + +### Backup data compatibility + +- The exported backup data **can only be imported** with the same version of `databend-metactl`. + +- The first line of the backup is the version, e.g.: + `["header",{"DataHeader":{"key":"header","value":{"version":"V100","upgrading":null}}}]` + +- **NO automatic upgrade** will be done when importing. + Automatic upgrade will only be done when `databend-meta` is brought up. diff --git a/src/meta/proto-conv/tests/it/v002_share_account_meta.rs b/src/meta/proto-conv/tests/it/v002_share_account_meta.rs index 40711bbcdfd4..9b63f063567b 100644 --- a/src/meta/proto-conv/tests/it/v002_share_account_meta.rs +++ b/src/meta/proto-conv/tests/it/v002_share_account_meta.rs @@ -28,7 +28,7 @@ use crate::common; // * or be removed when an old version is no longer supported. * // ************************************************************* // -// The message bytes are built from the output of `test_build_pb_buf()` +// The message bytes are built from the output of `test_pb_from_to()` #[test] fn test_decode_v2_share_account_meta() -> anyhow::Result<()> { let bytes: Vec = vec![ diff --git a/src/meta/proto-conv/tests/it/v002_share_meta.rs b/src/meta/proto-conv/tests/it/v002_share_meta.rs index a96e142bf12a..017c25dd75f8 100644 --- a/src/meta/proto-conv/tests/it/v002_share_meta.rs +++ b/src/meta/proto-conv/tests/it/v002_share_meta.rs @@ -31,7 +31,7 @@ use crate::common; // * or be removed when an old version is no longer supported. * // ************************************************************* // -// The message bytes are built from the output of `test_build_pb_buf()` +// The message bytes are built from the output of `test_pb_from_to()` #[test] fn test_decode_v2_share_meta() -> anyhow::Result<()> { let bytes: Vec = vec![ diff --git a/src/meta/proto-conv/tests/it/v002_table_meta.rs b/src/meta/proto-conv/tests/it/v002_table_meta.rs index 9c24ed3e6d71..31463536de6c 100644 --- a/src/meta/proto-conv/tests/it/v002_table_meta.rs +++ b/src/meta/proto-conv/tests/it/v002_table_meta.rs @@ -34,7 +34,7 @@ use crate::common; // * or be removed when an old version is no longer supported. * // ************************************************************* // -// The message bytes are built from the output of `test_build_pb_buf()` +// The message bytes are built from the output of `test_pb_from_to()` #[test] fn test_decode_v2_table_meta() -> anyhow::Result<()> { let bytes: Vec = vec![ diff --git a/src/meta/proto-conv/tests/it/v005_database_meta.rs b/src/meta/proto-conv/tests/it/v005_database_meta.rs index 82f9c233348e..67caf73db5aa 100644 --- a/src/meta/proto-conv/tests/it/v005_database_meta.rs +++ b/src/meta/proto-conv/tests/it/v005_database_meta.rs @@ -32,7 +32,7 @@ use crate::common; // * or be removed when an old version is no longer supported. * // ************************************************************* // -// The message bytes are built from the output of `test_build_pb_buf()` +// The message bytes are built from the output of `test_pb_from_to()` #[test] fn test_decode_v5_database_meta() -> anyhow::Result<()> { let bytes: Vec = vec![ diff --git a/src/meta/proto-conv/tests/it/v005_share_meta.rs b/src/meta/proto-conv/tests/it/v005_share_meta.rs index 8437c0df4536..d25e1a583795 100644 --- a/src/meta/proto-conv/tests/it/v005_share_meta.rs +++ b/src/meta/proto-conv/tests/it/v005_share_meta.rs @@ -31,7 +31,7 @@ use crate::common; // * or be removed when an old version is no longer supported. * // ************************************************************* // -// The message bytes are built from the output of `test_build_pb_buf()` +// The message bytes are built from the output of `test_pb_from_to()` #[test] fn test_decode_v5_share_meta() -> anyhow::Result<()> { let bytes: Vec = vec![ diff --git a/src/meta/proto-conv/tests/it/v006_copied_file_info.rs b/src/meta/proto-conv/tests/it/v006_copied_file_info.rs index 8192c5158ac4..fd66d4e16c57 100644 --- a/src/meta/proto-conv/tests/it/v006_copied_file_info.rs +++ b/src/meta/proto-conv/tests/it/v006_copied_file_info.rs @@ -28,7 +28,7 @@ use crate::common; // * or be removed when an old version is no longer supported. * // ************************************************************* // -// The message bytes are built from the output of `test_build_pb_buf()` +// The message bytes are built from the output of `test_pb_from_to()` #[test] fn test_decode_v6_copied_file_info() -> anyhow::Result<()> { let bytes: Vec = vec![ diff --git a/src/meta/proto-conv/tests/it/v010_table_meta.rs b/src/meta/proto-conv/tests/it/v010_table_meta.rs index 9e0a09f9cfad..79a800d17843 100644 --- a/src/meta/proto-conv/tests/it/v010_table_meta.rs +++ b/src/meta/proto-conv/tests/it/v010_table_meta.rs @@ -34,7 +34,7 @@ use crate::common; // * or be removed when an old version is no longer supported. * // ************************************************************* // -// The message bytes are built from the output of `test_build_pb_buf()` +// The message bytes are built from the output of `test_pb_from_to()` #[test] fn test_decode_v10_table_meta() -> anyhow::Result<()> { let bytes: Vec = vec![ diff --git a/src/meta/proto-conv/tests/it/v012_table_meta.rs b/src/meta/proto-conv/tests/it/v012_table_meta.rs index 66612a34bf81..9be27e527d37 100644 --- a/src/meta/proto-conv/tests/it/v012_table_meta.rs +++ b/src/meta/proto-conv/tests/it/v012_table_meta.rs @@ -35,7 +35,7 @@ use crate::common; // * or be removed when an old version is no longer supported. * // ************************************************************* // -// The message bytes are built from the output of `test_build_pb_buf()` +// The message bytes are built from the output of `test_pb_from_to()` #[test] fn test_decode_v12_table_meta() -> anyhow::Result<()> { let bytes: Vec = vec![ diff --git a/src/meta/proto-conv/tests/it/v023_table_meta.rs b/src/meta/proto-conv/tests/it/v023_table_meta.rs index 1f78689d93d4..00df8e83c3f5 100644 --- a/src/meta/proto-conv/tests/it/v023_table_meta.rs +++ b/src/meta/proto-conv/tests/it/v023_table_meta.rs @@ -35,7 +35,7 @@ use crate::common; // * or be removed when an old version is no longer supported. * // ************************************************************* // -// The message bytes are built from the output of `test_build_pb_buf()` +// The message bytes are built from the output of `test_pb_from_to()` #[test] fn test_decode_v23_table_meta() -> anyhow::Result<()> { let bytes: Vec = vec![ diff --git a/src/meta/proto-conv/tests/it/v024_table_meta.rs b/src/meta/proto-conv/tests/it/v024_table_meta.rs index 7d8e13b8c5dd..053991261926 100644 --- a/src/meta/proto-conv/tests/it/v024_table_meta.rs +++ b/src/meta/proto-conv/tests/it/v024_table_meta.rs @@ -35,7 +35,7 @@ use crate::common; // * or be removed when an old version is no longer supported. * // ************************************************************* // -// The message bytes are built from the output of `test_build_pb_buf()` +// The message bytes are built from the output of `test_pb_from_to()` #[test] fn test_decode_v24_table_meta() -> anyhow::Result<()> { let bytes = vec![ diff --git a/src/meta/proto-conv/tests/it/v026_schema.rs b/src/meta/proto-conv/tests/it/v026_schema.rs index 6c3e3557f15a..3dd0a1f36640 100644 --- a/src/meta/proto-conv/tests/it/v026_schema.rs +++ b/src/meta/proto-conv/tests/it/v026_schema.rs @@ -29,7 +29,7 @@ use crate::common; // * or be removed when an old version is no longer supported. * // ************************************************************* // -// The message bytes are built from the output of `test_build_pb_buf()` +// The message bytes are built from the output of `test_pb_from_to()` #[test] fn test_decode_v26_schema() -> anyhow::Result<()> { let schema_v26 = [ diff --git a/src/meta/proto-conv/tests/it/v027_schema.rs b/src/meta/proto-conv/tests/it/v027_schema.rs index b98c994975ba..0e3660bf7f5b 100644 --- a/src/meta/proto-conv/tests/it/v027_schema.rs +++ b/src/meta/proto-conv/tests/it/v027_schema.rs @@ -31,7 +31,7 @@ use crate::common; // * or be removed when an old version is no longer supported. * // ************************************************************* // -// The message bytes are built from the output of `test_build_pb_buf()` +// The message bytes are built from the output of `test_pb_from_to()` #[test] fn test_decode_v27_schema() -> anyhow::Result<()> { let schema_v27 = [ diff --git a/src/meta/proto-conv/tests/it/v028_schema.rs b/src/meta/proto-conv/tests/it/v028_schema.rs index 5ff7e401cf03..2041108eb9af 100644 --- a/src/meta/proto-conv/tests/it/v028_schema.rs +++ b/src/meta/proto-conv/tests/it/v028_schema.rs @@ -31,7 +31,7 @@ use crate::common; // * or be removed when an old version is no longer supported. * // ************************************************************* // -// The message bytes are built from the output of `test_build_pb_buf()` +// The message bytes are built from the output of `test_pb_from_to()` #[test] fn test_decode_v28_schema() -> anyhow::Result<()> { let schema_v28 = [ diff --git a/src/meta/proto-conv/tests/it/v029_schema.rs b/src/meta/proto-conv/tests/it/v029_schema.rs index 593143dbad6a..23710071f098 100644 --- a/src/meta/proto-conv/tests/it/v029_schema.rs +++ b/src/meta/proto-conv/tests/it/v029_schema.rs @@ -31,7 +31,7 @@ use crate::common; // * or be removed when an old version is no longer supported. * // ************************************************************* // -// The message bytes are built from the output of `test_build_pb_buf()` +// The message bytes are built from the output of `test_pb_from_to()` #[test] fn test_decode_v29_schema() -> anyhow::Result<()> { let schema_v29 = [ diff --git a/src/meta/proto-conv/tests/it/v033_table_meta.rs b/src/meta/proto-conv/tests/it/v033_table_meta.rs index 7e2593616938..2b8eecffce9a 100644 --- a/src/meta/proto-conv/tests/it/v033_table_meta.rs +++ b/src/meta/proto-conv/tests/it/v033_table_meta.rs @@ -34,7 +34,7 @@ use crate::common; // * or be removed when an old version is no longer supported. * // ************************************************************* // -// The message bytes are built from the output of `test_build_pb_buf()` +// The message bytes are built from the output of `test_pb_from_to()` #[test] fn test_decode_v33_table_meta() -> anyhow::Result<()> { let bytes = vec![ diff --git a/src/meta/proto-conv/tests/it/v034_schema.rs b/src/meta/proto-conv/tests/it/v034_schema.rs index 688e25cd482b..c1dcecadfb44 100644 --- a/src/meta/proto-conv/tests/it/v034_schema.rs +++ b/src/meta/proto-conv/tests/it/v034_schema.rs @@ -31,7 +31,7 @@ use crate::common; // * or be removed when an old version is no longer supported. * // ************************************************************* // -// The message bytes are built from the output of `test_build_pb_buf()` +// The message bytes are built from the output of `test_pb_from_to()` #[test] fn test_decode_v34_schema() -> anyhow::Result<()> { let schema_v34 = [ diff --git a/src/meta/proto-conv/tests/it/v038_empty_proto.rs b/src/meta/proto-conv/tests/it/v038_empty_proto.rs index e6d0c32802e8..1e843b867ee7 100644 --- a/src/meta/proto-conv/tests/it/v038_empty_proto.rs +++ b/src/meta/proto-conv/tests/it/v038_empty_proto.rs @@ -26,7 +26,7 @@ use crate::common; // * or be removed when an old version is no longer supported. * // ************************************************************* // -// The message bytes are built from the output of `test_build_pb_buf()` +// The message bytes are built from the output of `test_pb_from_to()` #[test] fn test_decode_v38_empty_proto() -> anyhow::Result<()> { let bytes: Vec = vec![160, 6, 7, 168, 6, 1]; diff --git a/src/meta/proto-conv/tests/it/v039_data_mask.rs b/src/meta/proto-conv/tests/it/v039_data_mask.rs index d311ff319724..b42c0a08400b 100644 --- a/src/meta/proto-conv/tests/it/v039_data_mask.rs +++ b/src/meta/proto-conv/tests/it/v039_data_mask.rs @@ -27,7 +27,7 @@ use crate::common; // * or be removed when an old version is no longer supported. * // ************************************************************* // -// The message bytes are built from the output of `test_build_pb_buf()` +// The message bytes are built from the output of `test_pb_from_to()` #[test] fn test_decode_v39_data_mask() -> anyhow::Result<()> { let bytes: Vec = vec![ diff --git a/src/meta/proto-conv/tests/it/v040_table_meta.rs b/src/meta/proto-conv/tests/it/v040_table_meta.rs index 95191bf4608c..a9517a4a03db 100644 --- a/src/meta/proto-conv/tests/it/v040_table_meta.rs +++ b/src/meta/proto-conv/tests/it/v040_table_meta.rs @@ -34,7 +34,7 @@ use crate::common; // * or be removed when an old version is no longer supported. * // ************************************************************* // -// The message bytes are built from the output of `test_build_pb_buf()` +// The message bytes are built from the output of `test_pb_from_to()` #[test] fn test_decode_v40_table_meta() -> anyhow::Result<()> { let bytes = vec![ diff --git a/src/meta/proto-conv/tests/it/v044_table_meta.rs b/src/meta/proto-conv/tests/it/v044_table_meta.rs index 5d21bf64542a..a9d17ce9158c 100644 --- a/src/meta/proto-conv/tests/it/v044_table_meta.rs +++ b/src/meta/proto-conv/tests/it/v044_table_meta.rs @@ -35,7 +35,7 @@ use crate::common; // * or be removed when an old version is no longer supported. * // ************************************************************* // -// The message bytes are built from the output of `test_build_pb_buf()` +// The message bytes are built from the output of `test_pb_from_to()` #[test] fn test_decode_v44_table_meta() -> anyhow::Result<()> { let bytes = vec![ diff --git a/src/meta/proto-conv/tests/it/v045_background.rs b/src/meta/proto-conv/tests/it/v045_background.rs index b251fc3fe588..2684e9354e45 100644 --- a/src/meta/proto-conv/tests/it/v045_background.rs +++ b/src/meta/proto-conv/tests/it/v045_background.rs @@ -39,7 +39,7 @@ use crate::common; // * or be removed when an old version is no longer supported. * // ************************************************************* // -// The message bytes are built from the output of `test_build_pb_buf()` +// The message bytes are built from the output of `test_pb_from_to()` #[test] fn test_decode_v44_background_task() -> anyhow::Result<()> { let bytes = vec![ diff --git a/src/meta/proto-conv/tests/it/v048_background.rs b/src/meta/proto-conv/tests/it/v048_background.rs index 2bafb122f06f..ec8072c069c6 100644 --- a/src/meta/proto-conv/tests/it/v048_background.rs +++ b/src/meta/proto-conv/tests/it/v048_background.rs @@ -40,7 +40,7 @@ use crate::common; // * or be removed when an old version is no longer supported. * // ************************************************************* // -// The message bytes are built from the output of `test_build_pb_buf()` +// The message bytes are built from the output of `test_pb_from_to()` #[test] fn test_decode_v48_background_task_case_2() -> anyhow::Result<()> { let bytes = vec![ diff --git a/src/meta/proto-conv/tests/it/v049_network_policy.rs b/src/meta/proto-conv/tests/it/v049_network_policy.rs index b3cd6c122641..4874d1abad8f 100644 --- a/src/meta/proto-conv/tests/it/v049_network_policy.rs +++ b/src/meta/proto-conv/tests/it/v049_network_policy.rs @@ -27,7 +27,7 @@ use crate::common; // * or be removed when an old version is no longer supported. * // ************************************************************* // -// The message bytes are built from the output of `test_build_pb_buf()` +// The message bytes are built from the output of `test_pb_from_to()` #[test] fn test_decode_v49_network_policy() -> anyhow::Result<()> { let bytes: Vec = vec![ diff --git a/src/meta/proto-conv/tests/it/v050_user_info.rs b/src/meta/proto-conv/tests/it/v050_user_info.rs index d620b6f6fd10..93a3054457ef 100644 --- a/src/meta/proto-conv/tests/it/v050_user_info.rs +++ b/src/meta/proto-conv/tests/it/v050_user_info.rs @@ -29,7 +29,7 @@ use crate::common; // * or be removed when an old version is no longer supported. * // ************************************************************* // -// The message bytes are built from the output of `test_build_pb_buf()` +// The message bytes are built from the output of `test_pb_from_to()` #[test] fn test_decode_v50_user_info() -> anyhow::Result<()> { let bytes: Vec = vec![ diff --git a/src/meta/proto-conv/tests/it/v051_obs_and_cos_storage.rs b/src/meta/proto-conv/tests/it/v051_obs_and_cos_storage.rs index b77efd7d3490..003a05145830 100644 --- a/src/meta/proto-conv/tests/it/v051_obs_and_cos_storage.rs +++ b/src/meta/proto-conv/tests/it/v051_obs_and_cos_storage.rs @@ -29,7 +29,7 @@ use crate::common; // * or be removed when an old version is no longer supported. * // ************************************************************* // -// The message bytes are built from the output of `test_build_pb_buf()` +// The message bytes are built from the output of `test_pb_from_to()` #[test] fn test_decode_v51_obs_stage() -> anyhow::Result<()> { let bytes = vec![ diff --git a/src/meta/proto-conv/tests/it/v057_hdfs_storage.rs b/src/meta/proto-conv/tests/it/v057_hdfs_storage.rs index d1e5f4494ec2..a071b79def06 100644 --- a/src/meta/proto-conv/tests/it/v057_hdfs_storage.rs +++ b/src/meta/proto-conv/tests/it/v057_hdfs_storage.rs @@ -28,7 +28,7 @@ use crate::common; // * or be removed when an old version is no longer supported. * // ************************************************************* // -// The message bytes are built from the output of `test_build_pb_buf()` +// The message bytes are built from the output of `test_pb_from_to()` #[test] fn test_decode_v57_hdfs_storage() -> anyhow::Result<()> { let bytes = vec![ diff --git a/src/meta/proto-conv/tests/it/v058_udf.rs b/src/meta/proto-conv/tests/it/v058_udf.rs index 9279156a3ff3..ba20ac5a8666 100644 --- a/src/meta/proto-conv/tests/it/v058_udf.rs +++ b/src/meta/proto-conv/tests/it/v058_udf.rs @@ -30,7 +30,7 @@ use crate::common; // * or be removed when an old version is no longer supported. * // ************************************************************* // -// The message bytes are built from the output of `test_build_pb_buf()` +// The message bytes are built from the output of `test_pb_from_to()` #[test] fn test_decode_v57_udf() -> anyhow::Result<()> { let bytes: Vec = vec![ diff --git a/src/meta/proto-conv/tests/it/v063_connection.rs b/src/meta/proto-conv/tests/it/v063_connection.rs index 038b581014a3..bea52c56b1e2 100644 --- a/src/meta/proto-conv/tests/it/v063_connection.rs +++ b/src/meta/proto-conv/tests/it/v063_connection.rs @@ -32,7 +32,7 @@ use crate::common; fn test_decode_v62_connection() -> anyhow::Result<()> { let user_defined_connection_v62 = vec![ 10, 7, 109, 121, 95, 99, 111, 110, 110, 18, 2, 115, 51, 26, 10, 10, 3, 107, 101, 121, 18, - 3, 118, 97, 108, 160, 6, 62, 168, 6, 24, + 3, 118, 97, 108, 160, 6, 63, 168, 6, 24, ]; let want = || UserDefinedConnection { name: "my_conn".to_string(), @@ -43,7 +43,7 @@ fn test_decode_v62_connection() -> anyhow::Result<()> { common::test_load_old( func_name!(), user_defined_connection_v62.as_slice(), - 62, + 63, want(), )?; Ok(()) diff --git a/src/meta/service/tests/it/tests/service.rs b/src/meta/service/tests/it/tests/service.rs index 14689da1542e..abaed0f59894 100644 --- a/src/meta/service/tests/it/tests/service.rs +++ b/src/meta/service/tests/it/tests/service.rs @@ -94,9 +94,8 @@ pub fn next_port() -> u32 { 29000u32 + (GlobalSequence::next() as u32) } +/// It holds a reference to a MetaNode or a GrpcServer, for testing MetaNode or GrpcServer. pub struct MetaSrvTestContext { - // /// To hold a per-case logging guard - // logging_guard: (WorkerGuard, DefaultGuard), pub config: configs::Config, pub meta_node: Option>,