fix mistaken rebase resolve

Signed-off-by: guo-shaoge <[email protected]>
pingcap · Aug 21, 2022 · 97d5fd3 · 97d5fd3
1 parent ec98572
commit 97d5fd3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/dbms/src/Flash/Coprocessor/DAGContext.h b/dbms/src/Flash/Coprocessor/DAGContext.h
@@ -29,6 +29,7 @@
 #include <DataStreams/IBlockInputStream.h>
 #include <Flash/Coprocessor/FineGrainedShuffle.h>
 #include <Flash/Coprocessor/TablesRegionsInfo.h>
+#include <Flash/Coprocessor/StreamWriter.h>
 #include <Flash/Mpp/MPPTaskId.h>
 #include <Interpreters/SubqueryForSet.h>
 #include <Storages/Transaction/TiDB.h>

diff --git a/dbms/src/Flash/Coprocessor/DAGDriver.cpp b/dbms/src/Flash/Coprocessor/DAGDriver.cpp
@@ -103,7 +103,7 @@ try
         LOG_DEBUG(log, "setting batch_cop_writer to nullptr");
     }
 
-    BlockIO streams = executeQuery(dag, context, internal, QueryProcessingStage::Complete);
+    BlockIO streams = executeQuery(context, internal, QueryProcessingStage::Complete);
 
     if (!streams.in || streams.out)
         // Only query is allowed, so streams.in must not be null and streams.out must be null

diff --git a/dbms/src/Flash/CoprocessorHandler.cpp b/dbms/src/Flash/CoprocessorHandler.cpp
@@ -98,7 +98,7 @@ grpc::Status CoprocessorHandler::execute()
             RegionInfo region_info(cop_context.kv_context.region_id(),
                                    cop_context.kv_context.region_epoch().version(),
                                    cop_context.kv_context.region_epoch().conf_ver(),
-                                   GenCopKeyRange(cop_request->ranges()),
+                                   genCopKeyRange(cop_request->ranges()),
                                    &bypass_lock_ts);
             if (cop_context.db_context.getTMTContext().getRole() == TiDB::NodeRole::ReadNode)
             {