This is an automated email from the ASF dual-hosted git repository.
caogaofei pushed a change to branch beyyes/multi_devices_fe
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 5d917e3cafc optimize the data types in align by device query + series
scan operator
add 34b61134470 fix conflict
No new revisions were added by this update.
Summary of changes:
.../execution/operator/source/AlignedSeriesScanOperator.java | 2 +-
.../org/apache/iotdb/db/queryengine/plan/analyze/TemplatedAnalyze.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)