Merge branch 'aggregation-func'

357447923 · Sep 15, 2023 · 1a0188b · 1a0188b
2 parents 26fbfaa + 0378612
commit 1a0188b
Show file tree

Hide file tree

Showing 21 changed files with 2,842 additions and 3,327 deletions.
diff --git a/etc/observer.ini b/etc/observer.ini
@@ -4,16 +4,16 @@
 [LOG]
 # log file's name, default is ${process_name_}.log
 LOG_FILE_NAME = observer.log
-#  LOG_LEVEL_PANIC = 0,
-#  LOG_LEVEL_ERR = 1,
-#  LOG_LEVEL_WARN = 2,
-#  LOG_LEVEL_INFO = 3,
-#  LOG_LEVEL_DEBUG = 4,
-#  LOG_LEVEL_TRACE = 5,
-#  LOG_LEVEL_LAST
+LOG_LEVEL_PANIC = 0,
+LOG_LEVEL_ERR = 1,
+LOG_LEVEL_WARN = 2,
+LOG_LEVEL_INFO = 3,
+LOG_LEVEL_DEBUG = 4,
+LOG_LEVEL_TRACE = 5,
+LOG_LEVEL_LAST
 # output log level, default is LOG_LEVEL_INFO
-LOG_FILE_LEVEL=5
-LOG_CONSOLE_LEVEL=1
+LOG_FILE_LEVEL=1
+LOG_CONSOLE_LEVEL=2
 # the module's log will output whatever level used.
 #DefaultLogModules="server.cpp,client.cpp"
 

diff --git a/src/observer/sql/lex_sql.h → lex_sql.h b/src/observer/sql/lex_sql.h → lex_sql.h
diff --git a/src/observer/session/session_stage.cpp b/src/observer/session/session_stage.cpp
@@ -125,6 +125,9 @@ void SessionStage::handle_request(StageEvent *event)
  * select、delete等DML语句，会产生一些执行计划，如果感觉繁琐，可以跳过optimize直接看
  * execute_stage中的执行，通过explain语句看需要哪些operator，然后找对应的operator来
  * 调试或者看代码执行过程即可。
+ * 
+ * 
+ * 逻辑算子，物理算子，表达式的生命周期都是从各自被创建到调用这个函数的函数返回
  */
 RC SessionStage::handle_sql(SQLStageEvent *sql_event)
 {
@@ -137,7 +140,7 @@ RC SessionStage::handle_sql(SQLStageEvent *sql_event)
   // 解析sql语句
   rc = parse_stage_.handle_request(sql_event);
   if (OB_FAIL(rc)) {
-    LOG_TRACE("failed to do parse. rc=%s", strrc(rc));
+    LOG_WARN("failed to do parse. rc=%s", strrc(rc));
     return rc;
   }
   // 在框架简介中，此处应该有一个plan Cache

diff --git a/src/observer/sql/executor/command_executor.cpp b/src/observer/sql/executor/command_executor.cpp
@@ -83,10 +83,6 @@ RC CommandExecutor::execute(SQLStageEvent *sql_event)
       return executor.execute(sql_event);
     }
 
-    case StmtType::UPDATE: {
-
-    }
-
     case StmtType::EXIT: {
       return RC::SUCCESS;
     }