This is an automated email from the ASF dual-hosted git repository. hui pushed a commit to branch lmh/RefactorAnalyzer in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 95f3ab11527518f44d10bcf428e82a46b060ed54 Author: liuminghui233 <[email protected]> AuthorDate: Mon Sep 26 23:16:40 2022 +0800 fix AnalyzeTest --- .../iotdb/db/mpp/common/header/DatasetHeader.java | 17 +++++++++++++++++ .../apache/iotdb/db/mpp/plan/analyze/AnalyzeTest.java | 6 ++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/common/header/DatasetHeader.java b/server/src/main/java/org/apache/iotdb/db/mpp/common/header/DatasetHeader.java index 34680b5a2c..23768dd4c3 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/common/header/DatasetHeader.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/common/header/DatasetHeader.java @@ -113,4 +113,21 @@ public class DatasetHeader { public int getOutputValueColumnCount() { return (int) columnHeaders.stream().map(ColumnHeader::getColumnName).distinct().count(); } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + DatasetHeader that = (DatasetHeader) o; + return isIgnoreTimestamp == that.isIgnoreTimestamp && columnHeaders.equals(that.columnHeaders); + } + + @Override + public int hashCode() { + return Objects.hash(columnHeaders, isIgnoreTimestamp); + } } diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeTest.java index e1907490b0..75c6687ef8 100644 --- a/server/src/test/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeTest.java +++ b/server/src/test/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeTest.java @@ -61,6 +61,7 @@ public class AnalyzeTest { expectedAnalysis.setSelectExpressions( Sets.newHashSet( new TimeSeriesOperand(new PartialPath("root.sg.d1.s1")), + new TimeSeriesOperand(new PartialPath("root.sg.d1.s2")), new AdditionExpression( new TimeSeriesOperand(new PartialPath("root.sg.d1.s1")), new ConstantOperand(TSDataType.INT64, "1")))); @@ -71,6 +72,7 @@ public class AnalyzeTest { expectedAnalysis.setSourceTransformExpressions( Sets.newHashSet( new TimeSeriesOperand(new PartialPath("root.sg.d1.s1")), + new TimeSeriesOperand(new PartialPath("root.sg.d1.s2")), new AdditionExpression( new TimeSeriesOperand(new PartialPath("root.sg.d1.s1")), new ConstantOperand(TSDataType.INT64, "1")))); @@ -82,8 +84,8 @@ public class AnalyzeTest { new DatasetHeader( Arrays.asList( new ColumnHeader("root.sg.d1.s1", TSDataType.INT32), - new ColumnHeader("root.sg.d1.s1", TSDataType.INT32, "status"), - new ColumnHeader("root.sg.d1.s1 + 1", TSDataType.INT32, "t")), + new ColumnHeader("root.sg.d1.s2", TSDataType.DOUBLE, "root.sg.d1.status"), + new ColumnHeader("root.sg.d1.s1 + 1", TSDataType.DOUBLE, "t")), false)); alignByTimeAnalysisEqualTest(actualAnalysis, expectedAnalysis); } catch (Exception e) {
