resolve the conflict of logbcak-test.xml
sort-3 passed (fixed the type in the SQLGenerator)