Add database id to TableGenerations.

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

Author: ienkovich

omniscidb/QueryEngine/ColumnIR.cpp

@@ -254,7 +254,8 @@ llvm::Value* CodeGenerator::codegenRowId(const hdk::ir::ColumnVar* col_var,
   AUTOMATIC_IR_METADATA(cgen_state_);
   const auto offset_lv = cgen_state_->frag_offsets_[adjusted_range_table_index(col_var)];
   llvm::Value* start_rowid_lv{nullptr};
-  const auto& table_generation = executor()->getTableGeneration(col_var->tableId());
+  const auto& table_generation =
+      executor()->getTableGeneration(col_var->dbId(), col_var->tableId());
   if (table_generation.start_rowid > 0) {
     // Handle the multi-node case: each leaf receives a start rowid used
     // to offset the local rowid and generate a cluster-wide unique rowid.

omniscidb/QueryEngine/Execute.cpp

@@ -530,8 +530,8 @@ TableFragmentsInfo Executor::getTableInfo(const int db_id, const int table_id) c
   return input_table_info_cache_.getTableInfo(db_id, table_id);
 }
 
-const TableGeneration& Executor::getTableGeneration(const int table_id) const {
-  return table_generations_.getGeneration(table_id);
+const TableGeneration& Executor::getTableGeneration(int db_id, int table_id) const {
+  return table_generations_.getGeneration(db_id, table_id);
 }
 
 ExpressionRange Executor::getColRange(const PhysicalInput& phys_input) const {
@@ -4056,6 +4056,7 @@ std::pair<bool, int64_t> Executor::skipFragment(
     const std::vector<uint64_t>& frag_offsets,
     const size_t frag_idx,
     compiler::CodegenTraitsDescriptor cgen_traits_desc) {
+  const int db_id = table_desc.getDatabaseId();
   const int table_id = table_desc.getTableId();
 
   for (const auto& simple_qual : simple_quals) {
@@ -4116,7 +4117,7 @@ std::pair<bool, int64_t> Executor::skipFragment(
     size_t start_rowid{0};
     if (chunk_meta_it == fragment.getChunkMetadataMap().end()) {
       if (lhs_col->isVirtual()) {
-        const auto& table_generation = getTableGeneration(table_id);
+        const auto& table_generation = getTableGeneration(db_id, table_id);
         start_rowid = table_generation.start_rowid;
         chunk_min = frag_offsets[frag_idx] + start_rowid;
         chunk_max = frag_offsets[frag_idx + 1] - 1 + start_rowid;
@@ -4325,6 +4326,7 @@ TableGenerations Executor::computeTableGenerations(
   for (auto [db_id, table_id] : phys_table_ids) {
     const auto table_info = getTableInfo(db_id, table_id);
     table_generations.setGeneration(
+        db_id,
         table_id,
         TableGeneration{static_cast<int64_t>(table_info.getPhysicalNumTuples()), 0});
   }

omniscidb/QueryEngine/Execute.h

@@ -352,7 +352,7 @@ class Executor : public StringDictionaryProxyProvider {
 
   TableFragmentsInfo getTableInfo(const int db_id, const int table_id) const;
 
-  const TableGeneration& getTableGeneration(const int table_id) const;
+  const TableGeneration& getTableGeneration(int db_id, int table_id) const;
 
   ExpressionRange getColRange(const PhysicalInput&) const;
 

omniscidb/QueryEngine/TableGenerations.cpp

@@ -17,19 +17,22 @@
 #include "TableGenerations.h"
 #include "Logger/Logger.h"
 
-void TableGenerations::setGeneration(const uint32_t id,
+void TableGenerations::setGeneration(int db_id,
+                                     int table_id,
                                      const TableGeneration& generation) {
-  const auto it_ok = id_to_generation_.emplace(id, generation);
+  const auto it_ok =
+      id_to_generation_.emplace(std::make_pair(db_id, table_id), generation);
   CHECK(it_ok.second);
 }
 
-const TableGeneration& TableGenerations::getGeneration(const uint32_t id) const {
-  const auto it = id_to_generation_.find(id);
+const TableGeneration& TableGenerations::getGeneration(int db_id, int table_id) const {
+  const auto it = id_to_generation_.find(std::make_pair(db_id, table_id));
   CHECK(it != id_to_generation_.end());
   return it->second;
 }
 
-const std::unordered_map<uint32_t, TableGeneration>& TableGenerations::asMap() const {
+const std::unordered_map<std::pair<int, int>, TableGeneration>& TableGenerations::asMap()
+    const {
   return id_to_generation_;
 }
 

omniscidb/QueryEngine/TableGenerations.h

@@ -27,16 +27,16 @@ struct TableGeneration {
 
 class TableGenerations {
  public:
-  void setGeneration(const uint32_t id, const TableGeneration& generation);
+  void setGeneration(int db_id, int table_id, const TableGeneration& generation);
 
-  const TableGeneration& getGeneration(const uint32_t id) const;
+  const TableGeneration& getGeneration(int db_id, int table_id) const;
 
-  const std::unordered_map<uint32_t, TableGeneration>& asMap() const;
+  const std::unordered_map<std::pair<int, int>, TableGeneration>& asMap() const;
 
   void clear();
 
  private:
-  std::unordered_map<uint32_t, TableGeneration> id_to_generation_;
+  std::unordered_map<std::pair<int, int>, TableGeneration> id_to_generation_;
 };
 
 #endif  // QUERYENGINE_TABLEGENERATIONS_H

omniscidb/Tests/QueryBuilderTest.cpp

@@ -6020,6 +6020,46 @@ TEST_F(Issue513, Reproducer) {
   compare_res_data(res, std::vector<int32_t>({3}));
 }
 
+class Issue588 : public TestSuite {
+ protected:
+  static void SetUpTestSuite() {
+    createTable("test_588_1", {{"id", ctx().int64()}, {"A", ctx().int64()}});
+    insertCsvValues("test_588_1", "1,1\n2,2\n3,3");
+    createTable("test_588_2", {{"id", ctx().int64()}, {"B", ctx().int64()}});
+    insertCsvValues("test_588_2", "1,2\n2,3\n3,3");
+    createTable("test_588_3", {{"id", ctx().int64()}, {"C", ctx().int64()}});
+    insertCsvValues("test_588_3", "1,1\n2,2\n3,3");
+    createTable("test_588_4", {{"id", ctx().int64()}, {"D", ctx().int64()}});
+    insertCsvValues("test_588_4", "1,2\n2,3\n3,3");
+  }
+
+  static void TearDownTestSuite() {
+    dropTable("test_588_1");
+    dropTable("test_588_2");
+    dropTable("test_588_3");
+    dropTable("test_588_4");
+  }
+};
+
+TEST_F(Issue588, Reproducer1) {
+  QueryBuilder builder(ctx(), getSchemaProvider(), configPtr());
+  auto scan1 = builder.scan("test_588_1");
+  auto scan2 = builder.scan("test_588_2");
+  auto scan3 = builder.scan("test_588_3");
+  auto scan4 = builder.scan("test_588_4");
+
+  auto dag1 = scan1.proj({0, 1}).join(scan2.proj({0, 1})).finalize();
+  auto res1 = runQuery(std::move(dag1));
+
+  auto dag2 =
+      builder.scan(res1.tableName()).proj({0, 1}).join(scan3.proj({0, 1})).finalize();
+  auto res2 = runQuery(std::move(dag2));
+
+  auto dag3 =
+      builder.scan(res2.tableName()).proj({0, 1}).join(scan4.proj({0, 1})).finalize();
+  auto res3 = runQuery(std::move(dag3));
+}
+
 TEST_F(QueryBuilderTest, RunOnResult) {
   QueryBuilder builder(ctx(), schema_mgr_, configPtr());