optimize basic optimizer
Merge branch 'i20' of https://github.com/XingCloud/incubator-drill into i20