Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

storage: Add keyspace_id to DT system tables #9371

Merged
merged 2 commits into from
Aug 27, 2024
Merged

storage: Add keyspace_id to DT system tables #9371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d01edc
storage: Add keyspace_id to DT system tables (#210)
breezewish Jun 6, 2024
1c77709
Merge branch 'master' into add-keyspace-id-system-table
JaySon-Huang Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions dbms/src/Storages/System/StorageSystemDTSegments.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

#include <Columns/ColumnString.h>
#include <DataStreams/OneBlockInputStream.h>
#include <DataTypes/DataTypeNullable.h>
#include <DataTypes/DataTypeString.h>
#include <DataTypes/DataTypesNumber.h>
#include <Databases/DatabaseTiFlash.h>
Expand All @@ -37,6 +38,7 @@ StorageSystemDTSegments::StorageSystemDTSegments(const std::string & name_)

{"tidb_database", std::make_shared<DataTypeString>()},
{"tidb_table", std::make_shared<DataTypeString>()},
{"keyspace_id", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>())},
{"table_id", std::make_shared<DataTypeInt64>()},
{"is_tombstone", std::make_shared<DataTypeUInt64>()},

Expand Down Expand Up @@ -115,11 +117,19 @@ BlockInputStreams StorageSystemDTSegments::read(
res_columns[j++]->insert(table_name);

String tidb_db_name;
KeyspaceID keyspace_id = NullspaceID;
if (db_tiflash)
tidb_db_name = mapper.displayDatabaseName(db_tiflash->getDatabaseInfo());
{
tidb_db_name = db_tiflash->getDatabaseInfo().name;
keyspace_id = db_tiflash->getDatabaseInfo().keyspace_id;
}
res_columns[j++]->insert(tidb_db_name);
String tidb_table_name = mapper.displayTableName(table_info);
String tidb_table_name = table_info.name;
res_columns[j++]->insert(tidb_table_name);
if (keyspace_id == NullspaceID)
res_columns[j++]->insert(Field());
else
res_columns[j++]->insert(static_cast<UInt64>(keyspace_id));
res_columns[j++]->insert(table_id);
res_columns[j++]->insert(dm_storage->getTombstone());

Expand Down
15 changes: 13 additions & 2 deletions dbms/src/Storages/System/StorageSystemDTTables.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@

#include <Columns/ColumnString.h>
#include <DataStreams/OneBlockInputStream.h>
#include <DataTypes/DataTypeNullable.h>
#include <DataTypes/DataTypeString.h>
#include <DataTypes/DataTypesNumber.h>
#include <Databases/DatabaseTiFlash.h>
#include <Databases/IDatabase.h>
#include <Interpreters/Context.h>
#include <Storages/DeltaMerge/DeltaMergeStore.h>
#include <Storages/KVStore/Types.h>
#include <Storages/MutableSupport.h>
#include <Storages/StorageDeltaMerge.h>
#include <Storages/System/StorageSystemDTTables.h>
Expand All @@ -37,6 +39,7 @@ StorageSystemDTTables::StorageSystemDTTables(const std::string & name_)

{"tidb_database", std::make_shared<DataTypeString>()},
{"tidb_table", std::make_shared<DataTypeString>()},
{"keyspace_id", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>())},
{"table_id", std::make_shared<DataTypeInt64>()},
{"is_tombstone", std::make_shared<DataTypeUInt64>()},

Expand Down Expand Up @@ -146,11 +149,19 @@ BlockInputStreams StorageSystemDTTables::read(
res_columns[j++]->insert(table_name);

String tidb_db_name;
KeyspaceID keyspace_id = NullspaceID;
if (db_tiflash)
tidb_db_name = mapper.displayDatabaseName(db_tiflash->getDatabaseInfo());
{
tidb_db_name = db_tiflash->getDatabaseInfo().name;
keyspace_id = db_tiflash->getDatabaseInfo().keyspace_id;
}
res_columns[j++]->insert(tidb_db_name);
String tidb_table_name = mapper.displayTableName(table_info);
String tidb_table_name = table_info.name;
res_columns[j++]->insert(tidb_table_name);
if (keyspace_id == NullspaceID)
res_columns[j++]->insert(Field());
else
res_columns[j++]->insert(static_cast<UInt64>(keyspace_id));
res_columns[j++]->insert(table_id);
res_columns[j++]->insert(dm_storage->getTombstone());

Expand Down