From 54b333b470a120c108a0dfaadf902f8e01f8bae0 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Mon, 20 Apr 2020 23:49:19 +0300 Subject: [PATCH] gpos/base/ITask.h isn't actually used very widely, remove it from base.h. (cherry picked from commit af6431ad3e9c28873755bb54fe4d74743f4050f0) --- src/backend/gporca/libgpopt/include/gpopt/search/CJob.h | 2 ++ src/backend/gporca/libgpopt/src/base/CPrintPrefix.cpp | 1 + src/backend/gporca/libgpos/include/gpos/base.h | 1 - src/backend/gporca/libgpos/include/gpos/common/CSyncPool.h | 1 + .../gporca/libgpos/include/gpos/error/CAutoExceptionStack.h | 2 ++ src/backend/gporca/libgpos/include/gpos/error/CAutoTrace.h | 1 + src/backend/gporca/libgpos/include/gpos/error/CMiniDumper.h | 1 + src/backend/gporca/libgpos/src/error/CAutoTrace.cpp | 2 ++ src/backend/gporca/libgpos/src/io/CFileDescriptor.cpp | 1 + src/backend/gporca/libgpos/src/io/CFileReader.cpp | 1 + src/backend/gporca/libgpos/src/io/CFileWriter.cpp | 1 + src/backend/gporca/libgpos/src/memory/CMemoryVisitorPrint.cpp | 1 + src/backend/gporca/libgpos/src/task/CAutoTraceFlag.cpp | 1 + 13 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CJob.h b/src/backend/gporca/libgpopt/include/gpopt/search/CJob.h index 3b5764973b..c22e5d6f6a 100644 --- a/src/backend/gporca/libgpopt/include/gpopt/search/CJob.h +++ b/src/backend/gporca/libgpopt/include/gpopt/search/CJob.h @@ -14,6 +14,8 @@ #include "gpos/base.h" #include "gpos/common/CList.h" +#include "gpos/task/ITask.h" + namespace gpopt { using namespace gpos; diff --git a/src/backend/gporca/libgpopt/src/base/CPrintPrefix.cpp b/src/backend/gporca/libgpopt/src/base/CPrintPrefix.cpp index 09576d9f8b..2c7c660254 100644 --- a/src/backend/gporca/libgpopt/src/base/CPrintPrefix.cpp +++ b/src/backend/gporca/libgpopt/src/base/CPrintPrefix.cpp @@ -10,6 +10,7 @@ //--------------------------------------------------------------------------- #include "gpos/base.h" +#include "gpos/task/IWorker.h" #include "gpopt/base/CPrintPrefix.h" diff --git a/src/backend/gporca/libgpos/include/gpos/base.h b/src/backend/gporca/libgpos/include/gpos/base.h index 1fe960cc74..b7c1aadab0 100644 --- a/src/backend/gporca/libgpos/include/gpos/base.h +++ b/src/backend/gporca/libgpos/include/gpos/base.h @@ -19,7 +19,6 @@ #include "gpos/error/IErrorContext.h" #include "gpos/error/ILogger.h" #include "gpos/memory/CMemoryPool.h" -#include "gpos/task/ITask.h" #endif // GPOS_base_H diff --git a/src/backend/gporca/libgpos/include/gpos/common/CSyncPool.h b/src/backend/gporca/libgpos/include/gpos/common/CSyncPool.h index 6fed60e3bd..e8918d6a63 100644 --- a/src/backend/gporca/libgpos/include/gpos/common/CSyncPool.h +++ b/src/backend/gporca/libgpos/include/gpos/common/CSyncPool.h @@ -24,6 +24,7 @@ #include "gpos/utils.h" #include "gpos/common/CAutoP.h" +#include "gpos/task/ITask.h" #define BYTES_PER_ULONG (GPOS_SIZEOF(ULONG)) #define BITS_PER_ULONG (BYTES_PER_ULONG * 8) diff --git a/src/backend/gporca/libgpos/include/gpos/error/CAutoExceptionStack.h b/src/backend/gporca/libgpos/include/gpos/error/CAutoExceptionStack.h index 0dfb849263..92482416b9 100644 --- a/src/backend/gporca/libgpos/include/gpos/error/CAutoExceptionStack.h +++ b/src/backend/gporca/libgpos/include/gpos/error/CAutoExceptionStack.h @@ -20,6 +20,8 @@ #include "gpos/base.h" +#include "gpos/common/CStackObject.h" + namespace gpos { diff --git a/src/backend/gporca/libgpos/include/gpos/error/CAutoTrace.h b/src/backend/gporca/libgpos/include/gpos/error/CAutoTrace.h index 9e6da9ae2a..4d5a5e9ac9 100644 --- a/src/backend/gporca/libgpos/include/gpos/error/CAutoTrace.h +++ b/src/backend/gporca/libgpos/include/gpos/error/CAutoTrace.h @@ -12,6 +12,7 @@ #define GPOS_CAutoTrace_H #include "gpos/base.h" +#include "gpos/common/CStackObject.h" #include "gpos/io/COstreamString.h" #include "gpos/string/CWStringDynamic.h" diff --git a/src/backend/gporca/libgpos/include/gpos/error/CMiniDumper.h b/src/backend/gporca/libgpos/include/gpos/error/CMiniDumper.h index 11049860b0..b3d6fb1f69 100644 --- a/src/backend/gporca/libgpos/include/gpos/error/CMiniDumper.h +++ b/src/backend/gporca/libgpos/include/gpos/error/CMiniDumper.h @@ -12,6 +12,7 @@ #define GPOS_CMiniDumper_H #include "gpos/base.h" +#include "gpos/common/CStackObject.h" #include "gpos/io/COstream.h" namespace gpos diff --git a/src/backend/gporca/libgpos/src/error/CAutoTrace.cpp b/src/backend/gporca/libgpos/src/error/CAutoTrace.cpp index f11dca8b49..8ccf1e4697 100644 --- a/src/backend/gporca/libgpos/src/error/CAutoTrace.cpp +++ b/src/backend/gporca/libgpos/src/error/CAutoTrace.cpp @@ -11,6 +11,8 @@ #include "gpos/error/CAutoTrace.h" +#include "gpos/task/ITask.h" + using namespace gpos; //--------------------------------------------------------------------------- diff --git a/src/backend/gporca/libgpos/src/io/CFileDescriptor.cpp b/src/backend/gporca/libgpos/src/io/CFileDescriptor.cpp index 9878e419e5..f32f26837b 100644 --- a/src/backend/gporca/libgpos/src/io/CFileDescriptor.cpp +++ b/src/backend/gporca/libgpos/src/io/CFileDescriptor.cpp @@ -14,6 +14,7 @@ #include "gpos/io/ioutils.h" #include "gpos/io/CFileDescriptor.h" #include "gpos/string/CStringStatic.h" +#include "gpos/task/IWorker.h" using namespace gpos; diff --git a/src/backend/gporca/libgpos/src/io/CFileReader.cpp b/src/backend/gporca/libgpos/src/io/CFileReader.cpp index 9020f39c22..3018ad1e96 100644 --- a/src/backend/gporca/libgpos/src/io/CFileReader.cpp +++ b/src/backend/gporca/libgpos/src/io/CFileReader.cpp @@ -12,6 +12,7 @@ #include "gpos/base.h" #include "gpos/io/ioutils.h" #include "gpos/io/CFileReader.h" +#include "gpos/task/IWorker.h" using namespace gpos; diff --git a/src/backend/gporca/libgpos/src/io/CFileWriter.cpp b/src/backend/gporca/libgpos/src/io/CFileWriter.cpp index efd7035ca1..aa8531af46 100644 --- a/src/backend/gporca/libgpos/src/io/CFileWriter.cpp +++ b/src/backend/gporca/libgpos/src/io/CFileWriter.cpp @@ -14,6 +14,7 @@ #include "gpos/base.h" #include "gpos/io/ioutils.h" #include "gpos/io/CFileWriter.h" +#include "gpos/task/IWorker.h" using namespace gpos; diff --git a/src/backend/gporca/libgpos/src/memory/CMemoryVisitorPrint.cpp b/src/backend/gporca/libgpos/src/memory/CMemoryVisitorPrint.cpp index 59ffde9453..a234553a42 100644 --- a/src/backend/gporca/libgpos/src/memory/CMemoryVisitorPrint.cpp +++ b/src/backend/gporca/libgpos/src/memory/CMemoryVisitorPrint.cpp @@ -22,6 +22,7 @@ #include "gpos/common/CStackDescriptor.h" #include "gpos/memory/CMemoryVisitorPrint.h" #include "gpos/string/CWStringStatic.h" +#include "gpos/task/ITask.h" using namespace gpos; diff --git a/src/backend/gporca/libgpos/src/task/CAutoTraceFlag.cpp b/src/backend/gporca/libgpos/src/task/CAutoTraceFlag.cpp index b5eac656fe..2a0d7349f2 100644 --- a/src/backend/gporca/libgpos/src/task/CAutoTraceFlag.cpp +++ b/src/backend/gporca/libgpos/src/task/CAutoTraceFlag.cpp @@ -10,6 +10,7 @@ //--------------------------------------------------------------------------- #include "gpos/base.h" +#include "gpos/error/CAutoTrace.h" #include "gpos/task/CAutoTraceFlag.h" using namespace gpos; -- GitLab