diff --git a/src/rootserver/ddl_task/ob_ddl_task.cpp b/src/rootserver/ddl_task/ob_ddl_task.cpp index 1ee7c8566a..6ad9e56c33 100644 --- a/src/rootserver/ddl_task/ob_ddl_task.cpp +++ b/src/rootserver/ddl_task/ob_ddl_task.cpp @@ -3263,7 +3263,7 @@ int ObDDLTaskRecordOperator::select_for_update( } else { SMART_VAR(ObMySQLProxy::MySQLResult, res) { sqlclient::ObMySQLResult *result = NULL; - if (OB_FAIL(sql_string.assign_fmt("SELECT status, execution_id FROM %s WHERE task_id = %lu FOR UPDATE NOWAIT", + if (OB_FAIL(sql_string.assign_fmt("SELECT status, execution_id FROM %s WHERE task_id = %lu FOR UPDATE", OB_ALL_DDL_TASK_STATUS_TNAME, task_id))) { LOG_WARN("assign sql string failed", K(ret), K(task_id), K(tenant_id)); } else if (OB_FAIL(trans.read(res, tenant_id, sql_string.ptr()))) { diff --git a/src/share/CMakeLists.txt b/src/share/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/src/share/backup/ob_backup_data_table_operator.cpp b/src/share/backup/ob_backup_data_table_operator.cpp old mode 100755 new mode 100644 diff --git a/src/share/backup/ob_backup_data_table_operator.h b/src/share/backup/ob_backup_data_table_operator.h old mode 100755 new mode 100644 diff --git a/src/share/backup/ob_backup_path.cpp b/src/share/backup/ob_backup_path.cpp old mode 100755 new mode 100644 diff --git a/src/share/backup/ob_backup_path.h b/src/share/backup/ob_backup_path.h old mode 100755 new mode 100644 diff --git a/src/share/backup/ob_backup_struct.cpp b/src/share/backup/ob_backup_struct.cpp old mode 100755 new mode 100644 diff --git a/src/share/backup/ob_backup_struct.h b/src/share/backup/ob_backup_struct.h old mode 100755 new mode 100644 diff --git a/src/share/ls/ob_ls_creator.cpp b/src/share/ls/ob_ls_creator.cpp old mode 100755 new mode 100644 diff --git a/src/share/ls/ob_ls_creator.h b/src/share/ls/ob_ls_creator.h old mode 100755 new mode 100644 diff --git a/src/share/ls/ob_ls_operator.cpp b/src/share/ls/ob_ls_operator.cpp old mode 100755 new mode 100644 diff --git a/src/share/ls/ob_ls_operator.h b/src/share/ls/ob_ls_operator.h old mode 100755 new mode 100644 diff --git a/src/share/ls/ob_ls_status_operator.cpp b/src/share/ls/ob_ls_status_operator.cpp old mode 100755 new mode 100644 diff --git a/src/share/ls/ob_ls_status_operator.h b/src/share/ls/ob_ls_status_operator.h old mode 100755 new mode 100644 diff --git a/src/share/scheduler/ob_dag_scheduler_config.h b/src/share/scheduler/ob_dag_scheduler_config.h old mode 100755 new mode 100644 diff --git a/src/share/scheduler/ob_dag_warning_history_mgr.h b/src/share/scheduler/ob_dag_warning_history_mgr.h old mode 100755 new mode 100644 diff --git a/src/share/scheduler/ob_tenant_dag_scheduler.cpp b/src/share/scheduler/ob_tenant_dag_scheduler.cpp old mode 100755 new mode 100644 diff --git a/src/storage/CMakeLists.txt b/src/storage/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/src/storage/access/ob_dml_param.cpp b/src/storage/access/ob_dml_param.cpp old mode 100755 new mode 100644 diff --git a/src/storage/access/ob_dml_param.h b/src/storage/access/ob_dml_param.h old mode 100755 new mode 100644 diff --git a/src/storage/access/ob_index_tree_prefetcher.cpp b/src/storage/access/ob_index_tree_prefetcher.cpp old mode 100755 new mode 100644 diff --git a/src/storage/access/ob_table_scan_iterator.cpp b/src/storage/access/ob_table_scan_iterator.cpp old mode 100755 new mode 100644 diff --git a/src/storage/backup/ob_backup_ctx.cpp b/src/storage/backup/ob_backup_ctx.cpp old mode 100755 new mode 100644 diff --git a/src/storage/backup/ob_backup_data_store.cpp b/src/storage/backup/ob_backup_data_store.cpp old mode 100755 new mode 100644 diff --git a/src/storage/backup/ob_backup_data_store.h b/src/storage/backup/ob_backup_data_store.h old mode 100755 new mode 100644 diff --git a/src/storage/backup/ob_backup_data_struct.cpp b/src/storage/backup/ob_backup_data_struct.cpp old mode 100755 new mode 100644 diff --git a/src/storage/backup/ob_backup_data_struct.h b/src/storage/backup/ob_backup_data_struct.h old mode 100755 new mode 100644 diff --git a/src/storage/backup/ob_backup_operator.cpp b/src/storage/backup/ob_backup_operator.cpp old mode 100755 new mode 100644 diff --git a/src/storage/backup/ob_backup_task.cpp b/src/storage/backup/ob_backup_task.cpp old mode 100755 new mode 100644 diff --git a/src/storage/backup/ob_backup_utils.cpp b/src/storage/backup/ob_backup_utils.cpp old mode 100755 new mode 100644 diff --git a/src/storage/backup/ob_backup_utils.h b/src/storage/backup/ob_backup_utils.h old mode 100755 new mode 100644 diff --git a/src/storage/compaction/ob_compaction_diagnose.cpp b/src/storage/compaction/ob_compaction_diagnose.cpp old mode 100755 new mode 100644 diff --git a/src/storage/compaction/ob_compaction_diagnose.h b/src/storage/compaction/ob_compaction_diagnose.h old mode 100755 new mode 100644 diff --git a/src/storage/compaction/ob_medium_compaction_info.h b/src/storage/compaction/ob_medium_compaction_info.h old mode 100755 new mode 100644 diff --git a/src/storage/compaction/ob_partition_merge_policy.cpp b/src/storage/compaction/ob_partition_merge_policy.cpp old mode 100755 new mode 100644 diff --git a/src/storage/compaction/ob_partition_merge_progress.h b/src/storage/compaction/ob_partition_merge_progress.h old mode 100755 new mode 100644 diff --git a/src/storage/compaction/ob_sstable_merge_info_mgr.cpp b/src/storage/compaction/ob_sstable_merge_info_mgr.cpp old mode 100755 new mode 100644 diff --git a/src/storage/compaction/ob_tablet_merge_ctx.cpp b/src/storage/compaction/ob_tablet_merge_ctx.cpp old mode 100755 new mode 100644 diff --git a/src/storage/compaction/ob_tablet_merge_ctx.h b/src/storage/compaction/ob_tablet_merge_ctx.h old mode 100755 new mode 100644 diff --git a/src/storage/compaction/ob_tablet_merge_task.cpp b/src/storage/compaction/ob_tablet_merge_task.cpp old mode 100755 new mode 100644 diff --git a/src/storage/compaction/ob_tenant_tablet_scheduler.h b/src/storage/compaction/ob_tenant_tablet_scheduler.h old mode 100755 new mode 100644 diff --git a/src/storage/ddl/ob_complement_data_task.cpp b/src/storage/ddl/ob_complement_data_task.cpp old mode 100755 new mode 100644 diff --git a/src/storage/ddl/ob_ddl_merge_task.cpp b/src/storage/ddl/ob_ddl_merge_task.cpp old mode 100755 new mode 100644 diff --git a/src/storage/ddl/ob_ddl_merge_task.h b/src/storage/ddl/ob_ddl_merge_task.h old mode 100755 new mode 100644 diff --git a/src/storage/ddl/ob_ddl_redo_log_replayer.cpp b/src/storage/ddl/ob_ddl_redo_log_replayer.cpp old mode 100755 new mode 100644 diff --git a/src/storage/ddl/ob_ddl_redo_log_writer.cpp b/src/storage/ddl/ob_ddl_redo_log_writer.cpp old mode 100755 new mode 100644 diff --git a/src/storage/ddl/ob_ddl_replay_executor.cpp b/src/storage/ddl/ob_ddl_replay_executor.cpp old mode 100755 new mode 100644 diff --git a/src/storage/ddl/ob_direct_insert_sstable_ctx.cpp b/src/storage/ddl/ob_direct_insert_sstable_ctx.cpp old mode 100755 new mode 100644 diff --git a/src/storage/ddl/ob_tablet_ddl_kv.cpp b/src/storage/ddl/ob_tablet_ddl_kv.cpp old mode 100755 new mode 100644 diff --git a/src/storage/direct_load/ob_direct_load_origin_table.cpp b/src/storage/direct_load/ob_direct_load_origin_table.cpp old mode 100755 new mode 100644 diff --git a/src/storage/direct_load/ob_direct_load_origin_table.h b/src/storage/direct_load/ob_direct_load_origin_table.h old mode 100755 new mode 100644 diff --git a/src/storage/high_availability/ob_ls_migration_handler.cpp b/src/storage/high_availability/ob_ls_migration_handler.cpp old mode 100755 new mode 100644 diff --git a/src/storage/high_availability/ob_ls_prepare_migration.cpp b/src/storage/high_availability/ob_ls_prepare_migration.cpp old mode 100755 new mode 100644 diff --git a/src/storage/high_availability/ob_storage_ha_dag.cpp b/src/storage/high_availability/ob_storage_ha_dag.cpp old mode 100755 new mode 100644 diff --git a/src/storage/high_availability/ob_storage_ha_src_provider.cpp b/src/storage/high_availability/ob_storage_ha_src_provider.cpp old mode 100755 new mode 100644 diff --git a/src/storage/high_availability/ob_storage_ha_tablet_builder.cpp b/src/storage/high_availability/ob_storage_ha_tablet_builder.cpp old mode 100755 new mode 100644 diff --git a/src/storage/ls/ob_ls.cpp b/src/storage/ls/ob_ls.cpp old mode 100755 new mode 100644 diff --git a/src/storage/ls/ob_ls.h b/src/storage/ls/ob_ls.h old mode 100755 new mode 100644 diff --git a/src/storage/ls/ob_ls_get_mod.h b/src/storage/ls/ob_ls_get_mod.h old mode 100755 new mode 100644 diff --git a/src/storage/ls/ob_ls_tablet_service.cpp b/src/storage/ls/ob_ls_tablet_service.cpp old mode 100755 new mode 100644 diff --git a/src/storage/ls/ob_ls_tablet_service.h b/src/storage/ls/ob_ls_tablet_service.h old mode 100755 new mode 100644 diff --git a/src/storage/memtable/mvcc/ob_mvcc_acc_ctx.h b/src/storage/memtable/mvcc/ob_mvcc_acc_ctx.h old mode 100755 new mode 100644 diff --git a/src/storage/memtable/mvcc/ob_mvcc_iterator.cpp b/src/storage/memtable/mvcc/ob_mvcc_iterator.cpp old mode 100755 new mode 100644 diff --git a/src/storage/memtable/ob_memtable.cpp b/src/storage/memtable/ob_memtable.cpp old mode 100755 new mode 100644 diff --git a/src/storage/memtable/ob_memtable_iterator.cpp b/src/storage/memtable/ob_memtable_iterator.cpp old mode 100755 new mode 100644 diff --git a/src/storage/tablelock/ob_mem_ctx_table_lock.cpp b/src/storage/tablelock/ob_mem_ctx_table_lock.cpp old mode 100755 new mode 100644 diff --git a/src/storage/tablelock/ob_table_lock_common.h b/src/storage/tablelock/ob_table_lock_common.h old mode 100755 new mode 100644 diff --git a/src/storage/tablelock/ob_table_lock_rpc_struct.cpp b/src/storage/tablelock/ob_table_lock_rpc_struct.cpp old mode 100755 new mode 100644 diff --git a/src/storage/tablelock/ob_table_lock_rpc_struct.h b/src/storage/tablelock/ob_table_lock_rpc_struct.h old mode 100755 new mode 100644 diff --git a/src/storage/tablelock/ob_table_lock_service.cpp b/src/storage/tablelock/ob_table_lock_service.cpp old mode 100755 new mode 100644 diff --git a/src/storage/tablelock/ob_table_lock_service.h b/src/storage/tablelock/ob_table_lock_service.h old mode 100755 new mode 100644 diff --git a/src/storage/tablet/ob_tablet.cpp b/src/storage/tablet/ob_tablet.cpp index 68ff5a44fa..d77e4b8fcb 100644 --- a/src/storage/tablet/ob_tablet.cpp +++ b/src/storage/tablet/ob_tablet.cpp @@ -233,7 +233,7 @@ ObTablet::ObTablet() table_store_cache_() { #if defined(__x86_64__) && !defined(ENABLE_OBJ_LEAK_CHECK) - static_assert(sizeof(ObTablet) + sizeof(ObRowkeyReadInfo) <= 1672, "The size of ObTablet will affect the meta memory manager, and the necessity of adding new fields needs to be considered."); + static_assert(sizeof(ObTablet) + sizeof(ObRowkeyReadInfo) == 1616, "The size of ObTablet will affect the meta memory manager, and the necessity of adding new fields needs to be considered."); #endif MEMSET(memtables_, 0x0, sizeof(memtables_)); } diff --git a/src/storage/tablet/ob_tablet.h b/src/storage/tablet/ob_tablet.h index e620ff5440..48ec5a279c 100644 --- a/src/storage/tablet/ob_tablet.h +++ b/src/storage/tablet/ob_tablet.h @@ -795,7 +795,7 @@ private: int32_t version_; int32_t length_; volatile int64_t wash_score_; - ObTabletMdsData mds_data_; // size: 440B, alignment: 8B + ObTabletMdsData mds_data_; // size: 384B, alignment: 8B volatile int64_t ref_cnt_; ObTabletHandle next_tablet_guard_; // size: 56B, alignment: 8B ObTabletMeta tablet_meta_; // size: 248, alignment: 8B diff --git a/src/storage/tx/ob_dup_table_base.cpp b/src/storage/tx/ob_dup_table_base.cpp old mode 100755 new mode 100644 diff --git a/src/storage/tx/ob_dup_table_util.cpp b/src/storage/tx/ob_dup_table_util.cpp old mode 100755 new mode 100644 diff --git a/src/storage/tx/ob_trans_define.cpp b/src/storage/tx/ob_trans_define.cpp old mode 100755 new mode 100644 diff --git a/src/storage/tx/ob_trans_part_ctx.cpp b/src/storage/tx/ob_trans_part_ctx.cpp old mode 100755 new mode 100644 diff --git a/src/storage/tx/ob_trans_service.cpp b/src/storage/tx/ob_trans_service.cpp old mode 100755 new mode 100644 diff --git a/src/storage/tx/ob_trans_service_v4.cpp b/src/storage/tx/ob_trans_service_v4.cpp old mode 100755 new mode 100644 diff --git a/src/storage/tx/ob_tx_log.h b/src/storage/tx/ob_tx_log.h old mode 100755 new mode 100644 diff --git a/src/storage/tx/ob_tx_replay_executor.cpp b/src/storage/tx/ob_tx_replay_executor.cpp old mode 100755 new mode 100644 diff --git a/src/storage/tx_storage/ob_access_service.cpp b/src/storage/tx_storage/ob_access_service.cpp old mode 100755 new mode 100644 diff --git a/src/storage/tx_storage/ob_tablet_gc_service.cpp b/src/storage/tx_storage/ob_tablet_gc_service.cpp old mode 100755 new mode 100644 diff --git a/src/storage/tx_storage/ob_tablet_gc_service.h b/src/storage/tx_storage/ob_tablet_gc_service.h old mode 100755 new mode 100644 diff --git a/src/storage/tx_table/ob_tx_data_table.cpp b/src/storage/tx_table/ob_tx_data_table.cpp old mode 100755 new mode 100644 diff --git a/src/storage/tx_table/ob_tx_data_table.h b/src/storage/tx_table/ob_tx_data_table.h old mode 100755 new mode 100644 diff --git a/src/storage/tx_table/ob_tx_table.cpp b/src/storage/tx_table/ob_tx_table.cpp old mode 100755 new mode 100644