Skip to content

Commit 2a5d29f

Browse files
author
linguanren
committed
fix conflict errors
1 parent 7236241 commit 2a5d29f

File tree

17 files changed

+0
-160
lines changed

17 files changed

+0
-160
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,7 @@ int CpuFlagSet::init_from_os(uint64_t& flags)
116116
#elif defined(__APPLE__)
117117
// On macOS, /proc/cpuinfo doesn't exist.
118118
// We can use sysctl to check for features, but for now we rely on init_from_cpu
119-
<<<<<<< HEAD
120-
// and just return success here with flags set to a reasonable default or
121-
=======
122119
// and just return success here with flags set to a reasonable default or
123-
>>>>>>> master
124120
// matched with cpu flags to avoid mismatch error in constructor.
125121
init_from_cpu(flags);
126122
#else

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -114,23 +114,6 @@ Cond::timed_wait_impl(const M& mutex, const ObSysTime& timeout) const
114114
LockState state;
115115
mutex.unlock(state);
116116

117-
<<<<<<< HEAD
118-
#ifdef __APPLE__
119-
// On macOS, pthread_cond_timedwait uses CLOCK_REALTIME
120-
// We need to use Realtime clock for the absolute timeout
121-
timeval tv = ObSysTime::now(ObSysTime::Realtime) + timeout;
122-
#else
123-
timeval tv = ObSysTime::now(ObSysTime::Monotonic) + timeout;
124-
#endif
125-
timespec ts;
126-
ts.tv_sec = tv.tv_sec;
127-
ts.tv_nsec = tv.tv_usec * 1000;
128-
/*timeval tv = ObSysTime::now(ObSysTime::Realtime);
129-
timespec ts;
130-
ts.tv_sec = tv.tv_sec + timeout/1000;
131-
ts.tv_nsec = tv.tv_usec * 1000 + ( timeout % 1000 ) * 1000000;*/
132-
=======
133-
>>>>>>> master
134117
oceanbase::common::ObWaitEventGuard
135118
wait_guard(oceanbase::common::ObWaitEventIds::DEFAULT_COND_WAIT, timeout.toMicroSeconds(), reinterpret_cast<uint64_t>(this));
136119

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,20 +68,12 @@ int futex_wait(volatile int *p, int val, const timespec *timeout)
6868
} else {
6969
timeout_us = 0; // infinite wait
7070
}
71-
<<<<<<< HEAD
72-
73-
=======
7471

75-
>>>>>>> master
7672
// Check if value has changed before waiting
7773
if (*p != val) {
7874
return EAGAIN;
7975
}
80-
<<<<<<< HEAD
81-
82-
=======
8376

