*: use if (container.contains(value)) instead of `if (container.cou…

…nt(value))` (#7510) ref #6233
pingcap · May 24, 2023 · 67b6b16 · 67b6b16
1 parent 1a19912
commit 67b6b16
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 20 deletions.
diff --git a/dbms/src/Functions/FunctionHelpers.cpp b/dbms/src/Functions/FunctionHelpers.cpp
@@ -33,7 +33,7 @@ const ColumnConst * checkAndGetColumnConstStringOrFixedString(const IColumn * co
     if (!column->isColumnConst())
         return {};
 
-    const ColumnConst * res = static_cast<const ColumnConst *>(column);
+    const auto * res = static_cast<const ColumnConst *>(column);
 
     if (checkColumn<ColumnString>(&res->getDataColumn()) || checkColumn<ColumnFixedString>(&res->getDataColumn()))
         return res;
@@ -44,7 +44,7 @@ const ColumnConst * checkAndGetColumnConstStringOrFixedString(const IColumn * co
 
 Columns convertConstTupleToConstantElements(const ColumnConst & column)
 {
-    const ColumnTuple & src_tuple = static_cast<const ColumnTuple &>(column.getDataColumn());
+    const auto & src_tuple = static_cast<const ColumnTuple &>(column.getDataColumn());
     const Columns & src_tuple_columns = src_tuple.getColumns();
     size_t tuple_size = src_tuple_columns.size();
     size_t rows = column.size();
@@ -67,7 +67,7 @@ static Block createBlockWithNestedColumnsImpl(const Block & block, const std::un
     {
         const auto & col = block.getByPosition(i);
 
-        if (args.count(i) && col.type->isNullable())
+        if (args.contains(i) && col.type->isNullable())
         {
             const DataTypePtr & nested_type = static_cast<const DataTypeNullable &>(*col.type).getNestedType();
 
@@ -92,9 +92,9 @@ static Block createBlockWithNestedColumnsImpl(const Block & block, const std::un
             else
                 throw Exception(
                     "Illegal column for DataTypeNullable:" + col.type->getName() + " [column_name=" + col.name
-                        + "] [created=" + DB::toString(bool(col.column))
-                        + "] [nullable=" + (col.column ? DB::toString(bool(col.column->isColumnNullable())) : "null")
-                        + "] [const=" + (col.column ? DB::toString(bool(col.column->isColumnConst())) : "null") + "]",
+                        + "] [created=" + DB::toString(col.column != nullptr)
+                        + "] [nullable=" + (col.column ? DB::toString(col.column->isColumnNullable()) : "null")
+                        + "] [const=" + (col.column ? DB::toString(col.column->isColumnConst()) : "null") + "]",
                     ErrorCodes::ILLEGAL_COLUMN);
         }
         else

diff --git a/dbms/src/Storages/DeltaMerge/StableValueSpace.cpp b/dbms/src/Storages/DeltaMerge/StableValueSpace.cpp
@@ -357,23 +357,13 @@ void StableValueSpace::calculateStableProperty(const DMContext & context, const
             context.tracing_id);
         const auto & use_packs = pack_filter.getUsePacksConst();
         size_t new_pack_properties_index = 0;
-        bool use_new_pack_properties = pack_properties.property_size() == 0;
+        const bool use_new_pack_properties = pack_properties.property_size() == 0;
         if (use_new_pack_properties)
         {
-            size_t use_packs_count = 0;
-            for (auto is_used : use_packs)
-            {
-                if (is_used)
-                    use_packs_count += 1;
-            }
-            if (unlikely((size_t)new_pack_properties.property_size() != use_packs_count))
-            {
-                throw Exception(
-                    fmt::format("size doesn't match [new_pack_properties_size={}] [use_packs_size={}]", new_pack_properties.property_size(), use_packs_count),
-                    ErrorCodes::LOGICAL_ERROR);
-            }
+            const size_t use_packs_count = std::count(use_packs.begin(), use_packs.end(), true);
+            RUNTIME_CHECK_MSG(static_cast<size_t>(new_pack_properties.property_size()) == use_packs_count, "size doesn't match, new_pack_properties_size={} use_packs_size={}", new_pack_properties.property_size(), use_packs_count);
         }
-        for (size_t pack_id = 0; pack_id < use_packs.size(); pack_id++)
+        for (size_t pack_id = 0; pack_id < use_packs.size(); ++pack_id)
         {
             if (!use_packs[pack_id])
                 continue;