Issue #24882:convert to metasql