Feat/embedded mode 1.3.0

.gitignore

@@ -381,6 +381,9 @@ tools/ob-configserver/bin/*
 tools/ob-configserver/tests/*.log
 tools/ob-configserver/tests/*.out
 
+############# package/libseekdb #############
+package/libseekdb/libseekdb-*.zip
+
 ## .NET Configurator build output (rebuilt by dotnet publish)
 tools/windows/seekdbConfigurator/bin/
 tools/windows/seekdbConfigurator/obj/

CMakeLists.txt

@@ -9,6 +9,13 @@ project("OceanBase"
   HOMEPAGE_URL "https://www.oceanbase.ai"
   LANGUAGES CXX C ASM)
 
+# Android NDK toolchain / defaults may pin C++17 after project(); enforce C++20 for language features (e.g. consteval).
+if(ANDROID)
+  set(CMAKE_CXX_STANDARD 20)
+  set(CMAKE_CXX_STANDARD_REQUIRED ON)
+  set(CMAKE_CXX_EXTENSIONS ON)
+endif()
+
 if(WIN32)
   find_program(LLVM_LIB_PROGRAM llvm-lib)
   if(LLVM_LIB_PROGRAM)
@@ -130,6 +137,7 @@ endif()
 
 add_subdirectory(deps/oblib)
 add_subdirectory(src/objit)
+include(${CMAKE_SOURCE_DIR}/cmake/EnsureWindowsDiaGuids.cmake)
 add_subdirectory(src)
 add_subdirectory(sqlite-benchmark)
 

build.ps1

@@ -18,7 +18,9 @@ $Action = "debug"
 $Ninja  = $false
 $Init   = $false
 $Jobs   = 0
-$h      = $false
+$h             = $false
+$NinjaTarget  = "observer"
+$ExtraCmake   = @()
 
 $i = 0
 while ($i -lt $args.Count) {
@@ -27,12 +29,17 @@ while ($i -lt $args.Count) {
         { $_ -in "-h", "--help", "-help" } { $h = $true }
         { $_ -in "--ninja", "-ninja" }     { $Ninja = $true }
         { $_ -in "--init", "-init" }       { $Init = $true }
+        { $_ -in "--target" } {
+            $i++
+            if ($i -lt $args.Count) { $NinjaTarget = "$($args[$i])" }
+        }
         { $_ -in "-j", "--jobs" } {
             $i++
             if ($i -lt $args.Count) { $Jobs = [int]$args[$i] }
         }
         default {
             if (-not $a.StartsWith("-")) { $Action = $a }
+            elseif ($a.StartsWith("-D")) { $ExtraCmake += $a }
             else { Write-Host "[build.ps1][WARN] Unknown flag: $a" -ForegroundColor Yellow }
         }
     }
@@ -181,6 +188,7 @@ Usage:
     .\build.ps1 [BuildType] --ninja               Configure + compile (ninja)
     .\build.ps1 [BuildType] --ninja -j 16         Compile with 16 jobs
     .\build.ps1 [BuildType] --ninja --init          Init deps, then build
+    .\build.ps1 release --ninja --target libseekdb   Build embed DLL (example)
     .\build.ps1 package                           Build release + MSI/ZIP installer
 
 BuildType:
@@ -191,6 +199,8 @@ BuildType:
 Flags:
     --ninja         Configure + compile with Ninja
     --init          Run dependency init before building (like build.sh --init)
+    --target NAME   Ninja target (default: observer); e.g. libseekdb
+    -DVAR=VALUE     Extra CMake cache entries (repeatable); e.g. -DBUILD_EMBED_MODE=ON
 
 Environment variables (override dependency paths):
     OB_VCPKG_DIR      vcpkg install root   (default: deps/3rd or C:/VcpkgInstalled)
@@ -286,7 +296,13 @@ function Do-Build {
         [string[]]$ExtraCMakeArgs = @()
     )
 
-    $buildDir = "$TOPDIR\build_$($BuildType.ToLower())"
+    # Align directory names with build.sh: release -> build_release, debug -> build_debug
+    $folderName = switch ($BuildType) {
+        "RelWithDebInfo" { "release" }
+        "Debug"          { "debug" }
+        default          { $BuildType.ToLower() }
+    }
+    $buildDir = "$TOPDIR\build_$folderName"
     if (-not (Test-Path $buildDir)) {
         New-Item -ItemType Directory -Path $buildDir | Out-Null
     }
@@ -300,9 +316,9 @@ function Do-Build {
         "-DOB_VCPKG_DIR=$DefaultVcpkgDir",
         "-DOB_OPENSSL_DIR=$DefaultOpenSSLDir",
         "-DOB_LLVM_DIR=$DefaultLLVMDir"
-    ) + $ExtraCMakeArgs
+    ) + $ExtraCMakeArgs + $ExtraCmake
 
-    Write-Log "CMake configure: build_$($BuildType.ToLower())"
+    Write-Log "CMake configure: build_$folderName"
     Write-Log "  Build type : $BuildType"
     Write-Log "  VcpkgDir   : $DefaultVcpkgDir"
     Write-Log "  OpenSSLDir : $DefaultOpenSSLDir"
@@ -311,13 +327,54 @@ function Do-Build {
 
     Push-Location $buildDir
     try {
-        & cmake @cmakeArgs | Out-Host
-        if ($LASTEXITCODE -ne 0) {
-            Write-Err "CMake configure failed (exit code $LASTEXITCODE)"
-            exit $LASTEXITCODE
+        function Invoke-CMakeConfigure {
+            & cmake @cmakeArgs | Out-Host
+            return $LASTEXITCODE
+        }
+
+        $exit = Invoke-CMakeConfigure
+        if ($exit -ne 0) {
+            Write-Err "CMake configure failed (exit code $exit)"
+            exit $exit
         }
         Write-Log "CMake configure succeeded."
 
+        # Facts from CI: CMakeCache can say CMAKE_GENERATOR=Ninja while no *.ninja exists (incomplete/stale tree).
+        # Recover once by wiping cache + CMakeFiles and re-running cmake.
+        function Test-HasNinjaBuildFiles {
+            param([string]$Dir)
+            if (Test-Path (Join-Path $Dir "build.ninja")) { return $true }
+            try {
+                $nf = [System.IO.Directory]::GetFiles($Dir, "*.ninja", [System.IO.SearchOption]::TopDirectoryOnly)
+                return ($nf.Length -gt 0)
+            } catch {
+                return $false
+            }
+        }
+
+        if (-not (Test-HasNinjaBuildFiles -Dir $buildDir)) {
+            Write-Log "[build.ps1] No Ninja build files after configure; clearing CMakeCache + CMakeFiles and re-configuring once."
+            Remove-Item (Join-Path $buildDir "CMakeCache.txt") -Force -ErrorAction SilentlyContinue
+            Remove-Item (Join-Path $buildDir "CMakeFiles") -Recurse -Force -ErrorAction SilentlyContinue
+            $exit2 = Invoke-CMakeConfigure
+            if ($exit2 -ne 0) {
+                Write-Err "CMake re-configure failed (exit code $exit2)"
+                exit $exit2
+            }
+            Write-Log "CMake re-configure finished."
+        }
+
+        # Fail fast if Ninja was requested but the build tree still has no Ninja backend files.
+        if (-not (Test-HasNinjaBuildFiles -Dir $buildDir)) {
+            Write-Err "CMake did not create build.ninja (or any *.ninja) under $buildDir after configure/retry (expected -G Ninja)."
+            $cache = Join-Path $buildDir "CMakeCache.txt"
+            if (Test-Path $cache) {
+                Select-String -Path $cache -Pattern "^CMAKE_GENERATOR:" | ForEach-Object { Write-Err $_.Line }
+            }
+            Write-Err "Fix: delete $buildDir completely and re-run, or ensure Ninja is on PATH when cmake runs (e.g. deps\3rd\tools\ninja)."
+            exit 1
+        }
+
         # Copy compile_commands.json to project root for IDE support
         $ccJson = "$buildDir\compile_commands.json"
         if (Test-Path $ccJson) {
@@ -334,17 +391,41 @@ function Do-Build {
 
 # -- ninja build -----------------------------------------------------
 function Do-Ninja {
-    param([string]$BuildDir)
+    param(
+        [string]$BuildDir,
+        [string]$Target = "observer"
+    )
 
-    Write-Log "Building with Ninja (-j $Jobs) in $BuildDir ..."
+    Write-Log "Building with Ninja (-j $Jobs) target=$Target in $BuildDir ..."
     Push-Location $BuildDir
     try {
-        & ninja -j $Jobs observer | Out-Host
+        & ninja -j $Jobs $Target | Out-Host
         if ($LASTEXITCODE -ne 0) {
             Write-Err "Build failed (exit code $LASTEXITCODE)"
             exit $LASTEXITCODE
         }
         Write-Log "Build succeeded!"
+
+        # Deterministic post-condition for libseekdb: link must emit a DLL somewhere under the build dir.
+        if ($Target -eq "libseekdb") {
+            $foundDll = $false
+            foreach ($leaf in @("seekdb.dll", "libseekdb.dll")) {
+                try {
+                    $arr = [System.IO.Directory]::GetFiles($BuildDir, $leaf, [System.IO.SearchOption]::AllDirectories)
+                    if ($arr -and $arr.Length -gt 0) {
+                        $foundDll = $true
+                        Write-Log "Found ${leaf} at $($arr[0])"
+                        break
+                    }
+                } catch {
+                    # ignore enumeration errors; treat as not found
+                }
+            }
+            if (-not $foundDll) {
+                Write-Err "ninja libseekdb succeeded but no seekdb.dll / libseekdb.dll under $BuildDir — link step did not produce a DLL (check ninja/link output above)."
+                exit 1
+            }
+        }
     }
     finally {
         Pop-Location
@@ -404,7 +485,7 @@ function Do-Package {
     }
 
     $buildDir = Do-Build -BuildType "RelWithDebInfo" -ExtraCMakeArgs @("-DOB_BUILD_PACKAGE=ON")
-    Do-Ninja -BuildDir $buildDir
+    Do-Ninja -BuildDir $buildDir -Target observer
 
     # Sign binaries before they are packaged into the MSI
     $exesToSign = @(
@@ -476,12 +557,12 @@ switch ($Action.ToLower()) {
     { $_ -in "release", "relwithdebinfo" } {
         if ($Init) { Do-Init }
         $buildDir = Do-Build -BuildType "RelWithDebInfo"
-        if ($Ninja) { Do-Ninja -BuildDir $buildDir }
+        if ($Ninja) { Do-Ninja -BuildDir $buildDir -Target $NinjaTarget }
     }
     { $_ -in "debug", "" } {
         if ($Init) { Do-Init }
         $buildDir = Do-Build -BuildType "Debug"
-        if ($Ninja) { Do-Ninja -BuildDir $buildDir }
+        if ($Ninja) { Do-Ninja -BuildDir $buildDir -Target $NinjaTarget }
     }
     "-h" {
         Show-Usage

build.sh

@@ -6,13 +6,11 @@ BUILD_SH=$TOPDIR/build.sh
 DEP_DIR=${TOPDIR}/deps/3rd/usr/local/oceanbase/deps/devel
 TOOLS_DIR=${TOPDIR}/deps/3rd/usr/local/oceanbase/devtools
 
-# Get CPU cores and CMAKE command, compatible with macOS and Linux
+# Get CPU cores; cmake path is resolved in do_build() (Linux may use host cmake before deps devtools exist)
 if [[ "$(uname -s)" == "Darwin" ]]; then
-  CMAKE_COMMAND="cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=1"
   CPU_CORES=$(sysctl -n hw.ncpu)
   KERNEL_RELEASE=""
 else
-  CMAKE_COMMAND="${TOOLS_DIR}/bin/cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=1"
   CPU_CORES=$(grep -c ^processor /proc/cpuinfo)
   KERNEL_RELEASE=$(grep -Po 'release [0-9]{1}' /etc/issue 2>/dev/null)
 fi
@@ -166,22 +164,25 @@ function do_init
 # make build directory && cmake && make (if need)
 function do_build
 {
-    # Check if cmake exists, compatible with macOS and Linux
+    # Resolve cmake: prefer OceanBase devtools on Linux; else Homebrew/common paths; else PATH (e.g. apt cmake on CI)
     CMAKE_PATH=""
     if [[ "$(uname -s)" == "Darwin" ]]; then
-      # macOS: cmake may be at /opt/homebrew/bin/cmake or /usr/local/bin/cmake
       if [ -f /opt/homebrew/bin/cmake ]; then
         CMAKE_PATH="/opt/homebrew/bin/cmake"
       elif [ -f /usr/local/bin/cmake ]; then
         CMAKE_PATH="/usr/local/bin/cmake"
       fi
     else
-      # Linux
-      CMAKE_PATH="${TOOLS_DIR}/bin/cmake"
+      if [[ -x "${TOOLS_DIR}/bin/cmake" ]]; then
+        CMAKE_PATH="${TOOLS_DIR}/bin/cmake"
+      fi
+    fi
+    if [[ -z "$CMAKE_PATH" ]] && command -v cmake >/dev/null 2>&1; then
+      CMAKE_PATH="$(command -v cmake)"
     fi
 
     if [ -z "$CMAKE_PATH" ]; then
-      echo_log "[NOTICE] Your workspace has not initialized dependencies, please append '--init' args to initialize dependencies"
+      echo_log "[NOTICE] cmake not found. On Linux install cmake (e.g. apt install cmake) or run --init so ${TOOLS_DIR}/bin/cmake exists"
       exit 1
     fi
 
@@ -196,11 +197,11 @@ function do_build
         echo_err "Set ANDROID_NDK_HOME or install the NDK"
         exit 1
       fi
-      ANDROID_CMAKE_ARGS="-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake -DANDROID_ABI=arm64-v8a -DANDROID_PLATFORM=android-28"
+      ANDROID_CMAKE_ARGS="-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake -DANDROID_ABI=arm64-v8a -DANDROID_PLATFORM=android-28 -DCMAKE_CXX_STANDARD=20 -DCMAKE_CXX_EXTENSIONS=ON"
       echo_log "Android NDK: $ANDROID_NDK_HOME"
     fi
 
-    ${CMAKE_COMMAND} ${TOPDIR} ${ANDROID_CMAKE_ARGS} "$@"
+    "${CMAKE_PATH}" -DCMAKE_EXPORT_COMPILE_COMMANDS=1 ${TOPDIR} ${ANDROID_CMAKE_ARGS} "$@"
     if [ $? -ne 0 ]; then
       echo_err "Failed to generate Makefile"
       exit 1

cmake/EnsureWindowsDiaGuids.cmake

@@ -0,0 +1,66 @@
+# LLVM imports may reference BuildTools\DIA SDK\...\diaguids.lib; CI/home often only have Community/etc.
+# Copy one existing VS 2022 diaguids.lib there before linking (must run before add_subdirectory(src)).
+
+if(NOT WIN32)
+  return()
+endif()
+
+# LLVM/seekdb Windows CI is x64 -> amd64 DIA libs; ARM64 host uses arm64.
+if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^(ARM64|aarch64)$")
+  set(_a "arm64")
+else()
+  set(_a "amd64")
+endif()
+
+set(_dst "C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/DIA SDK/lib/${_a}/diaguids.lib")
+if(EXISTS "${_dst}")
+  return()
+endif()
+
+set(_cand "")
+if(DEFINED ENV{VSINSTALLDIR})
+  file(TO_CMAKE_PATH "$ENV{VSINSTALLDIR}" _r)
+  string(REGEX REPLACE "/+$" "" _r "${_r}")
+  list(APPEND _cand "${_r}/DIA SDK/lib/${_a}/diaguids.lib")
+endif()
+
+set(_vw "C:/Program Files (x86)/Microsoft Visual Studio/Installer/vswhere.exe")
+if(EXISTS "${_vw}")
+  execute_process(
+    COMMAND "${_vw}" -latest -products * -utf8 -property installationPath
+    OUTPUT_VARIABLE _vp OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET RESULT_VARIABLE _vr
+  )
+  if(_vr EQUAL 0 AND _vp)
+    string(STRIP "${_vp}" _vp)
+    list(APPEND _cand "${_vp}/DIA SDK/lib/${_a}/diaguids.lib")
+  endif()
+endif()
+
+foreach(_root "C:/Program Files/Microsoft Visual Studio/2022" "C:/Program Files (x86)/Microsoft Visual Studio/2022")
+  if(EXISTS "${_root}")
+    file(GLOB _g "${_root}/*/DIA SDK/lib/${_a}/diaguids.lib")
+    list(APPEND _cand ${_g})
+  endif()
+endforeach()
+
+set(_src "")
+foreach(_i IN LISTS _cand)
+  if(EXISTS "${_i}")
+    set(_src "${_i}")
+    break()
+  endif()
+endforeach()
+
+if(NOT _src)
+  message(WARNING "EnsureWindowsDiaGuids: diaguids.lib (${_a}) not found. LLVM/lld link may fail.")
+  return()
+endif()
+
+get_filename_component(_dd "${_dst}" DIRECTORY)
+file(MAKE_DIRECTORY "${_dd}")
+execute_process(COMMAND "${CMAKE_COMMAND}" -E copy "${_src}" "${_dst}" RESULT_VARIABLE _ec)
+if(NOT _ec EQUAL 0)
+  message(WARNING "EnsureWindowsDiaGuids: copy failed (${_ec}); try elevated cmake or install DIA SDK.")
+else()
+  message(STATUS "EnsureWindowsDiaGuids: ${_src} -> ${_dst}")
+endif()