1) Refactor PushJoinThroughJoin, swapJoinRule 2) Fix RelMDDistinctRow to pass true predicate