Lps 32110 refactor SampleSQLBuilder, split changes.