move apis from connection to clientcontext

src/include/main/client_context.h

@@ -4,10 +4,15 @@
 #include <cstdint>
 #include <functional>
 #include <memory>
+#include <mutex>
 
 #include "common/timer.h"
 #include "common/types/value/value.h"
+#include "function/scalar_function.h"
 #include "main/kuzu_fwd.h"
+#include "parser/statement.h"
+#include "prepared_statement.h"
+#include "query_result.h"
 #include "transaction/transaction_context.h"
 
 namespace kuzu {
@@ -93,9 +98,58 @@ class ClientContext {
 
     KUZU_API std::string getEnvVariable(const std::string& name);
 
+    std::unique_ptr<PreparedStatement> prepare(std::string_view query);
+
+    void setQueryTimeOut(uint64_t timeoutInMS);
+
+    uint64_t getQueryTimeOut();
+
+    void setMaxNumThreadForExec(uint64_t numThreads);
+
+    uint64_t getMaxNumThreadForExec();
+
+    KUZU_API std::unique_ptr<QueryResult> executeWithParams(PreparedStatement* preparedStatement,
+        std::unordered_map<std::string, std::unique_ptr<common::Value>> inputParams);
+
+    std::unique_ptr<QueryResult> query(std::string_view queryStatement);
+
 private:
     inline void resetActiveQuery() { activeQuery.reset(); }
 
+    std::unique_ptr<QueryResult> query(
+        std::string_view query, std::string_view encodedJoin, bool enumerateAllPlans = true);
+
+    std::unique_ptr<QueryResult> queryResultWithError(std::string_view errMsg);
+
+    std::unique_ptr<PreparedStatement> preparedStatementWithError(std::string_view errMsg);
+
+    std::vector<std::unique_ptr<parser::Statement>> parseQuery(std::string_view query);
+
+    std::unique_ptr<PreparedStatement> prepareNoLock(parser::Statement* parsedStatement,
+        bool enumerateAllPlans = false, std::string_view joinOrder = std::string_view());
+
+    template<typename T, typename... Args>
+    std::unique_ptr<QueryResult> executeWithParams(PreparedStatement* preparedStatement,
+        std::unordered_map<std::string, std::unique_ptr<common::Value>> params,
+        std::pair<std::string, T> arg, std::pair<std::string, Args>... args) {
+        auto name = arg.first;
+        auto val = std::make_unique<common::Value>((T)arg.second);
+        params.insert({name, std::move(val)});
+        return executeWithParams(preparedStatement, std::move(params), args...);
+    }
+
+    void bindParametersNoLock(PreparedStatement* preparedStatement,
+        const std::unordered_map<std::string, std::unique_ptr<common::Value>>& inputParams);
+
+    std::unique_ptr<QueryResult> executeAndAutoCommitIfNecessaryNoLock(
+        PreparedStatement* preparedStatement, uint32_t planIdx = 0u);
+
+    void addScalarFunction(std::string name, function::function_set definitions);
+
+    bool startUDFAutoTrx(transaction::TransactionContext* trx);
+
+    void commitUDFTrx(bool isAutoCommitTrx);
+
     uint64_t numThreadsForExecution;
     ActiveQuery activeQuery;
     uint64_t timeoutInMS;
@@ -108,6 +162,7 @@ class ClientContext {
     std::string homeDirectory;
     std::string fileSearchPath;
     Database* database;
+    std::mutex mtx;
 };
 
 } // namespace main

src/include/main/connection.h

@@ -1,13 +1,8 @@
 #pragma once
 
-#include <mutex>
-
 #include "client_context.h"
 #include "database.h"
 #include "function/udf_function.h"
-#include "parser/statement.h"
-#include "prepared_statement.h"
-#include "query_result.h"
 
 namespace kuzu {
 namespace main {
@@ -159,10 +154,7 @@ class Connection {
     std::unique_ptr<QueryResult> executeWithParams(PreparedStatement* preparedStatement,
         std::unordered_map<std::string, std::unique_ptr<common::Value>> params,
         std::pair<std::string, T> arg, std::pair<std::string, Args>... args) {
-        auto name = arg.first;
-        auto val = std::make_unique<common::Value>((T)arg.second);
-        params.insert({name, std::move(val)});
-        return executeWithParams(preparedStatement, std::move(params), args...);
+        return clientContext->executeWithParams(preparedStatement, std::move(params), arg, args...);
     }
 
     void bindParametersNoLock(PreparedStatement* preparedStatement,
@@ -179,7 +171,6 @@ class Connection {
 private:
     Database* database;
     std::unique_ptr<ClientContext> clientContext;
-    std::mutex mtx;
 };
 
 } // namespace main

src/include/main/prepared_statement.h

@@ -18,6 +18,7 @@ namespace main {
  */
 class PreparedStatement {
     friend class Connection;
+    friend class ClientContext;
     friend class testing::TestHelper;
     friend class testing::TestRunner;
     friend class testing::TinySnbDDLTest;

src/include/main/query_result.h

@@ -32,6 +32,7 @@ struct DataTypeInfo {
  */
 class QueryResult {
     friend class Connection;
+    friend class ClientContext;
     class QueryResultIterator {
     private:
         QueryResult* currentResult;

src/include/main/query_summary.h

@@ -18,7 +18,7 @@ struct PreparedSummary {
  * @brief QuerySummary stores the execution time, plan, compiling time and query options of a query.
  */
 class QuerySummary {
-    friend class Connection;
+    friend class ClientContext;
     friend class benchmark::Benchmark;
 
 public: