[streaming] DataStream type refactor