提交 520f9a10 编写于 作者: H Heikki Linnakangas 提交者: Chris Hajas

Fix compilation of unit tests.

They use GPOS_RESET_EX, which needs ITask.

Fix missing includes in unit tests.

(cherry picked from commit 88f9744a)
上级 81b7d6e6
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
#include "gpos/base.h" #include "gpos/base.h"
#include "gpos/common/CMainArgs.h" #include "gpos/common/CMainArgs.h"
#include "gpos/common/CStackObject.h"
#include "gpos/task/ITask.h"
// helper macros // helper macros
#define GPOS_UNITTEST_FUNC(x) gpos::CUnittest(#x, CUnittest::EttStandard, x) #define GPOS_UNITTEST_FUNC(x) gpos::CUnittest(#x, CUnittest::EttStandard, x)
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include "gpopt/base/CAutoOptCtxt.h" #include "gpopt/base/CAutoOptCtxt.h"
#include "gpopt/base/CColRef.h" #include "gpopt/base/CColRef.h"
#include "gpopt/base/CQueryContext.h" #include "gpopt/base/CQueryContext.h"
#include "gpopt/base/CRange.h"
#include "gpopt/engine/CEnumeratorConfig.h" #include "gpopt/engine/CEnumeratorConfig.h"
#include "gpopt/mdcache/CMDAccessor.h" #include "gpopt/mdcache/CMDAccessor.h"
#include "gpopt/metadata/CTableDescriptor.h" #include "gpopt/metadata/CTableDescriptor.h"
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include "unittest/gpopt/CSubqueryTestUtils.h" #include "unittest/gpopt/CSubqueryTestUtils.h"
#include "naucrates/md/CMDIdGPDB.h" #include "naucrates/md/CMDIdGPDB.h"
#include "naucrates/md/IMDTypeBool.h"
using namespace gpopt; using namespace gpopt;
......
// Greenplum Database // Greenplum Database
// Copyright (C) 2018 Pivotal, Inc. // Copyright (C) 2018 Pivotal, Inc.
#include "gpos/io/COstreamString.h"
#include "unittest/dxl/CParseHandlerOptimizerConfigSerializeTest.h" #include "unittest/dxl/CParseHandlerOptimizerConfigSerializeTest.h"
#include "naucrates/dxl/xml/CXMLSerializer.h" #include "naucrates/dxl/xml/CXMLSerializer.h"
#include "unittest/gpopt/CTestUtils.h" #include "unittest/gpopt/CTestUtils.h"
#include "gpopt/optimizer/COptimizerConfig.h" #include "gpopt/optimizer/COptimizerConfig.h"
#include "naucrates/dxl/CDXLUtils.h" #include "naucrates/dxl/CDXLUtils.h"
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
// @doc: // @doc:
// Tests for datum classes // Tests for datum classes
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#include "gpos/error/CAutoTrace.h"
#include "gpos/io/COstreamString.h" #include "gpos/io/COstreamString.h"
#include "gpos/string/CWStringDynamic.h" #include "gpos/string/CWStringDynamic.h"
......
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
#define __STDC_CONSTANT_MACROS #define __STDC_CONSTANT_MACROS
#endif #endif
#include "gpos/io/COstreamString.h"
#include "naucrates/statistics/CPoint.h" #include "naucrates/statistics/CPoint.h"
#include "naucrates/statistics/CBucket.h" #include "naucrates/statistics/CBucket.h"
#include "naucrates/statistics/CHistogram.h" #include "naucrates/statistics/CHistogram.h"
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <stdint.h> #include <stdint.h>
#include "gpos/error/CAutoTrace.h"
#include "gpos/io/COstreamString.h" #include "gpos/io/COstreamString.h"
#include "gpos/string/CWStringDynamic.h" #include "gpos/string/CWStringDynamic.h"
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <stdint.h> #include <stdint.h>
#include "gpos/error/CAutoTrace.h"
#include "gpos/io/COstreamString.h" #include "gpos/io/COstreamString.h"
#include "gpos/string/CWStringDynamic.h" #include "gpos/string/CWStringDynamic.h"
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <stdint.h> #include <stdint.h>
#include "gpos/error/CAutoTrace.h"
#include "gpos/io/COstreamString.h" #include "gpos/io/COstreamString.h"
#include "gpos/string/CWStringDynamic.h" #include "gpos/string/CWStringDynamic.h"
......
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
// Tests for distribution specification // Tests for distribution specification
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#include "gpos/error/CAutoTrace.h"
#include "naucrates/md/IMDTypeInt4.h" #include "naucrates/md/IMDTypeInt4.h"
#include "naucrates/md/CMDProviderMemory.h" #include "naucrates/md/CMDProviderMemory.h"
......
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
// @doc: // @doc:
// Tests for functional dependencies // Tests for functional dependencies
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#include "gpos/error/CAutoTrace.h"
#include "gpopt/base/CFunctionalDependency.h" #include "gpopt/base/CFunctionalDependency.h"
#include "gpopt/eval/CConstExprEvaluatorDefault.h" #include "gpopt/eval/CConstExprEvaluatorDefault.h"
......
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
#include "unittest/base.h" #include "unittest/base.h"
#include "unittest/gpopt/base/CRangeTest.h" #include "unittest/gpopt/base/CRangeTest.h"
#include "gpos/error/CAutoTrace.h"
#include "naucrates/base/CDatumInt2GPDB.h" #include "naucrates/base/CDatumInt2GPDB.h"
#include "naucrates/base/CDatumInt4GPDB.h" #include "naucrates/base/CDatumInt4GPDB.h"
#include "naucrates/base/CDatumInt8GPDB.h" #include "naucrates/base/CDatumInt8GPDB.h"
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
// @doc: // @doc:
// Test for CEngine // Test for CEngine
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#include "gpos/error/CAutoTrace.h"
#include "gpos/task/CAutoTraceFlag.h" #include "gpos/task/CAutoTraceFlag.h"
#include "gpopt/base/CUtils.h" #include "gpopt/base/CUtils.h"
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
// Test for CEngine // Test for CEngine
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#include "gpos/base.h" #include "gpos/base.h"
#include "gpos/error/CAutoTrace.h"
#include "gpos/memory/CAutoMemoryPool.h" #include "gpos/memory/CAutoMemoryPool.h"
#include "gpos/task/CAutoTraceFlag.h" #include "gpos/task/CAutoTraceFlag.h"
#include "gpos/test/CUnittest.h" #include "gpos/test/CUnittest.h"
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
// Test for installcheck-good bugs // Test for installcheck-good bugs
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#include "gpos/error/CAutoTrace.h"
#include "gpos/task/CAutoTraceFlag.h" #include "gpos/task/CAutoTraceFlag.h"
#include "gpopt/base/CAutoOptCtxt.h" #include "gpopt/base/CAutoOptCtxt.h"
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#include <string.h> #include <string.h>
#include "gpos/error/CAutoTrace.h"
#include "gpos/io/COstreamString.h" #include "gpos/io/COstreamString.h"
#include "gpos/string/CWStringDynamic.h" #include "gpos/string/CWStringDynamic.h"
#include "gpos/task/CAutoTraceFlag.h" #include "gpos/task/CAutoTraceFlag.h"
...@@ -21,6 +22,7 @@ ...@@ -21,6 +22,7 @@
#include "gpopt/operators/CPredicateUtils.h" #include "gpopt/operators/CPredicateUtils.h"
#include "gpopt/operators/CScalarProjectElement.h" #include "gpopt/operators/CScalarProjectElement.h"
#include "gpopt/operators/CLogicalNAryJoin.h" #include "gpopt/operators/CLogicalNAryJoin.h"
#include "gpopt/operators/CLogicalSelect.h"
#include "gpopt/operators/CLogicalInnerJoin.h" #include "gpopt/operators/CLogicalInnerJoin.h"
#include "gpopt/operators/CLogicalLeftOuterJoin.h" #include "gpopt/operators/CLogicalLeftOuterJoin.h"
#include "gpopt/operators/CExpressionUtils.h" #include "gpopt/operators/CExpressionUtils.h"
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
// @doc: // @doc:
// Test for CExpression // Test for CExpression
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#include "gpos/error/CAutoTrace.h"
#include "gpos/io/COstreamString.h" #include "gpos/io/COstreamString.h"
#include "gpos/string/CWStringDynamic.h" #include "gpos/string/CWStringDynamic.h"
......
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
// @doc: // @doc:
// Test for predicate utilities // Test for predicate utilities
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#include "gpos/error/CAutoTrace.h"
#include "gpopt/base/CColRefSetIter.h" #include "gpopt/base/CColRefSetIter.h"
#include "gpopt/base/CUtils.h" #include "gpopt/base/CUtils.h"
#include "gpopt/eval/CConstExprEvaluatorDefault.h" #include "gpopt/eval/CConstExprEvaluatorDefault.h"
......
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
// @doc: // @doc:
// Test for optimization jobs // Test for optimization jobs
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#include "gpos/error/CAutoTrace.h"
#include "gpopt/engine/CEngine.h" #include "gpopt/engine/CEngine.h"
#include "gpopt/eval/CConstExprEvaluatorDefault.h" #include "gpopt/eval/CConstExprEvaluatorDefault.h"
#include "gpopt/operators/CLogicalInnerJoin.h" #include "gpopt/operators/CLogicalInnerJoin.h"
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include "gpopt/engine/CEngine.h" #include "gpopt/engine/CEngine.h"
#include "gpopt/eval/CConstExprEvaluatorDefault.h" #include "gpopt/eval/CConstExprEvaluatorDefault.h"
#include "gpopt/search/CSearchStage.h" #include "gpopt/search/CSearchStage.h"
#include "gpos/error/CAutoTrace.h"
#include "gpos/task/CAutoTraceFlag.h" #include "gpos/task/CAutoTraceFlag.h"
#include "gpopt/xforms/CXformFactory.h" #include "gpopt/xforms/CXformFactory.h"
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
// Test of tree map facility // Test of tree map facility
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#include "gpos/error/CAutoTrace.h"
#include "gpos/types.h" #include "gpos/types.h"
#include "gpos/io/COstreamString.h" #include "gpos/io/COstreamString.h"
#include "gpos/string/CWStringDynamic.h" #include "gpos/string/CWStringDynamic.h"
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
// @doc: // @doc:
// Test for join ordering // Test for join ordering
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#include "gpos/error/CAutoTrace.h"
#include "gpos/io/COstreamString.h" #include "gpos/io/COstreamString.h"
#include "gpos/test/CUnittest.h" #include "gpos/test/CUnittest.h"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册