Orc review

more clean one based on datasource api
for data source