Regression: Wrong result for query with disjunctive partition filters

For a query that contains certain types of disjunctive filter conditions such as 'dir0=x OR dir1=y' we get wrong result when metadata caching is used. This is a regression due to DRILL-4530.

Note that the filter involves OR of 2 different directory levels. For the normal case of OR condition at the same level the problem does not occur.

Correct result (without metadata cache)

0: jdbc:drill:zk=local> select count(*) from dfs.`orders` where dir0=1994 or dir1='Q3' ;
+---------+
| EXPR$0  |
+---------+
| 60      |
+---------+

Wrong result (with metadata cache):

0: jdbc:drill:zk=local> select count(*) from dfs.`orders` where dir0=1994 or dir1='Q3' ;
+---------+
| EXPR$0  |
+---------+
| 50      |
+---------+