Skip to content
This repository was archived by the owner on May 9, 2024. It is now read-only.

ResultSet refactoring and clean-up [03/N] #215

Merged
merged 1 commit into from
Feb 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions omniscidb/QueryEngine/CardinalityEstimator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/

#include "CardinalityEstimator.h"
#include "CountDistinct.h"
#include "ErrorHandling.h"
#include "ExpressionRewrite.h"
#include "RelAlgExecutor.h"
Expand Down
3 changes: 0 additions & 3 deletions omniscidb/QueryEngine/CountDistinct.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@
#include "ThirdParty/robin_hood.h"

#include <bitset>
#include <vector>

using CountDistinctDescriptors = std::vector<CountDistinctDescriptor>;

inline size_t bitmap_set_size(const int8_t* bitmap, const size_t bitmap_byte_sz) {
const auto bitmap_word_count = bitmap_byte_sz >> 3;
Expand Down
4 changes: 4 additions & 0 deletions omniscidb/QueryEngine/Descriptors/CountDistinctDescriptor.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
#include "../CompilationOptions.h"
#include "Logger/Logger.h"

#include <vector>

inline size_t bitmap_bits_to_bytes(const size_t bitmap_sz) {
size_t bitmap_byte_sz = bitmap_sz / 8;
if (bitmap_sz % 8) {
Expand Down Expand Up @@ -66,6 +68,8 @@ struct CountDistinctDescriptor {
}
};

using CountDistinctDescriptors = std::vector<CountDistinctDescriptor>;

inline bool operator==(const CountDistinctDescriptor& lhs,
const CountDistinctDescriptor& rhs) {
return lhs.impl_type_ == rhs.impl_type_ && lhs.min_val == rhs.min_val &&
Expand Down
2 changes: 1 addition & 1 deletion omniscidb/QueryEngine/Descriptors/QueryMemoryDescriptor.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
#define QUERYENGINE_QUERYMEMORYDESCRIPTOR_H

#include "../CompilationOptions.h"
#include "../CountDistinct.h"
#include "ColSlotContext.h"
#include "CountDistinctDescriptor.h"
#include "Types.h"

#include <boost/optional.hpp>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "QueryEngine/ColumnFetcher.h"
#include "QueryEngine/Execute.h"
#include "QueryEngine/ExpressionRewrite.h"
#include "QueryEngine/HyperLogLog.h"
#include "QueryEngine/JoinHashTable/BaselineHashTable.h"
#include "QueryEngine/JoinHashTable/Builders/BaselineHashTableBuilder.h"
#include "QueryEngine/JoinHashTable/PerfectJoinHashTable.h"
Expand Down
3 changes: 2 additions & 1 deletion omniscidb/QueryEngine/MemoryLayoutBuilder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

#include "QueryEngine/CardinalityEstimator.h"
#include "QueryEngine/ColRangeInfo.h"
#include "QueryEngine/HyperLogLog.h"
#include "QueryEngine/OutputBufferInitialization.h"

MemoryLayoutBuilder::MemoryLayoutBuilder(const RelAlgExecutionUnit& ra_exe_unit)
Expand Down Expand Up @@ -769,4 +770,4 @@ size_t MemoryLayoutBuilder::gpuSharedMemorySize(
}
}
return 0;
}
}
1 change: 1 addition & 0 deletions omniscidb/QueryEngine/RelAlgExecutor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "QueryEngine/ExtensionFunctionsBinding.h"
#include "QueryEngine/ExternalExecutor.h"
#include "QueryEngine/FromTableReordering.h"
#include "QueryEngine/HyperLogLog.h"
#include "QueryEngine/MemoryLayoutBuilder.h"
#include "QueryEngine/QueryPhysicalInputsCollector.h"
#include "QueryEngine/QueryPlanDagExtractor.h"
Expand Down
1 change: 1 addition & 0 deletions omniscidb/QueryEngine/ResultSet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
*/

#include "ResultSet.h"
#include "CountDistinct.h"
#include "DataMgr/Allocators/GpuAllocator.h"
#include "DataMgr/BufferMgr/BufferMgr.h"
#include "Execute.h"
Expand Down
1 change: 1 addition & 0 deletions omniscidb/QueryEngine/ResultSetIteration.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
* Copyright (c) 2014 MapD Technologies, Inc. All rights reserved.
*/

#include "CountDistinct.h"
#include "Execute.h"
#include "QueryEngine/TargetValue.h"
#include "ResultSet.h"
Expand Down
1 change: 1 addition & 0 deletions omniscidb/QueryEngine/ResultSetReduction.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
* Copyright (c) 2014 MapD Technologies, Inc. All rights reserved.
*/

#include "CountDistinct.h"
#include "DynamicWatchdog.h"
#include "Execute.h"
#include "ResultSet.h"
Expand Down
1 change: 1 addition & 0 deletions omniscidb/QueryEngine/ResultSetReductionJIT.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include "ResultSetReductionInterpreterStubs.h"

#include "CodeGenerator.h"
#include "CountDistinct.h"
#include "DynamicWatchdog.h"
#include "Execute.h"
#include "IRCodegenUtils.h"
Expand Down