Reduce number of friend classes for ResultSetStorage.

Signed-off-by: ienkovich <[email protected]>

Author: ienkovich

omniscidb/QueryEngine/ResultSetReduction.cpp

@@ -912,7 +912,7 @@ ResultSet* ResultSetManager::reduce(std::vector<ResultSet*>& result_sets,
   for (const auto result_set : result_sets) {
     CHECK_EQ(row_set_mem_owner, result_set->row_set_mem_owner_);
   }
-  if (first_result.query_mem_desc_.getQueryDescriptionType() ==
+  if (first_result.getQueryMemDesc().getQueryDescriptionType() ==
       QueryDescriptionType::GroupByBaselineHash) {
     const auto total_entry_count =
         std::accumulate(result_sets.begin(),
@@ -922,16 +922,16 @@ ResultSet* ResultSetManager::reduce(std::vector<ResultSet*>& result_sets,
                           return init + rs->query_mem_desc_.getEntryCount();
                         });
     CHECK(total_entry_count);
-    auto query_mem_desc = first_result.query_mem_desc_;
+    auto query_mem_desc = first_result.getQueryMemDesc();
     query_mem_desc.setEntryCount(total_entry_count);
-    rs_.reset(new ResultSet(first_result.targets_,
+    rs_.reset(new ResultSet(first_result.getTargets(),
                             ExecutorDeviceType::CPU,
                             query_mem_desc,
                             row_set_mem_owner,
                             result_rs->data_mgr_,
                             0,
                             0));
-    auto result_storage = rs_->allocateStorage(first_result.target_init_vals_);
+    auto result_storage = rs_->allocateStorage(first_result.getInitVals());
     rs_->initializeStorage();
     switch (query_mem_desc.getEffectiveKeyWidth()) {
       case 4:

omniscidb/QueryEngine/ResultSetStorage.h

@@ -124,7 +124,6 @@ class ResultSetStorage {
     query_mem_desc_.setEntryCount(new_entry_count);
   }
 
- private:
   void copyKeyColWise(const size_t entry_idx,
                       int8_t* this_buff,
                       const int8_t* that_buff) const;
@@ -133,6 +132,7 @@ class ResultSetStorage {
   bool isEmptyEntry(const size_t entry_idx) const;
   bool isEmptyEntryColumnar(const size_t entry_idx, const int8_t* buff) const;
 
+ private:
   void fillOneEntryRowWise(const std::vector<int64_t>& entry);
 
   void fillOneEntryColWise(const std::vector<int64_t>& entry);
@@ -169,8 +169,6 @@ class ResultSetStorage {
   std::shared_ptr<VarlenOutputInfo> varlen_output_info_;
 
   friend class ResultSet;
-  friend class ResultSetManager;
-  friend class ResultSetReduction;
 };
 
 using GroupValueInfo = std::pair<int64_t*, bool>;