From 12296f0fa4a1a97e236a8b62d4628aabc006d585 Mon Sep 17 00:00:00 2001 From: David Kimura Date: Thu, 12 Nov 2020 01:23:06 +0000 Subject: [PATCH] Fix clang error unused private field from GPDB commit bc7ab7bd03c --- .../include/naucrates/md/CDXLStatsDerivedRelation.h | 8 +------- .../libnaucrates/src/md/CDXLStatsDerivedRelation.cpp | 4 +--- .../src/parser/CParseHandlerStatsDerivedRelation.cpp | 3 +-- .../gporca/libnaucrates/src/statistics/CStatistics.cpp | 5 ++--- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CDXLStatsDerivedRelation.h b/src/backend/gporca/libnaucrates/include/naucrates/md/CDXLStatsDerivedRelation.h index 1887d0382d..f04a184172 100644 --- a/src/backend/gporca/libnaucrates/include/naucrates/md/CDXLStatsDerivedRelation.h +++ b/src/backend/gporca/libnaucrates/include/naucrates/md/CDXLStatsDerivedRelation.h @@ -44,12 +44,6 @@ private: // flag to indicate if input relation is empty BOOL m_empty; - // number of blocks in the relation (not always up to-to-date) - ULONG m_relpages; - - // number of all-visible blocks in the relation (not always up-to-date) - ULONG m_relallvisible; - // array of derived column statistics CDXLStatsDerivedColumnArray *m_dxl_stats_derived_col_array; @@ -58,7 +52,7 @@ public: // ctor CDXLStatsDerivedRelation( - CDouble rows, BOOL is_empty, ULONG relpages, ULONG relallvisible, + CDouble rows, BOOL is_empty, CDXLStatsDerivedColumnArray *dxl_stats_derived_col_array); // dtor diff --git a/src/backend/gporca/libnaucrates/src/md/CDXLStatsDerivedRelation.cpp b/src/backend/gporca/libnaucrates/src/md/CDXLStatsDerivedRelation.cpp index 39ff52f724..20748ad409 100644 --- a/src/backend/gporca/libnaucrates/src/md/CDXLStatsDerivedRelation.cpp +++ b/src/backend/gporca/libnaucrates/src/md/CDXLStatsDerivedRelation.cpp @@ -26,12 +26,10 @@ using namespace gpmd; // //--------------------------------------------------------------------------- CDXLStatsDerivedRelation::CDXLStatsDerivedRelation( - CDouble rows, BOOL is_empty, ULONG relpages, ULONG relallvisible, + CDouble rows, BOOL is_empty, CDXLStatsDerivedColumnArray *dxl_stats_derived_col_array) : m_rows(rows), m_empty(is_empty), - m_relpages(relpages), - m_relallvisible(relallvisible), m_dxl_stats_derived_col_array(dxl_stats_derived_col_array) { GPOS_ASSERT(NULL != dxl_stats_derived_col_array); diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerStatsDerivedRelation.cpp b/src/backend/gporca/libnaucrates/src/parser/CParseHandlerStatsDerivedRelation.cpp index bfdcc39bac..6eeffa9bbe 100644 --- a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerStatsDerivedRelation.cpp +++ b/src/backend/gporca/libnaucrates/src/parser/CParseHandlerStatsDerivedRelation.cpp @@ -173,8 +173,7 @@ CParseHandlerStatsDerivedRelation::EndElement( } m_dxl_stats_derived_relation = GPOS_NEW(m_mp) - CDXLStatsDerivedRelation(m_rows, m_empty, m_relpages, m_relallvisible, - dxl_stats_derived_col_array); + CDXLStatsDerivedRelation(m_rows, m_empty, dxl_stats_derived_col_array); // deactivate handler m_parse_handler_mgr->DeactivateHandler(); diff --git a/src/backend/gporca/libnaucrates/src/statistics/CStatistics.cpp b/src/backend/gporca/libnaucrates/src/statistics/CStatistics.cpp index 6d12db2e42..b7d022a05e 100644 --- a/src/backend/gporca/libnaucrates/src/statistics/CStatistics.cpp +++ b/src/backend/gporca/libnaucrates/src/statistics/CStatistics.cpp @@ -780,9 +780,8 @@ CStatistics::GetDxlStatsDrvdRelation(CMemoryPool *mp, dxl_stats_derived_col_array->Append(dxl_derived_col_stats); } - return GPOS_NEW(mp) - CDXLStatsDerivedRelation(m_rows, IsEmpty(), m_relpages, m_relallvisible, - dxl_stats_derived_col_array); + return GPOS_NEW(mp) CDXLStatsDerivedRelation(m_rows, IsEmpty(), + dxl_stats_derived_col_array); } // return the upper bound of ndvs for a column reference -- GitLab