add no_untiy entrance for build.sh and fix build error without unity

This commit is contained in:
wenxingsen
2022-05-20 14:31:30 +08:00
committed by wangzelin.wzl
parent 8167156cf5
commit 4177759770
10 changed files with 18 additions and 7 deletions

View File

@ -112,9 +112,15 @@ function build
xrelease) xrelease)
do_build "$@" -DCMAKE_BUILD_TYPE=RelWithDebInfo do_build "$@" -DCMAKE_BUILD_TYPE=RelWithDebInfo
;; ;;
xrelease_no_unity)
do_build "$@" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOB_ENABLE_UNITY=OFF -DOB_ENABLE_PCH=OFF
;;
xdebug) xdebug)
do_build "$@" -DCMAKE_BUILD_TYPE=Debug do_build "$@" -DCMAKE_BUILD_TYPE=Debug
;; ;;
xdebug_no_unity)
do_build "$@" -DCMAKE_BUILD_TYPE=Debug -DOB_ENABLE_UNITY=OFF -DOB_ENABLE_PCH=OFF
;;
xrpm) 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 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
;; ;;

View File

@ -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) uint64_t ObJsonVar::var_int2uint(int64_t var)
{ {
ObJsonBinLenSize size = static_cast<ObJsonBinLenSize>(ObJsonVar::get_var_type(var)); ObJsonBinLenSize size = static_cast<ObJsonBinLenSize>(ObJsonVar::get_var_type(var));
uint64 val = 0; uint64_t val = 0;
switch (size) { switch (size) {
case JBLS_UINT8: { case JBLS_UINT8: {
val = static_cast<uint64_t>(static_cast<int8_t>(var)); val = static_cast<uint64_t>(static_cast<int8_t>(var));

View File

@ -13,7 +13,6 @@
#include "ob_async_log_struct.h" #include "ob_async_log_struct.h"
#include "lib/objectpool/ob_concurrency_objpool.h" #include "lib/objectpool/ob_concurrency_objpool.h"
using namespace obutil;
namespace oceanbase { namespace oceanbase {
namespace common { namespace common {
ObPLogItem::ObPLogItem() ObPLogItem::ObPLogItem()

View File

@ -16,6 +16,7 @@
#include "lib/charset/ob_dtoa.h" #include "lib/charset/ob_dtoa.h"
#include "common/ob_field.h" #include "common/ob_field.h"
#include "share/schema/ob_schema_getter_guard.h" #include "share/schema/ob_schema_getter_guard.h"
#include <mariadb/mysql.h>
using namespace oceanbase::common; using namespace oceanbase::common;
using namespace oceanbase::obmysql; using namespace oceanbase::obmysql;

View File

@ -15,6 +15,9 @@
#include "share/backup/ob_backup_path.h" #include "share/backup/ob_backup_path.h"
#include "lib/lock/ob_lock_guard.h" #include "lib/lock/ob_lock_guard.h"
#include <algorithm> #include <algorithm>
#include "lib/container/ob_array.h"
#include "lib/container/ob_array_iterator.h"
using namespace oceanbase::common; using namespace oceanbase::common;
using namespace oceanbase::lib; using namespace oceanbase::lib;

View File

@ -13,6 +13,7 @@
#define USING_LOG_PREFIX SHARE #define USING_LOG_PREFIX SHARE
#include "share/backup/ob_backup_backuppiece_operator.h" #include "share/backup/ob_backup_backuppiece_operator.h"
#include "share/inner_table/ob_inner_table_schema_constants.h" #include "share/inner_table/ob_inner_table_schema_constants.h"
#include "lib/mysqlclient/ob_mysql_proxy.h"
using namespace oceanbase::share; using namespace oceanbase::share;

View File

@ -16,6 +16,7 @@
#include "share/backup/ob_backup_struct.h" #include "share/backup/ob_backup_struct.h"
#include "share/ob_dml_sql_splicer.h" #include "share/ob_dml_sql_splicer.h"
#include "lib/string/ob_sql_string.h" #include "lib/string/ob_sql_string.h"
#include "lib/mysqlclient/ob_mysql_result.h"
namespace oceanbase { namespace oceanbase {
namespace share { namespace share {

View File

@ -1,8 +1,4 @@
// Copyright 2020 Alibaba Inc. All Rights Reserved // 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_ #ifndef OCEANBASE_SHARE_BACKUP_OB_BACKUP_BACKUPSET_OPERATOR_H_
#define 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/ob_dml_sql_splicer.h"
#include "share/backup/ob_backup_struct.h" #include "share/backup/ob_backup_struct.h"
#include "lib/string/ob_sql_string.h" #include "lib/string/ob_sql_string.h"
#include "lib/mysqlclient/ob_mysql_result.h"
namespace oceanbase { namespace oceanbase {
namespace share { namespace share {
@ -114,7 +111,7 @@ public:
static int delete_task_item(const ObTenantBackupBackupsetTaskItem& task_item, common::ObISQLClient& client); 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, static int get_max_succeed_task(const uint64_t tenant_id, const int64_t copy_id,
ObTenantBackupBackupsetTaskItem& item, common::ObISQLClient& client); 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, 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, const int64_t backup_set_id, common::ObIArray<ObTenantBackupBackupsetTaskItem>& items,
common::ObISQLClient& client); common::ObISQLClient& client);

View File

@ -22,6 +22,8 @@
#include "rootserver/ob_rs_job_table_operator.h" #include "rootserver/ob_rs_job_table_operator.h"
#include "share/backup/ob_backup_path.h" #include "share/backup/ob_backup_path.h"
#include <algorithm> #include <algorithm>
#include "lib/container/ob_array.h"
#include "lib/container/ob_array_iterator.h"
using namespace oceanbase::common; using namespace oceanbase::common;
using namespace oceanbase::share; using namespace oceanbase::share;

View File

@ -16,6 +16,7 @@
#include "share/ob_define.h" #include "share/ob_define.h"
#include "lib/container/ob_iarray.h" #include "lib/container/ob_iarray.h"
#include "share/schema/ob_schema_struct.h" #include "share/schema/ob_schema_struct.h"
#include "common/sql_mode/ob_sql_mode.h"
namespace oceanbase { namespace oceanbase {
namespace common { namespace common {