Resolve merge conflicts: keep feat/embedded-mode (HEAD) content

- Clean leftover conflict markers in deps/oblib, src/, mittest, rpm, tools, unittest
- Preserve current branch changes for libseekdb embedded mode

Author: dengfuping

deps/oblib/src/lib/cpu/ob_cpu_topology.cpp

@@ -116,11 +116,7 @@ int CpuFlagSet::init_from_os(uint64_t& flags)
 #elif defined(__APPLE__)
   // On macOS, /proc/cpuinfo doesn't exist.
   // We can use sysctl to check for features, but for now we rely on init_from_cpu
-<<<<<<< HEAD
   // and just return success here with flags set to a reasonable default or 
-=======
-  // and just return success here with flags set to a reasonable default or
->>>>>>> master
   // matched with cpu flags to avoid mismatch error in constructor.
   init_from_cpu(flags);
 #else

deps/oblib/src/lib/lock/cond.h

@@ -114,7 +114,6 @@ Cond::timed_wait_impl(const M& mutex, const ObSysTime& timeout) const
     LockState state;
     mutex.unlock(state);
 
-<<<<<<< HEAD
 #ifdef __APPLE__
     // On macOS, pthread_cond_timedwait uses CLOCK_REALTIME
     // We need to use Realtime clock for the absolute timeout
@@ -129,8 +128,6 @@ Cond::timed_wait_impl(const M& mutex, const ObSysTime& timeout) const
     timespec ts;
     ts.tv_sec  = tv.tv_sec + timeout/1000;
     ts.tv_nsec = tv.tv_usec * 1000 + ( timeout % 1000 ) * 1000000;*/
-=======
->>>>>>> master
     oceanbase::common::ObWaitEventGuard
         wait_guard(oceanbase::common::ObWaitEventIds::DEFAULT_COND_WAIT, timeout.toMicroSeconds(), reinterpret_cast<uint64_t>(this));
 

deps/oblib/src/lib/lock/ob_futex.cpp

@@ -68,20 +68,12 @@ int futex_wait(volatile int *p, int val, const timespec *timeout)
   } else {
     timeout_us = 0; // infinite wait
   }
-<<<<<<< HEAD
 
-=======
-
->>>>>>> master
   // Check if value has changed before waiting
   if (*p != val) {
     return EAGAIN;
   }
-<<<<<<< HEAD
 
