Issue #24882:convert to metasql
Merge pull request #555 from garyhgohoos/24882

Issue #24882:convert to metasql