This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch ty/TableModelGrammar
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 54e566c2af2 resolve conflicts
add 48874801fc7 resolve conflicts
No new revisions were added by this update.
Summary of changes:
.../source/ActiveTimeSeriesRegionScanOperator.java | 3 +--
.../distribution/RegionScanPlanningTest.java | 13 +++++-----
.../logical/RegionScanLogicalPlannerTest.java | 28 ++++++++++------------
.../TsFileValidationCorrectnessTests.java | 4 ++--
.../settle/SettleCompactionTaskTest.java | 2 +-
5 files changed, 22 insertions(+), 28 deletions(-)
