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

Remove the log with high frequency and not useful enough #5141

Merged
merged 6 commits into from
Jun 14, 2022
Merged

Remove the log with high frequency and not useful enough #5141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
33acd53
remove the log
hongyunyan Jun 13, 2022
7170c2a
Merge branch 'master' into hongyunyan_remove_useless_log
hongyunyan Jun 13, 2022
ebe8776
fix typo
hongyunyan Jun 13, 2022
8a5589c
Merge branch 'hongyunyan_remove_useless_log' of https://github.com/ho…
hongyunyan Jun 13, 2022
7e4114c
fix function
hongyunyan Jun 13, 2022
c3b2237
fix function
hongyunyan Jun 13, 2022
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
2 changes: 1 addition & 1 deletion dbms/src/Storages/tests/gtest_filter_parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ DM::RSOperatorPtr FilterParserTest::generateRsOperator(const String table_info_j
DM::ColumnDefines columns_to_read;
{
NamesAndTypes source_columns;
std::tie(source_columns, std::ignore) = parseColumnsFromTableInfo(table_info, log->getLog());
std::tie(source_columns, std::ignore) = parseColumnsFromTableInfo(table_info);
dag_query = std::make_unique<DAGQueryInfo>(
conditions,
DAGPreparedSets(),
Expand Down
2 changes: 1 addition & 1 deletion dbms/src/TiDB/Schema/SchemaBuilder-internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ struct TableInfo;
}
namespace DB
{
std::tuple<NamesAndTypes, Strings> parseColumnsFromTableInfo(const TiDB::TableInfo & table_info, Poco::Logger * log);
std::tuple<NamesAndTypes, Strings> parseColumnsFromTableInfo(const TiDB::TableInfo & table_info);

constexpr char tmpNamePrefix[] = "_tiflash_tmp_";

Expand Down
5 changes: 2 additions & 3 deletions dbms/src/TiDB/Schema/SchemaBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -963,13 +963,12 @@ void SchemaBuilder<Getter, NameMapper>::applyDropSchema(const String & db_name)
}

std::tuple<NamesAndTypes, Strings>
parseColumnsFromTableInfo(const TiDB::TableInfo & table_info, Poco::Logger * log)
parseColumnsFromTableInfo(const TiDB::TableInfo & table_info)
{
NamesAndTypes columns;
std::vector<String> primary_keys;
for (const auto & column : table_info.columns)
{
LOG_FMT_DEBUG(log, "Analyzing column: {}, type: {}", column.name, static_cast<int>(column.tp));
DataTypePtr type = getDataTypeByColumnInfo(column);
columns.emplace_back(column.name, type);
if (column.hasPriKeyFlag())
Expand Down Expand Up @@ -999,7 +998,7 @@ String createTableStmt(
Poco::Logger * log)
{
LOG_FMT_DEBUG(log, "Analyzing table info : {}", table_info.serialize());
auto [columns, pks] = parseColumnsFromTableInfo(table_info, log);
auto [columns, pks] = parseColumnsFromTableInfo(table_info);

String stmt;
WriteBufferFromString stmt_buf(stmt);
Expand Down