Revert "modify new data scope"

This reverts commit 764db82190ad4d996dda5d7c34d75607001d2b4e.
Revert "dont strip  datasource metadata,minor code polishing"

This reverts commit 44d3ef119e148088d820bfc8a41ce6e9c2f68973.