hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

patch tair code removing from 22x to 31CE

Browse Source
This commit is contained in:
ly0
2022-04-06 10:56:12 +08:00
committed by LINxiansheng
parent 518fd3552f
commit 68cd558747
71 changed files with 1310 additions and 1764 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
unittest/election/test_election_base.cpp
View File

@ -15,7 +15,7 @@
#include "common/ob_clock_generator.h"
#include "election/ob_election_async_log.h"
#include "lib/net/ob_addr.h"
#include "lib/net/tbnetutil.h"
#include "lib/net/ob_net_util.h"
#include "election/ob_election_base.h"
namespace oceanbase {
@ -55,7 +55,7 @@ TEST_F(TestObElectionBase, get_self_addr)
if (ifa->ifa_addr->sa_family == AF_INET) {
const char *dev = ifa->ifa_name;
EXPECT_EQ(OB_SUCCESS, get_self_addr(addr, dev, port));
uint32_t ip = obsys::CNetUtil::getLocalAddr(dev);
uint32_t ip = obsys::ObNetUtil::get_local_addr_ipv4(dev);
EXPECT_EQ(ip, addr.get_ipv4());
EXPECT_EQ(port, addr.get_port());
}

2
unittest/share/schema/test_priv_mgr.cpp
View File

@ -37,7 +37,7 @@ protected:
void TestPrivMgr::SetUp()
{
// obsys::CConfig c1;
// obsys::ObSysConfig c1;
// priv_mgr_.init();
}

6
unittest/share/test_latch.cpp
View File

@ -30,7 +30,7 @@ public:
int64_t round0_;
int64_t value0_;
ObLatch lock0_;
obsys::CRWLock lock_;
obsys::ObRWLock lock_;
pthread_mutex_t mutex_;
};
@ -70,7 +70,7 @@ void TestLatchStress::run(obsys::CThread* thread, void* arg)
// ASSERT_EQ(0, ret);
// pthread_mutex_unlock(&mutex_);
// obsys::CWLockGuard guard(lock_);
// obsys::ObWLockGuard guard(lock_);
// ASSERT_EQ(OB_SUCCESS, ret);
}
} else {
@ -91,7 +91,7 @@ void TestLatchStress::run(obsys::CThread* thread, void* arg)
// ASSERT_EQ(0, ret);
// pthread_mutex_unlock(&mutex_);
// obsys::CRLockGuard guard(lock_);
// obsys::ObRLockGuard guard(lock_);
// ASSERT_EQ(OB_SUCCESS, ret);
}
}

2
unittest/sql/executor/ob_mock_utils.h
View File

@ -103,7 +103,7 @@ public:
private:
static ObMockPacketQueueThread* instance_;
static tbutil::Mutex locker_;
static obutil::Mutex locker_;
};
} // namespace sql

4
unittest/sql/parser/test_parser_perf.cpp
View File

@ -61,9 +61,9 @@ void TestParserPerf::do_parse(const char* query_str)
parse_result.is_fp_ = IS_FP;
ObString query = ObString::make_string(query_str);
int ret = OB_SUCCESS;
t0 = obsys::CTimeUtil::getTime();
t0 = obsys::ObSysTimeUtil::getTime();
ret = parser.parse(query, parse_result, pmode);
t1 = obsys::CTimeUtil::getTime();
t1 = obsys::ObSysTimeUtil::getTime();
if (OB_SUCC(ret)) {
succ_cnt_++;
}

4
unittest/storage/mockcontainer/mock_ob_server.cpp
View File

@ -18,7 +18,7 @@
#include "lib/string/ob_sql_string.h"
#include "lib/io/ob_io_manager.h"
#include "lib/net/tbnetutil.h"
#include "lib/net/ob_net_util.h"
#include "rpc/obrpc/ob_rpc_proxy.h"
#include "share/schema/ob_multi_version_schema_service.h"
#include "share/partition_table/ob_partition_info.h"
@ -90,7 +90,7 @@ int MockObServer::init(
ret = OB_ELECTION_ASYNC_LOG_WARN_INIT;
}
int32_t local_ip = ntohl(obsys::CNetUtil::getLocalAddr(config_.devname));
int32_t local_ip = ntohl(obsys::ObNetUtil::get_local_addr_ipv4(config_.devname));
int32_t local_port = static_cast<int32_t>(config_.rpc_port);
config_.print();