From 5df8f870c411208accfeb7edb6fe4af16b7fc5d4 Mon Sep 17 00:00:00 2001 From: chertus Date: Mon, 30 Sep 2019 18:45:53 +0300 Subject: [PATCH] try remove some PVS errors --- dbms/src/AggregateFunctions/AggregateFunctionSumMap.h | 2 +- dbms/src/AggregateFunctions/AggregateFunctionUniq.h | 2 +- dbms/src/AggregateFunctions/AggregateFunctionUniqCombined.h | 2 +- dbms/src/DataTypes/DataTypesDecimal.cpp | 2 +- dbms/src/Interpreters/CollectJoinOnKeysVisitor.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dbms/src/AggregateFunctions/AggregateFunctionSumMap.h b/dbms/src/AggregateFunctions/AggregateFunctionSumMap.h index 9a9ba9e8832..f17bfd8b6b0 100644 --- a/dbms/src/AggregateFunctions/AggregateFunctionSumMap.h +++ b/dbms/src/AggregateFunctions/AggregateFunctionSumMap.h @@ -111,7 +111,7 @@ public: using IteratorType = typename MapType::iterator; array_column.getData().get(values_vec_offset + i, value); - const auto & key = keys_vec.getData()[keys_vec_offset + i]; + const auto & key = keys_vec.getElement(keys_vec_offset + i); if (!keepKey(key)) { diff --git a/dbms/src/AggregateFunctions/AggregateFunctionUniq.h b/dbms/src/AggregateFunctions/AggregateFunctionUniq.h index 4ecd5693cc2..c0e4a8f4dd7 100644 --- a/dbms/src/AggregateFunctions/AggregateFunctionUniq.h +++ b/dbms/src/AggregateFunctions/AggregateFunctionUniq.h @@ -171,7 +171,7 @@ struct OneAdder { if constexpr (!std::is_same_v) { - const auto & value = assert_cast &>(column).getData()[row_num]; + const auto & value = assert_cast &>(column).getElement(row_num); data.set.insert(AggregateFunctionUniqTraits::hash(value)); } else diff --git a/dbms/src/AggregateFunctions/AggregateFunctionUniqCombined.h b/dbms/src/AggregateFunctions/AggregateFunctionUniqCombined.h index 8d90e72a149..88ddc2ab722 100644 --- a/dbms/src/AggregateFunctions/AggregateFunctionUniqCombined.h +++ b/dbms/src/AggregateFunctions/AggregateFunctionUniqCombined.h @@ -132,7 +132,7 @@ public: { if constexpr (!std::is_same_v) { - const auto & value = assert_cast &>(*columns[0]).getData()[row_num]; + const auto & value = assert_cast &>(*columns[0]).getElement(row_num); this->data(place).set.insert(detail::AggregateFunctionUniqCombinedTraits::hash(value)); } else diff --git a/dbms/src/DataTypes/DataTypesDecimal.cpp b/dbms/src/DataTypes/DataTypesDecimal.cpp index be5042fa57e..e8caae63a09 100644 --- a/dbms/src/DataTypes/DataTypesDecimal.cpp +++ b/dbms/src/DataTypes/DataTypesDecimal.cpp @@ -111,7 +111,7 @@ void DataTypeDecimal::serializeBinary(const Field & field, WriteBuffer & ostr template void DataTypeDecimal::serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr) const { - const FieldType & x = assert_cast(column).getData()[row_num]; + const FieldType & x = assert_cast(column).getElement(row_num); writeBinary(x, ostr); } diff --git a/dbms/src/Interpreters/CollectJoinOnKeysVisitor.h b/dbms/src/Interpreters/CollectJoinOnKeysVisitor.h index 024ad7c7cd8..4d085dfcc31 100644 --- a/dbms/src/Interpreters/CollectJoinOnKeysVisitor.h +++ b/dbms/src/Interpreters/CollectJoinOnKeysVisitor.h @@ -23,7 +23,7 @@ public: const NameSet & source_columns; const NameSet & joined_columns; const Aliases & aliases; - const bool is_asof; + const bool is_asof{false}; ASTPtr asof_left_key{}; ASTPtr asof_right_key{}; bool has_some{false};