This is an automated email from the ASF dual-hosted git repository.
gavinchou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 0f82adf9856 [chore](cloud) Make key info declaration more clear
(#57034)
0f82adf9856 is described below
commit 0f82adf98567d4959b880bfec88429833c72e5ac
Author: Gavin Chou <[email protected]>
AuthorDate: Tue Oct 21 12:48:04 2025 +0800
[chore](cloud) Make key info declaration more clear (#57034)
---
cloud/src/meta-store/keys.h | 106 ++++++++++++++++++++++----------------------
1 file changed, 53 insertions(+), 53 deletions(-)
diff --git a/cloud/src/meta-store/keys.h b/cloud/src/meta-store/keys.h
index 965b3eb0c1a..46af92fe6c9 100644
--- a/cloud/src/meta-store/keys.h
+++ b/cloud/src/meta-store/keys.h
@@ -147,64 +147,64 @@ struct BasicKeyInfo : Base {
// ATTN: newly added key must have different type number
// 0:instance_id
-using InstanceKeyInfo = BasicKeyInfo<0 , std::tuple<std::string>>;
+using InstanceKeyInfo = BasicKeyInfo<__LINE__ , std::tuple<std::string>>;
// 0:instance_id 1:db_id
2:label
-using TxnLabelKeyInfo = BasicKeyInfo<1 , std::tuple<std::string,
int64_t, std::string>>;
+using TxnLabelKeyInfo = BasicKeyInfo<__LINE__ , std::tuple<std::string,
int64_t, std::string>>;
// 0:instance_id 1:db_id
2:txn_id
-using TxnInfoKeyInfo = BasicKeyInfo<2 , std::tuple<std::string,
int64_t, int64_t>>;
+using TxnInfoKeyInfo = BasicKeyInfo<__LINE__ , std::tuple<std::string,
int64_t, int64_t>>;
// 0:instance_id 1:txn_id
-using TxnIndexKeyInfo = BasicKeyInfo<3 , std::tuple<std::string,
int64_t>>;
+using TxnIndexKeyInfo = BasicKeyInfo<__LINE__ , std::tuple<std::string,
int64_t>>;
// 0:instance_id 1:db_id
2:txn_id
-using TxnRunningKeyInfo = BasicKeyInfo<5 , std::tuple<std::string,
int64_t, int64_t>>;
+using TxnRunningKeyInfo = BasicKeyInfo<__LINE__ , std::tuple<std::string,
int64_t, int64_t>>;
// 0:instance_id 1:db_id
2:tbl_id 3:partition_id
-using PartitionVersionKeyInfo = BasicKeyInfo<6 , std::tuple<std::string,
int64_t, int64_t, int64_t>>;
+using PartitionVersionKeyInfo = BasicKeyInfo<__LINE__ ,
std::tuple<std::string, int64_t, int64_t, int64_t>>;
// 0:instance_id
1:tablet_id 2:version
-using MetaRowsetKeyInfo = BasicKeyInfo<7 , std::tuple<std::string,
int64_t, int64_t>>;
+using MetaRowsetKeyInfo = BasicKeyInfo<__LINE__ , std::tuple<std::string,
int64_t, int64_t>>;
// 0:instance_id
1:txn_id 2:tablet_id
-using MetaRowsetTmpKeyInfo = BasicKeyInfo<8 , std::tuple<std::string,
int64_t, int64_t>>;
+using MetaRowsetTmpKeyInfo = BasicKeyInfo<__LINE__ , std::tuple<std::string,
int64_t, int64_t>>;
// 0:instance_id
1:table_id 2:index_id 3:part_id 4:tablet_id
-using MetaTabletKeyInfo = BasicKeyInfo<9 , std::tuple<std::string,
int64_t, int64_t, int64_t, int64_t>>;
+using MetaTabletKeyInfo = BasicKeyInfo<__LINE__ , std::tuple<std::string,
int64_t, int64_t, int64_t, int64_t>>;
// 0:instance_id
1:tablet_id
-using MetaTabletIdxKeyInfo = BasicKeyInfo<10, std::tuple<std::string,
int64_t>>;
+using MetaTabletIdxKeyInfo = BasicKeyInfo<__LINE__, std::tuple<std::string,
int64_t>>;
// 0:instance_id
1:index_id
-using RecycleIndexKeyInfo = BasicKeyInfo<11, std::tuple<std::string,
int64_t>>;
+using RecycleIndexKeyInfo = BasicKeyInfo<__LINE__, std::tuple<std::string,
int64_t>>;
// 0:instance_id
1:part_id
-using RecyclePartKeyInfo = BasicKeyInfo<12, std::tuple<std::string,
int64_t>>;
+using RecyclePartKeyInfo = BasicKeyInfo<__LINE__, std::tuple<std::string,
int64_t>>;
// 0:instance_id
1:tablet_id 2:rowset_id
-using RecycleRowsetKeyInfo = BasicKeyInfo<13, std::tuple<std::string,
int64_t, std::string>>;
+using RecycleRowsetKeyInfo = BasicKeyInfo<__LINE__, std::tuple<std::string,
int64_t, std::string>>;
// 0:instance_id 1:db_id
2:txn_id
-using RecycleTxnKeyInfo = BasicKeyInfo<14, std::tuple<std::string,
int64_t, int64_t>>;
+using RecycleTxnKeyInfo = BasicKeyInfo<__LINE__, std::tuple<std::string,
int64_t, int64_t>>;
// 0:instance_id
1:table_id 2:index_id 3:part_id 4:tablet_id
-using StatsTabletKeyInfo = BasicKeyInfo<15, std::tuple<std::string,
int64_t, int64_t, int64_t, int64_t>>;
+using StatsTabletKeyInfo = BasicKeyInfo<__LINE__, std::tuple<std::string,
int64_t, int64_t, int64_t, int64_t>>;
// 0:instance_id
1:table_id 2:index_id 3:part_id 4:tablet_id
-using JobTabletKeyInfo = BasicKeyInfo<16, std::tuple<std::string,
int64_t, int64_t, int64_t, int64_t>>;
+using JobTabletKeyInfo = BasicKeyInfo<__LINE__, std::tuple<std::string,
int64_t, int64_t, int64_t, int64_t>>;
// 0:instance_id
1:stage_id 2:table_id 3:copy_id 4:group_id
-using CopyJobKeyInfo = BasicKeyInfo<17, std::tuple<std::string,
std::string, int64_t, std::string, int64_t>>;
+using CopyJobKeyInfo = BasicKeyInfo<__LINE__, std::tuple<std::string,
std::string, int64_t, std::string, int64_t>>;
// 0:instance_id
1:stage_id 2:table_id 3:obj_key 4:obj_etag
-using CopyFileKeyInfo = BasicKeyInfo<18, std::tuple<std::string,
std::string, int64_t, std::string, std::string>>;
+using CopyFileKeyInfo = BasicKeyInfo<__LINE__, std::tuple<std::string,
std::string, int64_t, std::string, std::string>>;
// 0:instance_id
1:stage_id
-using RecycleStageKeyInfo = BasicKeyInfo<19, std::tuple<std::string,
std::string>>;
+using RecycleStageKeyInfo = BasicKeyInfo<__LINE__, std::tuple<std::string,
std::string>>;
// 0:instance_id
-using JobRecycleKeyInfo = BasicKeyInfo<20 , std::tuple<std::string>>;
+using JobRecycleKeyInfo = BasicKeyInfo<__LINE__ , std::tuple<std::string>>;
// 0:instance_id
using JobSnapshotDataMigratorKeyInfo = BasicKeyInfo<53,
std::tuple<std::string>>;
@@ -212,33 +212,33 @@ using JobSnapshotDataMigratorKeyInfo = BasicKeyInfo<53,
std::tuple<std::string>>
using JobSnapshotChainCompactorKeyInfo = BasicKeyInfo<54,
std::tuple<std::string>>;
// 0:instance_id
1:index_id 2:schema_version
-using MetaSchemaKeyInfo = BasicKeyInfo<21, std::tuple<std::string,
int64_t, int64_t>>;
+using MetaSchemaKeyInfo = BasicKeyInfo<__LINE__, std::tuple<std::string,
int64_t, int64_t>>;
// 0:instance_id
1:tablet_id 2:rowest_id 3:version 4:seg_id
-using MetaDeleteBitmapInfo = BasicKeyInfo<22 , std::tuple<std::string,
int64_t, std::string, int64_t, int64_t>>;
+using MetaDeleteBitmapInfo = BasicKeyInfo<__LINE__ , std::tuple<std::string,
int64_t, std::string, int64_t, int64_t>>;
// partition_id of -1 indicates all partitions
// 0:instance_id
1:table_id 2:partition_id
-using MetaDeleteBitmapUpdateLockInfo = BasicKeyInfo<23 ,
std::tuple<std::string, int64_t, int64_t>>;
+using MetaDeleteBitmapUpdateLockInfo = BasicKeyInfo<__LINE__ ,
std::tuple<std::string, int64_t, int64_t>>;
// 0:instance_id
1:tablet_id
-using MetaPendingDeleteBitmapInfo = BasicKeyInfo<24 , std::tuple<std::string,
int64_t>>;
+using MetaPendingDeleteBitmapInfo = BasicKeyInfo<__LINE__ ,
std::tuple<std::string, int64_t>>;
// 0:instance_id 1:db_id
2:job_id
-using RLJobProgressKeyInfo = BasicKeyInfo<25, std::tuple<std::string, int64_t,
int64_t>>;
+using RLJobProgressKeyInfo = BasicKeyInfo<__LINE__, std::tuple<std::string,
int64_t, int64_t>>;
// 0:instance_id 1:db_id
2:job_id
-using StreamingJobKeyInfo = BasicKeyInfo<52, std::tuple<std::string, int64_t,
int64_t>>;
+using StreamingJobKeyInfo = BasicKeyInfo<__LINE__, std::tuple<std::string,
int64_t, int64_t>>;
// 0:instance_id
1:vault_id
-using StorageVaultKeyInfo = BasicKeyInfo<26, std::tuple<std::string,
std::string>>;
+using StorageVaultKeyInfo = BasicKeyInfo<__LINE__, std::tuple<std::string,
std::string>>;
// 0:instance_id 1:db_id
2:table_id
-using TableVersionKeyInfo = BasicKeyInfo<27, std::tuple<std::string, int64_t,
int64_t>>;
+using TableVersionKeyInfo = BasicKeyInfo<__LINE__, std::tuple<std::string,
int64_t, int64_t>>;
// 0:instance_id
1:index_id
-using MetaSchemaPBDictionaryInfo = BasicKeyInfo<28 , std::tuple<std::string,
int64_t>>;
+using MetaSchemaPBDictionaryInfo = BasicKeyInfo<__LINE__ ,
std::tuple<std::string, int64_t>>;
// 0:instance_id
1:table_id 2:initiator
-using MowTabletJobInfo = BasicKeyInfo<29 , std::tuple<std::string, int64_t,
int64_t>>;
+using MowTabletJobInfo = BasicKeyInfo<__LINE__ , std::tuple<std::string,
int64_t, int64_t>>;
namespace versioned {
@@ -247,94 +247,94 @@ namespace versioned {
// 0x03 "version" ${instance_id} "partition" ${partition_id} ${timestamp} ->
VersionPB
// 0:instance_id
1:partition_id
-using PartitionVersionKeyInfo = BasicKeyInfo<30, std::tuple<std::string,
int64_t>>;
+using PartitionVersionKeyInfo = BasicKeyInfo<__LINE__, std::tuple<std::string,
int64_t>>;
// 0x03 "version" ${instance_id} "table" ${table_id} ${timestamp} ->
${empty_value}
// 0:instance_id
1:table_id
-using TableVersionKeyInfo = BasicKeyInfo<31, std::tuple<std::string, int64_t>>;
+using TableVersionKeyInfo = BasicKeyInfo<__LINE__, std::tuple<std::string,
int64_t>>;
// 0x03 "index" ${instance_id} "partition" ${partition_id} ->
PartitionIndexPB
// 0:instance_id
1:partition_id
-using PartitionIndexKeyInfo = BasicKeyInfo<32, std::tuple<std::string,
int64_t>>;
+using PartitionIndexKeyInfo = BasicKeyInfo<__LINE__, std::tuple<std::string,
int64_t>>;
// 0x03 "index" ${instance_id} "partition_inverted" ${db_id} ${table_id}
${partition} -> ${empty_value}
// 0:instance_id 1:db_id
2:table_id 3:partition_id
-using PartitionInvertedIndexKeyInfo = BasicKeyInfo<33, std::tuple<std::string,
int64_t, int64_t, int64_t>>;
+using PartitionInvertedIndexKeyInfo = BasicKeyInfo<__LINE__,
std::tuple<std::string, int64_t, int64_t, int64_t>>;
// 0x03 "index" ${instance_id} "tablet" ${tablet_id} ->
TabletIndexPB
// 0:instance_id
1:tablet_id
-using TabletIndexKeyInfo = BasicKeyInfo<34, std::tuple<std::string, int64_t>>;
+using TabletIndexKeyInfo = BasicKeyInfo<__LINE__, std::tuple<std::string,
int64_t>>;
// 0x03 "index" ${instance_id} "tablet_inverted" ${db_id} ${table_id}
${index_id} ${partition} ${tablet} -> ${empty_value}
// 0:instance_id 1:db_id
2:table_id 3:index_id 4:partition_id 5:tablet_id
-using TabletInvertedIndexKeyInfo = BasicKeyInfo<35, std::tuple<std::string,
int64_t, int64_t, int64_t, int64_t, int64_t>>;
+using TabletInvertedIndexKeyInfo = BasicKeyInfo<__LINE__,
std::tuple<std::string, int64_t, int64_t, int64_t, int64_t, int64_t>>;
// 0x03 "index" ${instance_id} "index" ${index_id} ->
IndexIndexPB
// 0:instance_id
1:index_id
-using IndexIndexKeyInfo = BasicKeyInfo<36, std::tuple<std::string, int64_t>>;
+using IndexIndexKeyInfo = BasicKeyInfo<__LINE__, std::tuple<std::string,
int64_t>>;
// 0x03 "index" ${instance_id} "index_inverted" ${db_id} ${table_id}
${index_id} -> ${empty_value}
// 0:instance_id 1:db_id
2:table_id 3:index_id
-using IndexInvertedKeyInfo = BasicKeyInfo<37, std::tuple<std::string, int64_t,
int64_t, int64_t>>;
+using IndexInvertedKeyInfo = BasicKeyInfo<__LINE__, std::tuple<std::string,
int64_t, int64_t, int64_t>>;
// 0x03 "stats" ${instance_id} "tablet_load" ${tablet_id} ${timestamp} ->
TabletStatsPB
// 0:instance_id
1:tablet_id
-using TabletLoadStatsKeyInfo = BasicKeyInfo<38, std::tuple<std::string,
int64_t>>;
+using TabletLoadStatsKeyInfo = BasicKeyInfo<__LINE__, std::tuple<std::string,
int64_t>>;
// 0x03 "stats" ${instance_id} "tablet_compact" ${tablet_id} ${timestamp} ->
TabletStatsPB
// 0:instance_id
1:tablet_id
-using TabletCompactStatsKeyInfo = BasicKeyInfo<39, std::tuple<std::string,
int64_t>>;
+using TabletCompactStatsKeyInfo = BasicKeyInfo<__LINE__,
std::tuple<std::string, int64_t>>;
// 0x03 "meta" ${instance_id} "partition" ${partition_id} ${timestamp} ->
${empty_value}
// 0:instance_id
1:partition_id
-using MetaPartitionKeyInfo = BasicKeyInfo<40, std::tuple<std::string,
int64_t>>;
+using MetaPartitionKeyInfo = BasicKeyInfo<__LINE__, std::tuple<std::string,
int64_t>>;
// 0x03 "meta" ${instance_id} "index" ${index_id} ${timestamp} ->
${empty_value}
// 0:instance_id
1:index_id
-using MetaIndexKeyInfo = BasicKeyInfo<41, std::tuple<std::string, int64_t>>;
+using MetaIndexKeyInfo = BasicKeyInfo<__LINE__, std::tuple<std::string,
int64_t>>;
// 0x03 "meta" ${instance_id} "tablet" ${tablet_id} ${timestamp} ->
TabletMetaPB
// 0:instance_id
1:tablet_id
-using MetaTabletKeyInfo = BasicKeyInfo<42, std::tuple<std::string, int64_t>>;
+using MetaTabletKeyInfo = BasicKeyInfo<__LINE__, std::tuple<std::string,
int64_t>>;
// 0x03 "meta" ${instance_id} "schema" ${index_id} ${schema_version} ->
TabletSchemaPB
// 0:instance_id
1:index_id 2:schema_version
-using MetaSchemaKeyInfo = BasicKeyInfo<43, std::tuple<std::string, int64_t,
int64_t>>;
+using MetaSchemaKeyInfo = BasicKeyInfo<__LINE__, std::tuple<std::string,
int64_t, int64_t>>;
// 0x03 "meta" ${instance_id} "rowset_load" ${tablet_id} ${version}
${timestamp} -> RowsetMetaPB
// 0:instance_id
1:tablet_id 2:version
-using MetaRowsetLoadKeyInfo = BasicKeyInfo<44, std::tuple<std::string,
int64_t, int64_t>>;
+using MetaRowsetLoadKeyInfo = BasicKeyInfo<__LINE__, std::tuple<std::string,
int64_t, int64_t>>;
// 0x03 "meta" ${instance_id} "rowset_compact" ${tablet_id} ${version}
${timestamp} -> RowsetMetaPB
// 0:instance_id
1:tablet_id 2:version
-using MetaRowsetCompactKeyInfo = BasicKeyInfo<45, std::tuple<std::string,
int64_t, int64_t>>;
+using MetaRowsetCompactKeyInfo = BasicKeyInfo<__LINE__,
std::tuple<std::string, int64_t, int64_t>>;
// 0x03 "meta" ${instance_id} "delete_bitmap" ${tablet_id} ${rowset_id} ->
DeleteBitmapStoragePB
// 0:instance_id
1:tablet_id 2:rowest_id
-using MetaDeleteBitmapInfo = BasicKeyInfo<22 , std::tuple<std::string,
int64_t, std::string>>;
+using MetaDeleteBitmapInfo = BasicKeyInfo<__LINE__ , std::tuple<std::string,
int64_t, std::string>>;
// 0x03 "data" ${instance_id} "rowset_ref_count" ${tablet_id} ${rowset_id}
-> int64
// 0:instance_id
1:tablet_id 2:rowset_id
-using DataRowsetRefCountKeyInfo = BasicKeyInfo<46, std::tuple<std::string,
int64_t, std::string>>;
+using DataRowsetRefCountKeyInfo = BasicKeyInfo<__LINE__,
std::tuple<std::string, int64_t, std::string>>;
// 0x03 "snapshot" ${instance_id} "full" ${timestamp} ->
SnapshotPB
// 0:instance_id
-using SnapshotFullKeyInfo = BasicKeyInfo<47, std::tuple<std::string>>;
+using SnapshotFullKeyInfo = BasicKeyInfo<__LINE__, std::tuple<std::string>>;
// 0x03 "snapshot" ${instance_id} "reference" ${timestamp} ${instance_id} ->
${empty_value}
// 0:instance_id
1:timestamp 2:ref_instance_id
-using SnapshotReferenceKeyInfo = BasicKeyInfo<48, std::tuple<std::string,
Versionstamp, std::string>>;
+using SnapshotReferenceKeyInfo = BasicKeyInfo<__LINE__,
std::tuple<std::string, Versionstamp, std::string>>;
// 0x03 "log" ${instance_id} ${timestamp} ->
OperationLogPB
// 0:instance_id
-using LogKeyInfo = BasicKeyInfo<49, std::tuple<std::string>>;
+using LogKeyInfo = BasicKeyInfo<__LINE__, std::tuple<std::string>>;
} // namespace versioned
// 0:instance_id
1:tablet_id
-using JobRestoreTabletKeyInfo = BasicKeyInfo<50, std::tuple<std::string,
int64_t>>;
+using JobRestoreTabletKeyInfo = BasicKeyInfo<__LINE__, std::tuple<std::string,
int64_t>>;
// 0:instance_id
1:tablet_id 2:version
-using JobRestoreRowsetKeyInfo = BasicKeyInfo<51, std::tuple<std::string,
int64_t, int64_t>>;
+using JobRestoreRowsetKeyInfo = BasicKeyInfo<__LINE__, std::tuple<std::string,
int64_t, int64_t>>;
void instance_key(const InstanceKeyInfo& in, std::string* out);
static inline std::string instance_key(const InstanceKeyInfo& in) {
std::string s; instance_key(in, &s); return s; }
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
