fix clang

kuzudb · Mar 26, 2024 · 575e5f7 · 575e5f7
1 parent 5c11fed
commit 575e5f7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/src/include/main/prepared_statement.h b/src/include/main/prepared_statement.h
@@ -58,13 +58,13 @@ class PreparedStatement {
 private:
     bool success = true;
     bool readOnly = false;
+    bool requiredNewTx = true;
     std::string errMsg;
     PreparedSummary preparedSummary;
     std::unordered_map<std::string, std::shared_ptr<common::Value>> parameterMap;
     std::unique_ptr<binder::BoundStatementResult> statementResult;
     std::vector<std::unique_ptr<planner::LogicalPlan>> logicalPlans;
     std::shared_ptr<parser::Statement> parsedStatement;
-    bool requiredNewTx = true;
 };
 
 } // namespace main

diff --git a/src/main/client_context.cpp b/src/main/client_context.cpp
@@ -257,7 +257,6 @@ std::unique_ptr<PreparedStatement> ClientContext::preparedStatementWithError(
 void ClientContext::prepareInternal(PreparedStatement& preparedStatement, bool enumerateAllPlans,
     std::string_view encodedJoin,
     std::optional<std::unordered_map<std::string, std::shared_ptr<common::Value>>> inputParams) {
-    // TODO(Jiamin): parsedStatement
     auto parsedStatement = preparedStatement.parsedStatement;
     // parsing
     if (preparedStatement.requiredNewTx) {
@@ -334,10 +333,7 @@ std::unique_ptr<PreparedStatement> ClientContext::prepareNoLock(
     std::unique_ptr<ExecutionContext> executionContext;
     std::unique_ptr<LogicalPlan> logicalPlan;
     try {
-        // TODO(Jiamin): need to copy parsed statement?
         preparedStatement->parsedStatement = parsedStatement;
-        KU_ASSERT(preparedStatement->parsedStatement->getStatementType() ==
-                  parsedStatement->getStatementType());
         prepareInternal(*preparedStatement, enumerateAllPlans, encodedJoin);
     } catch (std::exception& exception) {
         preparedStatement->success = false;
@@ -372,8 +368,7 @@ std::unique_ptr<QueryResult> ClientContext::executeWithParams(PreparedStatement*
         std::string errMsg = exception.what();
         return queryResultWithError(errMsg);
     }
-    // rebind here
-    // TODO(Jiamin): pass parameters
+    // rebind
     KU_ASSERT(preparedStatement->parsedStatement != nullptr);
     auto& parameterMap = preparedStatement->parameterMap;
     preparedStatement->requiredNewTx = transactionContext->hasActiveTransaction() ? false : true;

diff --git a/test/main/prepare_test.cpp b/test/main/prepare_test.cpp
@@ -1,6 +1,5 @@
 #include "main_test_helper/main_test_helper.h"
 
-#include<iostream>
 using namespace kuzu::common;
 using namespace kuzu::testing;