[FEAT MERGE] log4100 branch
Co-authored-by: tino247 <tino247@126.com> Co-authored-by: BinChenn <binchenn.bc@gmail.com> Co-authored-by: HaHaJeff <jeffzhouhhh@gmail.com>
This commit is contained in:
@ -479,7 +479,7 @@ int ObOptEstCost::estimate_width_for_exprs(const OptTableMetas &table_metas,
|
||||
int64_t avg_len = 0;
|
||||
const OptTableMeta *table_meta = table_metas.get_table_meta_by_table_id(table_id);
|
||||
// base table column expr use statistic
|
||||
if (OB_NOT_NULL(table_meta) &&
|
||||
if (OB_NOT_NULL(table_meta) && table_meta->use_opt_stat() &&
|
||||
OB_FAIL(ctx.get_opt_stat_manager()->get_column_stat(ctx.get_session_info()->get_effective_tenant_id(),
|
||||
table_meta->get_ref_table_id(),
|
||||
table_meta->get_all_used_parts(),
|
||||
|
||||
@ -3032,7 +3032,8 @@ int ObOptSelectivity::get_column_min_max(const OptTableMetas &table_metas,
|
||||
ret = OB_ERR_UNEXPECTED;
|
||||
LOG_WARN("get unexpected null", K(ret), K(ctx.get_opt_stat_manager()),
|
||||
K(ctx.get_session_info()));
|
||||
} else if (OB_FAIL(ctx.get_opt_stat_manager()->get_column_stat(ctx.get_session_info()->get_effective_tenant_id(),
|
||||
} else if (table_meta->use_opt_stat() &&
|
||||
OB_FAIL(ctx.get_opt_stat_manager()->get_column_stat(ctx.get_session_info()->get_effective_tenant_id(),
|
||||
table_meta->get_ref_table_id(),
|
||||
table_meta->get_all_used_parts(),
|
||||
column_id,
|
||||
|
||||
@ -1767,8 +1767,9 @@ int ObTableLocation::get_link_table_location(const uint64_t tenant_id,
|
||||
fake_addr.set_ipv4_addr(654321, 4321);
|
||||
int64_t fake_port = 4321;
|
||||
OZ(ls_replica.init(fake_addr, common::LEADER,
|
||||
fake_port, REPLICA_TYPE_FULL,
|
||||
mock_prop, ls_restore_status));
|
||||
fake_port, REPLICA_TYPE_FULL,
|
||||
mock_prop, ls_restore_status,
|
||||
1 /*proposal_id*/));
|
||||
location.init(GCONF.cluster_id, tenant_id, ObLSID(ObLSID::SYS_LS_ID), now);
|
||||
OZ(location.add_replica_location(ls_replica));
|
||||
return ret;
|
||||
|
||||
Reference in New Issue
Block a user