drop tables

Author: Morri77

.vscode/tasks.json

@@ -6,7 +6,7 @@
         {
             "label": "init",
             "type": "shell",
-            "command": "sudo -E env PATH=$PATH bash ${workspaceFolder}/build.sh init",
+            "command": "env PATH=$PATH bash ${workspaceFolder}/build.sh init",
             "problemMatcher": [],
             "presentation": {
                 "focus": true,
@@ -101,6 +101,16 @@
                 "focus": true,
             },
         },
+        {
+            "label": "Run observer",
+            "type": "shell",
+            "command": "/root/miniob/build/bin/observer -s/root/miniob-test.sock -f /root/miniob/etc/observer.ini"
+        },
+        {
+            "label": "Run obclient",
+            "type": "shell",
+            "command": "/root/miniob/build/bin/obclient -s/root/miniob-test.sock"
+        },
     ],
     "inputs": [
         {
@@ -136,4 +146,4 @@
             "default": "basic,primary-select-meta"
         }
     ]
-}
+}

CMakeLists.txt

@@ -1,3 +1,4 @@
+add_definitions("-Wall -g")
 cmake_minimum_required(VERSION 3.10)
 set(CMAKE_CXX_STANDARD 20)
 

build.sh

@@ -9,7 +9,7 @@ CMAKE_COMMAND="cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=1 --log-level=STATUS"
 
 ALL_ARGS=("$@")
 BUILD_ARGS=()
-MAKE_ARGS=()
+MAKE_ARGS=(-j $CPU_CORES)
 MAKE=make
 
 echo "$0 ${ALL_ARGS[@]}"
@@ -20,17 +20,17 @@ function usage
   echo "./build.sh -h"
   echo "./build.sh init # install dependence"
   echo "./build.sh clean"
-  echo "./build.sh make"      #添加常用命令
+  echo "./build.sh make"
   echo "./build.sh unittest"
   echo "./build.sh test [TestCases] [TestOptions]"
-  echo "./build.sh dif SingleTestCaseName [DiffOptions]"
+  echo "./build.sh diff SingleTestCaseName [DiffOptions]"
   echo "./build.sh [BuildType] [--make [MakeOptions]]"
   echo ""
   echo "OPTIONS:"
   echo "BuildType => debug(default), release"
   echo "MakeOptions => Options to make command, default: -j N"
-  echo "DiffOptions => Options to diff command, e.g. -u|-c|-y"  # -u: unified, -c: context, -y: side by side
-  echo "TestOptions => Options to 。/test/case/miniob_test.py" 
+  echo "DiffOptions => Options to diff command, e.g. -u|-c|-y"
+  echo "TestOptions => Options to ./test/case/miniob_test.py"
 
   echo ""
   echo "Examples:"
@@ -59,7 +59,8 @@ function parse_args
     elif [[ $make_start == false ]]
     then
       BUILD_ARGS+=("$arg")
-    else
+    e
+    se
       MAKE_ARGS+=("$arg")
     fi
 
@@ -108,7 +109,7 @@ function do_init
 
   # build libevent
   cd ${TOPDIR}/deps/3rd/libevent && \
-    git checkout release-2.1.12-stable && \  #不知道干了什么
+    git checkout release-2.1.12-stable && \
     mkdir -p build && \
     cd build && \
     ${CMAKE_COMMAND} .. -DEVENT__DISABLE_OPENSSL=ON -DEVENT__LIBRARY_TYPE=BOTH && \
@@ -127,7 +128,7 @@ function do_init
   cd ${TOPDIR}/deps/3rd/benchmark && \
     mkdir -p build && \
     cd build && \
-    ${CMAKE_COMMAND} .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBENCHMARK_ENABLE_TESTING=OFF  -DBENCHMARK_INSTALL_DOCS=OFF -DBENCHMARK_ENABLE_GTEST_TESTS=OFF -DBENCHMARK_USE_BUNDLED_GTEST=OFF -DBENCHMARK_ENABLE_ASSEMBLY_TESTS=OFF && \
+    ${CMAKE_COMMAND} .. -DBENCHMARK_ENABLE_TESTING=OFF  -DBENCHMARK_INSTALL_DOCS=OFF -DBENCHMARK_ENABLE_GTEST_TESTS=OFF -DBENCHMARK_USE_BUNDLED_GTEST=OFF -DBENCHMARK_ENABLE_ASSEMBLY_TESTS=OFF && \
     ${MAKE_COMMAND} -j4 && \
     ${MAKE_COMMAND} install
 
@@ -183,6 +184,20 @@ function build
   esac
 }
 
+function do_unittest
+{
+  cd ./build/bin
+  for exe in $(pwd)/*_test; do
+    echo $exe
+    if [ $exe != $(pwd)/"client_performance_test" ] && \
+        [ $exe != $(pwd)/"record_manager_concurrency_test" ] && \
+        [ $exe != $(pwd)/"bplus_tree_concurrency_test" ] && \
+        [ $exe != $(pwd)/"bplus_tree_test" ]; then
+      $exe
+    fi
+  done
+}
+
 function do_test
 {
   # test component
@@ -255,4 +270,4 @@ function main
   esac
 }
 
-main "$@"
+main "$@"

db/sys/dblwr.db

@@ -0,0 +1 @@
+0

miniob/db/sys/dblwr.db

@@ -0,0 +1,17 @@
+{
+	"fields" : 
+	[
+		{
+			"FIELD_id" : 0,
+			"len" : 4,
+			"name" : "t1",
+			"offset" : 0,
+			"type" : "ints",
+			"visible" : true
+		}
+	],
+	"indexes" : null,
+	"storage_format" : 1,
+	"table_id" : 0,
+	"table_name" : "test"
+}

miniob/db/sys/sys.db

@@ -0,0 +1,17 @@
+{
+	"fields" : 
+	[
+		{
+			"FIELD_id" : 0,
+			"len" : 4,
+			"name" : "t2",
+			"offset" : 0,
+			"type" : "ints",
+			"visible" : true
+		}
+	],
+	"indexes" : null,
+	"storage_format" : 1,
+	"table_id" : 1,
+	"table_name" : "test2"
+}