[iotdb] branch master updated: Fix conflicts in path constructor (#7859)

[xingtanzjr]

This is an automated email from the ASF dual-hosted git repository.

xingtanzjr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 933d51bf04 Fix conflicts in path constructor (#7859)
933d51bf04 is described below

commit 933d51bf04b3c2d47481c1ddeb3221f6020ee4c6
Author: 周沛辰 <45144903+chouben...@users.noreply.github.com>
AuthorDate: Tue Nov 1 17:31:26 2022 +0800

    Fix conflicts in path constructor (#7859)
---
 .../java/org/apache/iotdb/tsfile/write/TsFileWriteApiTest.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileWriteApiTest.java 
b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileWriteApiTest.java
index 7eb9fae547..f23423c912 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileWriteApiTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileWriteApiTest.java
@@ -473,7 +473,7 @@ public class TsFileWriteApiTest {
       QueryExpression queryExpression =
           QueryExpression.create(
               Collections.singletonList(
-                  new Path(deviceId, 
alignedMeasurementSchemas.get(i).getMeasurementId())),
+                  new Path(deviceId, 
alignedMeasurementSchemas.get(i).getMeasurementId(), true)),
               null);
       QueryDataSet queryDataSet = tsFileReader.query(queryExpression);
 
@@ -519,7 +519,7 @@ public class TsFileWriteApiTest {
       QueryExpression queryExpression =
           QueryExpression.create(
               Collections.singletonList(
-                  new Path(deviceId, 
alignedMeasurementSchemas.get(i).getMeasurementId())),
+                  new Path(deviceId, 
alignedMeasurementSchemas.get(i).getMeasurementId(), true)),
               null);
       QueryDataSet queryDataSet = tsFileReader.query(queryExpression);
       int cnt = 0;
@@ -585,7 +585,7 @@ public class TsFileWriteApiTest {
       QueryExpression queryExpression =
           QueryExpression.create(
               Collections.singletonList(
-                  new Path(deviceId, 
alignedMeasurementSchemas.get(i).getMeasurementId())),
+                  new Path(deviceId, 
alignedMeasurementSchemas.get(i).getMeasurementId(), true)),
               null);
       QueryDataSet queryDataSet = tsFileReader.query(queryExpression);
       int cnt = 0;
@@ -668,7 +668,7 @@ public class TsFileWriteApiTest {
       QueryExpression queryExpression =
           QueryExpression.create(
               Collections.singletonList(
-                  new Path(deviceId, 
measurementSchemas.get(0).getMeasurementId())),
+                  new Path(deviceId, 
measurementSchemas.get(0).getMeasurementId(), true)),
               null);
       QueryDataSet queryDataSet = tsFileReader.query(queryExpression);
       int cnt = 0;