84-
>>>>>>> master
8577
int ret = __ulock_wait(UL_COMPARE_AND_WAIT, (void*)p, (uint64_t)val, timeout_us);
8678
if (ret < 0) {
8779
if (errno == ETIMEDOUT) {

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,23 +90,15 @@ int ObThreadCond::wait_us(const uint64_t time_us)
9090
}
9191
} else {
9292
#ifdef __APPLE__
93-
<<<<<<< HEAD
94-
// On macOS, pthread_cond_timedwait uses gettimeofday internally and can have
95-
=======
9693
// On macOS, pthread_cond_timedwait uses gettimeofday internally and can have
97-
>>>>>>> master
9894
// high overhead. Use pthread_cond_timedwait_relative_np instead, which:
9995
// 1. Takes a relative timeout (no need for gettimeofday to compute absolute time)
10096
// 2. Uses efficient internal implementation without polling
10197
// 3. Provides immediate signal response (no polling latency)
10298
struct timespec reltime;
10399
reltime.tv_sec = static_cast<time_t>(time_us / 1000000);
104100
reltime.tv_nsec = static_cast<long>((time_us % 1000000) * 1000);
105-
<<<<<<< HEAD
106-
107-
=======
108101

109-
>>>>>>> master
110102
tmp_ret = pthread_cond_timedwait_relative_np(&cond_, &mutex_, &reltime);
111103
if (tmp_ret != 0) {
112104
if (ETIMEDOUT != tmp_ret) {

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,22 +101,14 @@ int Thread::start()
101101
// Continue even if QoS setting failed
102102
}
103103
#ifdef __APPLE__
104-
<<<<<<< HEAD
105-
// On macOS, pthread_attr_setstack often fails with EINVAL if address/size
106-
=======
107104
// On macOS, pthread_attr_setstack often fails with EINVAL if address/size
108-
>>>>>>> master
109105
// are not perfectly aligned or if the memory is already managed in a way
110106
// that pthread doesn't like. Use setstacksize instead and let the system
111107
// allocate the stack, while keeping our stack_addr_ for stack_header logic.
112108
pret = pthread_attr_setstacksize(&attr, stack_size_);
113109
if (pret != 0) {
114110
// Fallback to default if setstacksize fails
115-
<<<<<<< HEAD
116-
pret = 0;
117-
=======
118111
pret = 0;
119-
>>>>>>> master
120112
} else {
121113
size_t actual_stack_size = 0;
122114
pthread_attr_getstacksize(&attr, &actual_stack_size);

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

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -53,23 +53,13 @@ class IteratorWrapper
5353
return *iter_;
5454
}
5555
inline pointer operator->()
56-
<<<<<<< HEAD
5756
{
5857
return &(*iter_);
5958
}
6059
inline pointer operator->() const
6160
{
6261
return &(*iter_);
6362
}
64-
=======
65-
{
66-
return &(*iter_);
67-
}
68-
inline pointer operator->() const
69-
{
70-
return &(*iter_);
71-
}
72-
>>>>>>> master
7363
inline reference operator[](difference_type n)
7464
{
7565
return iter_[n];
@@ -117,7 +107,6 @@ class IteratorWrapper
117107
return *this;
118108
}
119109
inline IteratorWrapper &operator-=(int64_t off)
120-
<<<<<<< HEAD
121110
{
122111
if (OB_UNLIKELY(index_ < 0)) abort_maybe_bad_compare();
123112
iter_ -= off;
@@ -131,21 +120,6 @@ class IteratorWrapper
131120
new_iter -= off;
132121
return IteratorWrapper(new_iter, index_ - off, end_);
133122
}
134-
=======
135-
{
136-
if (OB_UNLIKELY(index_ < 0)) abort_maybe_bad_compare();
137-
iter_ -= off;
138-
index_ -= off;
139-
return *this;
140-
}
141-
inline IteratorWrapper operator-(int64_t off) const
142-
{
143-
if (OB_UNLIKELY(index_ < 0)) abort_maybe_bad_compare();
144-
Iterator new_iter = iter_;
145-
new_iter -= off;
146-
return IteratorWrapper(new_iter, index_ - off, end_);
147-
}
148-
>>>>>>> master
149123
inline difference_type operator-(const IteratorWrapper &rhs) const
150124
{
151125
return index_ - rhs.index_;
@@ -222,4 +196,3 @@ void ob_sort(Iterator first, Iterator last)
222196
} // end of namespace lib
223197
} // end of namespace oceanbase
224198
#endif
225-

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,9 @@
2121
#ifdef __linux__
2222
#include <gnu/libc-version.h>
2323
#endif
24-
<<<<<<< HEAD
25-
=======
2624
#ifdef __APPLE__
2725
#include <sys/sysctl.h>
2826
#endif
29-
>>>>>>> master
3027
#include "lib/utility/ob_platform_utils.h" // Platform compatibility layer
3128
#include "lib/file/file_directory_utils.h"
3229
#include "deps/oblib/src/common/ob_string_buf.h"
@@ -1199,19 +1196,6 @@ static int use_daemon()
11991196
if (OB_SUCC(ret)) {
12001197
// 1. Remove background state from current thread using PRIO_DARWIN_THREAD
12011198
int darwin_thread_ret = setpriority(PRIO_DARWIN_THREAD, 0, 0);
1202-
<<<<<<< HEAD
1203-
1204-
// 2. Remove background state from process using PRIO_DARWIN_PROCESS
1205-
int darwin_proc_ret = setpriority(PRIO_DARWIN_PROCESS, 0, 0);
1206-
1207-
// 3. Set thread QoS to USER_INITIATED using platform compatibility layer
1208-
int qos_ret = lib::ob_set_thread_qos(lib::ObThreadQoS::USER_INITIATED);
1209-
1210-
// 4. Set normal process priority
1211-
int prio_ret = setpriority(PRIO_PROCESS, 0, 0);
1212-
1213-
_LOG_INFO("macOS daemon priority setup: darwin_thread=%d, darwin_proc=%d, qos=%d, prio=%d",
1214-
=======
12151199

12161200
// 2. Remove background state from process using PRIO_DARWIN_PROCESS
12171201
int darwin_proc_ret = setpriority(PRIO_DARWIN_PROCESS, 0, 0);
@@ -1223,7 +1207,6 @@ static int use_daemon()
12231207
int prio_ret = setpriority(PRIO_PROCESS, 0, 0);
12241208

12251209
_LOG_INFO("macOS daemon priority setup: darwin_thread=%d, darwin_proc=%d, qos=%d, prio=%d",
1226-
>>>>>>> master
12271210
darwin_thread_ret, darwin_proc_ret, qos_ret, prio_ret);
12281211
}
12291212
#endif

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -330,11 +330,7 @@ void ObLibXml2SaxHandler::entity_reference(void *ctx, const xmlChar *name)
330330
}
331331
}
332332
#if defined(__APPLE__)
333-
<<<<<<< HEAD
334-
void ObLibXml2SaxHandler::structured_error(void *ctx, xmlError *error)
335-
=======
336333
void ObLibXml2SaxHandler::structured_error(void *ctx, xmlError *error)
337-
>>>>>>> master
338334
#else
339335
void ObLibXml2SaxHandler::structured_error(void *ctx, const xmlError *error)
340336
#endif

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

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -95,30 +95,18 @@ static int kqueue_epoll_create1(int flags) {
9595
static int kqueue_epoll_ctl(int epfd, int op, int fd, struct epoll_event *event) {
9696
struct kevent kev[2];
9797
int n = 0;
98-
<<<<<<< HEAD
99-
100-
if (op == EPOLL_CTL_ADD || op == EPOLL_CTL_MOD) {
101-
uint16_t flags = EV_ADD | EV_ENABLE;
102-
if (event->events & EPOLLET) flags |= EV_CLEAR;
103-
104-
=======
10598

10699
if (op == EPOLL_CTL_ADD || op == EPOLL_CTL_MOD) {
107100
uint16_t flags = EV_ADD | EV_ENABLE;
108101
if (event->events & EPOLLET) flags |= EV_CLEAR;
109102

110-
>>>>>>> master
111103
if (event->events & EPOLLIN) {
112104
EV_SET(&kev[n++], fd, EVFILT_READ, flags, 0, 0, event->data.ptr);
113105
}
114106
if (event->events & EPOLLOUT) {
115107
EV_SET(&kev[n++], fd, EVFILT_WRITE, flags, 0, 0, event->data.ptr);
116108
}
117-
<<<<<<< HEAD
118-
119-
=======
120109

121-
>>>>>>> master
122110
if (op == EPOLL_CTL_MOD) {
123111
// For MOD, we might need to delete existing filters if they are not in the new event
124112
if (!(event->events & EPOLLIN)) {
@@ -139,11 +127,7 @@ static int kqueue_epoll_ctl(int epfd, int op, int fd, struct epoll_event *event)
139127
errno = EINVAL;
140128
return -1;
141129
}
142-
<<<<<<< HEAD
143-
144-
=======
145130

146-
>>>>>>> master
147131
if (n > 0) {
148132
if (kevent(epfd, kev, n, NULL, 0, NULL) < 0) {
149133
if (op != EPOLL_CTL_DEL) return -1;
@@ -156,27 +140,16 @@ static int kqueue_epoll_wait(int epfd, struct epoll_event *events, int maxevents
156140
struct kevent *kevs = (struct kevent *)alloca(sizeof(struct kevent) * maxevents);
157141
struct timespec ts;
158142
struct timespec *pts = NULL;
159-
<<<<<<< HEAD
160-
161-
=======
162143

163-
>>>>>>> master
164144
if (timeout >= 0) {
165145
ts.tv_sec = timeout / 1000;
166146
ts.tv_nsec = (timeout % 1000) * 1000000;
167147
pts = &ts;
168148
}
169-
<<<<<<< HEAD
170-
171-
int n = kevent(epfd, NULL, 0, kevs, maxevents, pts);
172-
if (n < 0) return -1;
173-
174-
=======
175149

176150
int n = kevent(epfd, NULL, 0, kevs, maxevents, pts);
177151
if (n < 0) return -1;
178152

179-
>>>>>>> master
180153
for (int i = 0; i < n; i++) {
181154
events[i].events = 0;
182155
if (kevs[i].filter == EVFILT_READ) events[i].events |= EPOLLIN;

‎src/objit/src/core/ob_orc_jit.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,10 +209,6 @@ class ObJitGlobalSymbolGenerator: public ObJitDefinitionGenerator {
209209
symbol_table[StringRef(*prefixed)] = pointerToJITTargetAddress(addr);
210210
#endif
211211
}
212-
213-
private:
214-
// Storage for prefixed symbol names on macOS
215-
static std::vector<std::string*> persistent_strings;
216212

217213
private:
218214
// Storage for prefixed symbol names on macOS

0 commit comments

Comments
 (0)