flink: simplify adding operators, clean dataset name