diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CQueryContext.h b/src/backend/gporca/libgpopt/include/gpopt/base/CQueryContext.h index bd6bbc50d7955e9f56a15ee1f8174477af5a969b..97b56060940911aa6ea99ecd28582a4c7c41577f 100644 --- a/src/backend/gporca/libgpopt/include/gpopt/base/CQueryContext.h +++ b/src/backend/gporca/libgpopt/include/gpopt/base/CQueryContext.h @@ -144,7 +144,7 @@ public: #ifdef GPOS_DEBUG // debug print - virtual IOstream &OsPrint(IOstream &) const; + IOstream &OsPrint(IOstream &) const; void DbgPrint() const; #endif // GPOS_DEBUG diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CSearchStage.h b/src/backend/gporca/libgpopt/include/gpopt/search/CSearchStage.h index 42b9b2ccb24a18b247d6da7cf770bd8873b366d9..406731e6ec295d6d5225cdc23ebe62e60762a5a4 100644 --- a/src/backend/gporca/libgpopt/include/gpopt/search/CSearchStage.h +++ b/src/backend/gporca/libgpopt/include/gpopt/search/CSearchStage.h @@ -139,7 +139,7 @@ public: } // print function - virtual IOstream &OsPrint(IOstream &) const; + IOstream &OsPrint(IOstream &) const; // generate default search strategy static CSearchStageArray *PdrgpssDefault(CMemoryPool *mp); diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CJoinOrder.h b/src/backend/gporca/libgpopt/include/gpopt/xforms/CJoinOrder.h index 3a0978eab16c06fc8bdf385a3402293d4df13090..e27ef8f83dbef343405688cf450ad24fe8d69967 100644 --- a/src/backend/gporca/libgpopt/include/gpopt/xforms/CJoinOrder.h +++ b/src/backend/gporca/libgpopt/include/gpopt/xforms/CJoinOrder.h @@ -237,7 +237,7 @@ public: virtual ~CJoinOrder(); // print function - virtual IOstream &OsPrint(IOstream &) const; + IOstream &OsPrint(IOstream &) const; // is this a valid join combination BOOL IsValidJoinCombination(SComponent *comp1, SComponent *comp2) const; diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CJoinOrderDP.h b/src/backend/gporca/libgpopt/include/gpopt/xforms/CJoinOrderDP.h index e9ace99421de95f09be01950fa5d3ff121a2af3d..7ba39d30e4a1d581d29513518c3c547797f23b40 100644 --- a/src/backend/gporca/libgpopt/include/gpopt/xforms/CJoinOrderDP.h +++ b/src/backend/gporca/libgpopt/include/gpopt/xforms/CJoinOrderDP.h @@ -187,7 +187,7 @@ public: } // print function - IOstream &OsPrint(IOstream &) const override; + IOstream &OsPrint(IOstream &) const; #ifdef GPOS_DEBUG void DbgPrint(); diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CJoinOrderDPv2.h b/src/backend/gporca/libgpopt/include/gpopt/xforms/CJoinOrderDPv2.h index 9045e2fa5da128d3b887b74bfb629f2b9aeb3d36..adb664058b52c7f01d81f5c06caf8829974c9aa9 100644 --- a/src/backend/gporca/libgpopt/include/gpopt/xforms/CJoinOrderDPv2.h +++ b/src/backend/gporca/libgpopt/include/gpopt/xforms/CJoinOrderDPv2.h @@ -555,7 +555,7 @@ public: CBitSet **requiredBitsOnLeft = NULL); // print function - IOstream &OsPrint(IOstream &) const override; + IOstream &OsPrint(IOstream &) const; IOstream &OsPrintProperty(IOstream &, SExpressionProperties &) const; diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CJoinOrderMinCard.h b/src/backend/gporca/libgpopt/include/gpopt/xforms/CJoinOrderMinCard.h index b52c4cc337d8859c007993b3931e0d76ca81b0dd..dcf2737e9dcf81b809fe42a0b5a345d2f1598193 100644 --- a/src/backend/gporca/libgpopt/include/gpopt/xforms/CJoinOrderMinCard.h +++ b/src/backend/gporca/libgpopt/include/gpopt/xforms/CJoinOrderMinCard.h @@ -47,7 +47,7 @@ public: virtual CExpression *PexprExpand(); // print function - IOstream &OsPrint(IOstream &) const override; + IOstream &OsPrint(IOstream &) const; }; // class CJoinOrderMinCard diff --git a/src/backend/gporca/libgpopt/src/xforms/CJoinOrder.cpp b/src/backend/gporca/libgpopt/src/xforms/CJoinOrder.cpp index 32cd8cdfde2149ff1703304ad57922d7aa6e74da..28ffc9cdfbd5ca3fb819c1ef73d412ff6d2c7c3d 100644 --- a/src/backend/gporca/libgpopt/src/xforms/CJoinOrder.cpp +++ b/src/backend/gporca/libgpopt/src/xforms/CJoinOrder.cpp @@ -604,6 +604,8 @@ CJoinOrder::DeriveStats(CExpression *pexpr) // Helper function to print a join order class // //--------------------------------------------------------------------------- +// FIXME: the following function is completely unused even for the purpose of +// debugging, because all subclasses implement their own OsPrint IOstream & CJoinOrder::OsPrint(IOstream &os) const { diff --git a/src/backend/gporca/libgpos/include/gpos/memory/CMemoryPool.h b/src/backend/gporca/libgpos/include/gpos/memory/CMemoryPool.h index 4a01191aac7b6af5f2a0884ff44054c795c956a5..fff2022ab36a8482970b55ea3dddced397282e54 100644 --- a/src/backend/gporca/libgpos/include/gpos/memory/CMemoryPool.h +++ b/src/backend/gporca/libgpos/include/gpos/memory/CMemoryPool.h @@ -175,7 +175,7 @@ public: } // dump memory pool to given stream - virtual IOstream &OsPrint(IOstream &os); + IOstream &OsPrint(IOstream &os); // check if a memory pool is empty virtual void AssertEmpty(IOstream &os); diff --git a/src/backend/gporca/libgpos/include/gpos/task/CTaskLocalStorageObject.h b/src/backend/gporca/libgpos/include/gpos/task/CTaskLocalStorageObject.h index 012d3fc8fabc76bc0c5e6e28f3c3f49dbcb4e088..d7cd2d3e4825c23addfc0957972febd5d3135164 100644 --- a/src/backend/gporca/libgpos/include/gpos/task/CTaskLocalStorageObject.h +++ b/src/backend/gporca/libgpos/include/gpos/task/CTaskLocalStorageObject.h @@ -55,11 +55,6 @@ public: // key const CTaskLocalStorage::Etlsidx m_etlsidx; -#ifdef GPOS_DEBUG - // debug print - virtual IOstream &OsPrint(IOstream &os) const = 0; -#endif // GPOS_DEBUG - }; // class CTaskLocalStorageObject } // namespace gpos diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/task/CTaskLocalStorageTest.h b/src/backend/gporca/libgpos/server/include/unittest/gpos/task/CTaskLocalStorageTest.h index 39d82277ff9bed14802369b28d819ddc3fd0004b..2f2d01ad3b93d300d05003e366b632529dce1fa6 100644 --- a/src/backend/gporca/libgpos/server/include/unittest/gpos/task/CTaskLocalStorageTest.h +++ b/src/backend/gporca/libgpos/server/include/unittest/gpos/task/CTaskLocalStorageTest.h @@ -43,15 +43,6 @@ private: CTestObject() : CTaskLocalStorageObject(CTaskLocalStorage::EtlsidxTest) { } - -#ifdef GPOS_DEBUG - // overwrite abstract member - IOstream & - OsPrint(IOstream &os) const override - { - return os; - } -#endif // GPOS_DEBUG }; public: diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CBucket.h b/src/backend/gporca/libnaucrates/include/naucrates/statistics/CBucket.h index 4af7d4b84fb9b65a57ce2fc5d5be8a6864d8e66f..920c7594d76757125f5dab3030eb506d066d76c8 100644 --- a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CBucket.h +++ b/src/backend/gporca/libnaucrates/include/naucrates/statistics/CBucket.h @@ -163,7 +163,7 @@ public: BOOL IsAfter(const CBucket *bucket) const; // print function - virtual IOstream &OsPrint(IOstream &os) const; + IOstream &OsPrint(IOstream &os) const; #ifdef GPOS_DEBUG void DbgPrint() const; diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CHistogram.h b/src/backend/gporca/libnaucrates/include/naucrates/statistics/CHistogram.h index 83ccbf5eed2ee03206818f0072bf242b141e8333..f57f1aef716b3ce0f2b0560a3e0999c7c1076ab3 100644 --- a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CHistogram.h +++ b/src/backend/gporca/libnaucrates/include/naucrates/statistics/CHistogram.h @@ -341,7 +341,7 @@ public: } // print function - virtual IOstream &OsPrint(IOstream &os) const; + IOstream &OsPrint(IOstream &os) const; #ifdef GPOS_DEBUG void DbgPrint() const;