Reviewed-by: Siyao Meng <smeng@cloudera.com> Reviewed-by: Wei-Chiu CHuang <weichiu@apache.org> Signed-off-by: Wei-Chiu Chuang <weichiu@apache.org> (cherry picked from commit b8db5b9a9812023754ed1b3e5b428e161f0add50) (cherry picked from commit 6b01effd011ab1f88bdbb9f2dbf9bbb0765984e6)