-=======
-
->>>>>>> master
   int ret = __ulock_wait(UL_COMPARE_AND_WAIT, (void*)p, (uint64_t)val, timeout_us);
   if (ret < 0) {
     if (errno == ETIMEDOUT) {

deps/oblib/src/lib/lock/ob_thread_cond.cpp

@@ -90,23 +90,15 @@ int ObThreadCond::wait_us(const uint64_t time_us)
       }
     } else {
 #ifdef __APPLE__
-<<<<<<< HEAD
       // On macOS, pthread_cond_timedwait uses gettimeofday internally and can have 
-=======
-      // On macOS, pthread_cond_timedwait uses gettimeofday internally and can have
->>>>>>> master
       // high overhead. Use pthread_cond_timedwait_relative_np instead, which:
       // 1. Takes a relative timeout (no need for gettimeofday to compute absolute time)
       // 2. Uses efficient internal implementation without polling
       // 3. Provides immediate signal response (no polling latency)
       struct timespec reltime;
       reltime.tv_sec = static_cast<time_t>(time_us / 1000000);
       reltime.tv_nsec = static_cast<long>((time_us % 1000000) * 1000);
-<<<<<<< HEAD
 
-=======
-
->>>>>>> master
       tmp_ret = pthread_cond_timedwait_relative_np(&cond_, &mutex_, &reltime);
       if (tmp_ret != 0) {
         if (ETIMEDOUT != tmp_ret) {

deps/oblib/src/lib/thread/thread.cpp

@@ -101,22 +101,14 @@ int Thread::start()
         // Continue even if QoS setting failed
       }
 #ifdef __APPLE__
-<<<<<<< HEAD
       // On macOS, pthread_attr_setstack often fails with EINVAL if address/size 
-=======
-      // On macOS, pthread_attr_setstack often fails with EINVAL if address/size
->>>>>>> master
       // are not perfectly aligned or if the memory is already managed in a way
       // that pthread doesn't like. Use setstacksize instead and let the system
       // allocate the stack, while keeping our stack_addr_ for stack_header logic.
       pret = pthread_attr_setstacksize(&attr, stack_size_);
       if (pret != 0) {
         // Fallback to default if setstacksize fails
-<<<<<<< HEAD
         pret = 0; 
-=======
-        pret = 0;
->>>>>>> master
       } else {
         size_t actual_stack_size = 0;
         pthread_attr_getstacksize(&attr, &actual_stack_size);

deps/oblib/src/lib/utility/ob_sort.h

@@ -53,23 +53,13 @@ class IteratorWrapper
     return *iter_;
   }
   inline pointer operator->()
-<<<<<<< HEAD
   {
     return &(*iter_);
   }
   inline pointer operator->() const
   {
     return &(*iter_);
   }
-=======
-  {
-    return &(*iter_);
-  }
-  inline pointer operator->() const
-  {
-    return &(*iter_);
-  }
->>>>>>> master
   inline reference operator[](difference_type n)
   {
     return iter_[n];
@@ -117,21 +107,6 @@ class IteratorWrapper
     return *this;
   }
   inline IteratorWrapper &operator-=(int64_t off)
-<<<<<<< HEAD
-  {
-    if (OB_UNLIKELY(index_ < 0)) abort_maybe_bad_compare();
-    iter_ -= off;
-    index_ -= off;
-    return *this;
-  }
-  inline IteratorWrapper operator-(int64_t off) const
-  {
-    if (OB_UNLIKELY(index_ < 0)) abort_maybe_bad_compare();
-    Iterator new_iter = iter_;
-    new_iter -= off;
-    return IteratorWrapper(new_iter, index_ - off, end_);
-  }
-=======
   {
     if (OB_UNLIKELY(index_ < 0)) abort_maybe_bad_compare();
     iter_ -= off;
@@ -145,7 +120,6 @@ class IteratorWrapper
     new_iter -= off;
     return IteratorWrapper(new_iter, index_ - off, end_);
   }
->>>>>>> master
   inline difference_type operator-(const IteratorWrapper &rhs) const
   {
     return index_ - rhs.index_;

deps/oblib/src/lib/utility/utility.cpp

@@ -21,12 +21,6 @@
 #ifdef __linux__
 #include <gnu/libc-version.h>
 #endif
-<<<<<<< HEAD
-=======
-#ifdef __APPLE__
-#include <sys/sysctl.h>
-#endif
->>>>>>> master
 #include "lib/utility/ob_platform_utils.h"  // Platform compatibility layer
 #include "lib/file/file_directory_utils.h"
 #include "deps/oblib/src/common/ob_string_buf.h"
@@ -1199,7 +1193,6 @@ static int use_daemon()
   if (OB_SUCC(ret)) {
     // 1. Remove background state from current thread using PRIO_DARWIN_THREAD
     int darwin_thread_ret = setpriority(PRIO_DARWIN_THREAD, 0, 0);
-<<<<<<< HEAD
 
     // 2. Remove background state from process using PRIO_DARWIN_PROCESS  
     int darwin_proc_ret = setpriority(PRIO_DARWIN_PROCESS, 0, 0);
@@ -1211,19 +1204,6 @@ static int use_daemon()
     int prio_ret = setpriority(PRIO_PROCESS, 0, 0);
 
     _LOG_INFO("macOS daemon priority setup: darwin_thread=%d, darwin_proc=%d, qos=%d, prio=%d", 
-=======
-
-    // 2. Remove background state from process using PRIO_DARWIN_PROCESS
-    int darwin_proc_ret = setpriority(PRIO_DARWIN_PROCESS, 0, 0);
-
-    // 3. Set thread QoS to USER_INITIATED using platform compatibility layer
-    int qos_ret = lib::ob_set_thread_qos(lib::ObThreadQoS::USER_INITIATED);
-
-    // 4. Set normal process priority
-    int prio_ret = setpriority(PRIO_PROCESS, 0, 0);
-
-    _LOG_INFO("macOS daemon priority setup: darwin_thread=%d, darwin_proc=%d, qos=%d, prio=%d",
->>>>>>> master
               darwin_thread_ret, darwin_proc_ret, qos_ret, prio_ret);
   }
 #endif

deps/oblib/src/lib/xml/ob_libxml2_sax_handler.cpp

@@ -330,11 +330,7 @@ void ObLibXml2SaxHandler::entity_reference(void *ctx, const xmlChar *name)
   }
 }
 #if defined(__APPLE__)
-<<<<<<< HEAD
 void ObLibXml2SaxHandler::structured_error(void *ctx, xmlError *error) 
-=======
-void ObLibXml2SaxHandler::structured_error(void *ctx, xmlError *error)
->>>>>>> master
 #else
 void ObLibXml2SaxHandler::structured_error(void *ctx, const xmlError *error) 
 #endif

deps/oblib/src/rpc/obmysql/ob_sql_nio.cpp

@@ -95,30 +95,18 @@ static int kqueue_epoll_create1(int flags) {
 static int kqueue_epoll_ctl(int epfd, int op, int fd, struct epoll_event *event) {
   struct kevent kev[2];
   int n = 0;
-<<<<<<< HEAD
 
   if (op == EPOLL_CTL_ADD || op == EPOLL_CTL_MOD) {
     uint16_t flags = EV_ADD | EV_ENABLE;
     if (event->events & EPOLLET) flags |= EV_CLEAR;
 
-=======
-
-  if (op == EPOLL_CTL_ADD || op == EPOLL_CTL_MOD) {
-    uint16_t flags = EV_ADD | EV_ENABLE;
-    if (event->events & EPOLLET) flags |= EV_CLEAR;
-
->>>>>>> master
     if (event->events & EPOLLIN) {
       EV_SET(&kev[n++], fd, EVFILT_READ, flags, 0, 0, event->data.ptr);
     }
     if (event->events & EPOLLOUT) {
       EV_SET(&kev[n++], fd, EVFILT_WRITE, flags, 0, 0, event->data.ptr);
     }
-<<<<<<< HEAD
 
-=======
-
->>>>>>> master
     if (op == EPOLL_CTL_MOD) {
       // For MOD, we might need to delete existing filters if they are not in the new event
       if (!(event->events & EPOLLIN)) {
@@ -139,11 +127,7 @@ static int kqueue_epoll_ctl(int epfd, int op, int fd, struct epoll_event *event)
     errno = EINVAL;
     return -1;
   }
-<<<<<<< HEAD
 
-=======
-
->>>>>>> master
   if (n > 0) {
     if (kevent(epfd, kev, n, NULL, 0, NULL) < 0) {
       if (op != EPOLL_CTL_DEL) return -1;
@@ -156,27 +140,16 @@ static int kqueue_epoll_wait(int epfd, struct epoll_event *events, int maxevents
   struct kevent *kevs = (struct kevent *)alloca(sizeof(struct kevent) * maxevents);
   struct timespec ts;
   struct timespec *pts = NULL;
-<<<<<<< HEAD
 
-=======
-
->>>>>>> master
   if (timeout >= 0) {
     ts.tv_sec = timeout / 1000;
     ts.tv_nsec = (timeout % 1000) * 1000000;
     pts = &ts;
   }
-<<<<<<< HEAD
 
   int n = kevent(epfd, NULL, 0, kevs, maxevents, pts);
   if (n < 0) return -1;
 
-=======
-
-  int n = kevent(epfd, NULL, 0, kevs, maxevents, pts);
-  if (n < 0) return -1;
-
->>>>>>> master
   for (int i = 0; i < n; i++) {
     events[i].events = 0;
     if (kevs[i].filter == EVFILT_READ) events[i].events |= EPOLLIN;

mittest/mtlenv/mock_tenant_module_env.h

@@ -506,11 +506,7 @@ int MockTenantModuleEnv::init_dir()
 #else
   curr_dir_ = get_current_dir_name();
 #endif
-<<<<<<< HEAD
 
-=======
-
->>>>>>> master
   int ret = OB_SUCCESS;
   sstable_dir_ = env_dir_ + "/sstable";
   clog_dir_ = env_dir_ + "/clog";