Merge remote-tracking branch 'origin/main' into ic_bench_opt

alibaba · Oct 23, 2024 · b29db01 · b29db01
2 parents b90b2eb + 6aa557c
commit b29db01
Show file tree

Hide file tree

Showing 43 changed files with 936 additions and 59 deletions.
diff --git a/.github/workflows/interactive.yml b/.github/workflows/interactive.yml
@@ -175,7 +175,7 @@ jobs:
         INTERACTIVE_WORKSPACE: /tmp/interactive_workspace
       run: |
         cd ${GITHUB_WORKSPACE}/flex/tests/hqps
-        bash hqps_robust_test.sh ${INTERACTIVE_WORKSPACE} ./interactive_config_test.yaml
+        bash hqps_robust_test.sh ${INTERACTIVE_WORKSPACE} ./interactive_config_test.yaml ./interactive_config_test_cbo.yaml
 
     - name: Sample Query test
       env:

diff --git a/flex/engines/graph_db/database/graph_db.cc b/flex/engines/graph_db/database/graph_db.cc
@@ -259,9 +259,8 @@ void GraphDB::Close() {
   std::fill(app_factories_.begin(), app_factories_.end(), nullptr);
 }
 
-ReadTransaction GraphDB::GetReadTransaction() {
-  uint32_t ts = version_manager_.acquire_read_timestamp();
-  return {graph_, version_manager_, ts};
+ReadTransaction GraphDB::GetReadTransaction(int thread_id) {
+  return contexts_[thread_id].session.GetReadTransaction();
 }
 
 InsertTransaction GraphDB::GetInsertTransaction(int thread_id) {

diff --git a/flex/engines/graph_db/database/graph_db.h b/flex/engines/graph_db/database/graph_db.h
@@ -98,7 +98,7 @@ class GraphDB {
    *
    * @return graph_dir The directory of graph data.
    */
-  ReadTransaction GetReadTransaction();
+  ReadTransaction GetReadTransaction(int thread_id = 0);
 
   /** @brief Create a transaction to insert vertices and edges with a default
    * allocator.

diff --git a/flex/engines/graph_db/database/graph_db_session.cc b/flex/engines/graph_db/database/graph_db_session.cc
@@ -29,7 +29,7 @@ namespace gs {
 
 ReadTransaction GraphDBSession::GetReadTransaction() const {
   uint32_t ts = db_.version_manager_.acquire_read_timestamp();
-  return ReadTransaction(db_.graph_, db_.version_manager_, ts);
+  return ReadTransaction(*this, db_.graph_, db_.version_manager_, ts);
 }
 
 InsertTransaction GraphDBSession::GetInsertTransaction() {

diff --git a/flex/engines/graph_db/database/read_transaction.cc b/flex/engines/graph_db/database/read_transaction.cc
@@ -19,9 +19,10 @@
 
 namespace gs {
 
-ReadTransaction::ReadTransaction(const MutablePropertyFragment& graph,
+ReadTransaction::ReadTransaction(const GraphDBSession& session,
+                                 const MutablePropertyFragment& graph,
                                  VersionManager& vm, timestamp_t timestamp)
-    : graph_(graph), vm_(vm), timestamp_(timestamp) {}
+    : session_(session), graph_(graph), vm_(vm), timestamp_(timestamp) {}
 ReadTransaction::~ReadTransaction() { release(); }
 
 timestamp_t ReadTransaction::timestamp() const { return timestamp_; }
@@ -135,4 +136,6 @@ void ReadTransaction::release() {
   }
 }
 
+const GraphDBSession& ReadTransaction::GetSession() const { return session_; }
+
 }  // namespace gs
diff --git a/flex/engines/graph_db/database/read_transaction.h b/flex/engines/graph_db/database/read_transaction.h
@@ -26,6 +26,7 @@
 namespace gs {
 
 class MutablePropertyFragment;
+class GraphDBSession;
 class VersionManager;
 template <typename EDATA_T>
 class AdjListView {
@@ -276,7 +277,8 @@ class SingleImmutableGraphView<std::string_view> {
 
 class ReadTransaction {
  public:
-  ReadTransaction(const MutablePropertyFragment& graph, VersionManager& vm,
+  ReadTransaction(const GraphDBSession& session,
+                  const MutablePropertyFragment& graph, VersionManager& vm,
                   timestamp_t timestamp);
   ~ReadTransaction();
 
@@ -429,9 +431,12 @@ class ReadTransaction {
     return SingleImmutableGraphView<EDATA_T>(*csr);
   }
 
+  const GraphDBSession& GetSession() const;
+
  private:
   void release();
 
+  const GraphDBSession& session_;
   const MutablePropertyFragment& graph_;
   VersionManager& vm_;
   timestamp_t timestamp_;

diff --git a/flex/engines/graph_db/runtime/adhoc/operators/operators.h b/flex/engines/graph_db/runtime/adhoc/operators/operators.h
@@ -78,6 +78,11 @@ bl::result<Context> eval_join(const physical::Join& opr, Context&& ctx,
 
 bl::result<Context> eval_limit(const algebra::Limit& opr, Context&& ctx);
 
+bl::result<Context> eval_procedure_call(const std::vector<int32_t>& alias,
+                                        const physical::ProcedureCall& opr,
+                                        const ReadTransaction& txn,
+                                        Context&& ctx);
+
 void eval_sink(const Context& ctx, const ReadTransaction& txn, Encoder& output);
 
 }  // namespace runtime