fix: add on conditions null check and rightRowLocations no longer hides the outer scope rightRowLocations

fix: using right rows to build hash table when the tag equal cond is not null and same ts row row number is greater than 16

This reverts commit 9ce1e8cc.

presents