From 3df4929b6332aa6ebd0ce61ac659a8b514203653 Mon Sep 17 00:00:00 2001 From: bharatnc Date: Sat, 5 Feb 2022 16:40:55 -0800 Subject: [PATCH] minor fixes --- src/Functions/s2CapUnion.cpp | 21 ++++++++------------- src/Functions/s2RectAdd.cpp | 3 --- src/Functions/s2RectContains.cpp | 3 --- src/Functions/s2RectIntersection.cpp | 4 ---- src/Functions/s2RectUnion.cpp | 4 ---- 5 files changed, 8 insertions(+), 27 deletions(-) diff --git a/src/Functions/s2CapUnion.cpp b/src/Functions/s2CapUnion.cpp index 5800b08be87..7af6324a7d5 100644 --- a/src/Functions/s2CapUnion.cpp +++ b/src/Functions/s2CapUnion.cpp @@ -90,8 +90,7 @@ public: arguments[0].type->getName(), 1, getName()); - - const auto & data_center_1 = col_center1->getData(); + const auto & data_center1 = col_center1->getData(); const auto * col_radius1 = checkAndGetColumn(arguments[1].column.get()); if (!col_radius1) @@ -101,8 +100,7 @@ public: arguments[1].type->getName(), 2, getName()); - - const auto & data_radius_1 = col_radius1->getData(); + const auto & data_radius1 = col_radius1->getData(); const auto * col_center2 = checkAndGetColumn(arguments[2].column.get()); if (!col_center2) @@ -112,8 +110,7 @@ public: arguments[2].type->getName(), 3, getName()); - - const auto & data_center_2 = col_center2->getData(); + const auto & data_center2 = col_center2->getData(); const auto * col_radius2 = checkAndGetColumn(arguments[3].column.get()); if (!col_radius2) @@ -123,9 +120,7 @@ public: arguments[3].type->getName(), 4, getName()); - - const auto & data_radius_2 = col_radius2->getData(); - + const auto & data_radius2 = col_radius2->getData(); auto col_res_center = ColumnUInt64::create(); auto col_res_radius = ColumnFloat64::create(); @@ -138,10 +133,10 @@ public: for (size_t row = 0; row < input_rows_count; ++row) { - const UInt64 first_center = data_center_1[row]; - const Float64 first_radius = data_radius_1[row]; - const UInt64 second_center = data_center_2[row]; - const Float64 second_radius = data_radius_2[row]; + const UInt64 first_center = data_center1[row]; + const Float64 first_radius = data_radius1[row]; + const UInt64 second_center = data_center2[row]; + const Float64 second_radius = data_radius2[row]; if (isNaN(first_radius) || isNaN(second_radius)) throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Radius of the cap must not be nan"); diff --git a/src/Functions/s2RectAdd.cpp b/src/Functions/s2RectAdd.cpp index f48b193a47b..75da7de8f7e 100644 --- a/src/Functions/s2RectAdd.cpp +++ b/src/Functions/s2RectAdd.cpp @@ -73,7 +73,6 @@ public: arguments[0].type->getName(), 1, getName()); - const auto & data_low = col_lo->getData(); const auto * col_hi = checkAndGetColumn(arguments[1].column.get()); @@ -84,7 +83,6 @@ public: arguments[1].type->getName(), 2, getName()); - const auto & data_hi = col_hi->getData(); const auto * col_point = checkAndGetColumn(arguments[2].column.get()); @@ -95,7 +93,6 @@ public: arguments[2].type->getName(), 3, getName()); - const auto & data_point = col_point->getData(); auto col_res_first = ColumnUInt64::create(); diff --git a/src/Functions/s2RectContains.cpp b/src/Functions/s2RectContains.cpp index bb318530c0b..be46253f70e 100644 --- a/src/Functions/s2RectContains.cpp +++ b/src/Functions/s2RectContains.cpp @@ -71,7 +71,6 @@ public: arguments[0].type->getName(), 1, getName()); - const auto & data_low = col_lo->getData(); const auto * col_hi = checkAndGetColumn(arguments[1].column.get()); @@ -82,7 +81,6 @@ public: arguments[1].type->getName(), 2, getName()); - const auto & data_hi = col_hi->getData(); const auto * col_point = checkAndGetColumn(arguments[2].column.get()); @@ -93,7 +91,6 @@ public: arguments[2].type->getName(), 3, getName()); - const auto & data_point = col_point->getData(); auto dst = ColumnVector::create(); diff --git a/src/Functions/s2RectIntersection.cpp b/src/Functions/s2RectIntersection.cpp index ab5a68803bf..d4339b4d601 100644 --- a/src/Functions/s2RectIntersection.cpp +++ b/src/Functions/s2RectIntersection.cpp @@ -76,7 +76,6 @@ public: arguments[0].type->getName(), 1, getName()); - const auto & data_lo1 = col_lo1->getData(); const auto * col_hi1 = checkAndGetColumn(arguments[1].column.get()); @@ -87,7 +86,6 @@ public: arguments[1].type->getName(), 2, getName()); - const auto & data_hi1 = col_hi1->getData(); const auto * col_lo2 = checkAndGetColumn(arguments[2].column.get()); @@ -98,7 +96,6 @@ public: arguments[2].type->getName(), 3, getName()); - const auto & data_lo2 = col_lo2->getData(); const auto * col_hi2 = checkAndGetColumn(arguments[3].column.get()); @@ -109,7 +106,6 @@ public: arguments[3].type->getName(), 4, getName()); - const auto & data_hi2 = col_hi2->getData(); auto col_res_first = ColumnUInt64::create(); diff --git a/src/Functions/s2RectUnion.cpp b/src/Functions/s2RectUnion.cpp index 510f496c859..047d331e711 100644 --- a/src/Functions/s2RectUnion.cpp +++ b/src/Functions/s2RectUnion.cpp @@ -74,7 +74,6 @@ public: arguments[0].type->getName(), 1, getName()); - const auto & data_lo1 = col_lo1->getData(); const auto * col_hi1 = checkAndGetColumn(arguments[1].column.get()); @@ -85,7 +84,6 @@ public: arguments[1].type->getName(), 2, getName()); - const auto & data_hi1 = col_hi1->getData(); const auto * col_lo2 = checkAndGetColumn(arguments[2].column.get()); @@ -96,7 +94,6 @@ public: arguments[2].type->getName(), 3, getName()); - const auto & data_lo2 = col_lo2->getData(); const auto * col_hi2 = checkAndGetColumn(arguments[3].column.get()); @@ -107,7 +104,6 @@ public: arguments[3].type->getName(), 4, getName()); - const auto & data_hi2 = col_hi2->getData(); auto col_res_first = ColumnUInt64::create();