[Call For Review][2003 Filter]2 data pilot bugs

[Jianyuan Li]

Hi, all,

I have fixes for two data pilot issues. Can anyone help review? Thanks.
https://issues.apache.org/ooo/show_bug.cgi?id=121071
https://issues.apache.org/ooo/show_bug.cgi?id=119514(Based on the fix for
121071)


Regards,
Jianyuan