s

Author: Devjiu

omniscidb/DataMgr/Chunk/Chunk.cpp

@@ -40,11 +40,7 @@ std::shared_ptr<Chunk> Chunk::getChunk(ColumnInfoPtr col_info,
   auto timer = DEBUG_TIMER("ChunkNS getChunk ");
   std::shared_ptr<Chunk> chunkp = std::make_shared<Chunk>(Chunk(col_info));
   chunkp->getChunkBuffer(data_mgr, key, memoryLevel, deviceId, numBytes, numElems);
-  {
-    // auto timer2 = DEBUG_TIMER("ChunkNS getChunk ");
-    timer.stop();
-    LOG(WARNING) << "[Debug Timer]  col_info: " << col_info->toString();
-  }
+  LOG(WARNING) << "[Debug Timer]  col_info: " << col_info->toString();
   return chunkp;
 }
 

omniscidb/QueryEngine/ColumnFetcher.cpp

@@ -296,26 +296,26 @@ const int8_t* ColumnFetcher::getAllTableColumnFragments(
                                                     int(0),
                                                     device_allocator,
                                                     thread_idx);
-        column_frags_raw.push_back(
-            {col_buffer, fragment.getNumTuples(), chunk_meta_it->second->type()});
-        // column_frags.push_back(
-        //     std::make_unique<ColumnarResults>(executor_->row_set_mem_owner_,
-        //                                       col_buffer,
-        //                                       fragment.getNumTuples(),
-        //                                       chunk_meta_it->second->type(),
-        //                                       thread_idx));
+        // column_frags_raw.push_back(
+        //     {col_buffer, fragment.getNumTuples(), chunk_meta_it->second->type()});
+        column_frags.push_back(
+            std::make_unique<ColumnarResults>(executor_->row_set_mem_owner_,
+                                              col_buffer,
+                                              fragment.getNumTuples(),
+                                              chunk_meta_it->second->type(),
+                                              thread_idx));
       }
-      // auto merged_results =
-      //     ColumnarResults::mergeResults(executor_->row_set_mem_owner_, column_frags);
       auto merged_results =
-          ColumnarResults::mergeResults(executor_->row_set_mem_owner_, column_frags_raw);
+          ColumnarResults::mergeResults(executor_->row_set_mem_owner_, column_frags);
+      // auto merged_results =
+      //     ColumnarResults::mergeResults(executor_->row_set_mem_owner_,
+      //     column_frags_raw);
       table_column = merged_results.get();
       columnarized_scan_table_cache_.emplace(std::make_pair(table_id, col_id),
                                              std::move(merged_results));
     } else {
       table_column = column_it->second.get();
     }
-    timer.stop();
   }
   return ColumnFetcher::transferColumnIfNeeded(
       table_column, 0, memory_level, device_id, device_allocator);

omniscidb/QueryEngine/Execute.cpp

@@ -2892,6 +2892,7 @@ void Executor::launchKernels(SharedKernelContext& shared_context,
             &shared_context,
             parent_thread_id = logger::thread_id(),
             crt_kernel_idx = kernel_idx++] {
+      DEBUG_TIMER_NEW_THREAD(parent_thread_id);
       const size_t thread_i = crt_kernel_idx % cpu_threads();
       kernel->run(this, thread_i, shared_context);
     });
@@ -3050,6 +3051,8 @@ bool Executor::needFetchAllFragments(const InputColDescriptor& inner_col_desc,
   CHECK_LT(static_cast<size_t>(nest_level), selected_fragments.size());
   CHECK_EQ(table_id, selected_fragments[nest_level].table_id);
   const auto& fragments = selected_fragments[nest_level].fragment_ids;
+  LOG(WARNING) << "needFetchAllFragments fragments size: " << fragments.size()
+               << " table_id: " << table_id;
   return fragments.size() > 1;
 }
 
@@ -3153,7 +3156,7 @@ FetchResult Executor::fetchChunks(
               device_allocator,
               thread_idx);
         } else {
-          frag_col_buffers[it->second] =
+          x frag_col_buffers[it->second] =
               column_fetcher.getAllTableColumnFragments(col_id->getColInfo(),
                                                         all_tables_fragments,
                                                         memory_level_for_column,