patch 4.0

src/sql/executor/ob_executor.h

@@ -15,38 +15,43 @@
 
 #include "share/ob_define.h"
 
-namespace oceanbase {
-namespace sql {
+namespace oceanbase
+{
+namespace sql
+{
 class ObPhysicalPlan;
 class ObExecContext;
 class ObPhyOperator;
 
-class ObExecutor {
+class ObExecutor
+{
 public:
-  ObExecutor();
-  ~ObExecutor(){};
-  int init(ObPhysicalPlan* plan);
+  ObExecutor()
+    : inited_(false),
+      phy_plan_(NULL),
+      execution_id_(common::OB_INVALID_ID)
+  {
+    /* add your code here */
+  }
+  ~ObExecutor() {};
+  int init(ObPhysicalPlan *plan);
   void reset();
-  int execute_plan(ObExecContext& ctx);
-  int close(ObExecContext& ctx);
-
+  int execute_plan(ObExecContext &ctx);
+  int close(ObExecContext &ctx);
 private:
   // disallow copy
-  ObExecutor(const ObExecutor& other);
-  ObExecutor& operator=(const ObExecutor& ohter);
-
+  ObExecutor(const ObExecutor &other);
+  ObExecutor &operator=(const ObExecutor &ohter);
 private:
-  int execute_local_single_partition_plan(ObExecContext& ctx);
-  int execute_remote_single_partition_plan(ObExecContext& ctx);
-  int execute_distributed_plan(ObExecContext& ctx);
-  int execute_old_px_plan(ObExecContext& ctx);
-  int execute_static_cg_px_plan(ObExecContext& ctx);
-
+  int execute_remote_single_partition_plan(ObExecContext &ctx);
+  int execute_distributed_plan(ObExecContext &ctx);
+  int execute_static_cg_px_plan(ObExecContext &ctx);
 private:
   bool inited_;
-  ObPhysicalPlan* phy_plan_;
+  ObPhysicalPlan *phy_plan_;
+  // 用于distributed scheduler
   uint64_t execution_id_;
 };
-}  // namespace sql
-}  // namespace oceanbase
+}
+}
 #endif /* OCEANBASE_SQL_EXECUTOR_OB_EXECUTOR_ */