update docker (#245)

### What problem were solved in this pull request?

Issue Number: ref #205 

Problem:
The build method is different with the current docker image, so we need
to update it.

### What is changed and how it works?
Install build tools and dependencies when building image.

docker/Dockerfile

@@ -19,6 +19,12 @@ RUN apt-get update && apt-get install -y build-essential gdb cmake git wget flex
 # install openssh
 RUN apt-get install -y openssh-server
 
+# init miniob dependencies
+RUN git clone https://github.com/oceanbase/miniob /tmp/miniob \
+    && cd /tmp/miniob \
+    && bash build.sh init \
+    && rm -rf /tmp/miniob
+
 # change root password
 RUN echo "root:root" | chpasswd
 RUN mkdir /var/run/sshd
@@ -32,16 +38,12 @@ RUN apt-get install -y zsh \
     && echo "export LD_LIBRARY_PATH=/usr/local/lib64:\$LD_LIBRARY_PATH" >> ~/.zshrc
 
 RUN mkdir -p ${DOCKER_CONFIG_DIR}/bin
-RUN mkdir -p ${DOCKER_CONFIG_DIR}/config
 
 WORKDIR ${DOCKER_CONFIG_DIR}/bin
 
-# copy vscode config files
-COPY config/* ${DOCKER_CONFIG_DIR}/config/
-
 # copy starter scripts
 COPY bin/* ${DOCKER_CONFIG_DIR}/bin/
 
 RUN chmod +x ${DOCKER_CONFIG_DIR}/bin/*
 
-ENTRYPOINT ./starter.sh
\ No newline at end of file
+ENTRYPOINT ./starter.sh

docker/README.md

+# 构建
+docker-compose build
+
+# 启动容器
+docker-compose up -d
+
+-d 表示后台启动
+
+# 进入容器
+docker exec -it miniob bash

docker/bin/starter-code.sh

@@ -61,19 +61,3 @@ else
     git clone $REPO_ADDR ${REPO_DIR}
 fi
 
-if [ ! -d "${REPO_DIR}/bin" ]; then
-    mkdir -p ${REPO_DIR}/build
-fi
-
-# vscode config
-if [ ! -d "${REPO_DIR}/.vscode" ]; then
-    mkdir -p ${REPO_DIR}/.vscode
-fi
-
-if [ ! -f "${REPO_DIR}/.vscode/launch.json" ]; then
-    cp /root/docker/config/launch.json ${REPO_DIR}/.vscode/launch.json
-fi
-
-if [ ! -f "${REPO_DIR}/.vscode/tasks.json" ]; then
-    cp /root/docker/config/tasks.json ${REPO_DIR}/.vscode/tasks.json
-fi

docker/bin/starter-sshd.sh

@@ -5,6 +5,6 @@ HOST_KEY_DIR=/etc/ssh/ssh_host_rsa_key
 if [ ! -f "${HOST_KEY_DIR}" ]; then
     ssh-keygen -A
 fi
-/usr/sbin/sshd -D
+/usr/sbin/sshd
 
 echo sshd started!

docker/config/launch.json

-{
-    // 使用 IntelliSense 了解相关属性。 
-    // 悬停以查看现有属性的描述。
-    // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "(gdb) 启动",
-            "type": "cppdbg",
-            "request": "launch",
-            "program": "${workspaceFolder}/build/bin/observer",
-            "args": ["-f", "${workspaceFolder}/etc/observer.ini"],
-            "stopAtEntry": false,
-            "cwd": "${fileDirname}",
-            "environment": [],
-            "externalConsole": false,
-            "MIMode": "gdb",
-            "setupCommands": [
-                {
-                    "description": "为 gdb 启用整齐打印",
-                    "text": "-enable-pretty-printing",
-                    "ignoreFailures": true
-                },
-                {
-                    "description":  "将反汇编风格设置为 Intel",
-                    "text": "-gdb-set disassembly-flavor intel",
-                    "ignoreFailures": true
-                }
-            ],
-            "preLaunchTask": "CMake Build"
-        }
-    ]
-}
\ No newline at end of file

docker/config/tasks.json

-{
-    "options": {
-        "cwd": "${workspaceFolder}/build"
-    },
-    "tasks": [
-        {
-            "label": "cmake",
-            "command": "cmake",
-            "args": [
-                "-DDEBUG=ON",
-                ".."
-            ]
-        },
-        {
-            "label": "make",
-            "command": "make",
-            "args": [
-                "-j",
-                "6"
-            ]
-        },
-        {
-            "label": "CMake Build",
-            "dependsOn": [
-                "cmake",
-                "make"
-            ]
-        }
-    ],
-    "version": "2.0.0"
-}
\ No newline at end of file

docker/docker-compose.yml

@@ -4,7 +4,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-    image: miniob:v1.0
+    image: miniob:v1.1
     container_name: miniob
     privileged: true
     ports:
@@ -19,4 +19,4 @@ services:
       #    Windows powershell: 
       #        $env:PRIVATE_KEY=$(cat ~/.ssh/id_rsa) && docker-compose up -d --build
       - REPO_ADDR=https://github.com/oceanbase/miniob.git
-      - PRIVATE_KEY=${PRIVATE_KEY} 
\ No newline at end of file
+      - PRIVATE_KEY=${PRIVATE_KEY} 

src/observer/sql/stmt/calc_stmt.h

@@ -21,13 +21,11 @@ See the Mulan PSL v2 for more details. */
 #include "sql/stmt/stmt.h"
 #include "sql/expr/expression.h"
 
-class FieldMeta;
-class FilterStmt;
 class Db;
 class Table;
 
 /**
- * @brief 表示select语句
+ * @brief 描述算术运算语句
  * @ingroup Statement
  */
 class CalcStmt : public Stmt