Move Logger out of Shared.

yma11 · Sep 15, 2020 · 6eaefcd · 6eaefcd
1 parent 847505e
commit 6eaefcd
Show file tree

Hide file tree

Showing 151 changed files with 195 additions and 177 deletions.
diff --git a/Analyzer/Analyzer.h b/Analyzer/Analyzer.h
@@ -24,7 +24,7 @@
 #ifndef ANALYZER_H
 #define ANALYZER_H
 
-#include "../Shared/Logger.h"
+#include "../Logger/Logger.h"
 
 #include <cstdint>
 #include <iostream>

diff --git a/Archive/S3Archive.cpp b/Archive/S3Archive.cpp
@@ -26,7 +26,7 @@
 #include <fstream>
 #include <memory>
 
-#include "Shared/Logger.h"
+#include "Logger/Logger.h"
 
 int S3Archive::awsapi_count;
 std::mutex S3Archive::awsapi_mtx;

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -579,6 +579,7 @@ add_subdirectory(QueryEngine)
 add_subdirectory(DataMgr)
 add_subdirectory(CudaMgr)
 add_subdirectory(LockMgr)
+add_subdirectory(Logger)
 add_subdirectory(MigrationMgr)
 add_subdirectory(Fragmenter)
 add_subdirectory(Shared)
@@ -599,7 +600,7 @@ if(ENABLE_ODBC)
   add_subdirectory(ODBC)
 endif()
 
-set(MAPD_LIBRARIES Shared Catalog SqliteConnector MigrationMgr TableArchiver Parser Analyzer ImportExport QueryRunner QueryEngine QueryState LockMgr DataMgr Fragmenter)
+set(MAPD_LIBRARIES Shared Catalog SqliteConnector MigrationMgr TableArchiver Parser Analyzer ImportExport QueryRunner QueryEngine QueryState LockMgr DataMgr Fragmenter Logger)
 
 if("${MAPD_EDITION_LOWER}" STREQUAL "ee")
   list(APPEND MAPD_LIBRARIES Distributed)

diff --git a/Calcite/Calcite.cpp b/Calcite/Calcite.cpp
@@ -23,7 +23,7 @@
 
 #include "Calcite.h"
 #include "Catalog/Catalog.h"
-#include "Shared/Logger.h"
+#include "Logger/Logger.h"
 #include "Shared/SystemParameters.h"
 #include "Shared/ThriftClient.h"
 #include "Shared/fixautotools.h"

diff --git a/Catalog/DBObject.h b/Catalog/DBObject.h
@@ -31,7 +31,7 @@
 
 #include <string>
 #include <unordered_set>
