Lps 32110 refactor SampleSQLBuilder, rebase and retest.