unify HCatScheme's source and sink fields