-#include "Shared/Logger.h"
+#include "Logger/Logger.h"
 
 namespace Catalog_Namespace {
 class Catalog;

diff --git a/Catalog/Grantee.h b/Catalog/Grantee.h
@@ -24,7 +24,7 @@
 #include <map>
 #include <string>
 #include <unordered_set>
-#include "Shared/Logger.h"
+#include "Logger/Logger.h"
 
 class User;
 class Role;

diff --git a/Catalog/OptionsContainer.h b/Catalog/OptionsContainer.h
@@ -23,6 +23,7 @@
 #include "rapidjson/stringbuffer.h"
 #include "rapidjson/writer.h"
 
+#include "Logger/Logger.h"
 #include "Shared/StringTransform.h"
 
 namespace foreign_storage {

diff --git a/Catalog/SharedDictionaryValidator.cpp b/Catalog/SharedDictionaryValidator.cpp
@@ -18,7 +18,7 @@
 
 #include <memory>
 
-#include "Shared/Logger.h"
+#include "Logger/Logger.h"
 
 const Parser::SharedDictionaryDef compress_reference_path(
     Parser::SharedDictionaryDef cur_node,

diff --git a/CudaMgr/CudaMgr.cpp b/CudaMgr/CudaMgr.cpp
@@ -23,7 +23,7 @@
 #include <iostream>
 #include <stdexcept>
 
-#include "Shared/Logger.h"
+#include "Logger/Logger.h"
 
 namespace CudaMgr_Namespace {
 

diff --git a/CudaMgr/CudaMgr.h b/CudaMgr/CudaMgr.h
@@ -20,8 +20,8 @@
 #include <string>
 #include <vector>
 
+#include "Logger/Logger.h"
 #include "Shared/DeviceGroup.h"
-#include "Shared/Logger.h"
 
 #ifdef HAVE_CUDA
 #include <cuda.h>

diff --git a/CudaMgr/CudaMgrNoCuda.cpp b/CudaMgr/CudaMgrNoCuda.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "CudaMgr.h"
-#include "Shared/Logger.h"
+#include "Logger/Logger.h"
 
 namespace CudaMgr_Namespace {
 

diff --git a/DataMgr/AbstractBuffer.h b/DataMgr/AbstractBuffer.h
@@ -31,7 +31,7 @@
 #include "Encoder.h"
 #include "MemoryLevel.h"
 
-#include "Shared/Logger.h"
+#include "Logger/Logger.h"
 #include "Shared/sqltypes.h"
 #include "Shared/types.h"
 

diff --git a/DataMgr/Allocators/CudaAllocator.cpp b/DataMgr/Allocators/CudaAllocator.cpp
@@ -18,7 +18,7 @@
 
 #include <CudaMgr/CudaMgr.h>
 #include <DataMgr/DataMgr.h>
-#include <Shared/Logger.h>
+#include <Logger/Logger.h>
 #include <Shared/types.h>
 
 CudaAllocator::CudaAllocator(Data_Namespace::DataMgr* data_mgr, const int device_id)

diff --git a/DataMgr/Allocators/DeviceAllocator.h b/DataMgr/Allocators/DeviceAllocator.h
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "Shared/Logger.h"
+#include "Logger/Logger.h"
 
 #ifdef HAVE_CUDA
 #include <cuda.h>

diff --git a/DataMgr/Allocators/ThrustAllocator.cpp b/DataMgr/Allocators/ThrustAllocator.cpp
@@ -24,7 +24,7 @@
 #include "CudaMgr/CudaMgr.h"
 #include "DataMgr/Allocators/CudaAllocator.h"
 #include "DataMgr/DataMgr.h"
-#include "Shared/Logger.h"
+#include "Logger/Logger.h"
 
 int8_t* ThrustAllocator::allocate(std::ptrdiff_t num_bytes) {
   VLOG(1) << "Thrust allocation: Device #" << device_id_ << " Allocation #"

diff --git a/DataMgr/ArrayNoneEncoder.h b/DataMgr/ArrayNoneEncoder.h
@@ -24,7 +24,7 @@
 #ifndef ARRAY_NONE_ENCODER_H
 #define ARRAY_NONE_ENCODER_H
 
-#include "Shared/Logger.h"
+#include "Logger/Logger.h"
 
 #include <cassert>
 #include <cstring>

diff --git a/DataMgr/BufferMgr/Buffer.cpp b/DataMgr/BufferMgr/Buffer.cpp
@@ -20,7 +20,7 @@
 #include <stdexcept>
 
 #include "DataMgr/BufferMgr/BufferMgr.h"
-#include "Shared/Logger.h"
+#include "Logger/Logger.h"
 
 namespace Buffer_Namespace {
 

diff --git a/DataMgr/BufferMgr/BufferMgr.cpp b/DataMgr/BufferMgr/BufferMgr.cpp
@@ -26,7 +26,7 @@
 #include <limits>
 
 #include "DataMgr/BufferMgr/Buffer.h"
-#include "Shared/Logger.h"
+#include "Logger/Logger.h"
 #include "Shared/measure.h"
 
 using namespace std;

diff --git a/DataMgr/BufferMgr/CpuBufferMgr/CpuBuffer.cpp b/DataMgr/BufferMgr/CpuBufferMgr/CpuBuffer.cpp
@@ -20,7 +20,7 @@
 #include <cstring>
 
 #include "CudaMgr/CudaMgr.h"
-#include "Shared/Logger.h"
+#include "Logger/Logger.h"
 
 namespace Buffer_Namespace {
 

diff --git a/DataMgr/BufferMgr/GpuCudaBufferMgr/GpuCudaBuffer.cpp b/DataMgr/BufferMgr/GpuCudaBufferMgr/GpuCudaBuffer.cpp
@@ -19,7 +19,7 @@
 #include <cassert>
 
 #include "CudaMgr/CudaMgr.h"
-#include "Shared/Logger.h"
+#include "Logger/Logger.h"
 
 namespace Buffer_Namespace {
 

diff --git a/DataMgr/BufferMgr/GpuCudaBufferMgr/GpuCudaBufferMgr.cpp b/DataMgr/BufferMgr/GpuCudaBufferMgr/GpuCudaBufferMgr.cpp
@@ -18,7 +18,7 @@
 
 #include "CudaMgr/CudaMgr.h"
 #include "DataMgr/BufferMgr/GpuCudaBufferMgr/GpuCudaBuffer.h"
-#include "Shared/Logger.h"
+#include "Logger/Logger.h"
 
 namespace Buffer_Namespace {
 

diff --git a/DataMgr/ChunkMetadata.h b/DataMgr/ChunkMetadata.h
@@ -20,7 +20,7 @@
 #include "../Shared/sqltypes.h"
 #include "Shared/types.h"
 
-#include "Shared/Logger.h"
+#include "Logger/Logger.h"
 
 struct ChunkStats {
   Datum min;

diff --git a/DataMgr/DateDaysEncoder.h b/DataMgr/DateDaysEncoder.h
@@ -17,7 +17,7 @@
 #ifndef DATE_DAYS_ENCODER_H
 #define DATE_DAYS_ENCODER_H
 
-#include "Shared/Logger.h"
+#include "Logger/Logger.h"
 
 #include <iostream>
 #include <memory>

diff --git a/DataMgr/Encoder.cpp b/DataMgr/Encoder.cpp
@@ -19,8 +19,8 @@
 #include "DateDaysEncoder.h"
 #include "FixedLengthArrayNoneEncoder.h"
 #include "FixedLengthEncoder.h"
+#include "Logger/Logger.h"
 #include "NoneEncoder.h"
-#include "Shared/Logger.h"
 #include "StringNoneEncoder.h"
 
 Encoder* Encoder::Create(Data_Namespace::AbstractBuffer* buffer,

diff --git a/DataMgr/FileMgr/FileBuffer.h b/DataMgr/FileMgr/FileBuffer.h
@@ -28,7 +28,7 @@
 #include <iostream>
 #include <stdexcept>
 
-#include "Shared/Logger.h"
+#include "Logger/Logger.h"
 
 using namespace Data_Namespace;
 

diff --git a/DataMgr/FileMgr/FileInfo.h b/DataMgr/FileMgr/FileInfo.h
@@ -24,8 +24,8 @@
 #include <set>
 #include <vector>
 #include "../../Shared/types.h"
+#include "Logger/Logger.h"
 #include "Page.h"
-#include "Shared/Logger.h"
 
 namespace File_Namespace {
 

diff --git a/DataMgr/FileMgr/Page.h b/DataMgr/FileMgr/Page.h
@@ -23,7 +23,7 @@
 #ifndef DATAMGR_MEMORY_FILE_PAGE_H
 #define DATAMGR_MEMORY_FILE_PAGE_H
 
-#include "Shared/Logger.h"
+#include "Logger/Logger.h"
 
 #include <cassert>
 #include <deque>

diff --git a/DataMgr/FixedLengthArrayNoneEncoder.h b/DataMgr/FixedLengthArrayNoneEncoder.h
@@ -24,7 +24,7 @@
 #ifndef FIXED_LENGTH_ARRAY_NONE_ENCODER_H
 #define FIXED_LENGTH_ARRAY_NONE_ENCODER_H
 
-#include "Shared/Logger.h"
+#include "Logger/Logger.h"
 
 #include <cassert>
 #include <cstring>

diff --git a/DataMgr/FixedLengthEncoder.h b/DataMgr/FixedLengthEncoder.h
@@ -16,7 +16,7 @@
 
 #ifndef FIXED_LENGTH_ENCODER_H
 #define FIXED_LENGTH_ENCODER_H
-#include "Shared/Logger.h"
+#include "Logger/Logger.h"
 
 #include <iostream>
 #include <memory>

diff --git a/DataMgr/ForeignStorage/ArrowCsvForeignStorage.cpp b/DataMgr/ForeignStorage/ArrowCsvForeignStorage.cpp
@@ -29,9 +29,9 @@
 #include "Catalog/DataframeTableDescriptor.h"
 #include "DataMgr/ForeignStorage/ForeignStorageInterface.h"
 #include "DataMgr/StringNoneEncoder.h"
+#include "Logger/Logger.h"
 #include "QueryEngine/ArrowResultSet.h"
 #include "Shared/ArrowUtil.h"
-#include "Shared/Logger.h"
 #include "Shared/measure.h"
 
 struct Frag {

diff --git a/DataMgr/StringNoneEncoder.h b/DataMgr/StringNoneEncoder.h
@@ -23,7 +23,7 @@
  **/
 #ifndef STRING_NONE_ENCODER_H
 #define STRING_NONE_ENCODER_H
-#include "Shared/Logger.h"
+#include "Logger/Logger.h"
 
 #include <cassert>
 #include <string>

diff --git a/Distributed/os/LeafAggregator.h b/Distributed/os/LeafAggregator.h
@@ -24,7 +24,7 @@
 #include "QueryEngine/TargetMetaInfo.h"
 #include "gen-cpp/OmniSci.h"
 
-#include "Shared/Logger.h"
+#include "Logger/Logger.h"
 
 namespace Catalog_Namespace {
 class SessionInfo;

diff --git a/Embedded/DBEngine.cpp b/Embedded/DBEngine.cpp
@@ -19,10 +19,10 @@
 #include <boost/variant.hpp>
 #include <iostream>
 #include "Catalog/Catalog.h"
+#include "Logger/Logger.h"
 #include "QueryEngine/CompilationOptions.h"
 #include "QueryEngine/ResultSet.h"
 #include "QueryRunner/QueryRunner.h"
-#include "Shared/Logger.h"
 #include "Shared/mapdpath.h"
 #include "Shared/sqltypes.h"
 

diff --git a/Fragmenter/InsertOrderFragmenter.cpp b/Fragmenter/InsertOrderFragmenter.cpp
@@ -29,7 +29,7 @@
 #include "DataMgr/AbstractBuffer.h"
 #include "DataMgr/DataMgr.h"
 #include "LockMgr/LockMgr.h"
-#include "Shared/Logger.h"
+#include "Logger/Logger.h"
 #include "Shared/checked_alloc.h"
 #include "Shared/thread_count.h"
 

diff --git a/Fragmenter/UpdelStorage.cpp b/Fragmenter/UpdelStorage.cpp
@@ -25,10 +25,10 @@
 #include "DataMgr/DataMgr.h"
 #include "DataMgr/FixedLengthArrayNoneEncoder.h"
 #include "Fragmenter/InsertOrderFragmenter.h"
+#include "Logger/Logger.h"
 #include "QueryEngine/Execute.h"
 #include "QueryEngine/TargetValue.h"
 #include "Shared/DateConverters.h"
-#include "Shared/Logger.h"
 #include "Shared/TypedDataAccessors.h"
 #include "Shared/thread_count.h"
 #include "TargetValueConvertersFactories.h"

diff --git a/ImportExport/CMakeLists.txt b/ImportExport/CMakeLists.txt
@@ -21,7 +21,7 @@ set(EXPORT_SOURCES
 
 add_library(ImportExport ${GDAL_SOURCES} ${IMPORT_SOURCES} ${EXPORT_SOURCES} ${S3Archive})
 
-target_link_libraries(ImportExport mapd_thrift Shared Catalog DataMgr StringDictionary ${GDAL_LIBRARIES} ${CMAKE_DL_LIBS}
+target_link_libraries(ImportExport mapd_thrift Logger Shared Catalog DataMgr StringDictionary ${GDAL_LIBRARIES} ${CMAKE_DL_LIBS}
  ${LibArchive_LIBRARIES} ${IMPORT_EXPORT_LIBRARIES} ${Arrow_LIBRARIES})
 
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/ThirdParty/gdal-data DESTINATION "ThirdParty")
@@ -34,9 +34,9 @@ add_library(RowToColumn RowToColumnLoader.cpp RowToColumnLoader.h DelimitedParse
 target_link_libraries(RowToColumn ThriftClient)
 
 add_executable(StreamImporter StreamImporter.cpp)
-target_link_libraries(StreamImporter RowToColumn mapd_thrift Shared ${CMAKE_DL_LIBS} ${Boost_LIBRARIES} ${PROFILER_LIBS})
+target_link_libraries(StreamImporter RowToColumn mapd_thrift Logger Shared ${CMAKE_DL_LIBS} ${Boost_LIBRARIES} ${PROFILER_LIBS})
 
 add_executable(KafkaImporter KafkaImporter.cpp)
-target_link_libraries(KafkaImporter RowToColumn mapd_thrift ${RdKafka_LIBRARIES} Shared ${CMAKE_DL_LIBS} ${Boost_LIBRARIES} ${PROFILER_LIBS})
+target_link_libraries(KafkaImporter RowToColumn mapd_thrift ${RdKafka_LIBRARIES} Logger Shared ${CMAKE_DL_LIBS} ${Boost_LIBRARIES} ${PROFILER_LIBS})
 
 install(TARGETS StreamImporter KafkaImporter DESTINATION bin)
diff --git a/ImportExport/DelimitedParserUtils.cpp b/ImportExport/DelimitedParserUtils.cpp
@@ -24,7 +24,7 @@
 
 #include <string_view>
 
-#include "Shared/Logger.h"
+#include "Logger/Logger.h"
 #include "StringDictionary/StringDictionary.h"
 
 namespace {

diff --git a/ImportExport/GDAL.cpp b/ImportExport/GDAL.cpp
@@ -22,7 +22,7 @@
 #include <gdal.h>
 #include <gdal_priv.h>
 
-#include <Shared/Logger.h>
+#include <Logger/Logger.h>
 #include <Shared/mapdpath.h>
 
 namespace import_export {

diff --git a/ImportExport/Importer.cpp b/ImportExport/Importer.cpp
@@ -55,8 +55,8 @@
 #include "ArrowImporter.h"
 #include "ImportExport/DelimitedParserUtils.h"
 #include "ImportExport/GDAL.h"
+#include "Logger/Logger.h"
 #include "QueryEngine/TypePunning.h"
-#include "Shared/Logger.h"
 #include "Shared/SqlTypesLayout.h"
 #include "Shared/geo_compression.h"
 #include "Shared/geo_types.h"

diff --git a/ImportExport/Importer.h b/ImportExport/Importer.h
@@ -47,7 +47,7 @@
 #include "DataMgr/Chunk/Chunk.h"
 #include "Fragmenter/Fragmenter.h"
 #include "ImportExport/CopyParams.h"
-#include "Shared/Logger.h"
+#include "Logger/Logger.h"
 #include "Shared/ThreadController.h"
 #include "Shared/checked_alloc.h"
 #include "Shared/fixautotools.h"