Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Metz
oceanbase
提交
41777597
O
oceanbase
项目概览
Metz
/
oceanbase
与 Fork 源项目一致
Fork自
oceanbase / oceanbase
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
oceanbase
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
提交
41777597
编写于
5月 20, 2022
作者:
W
wenxingsen
提交者:
wangzelin.wzl
5月 20, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add no_untiy entrance for build.sh and fix build error without unity
上级
8167156c
变更
10
显示空白变更内容
内联
并排
Showing
10 changed file
with
18 addition
and
7 deletion
+18
-7
build.sh
build.sh
+6
-0
deps/oblib/src/lib/json_type/ob_json_bin.cpp
deps/oblib/src/lib/json_type/ob_json_bin.cpp
+1
-1
deps/oblib/src/lib/oblog/ob_async_log_struct.cpp
deps/oblib/src/lib/oblog/ob_async_log_struct.cpp
+0
-1
src/observer/mysql/obsm_utils.cpp
src/observer/mysql/obsm_utils.cpp
+1
-0
src/share/backup/ob_backup_archive_log_round_stat.cpp
src/share/backup/ob_backup_archive_log_round_stat.cpp
+3
-0
src/share/backup/ob_backup_backuppiece_operator.cpp
src/share/backup/ob_backup_backuppiece_operator.cpp
+1
-0
src/share/backup/ob_backup_backuppiece_operator.h
src/share/backup/ob_backup_backuppiece_operator.h
+1
-0
src/share/backup/ob_backup_backupset_operator.h
src/share/backup/ob_backup_backupset_operator.h
+2
-5
src/share/backup/ob_physical_restore_table_operator.cpp
src/share/backup/ob_physical_restore_table_operator.cpp
+2
-0
src/share/schema/ob_schema_printer.h
src/share/schema/ob_schema_printer.h
+1
-0
未找到文件。
build.sh
浏览文件 @
41777597
...
...
@@ -112,9 +112,15 @@ function build
xrelease
)
do_build
"
$@
"
-DCMAKE_BUILD_TYPE
=
RelWithDebInfo
;;
xrelease_no_unity
)
do_build
"
$@
"
-DCMAKE_BUILD_TYPE
=
RelWithDebInfo
-DOB_ENABLE_UNITY
=
OFF
-DOB_ENABLE_PCH
=
OFF
;;
xdebug
)
do_build
"
$@
"
-DCMAKE_BUILD_TYPE
=
Debug
;;
xdebug_no_unity
)
do_build
"
$@
"
-DCMAKE_BUILD_TYPE
=
Debug
-DOB_ENABLE_UNITY
=
OFF
-DOB_ENABLE_PCH
=
OFF
;;
xrpm
)
do_build
"
$@
"
-DOB_BUILD_RPM
=
ON
-DCMAKE_BUILD_TYPE
=
RelWithDebInfo
-DOB_USE_CCACHE
=
OFF
-DOB_COMPRESS_DEBUG_SECTIONS
=
ON
-DOB_STATIC_LINK_LGPL_DEPS
=
OFF
;;
...
...
deps/oblib/src/lib/json_type/ob_json_bin.cpp
浏览文件 @
41777597
...
...
@@ -4325,7 +4325,7 @@ int ObJsonVar::read_var(const char *data, uint8_t type, int64_t *var)
uint64_t
ObJsonVar
::
var_int2uint
(
int64_t
var
)
{
ObJsonBinLenSize
size
=
static_cast
<
ObJsonBinLenSize
>
(
ObJsonVar
::
get_var_type
(
var
));
uint64
val
=
0
;
uint64
_t
val
=
0
;
switch
(
size
)
{
case
JBLS_UINT8
:
{
val
=
static_cast
<
uint64_t
>
(
static_cast
<
int8_t
>
(
var
));
...
...
deps/oblib/src/lib/oblog/ob_async_log_struct.cpp
浏览文件 @
41777597
...
...
@@ -13,7 +13,6 @@
#include "ob_async_log_struct.h"
#include "lib/objectpool/ob_concurrency_objpool.h"
using
namespace
obutil
;
namespace
oceanbase
{
namespace
common
{
ObPLogItem
::
ObPLogItem
()
...
...
src/observer/mysql/obsm_utils.cpp
浏览文件 @
41777597
...
...
@@ -16,6 +16,7 @@
#include "lib/charset/ob_dtoa.h"
#include "common/ob_field.h"
#include "share/schema/ob_schema_getter_guard.h"
#include <mariadb/mysql.h>
using
namespace
oceanbase
::
common
;
using
namespace
oceanbase
::
obmysql
;
...
...
src/share/backup/ob_backup_archive_log_round_stat.cpp
浏览文件 @
41777597
...
...
@@ -15,6 +15,9 @@
#include "share/backup/ob_backup_path.h"
#include "lib/lock/ob_lock_guard.h"
#include <algorithm>
#include "lib/container/ob_array.h"
#include "lib/container/ob_array_iterator.h"
using
namespace
oceanbase
::
common
;
using
namespace
oceanbase
::
lib
;
...
...
src/share/backup/ob_backup_backuppiece_operator.cpp
浏览文件 @
41777597
...
...
@@ -13,6 +13,7 @@
#define USING_LOG_PREFIX SHARE
#include "share/backup/ob_backup_backuppiece_operator.h"
#include "share/inner_table/ob_inner_table_schema_constants.h"
#include "lib/mysqlclient/ob_mysql_proxy.h"
using
namespace
oceanbase
::
share
;
...
...
src/share/backup/ob_backup_backuppiece_operator.h
浏览文件 @
41777597
...
...
@@ -16,6 +16,7 @@
#include "share/backup/ob_backup_struct.h"
#include "share/ob_dml_sql_splicer.h"
#include "lib/string/ob_sql_string.h"
#include "lib/mysqlclient/ob_mysql_result.h"
namespace
oceanbase
{
namespace
share
{
...
...
src/share/backup/ob_backup_backupset_operator.h
浏览文件 @
41777597
// Copyright 2020 Alibaba Inc. All Rights Reserved
// Author:
// yanfeng <yangyi.yyy@alibaba-inc.com>
// Normalizer:
// yanfeng <yangyi.yyy@alibaba-inc.com>
#ifndef OCEANBASE_SHARE_BACKUP_OB_BACKUP_BACKUPSET_OPERATOR_H_
#define OCEANBASE_SHARE_BACKUP_OB_BACKUP_BACKUPSET_OPERATOR_H_
...
...
@@ -10,6 +6,7 @@
#include "share/ob_dml_sql_splicer.h"
#include "share/backup/ob_backup_struct.h"
#include "lib/string/ob_sql_string.h"
#include "lib/mysqlclient/ob_mysql_result.h"
namespace
oceanbase
{
namespace
share
{
...
...
@@ -114,7 +111,7 @@ public:
static
int
delete_task_item
(
const
ObTenantBackupBackupsetTaskItem
&
task_item
,
common
::
ObISQLClient
&
client
);
static
int
get_max_succeed_task
(
const
uint64_t
tenant_id
,
const
int64_t
copy_id
,
ObTenantBackupBackupsetTaskItem
&
item
,
common
::
ObISQLClient
&
client
);
//
支持换
backup backup dest
//
support to replace
backup backup dest
static
int
get_same_backup_set_id_tasks
(
const
bool
is_tenant_level
,
const
uint64_t
tenant_id
,
const
int64_t
backup_set_id
,
common
::
ObIArray
<
ObTenantBackupBackupsetTaskItem
>&
items
,
common
::
ObISQLClient
&
client
);
...
...
src/share/backup/ob_physical_restore_table_operator.cpp
浏览文件 @
41777597
...
...
@@ -22,6 +22,8 @@
#include "rootserver/ob_rs_job_table_operator.h"
#include "share/backup/ob_backup_path.h"
#include <algorithm>
#include "lib/container/ob_array.h"
#include "lib/container/ob_array_iterator.h"
using
namespace
oceanbase
::
common
;
using
namespace
oceanbase
::
share
;
...
...
src/share/schema/ob_schema_printer.h
浏览文件 @
41777597
...
...
@@ -16,6 +16,7 @@
#include "share/ob_define.h"
#include "lib/container/ob_iarray.h"
#include "share/schema/ob_schema_struct.h"
#include "common/sql_mode/ob_sql_mode.h"
namespace
oceanbase
{
namespace
common
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录