This is an automated email from the ASF dual-hosted git repository.
xuekaifeng pushed a change to branch new_series_reader
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 2ea5ff7 Resolve conflict from IOTDB-447
add 72eb5af [IOTDB-447] query not exist measurement and constant
measurement (#772)
add 96cf31e resolve conflict from IOTDB-447
No new revisions were added by this update.
Summary of changes:
.../main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java | 5 -----
.../apache/iotdb/db/qp/strategy/optimizer/ConcatPathOptimizer.java | 1 -
server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java | 1 +
3 files changed, 1 insertion(+), 6 deletions(-)
