fix ccls build mode copy.sh and clean logic

This commit is contained in:
wenxingsen
2022-12-27 13:12:05 +00:00
committed by ob-robot
parent 4666798151
commit 7bcc0330c1
6 changed files with 15 additions and 14 deletions

View File

@ -140,7 +140,7 @@ function do_build
function do_clean function do_clean
{ {
echo_log "cleaning..." echo_log "cleaning..."
find . -maxdepth 1 -type d -name 'build_*' | xargs rm -rf find . -maxdepth 1 -type d -name 'build_*' | grep -v 'build_ccls' | xargs rm -rf
} }
# build - configurate project and prepare to compile, by calling make # build - configurate project and prepare to compile, by calling make

View File

@ -4,7 +4,6 @@ add_subdirectory(regex)
target_compile_definitions(regex PRIVATE -DREGEX_STANDALONE -DREGEX_WCHAR) target_compile_definitions(regex PRIVATE -DREGEX_STANDALONE -DREGEX_WCHAR)
ob_set_subtarget(oblib_lib ALONE ob_set_subtarget(oblib_lib ALONE
cpu/ob_cpu_topology.cpp
timezone/ob_timezone_util.cpp timezone/ob_timezone_util.cpp
geo/ob_geo_func_difference.cpp geo/ob_geo_func_difference.cpp
geo/ob_geo_func_covered_by.cpp geo/ob_geo_func_covered_by.cpp
@ -84,6 +83,7 @@ ob_set_subtarget(oblib_lib common_mixed
checksum/ob_parity_check.cpp checksum/ob_parity_check.cpp
container/ob_bitmap.cpp container/ob_bitmap.cpp
container/ob_vector.ipp container/ob_vector.ipp
cpu/ob_cpu_topology.cpp
encode/ob_base64_encode.cpp encode/ob_base64_encode.cpp
encode/ob_quoted_printable_encode.cpp encode/ob_quoted_printable_encode.cpp
encode/ob_uuencode.cpp encode/ob_uuencode.cpp

View File

@ -1,8 +1,8 @@
ob_set_subtarget(ob_rootserver ALONE ob_set_subtarget(ob_rootserver ALONE
ob_ddl_service.cpp ob_ddl_service.cpp
ob_index_builder.cpp
ob_root_inspection.cpp
ob_root_service.cpp ob_root_service.cpp
ddl_task/ob_ddl_redefinition_task.cpp
ob_unit_manager.cpp
) )
ob_set_subtarget(ob_rootserver backup ob_set_subtarget(ob_rootserver backup
@ -39,11 +39,13 @@ ob_set_subtarget(ob_rootserver common
ob_ddl_operator.cpp ob_ddl_operator.cpp
ob_ddl_sql_generator.cpp ob_ddl_sql_generator.cpp
ob_inner_table_monitor.cpp ob_inner_table_monitor.cpp
ob_index_builder.cpp
ob_locality_util.cpp ob_locality_util.cpp
ob_resource_weight_parser.cpp ob_resource_weight_parser.cpp
ob_root_balancer.cpp ob_root_balancer.cpp
ob_root_minor_freeze.cpp ob_root_minor_freeze.cpp
ob_root_utils.cpp ob_root_utils.cpp
ob_root_inspection.cpp
ob_rs_event_history_table_operator.cpp ob_rs_event_history_table_operator.cpp
ob_rs_job_table_operator.cpp ob_rs_job_table_operator.cpp
ob_rs_reentrant_thread.cpp ob_rs_reentrant_thread.cpp
@ -70,7 +72,6 @@ ob_set_subtarget(ob_rootserver common
ob_tenant_role_transition_service.cpp ob_tenant_role_transition_service.cpp
ob_server_balancer.cpp ob_server_balancer.cpp
ob_system_admin_util.cpp ob_system_admin_util.cpp
ob_unit_manager.cpp
ob_update_rs_list_task.cpp ob_update_rs_list_task.cpp
ob_upgrade_storage_format_version_executor.cpp ob_upgrade_storage_format_version_executor.cpp
ob_schema_history_recycler.cpp ob_schema_history_recycler.cpp
@ -82,7 +83,7 @@ ob_set_subtarget(ob_rootserver common
ob_set_subtarget(ob_rootserver ddl_task ob_set_subtarget(ob_rootserver ddl_task
ddl_task/ob_column_redefinition_task.cpp ddl_task/ob_column_redefinition_task.cpp
ddl_task/ob_constraint_task.cpp ddl_task/ob_constraint_task.cpp
ddl_task/ob_ddl_redefinition_task.cpp
ddl_task/ob_ddl_retry_task.cpp ddl_task/ob_ddl_retry_task.cpp
ddl_task/ob_ddl_scheduler.cpp ddl_task/ob_ddl_scheduler.cpp
ddl_task/ob_ddl_single_replica_executor.cpp ddl_task/ob_ddl_single_replica_executor.cpp

View File

@ -1,12 +1,8 @@
ob_set_subtarget(ob_share ALONE ob_set_subtarget(ob_share ALONE
ob_rpc_struct.cpp ob_rpc_struct.cpp
ob_tenant_mgr.cpp ob_tenant_mgr.cpp
schema/ob_schema_getter_guard.cpp datum/ob_datum_funcs.cpp
schema/ob_schema_service_sql_impl.cpp schema/ob_schema_service_sql_impl.cpp
schema/ob_schema_struct.cpp
schema/ob_sequence_sql_service.cpp
schema/ob_server_schema_service.cpp
schema/ob_table_schema.cpp
parameter/ob_parameter_attr.cpp parameter/ob_parameter_attr.cpp
) )
@ -191,7 +187,6 @@ ob_set_subtarget(ob_share common_mixed
client_feedback/ob_feedback_int_struct.cpp client_feedback/ob_feedback_int_struct.cpp
client_feedback/ob_feedback_partition_struct.cpp client_feedback/ob_feedback_partition_struct.cpp
datum/ob_datum.cpp datum/ob_datum.cpp
datum/ob_datum_funcs.cpp
diagnosis/ob_sql_monitor_statname.cpp diagnosis/ob_sql_monitor_statname.cpp
diagnosis/ob_sql_plan_monitor_node_list.cpp diagnosis/ob_sql_plan_monitor_node_list.cpp
interrupt/ob_global_interrupt_call.cpp interrupt/ob_global_interrupt_call.cpp
@ -394,6 +389,11 @@ ob_set_subtarget(ob_share schema
schema/ob_context_sql_service.cpp schema/ob_context_sql_service.cpp
schema/ob_context_mgr.cpp schema/ob_context_mgr.cpp
schema/ob_context_ddl_proxy.cpp schema/ob_context_ddl_proxy.cpp
schema/ob_schema_getter_guard.cpp
schema/ob_schema_struct.cpp
schema/ob_sequence_sql_service.cpp
schema/ob_server_schema_service.cpp
schema/ob_table_schema.cpp
) )
ob_set_subtarget(ob_share stat ob_set_subtarget(ob_share stat

View File

@ -1070,7 +1070,7 @@ OB_INLINE int ObLocalIndexLookupOp::process_data_table_rowkey()
return ret; return ret;
} }
OB_INLINE int ObLocalIndexLookupOp::do_index_lookup() int ObLocalIndexLookupOp::do_index_lookup()
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
ObITabletScan &tsc_service = get_tsc_service(); ObITabletScan &tsc_service = get_tsc_service();

View File

@ -2,7 +2,7 @@
if [ $# -lt 1 ] if [ $# -lt 1 ]
then then
echo "Usage ./copy.sh [oceanbase_dev_dir]" echo "Usage ./copy.sh [oceanbase_dev_dir]"
BUILD_DIR=$(find $PWD/../../ -maxdepth 1 -name 'build_*' -type d | head -1) BUILD_DIR=$(find $PWD/../../ -maxdepth 1 -name 'build_*' -type d | grep -v 'build_ccls' | head -1)
SOURCE_DIR=$PWD/../../ SOURCE_DIR=$PWD/../../
else else
BUILD_DIR=$1 BUILD_DIR=$1