You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@iotdb.apache.org by GitBox <gi...@apache.org> on 2022/08/04 02:52:09 UTC
[GitHub] [iotdb] Husaimawx opened a new pull request, #6892: Add a new UDF function: MasterRepair with docs
Husaimawx opened a new pull request, #6892:
URL: https://github.com/apache/iotdb/pull/6892
## Description
Add a new UDF function: MasterRepair with docs
### Content1 ...
### Content2 ...
### Content3 ...
<!--
In each section, please describe design decisions made, including:
- Choice of algorithms
- Behavioral aspects. What configuration values are acceptable? How are corner cases and error
conditions handled, such as when there are insufficient resources?
- Class organization and design (how the logic is split between classes, inheritance, composition,
design patterns)
- Method organization and design (how the logic is split between methods, parameters and return types)
- Naming (class, method, API, configuration, HTTP endpoint, names of emitted metrics)
-->
<!-- It's good to describe an alternative design (or mention an alternative name) for every design
(or naming) decision point and compare the alternatives with the designs that you've implemented
(or the names you've chosen) to highlight the advantages of the chosen designs and names. -->
<!-- If there was a discussion of the design of the feature implemented in this PR elsewhere
(e. g. a "Proposal" issue, any other issue, or a thread in the development mailing list),
link to that discussion from this PR description and explain what have changed in your final design
compared to your original proposal or the consensus version in the end of the discussion.
If something hasn't changed since the original discussion, you can omit a detailed discussion of
those aspects of the design here, perhaps apart from brief mentioning for the sake of readability
of this PR description. -->
<!-- Some of the aspects mentioned above may be omitted for simple and small changes. -->
<hr>
This PR has:
- [ ] been self-reviewed.
- [ ] concurrent read
- [ ] concurrent write
- [ ] concurrent read and write
- [ ] added documentation for new or modified features or behaviors.
- [ ] added Javadocs for most classes and all non-trivial methods.
- [ ] added or updated version, __license__, or notice information
- [ ] added comments explaining the "why" and the intent of the code wherever would not be obvious
for an unfamiliar reader.
- [ ] added unit tests or modified existing tests to cover new code paths, ensuring the threshold
for code coverage.
- [ ] added integration tests.
- [ ] been tested in a test IoTDB cluster.
<!-- Check the items by putting "x" in the brackets for the done things. Not all of these items
apply to every PR. Remove the items which are not done or not relevant to the PR. None of the items
from the checklist above are strictly necessary, but it would be very helpful if you at least
self-review the PR. -->
<hr>
##### Key changed/added classes (or packages if there are too many classes) in this PR
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@iotdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] SteveYurongSu merged pull request #6892: Add a new UDF function: MasterRepair with docs
Posted by GitBox <gi...@apache.org>.
SteveYurongSu merged PR #6892:
URL: https://github.com/apache/iotdb/pull/6892
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@iotdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] Husaimawx commented on a diff in pull request #6892: Add a new UDF function: MasterRepair with docs
Posted by GitBox <gi...@apache.org>.
Husaimawx commented on code in PR #6892:
URL: https://github.com/apache/iotdb/pull/6892#discussion_r939818598
##########
integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFBuiltinFunctionIT.java:
##########
@@ -1232,6 +1232,200 @@ private void testStrLength(Statement statement) {
}
}
+ @Test
+ public void testMasterRepair() {
+ // create time series with master data
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ statement.execute("SET STORAGE GROUP TO root.testMasterRepair");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s1 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s2 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s3 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m1 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m2 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m3 with datatype=FLOAT,encoding=PLAIN");
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ String[] INSERT_SQL = {
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (1,1704,1154.55,0.195,1704,1154.55,0.195)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (2,1702,1152.30,0.193,1702,1152.30,0.193)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (3,1702,1148.65,0.192,1702,1148.65,0.192)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (4,1701,1145.20,0.194,1701,1145.20,0.194)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (7,1703,1150.55,0.195,1703,1150.55,0.195)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (8,1694,1151.55,0.193,1704,1151.55,0.193)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (9,1705,1153.55,0.194,1705,1153.55,0.194)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (10,1706,1152.30,0.190,1706,1152.30,0.190)",
+ };
+
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ for (String dataGenerationSql : INSERT_SQL) {
+ statement.execute(dataGenerationSql);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 1
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r1 = {1704.0, 1702.0, 1702.0, 1701.0, 1703.0, 1702.0, 1705.0, 1706.0};
+ ResultSet resultSet =
+ statement.executeQuery(
+ "select MasterRepair(s1,s2,s3,m1,m2,m3) from root.testMasterRepair.d1");
+ int columnCount = resultSet.getMetaData().getColumnCount();
+ assertEquals(1 + 1, columnCount);
+ for (int i = 0; i < timestamps.length; i++) {
+ resultSet.next();
+ long expectedTimestamp = timestamps[i];
+ long actualTimestamp = Long.parseLong(resultSet.getString(1));
+ assertEquals(expectedTimestamp, actualTimestamp);
+
+ double expectedResult = r1[i];
+ double actualResult = resultSet.getDouble(2);
+ double delta = 0.001;
+ assertEquals(expectedResult, actualResult, delta);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 2
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r2 = {1154.55, 1152.30, 1148.65, 1145.20, 1150.55, 1152.30, 1153.55, 1152.30};
+
+ ResultSet resultSet =
+ statement.executeQuery(
+ "select MasterRepair(s1,s2,s3,m1,m2,m3,'output_column'='2') from root.testMasterRepair.d1");
+ int columnCount = resultSet.getMetaData().getColumnCount();
+ assertEquals(1 + 1, columnCount);
+ for (int i = 0; i < timestamps.length; i++) {
+ resultSet.next();
+ long expectedTimestamp = timestamps[i];
+ long actualTimestamp = Long.parseLong(resultSet.getString(1));
+ assertEquals(expectedTimestamp, actualTimestamp);
+
+ double expectedResult = r2[i];
+ double actualResult = resultSet.getDouble(2);
+ double delta = 0.001;
+ assertEquals(expectedResult, actualResult, delta);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 3
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r3 = {0.195, 0.193, 0.192, 0.194, 0.195, 0.193, 0.194, 0.190};
+ ResultSet resultSet =
+ statement.executeQuery(
+ "select MasterRepair(s1,s2,s3,m1,m2,m3,'output_column'='3') from root.testMasterRepair.d1");
+ int columnCount = resultSet.getMetaData().getColumnCount();
+ assertEquals(1 + 1, columnCount);
+ for (int i = 0; i < timestamps.length; i++) {
+ resultSet.next();
+ long expectedTimestamp = timestamps[i];
+ long actualTimestamp = Long.parseLong(resultSet.getString(1));
+ assertEquals(expectedTimestamp, actualTimestamp);
+
+ double expectedResult = r3[i];
+ double actualResult = resultSet.getDouble(2);
+ double delta = 0.001;
+ assertEquals(expectedResult, actualResult, delta);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 4
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r4 = {1704.0, 1702.0, 1702.0, 1701.0, 1703.0, 1704.0, 1705.0, 1706.0};
+ ResultSet resultSet =
+ statement.executeQuery(
+ "select MasterRepair(s1,s2,s3,m1,m2,m3,'omega'='2','eta'='3.0','k'='5') from root.testMasterRepair.d1");
+ int columnCount = resultSet.getMetaData().getColumnCount();
+ assertEquals(1 + 1, columnCount);
+ for (int i = 0; i < timestamps.length; i++) {
+ resultSet.next();
+ long expectedTimestamp = timestamps[i];
+ long actualTimestamp = Long.parseLong(resultSet.getString(1));
+ assertEquals(expectedTimestamp, actualTimestamp);
+
+ double expectedResult = r4[i];
+ double actualResult = resultSet.getDouble(2);
+ double delta = 0.001;
+ assertEquals(expectedResult, actualResult, delta);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 5
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r5 = {1154.55, 1152.30, 1148.65, 1145.20, 1150.55, 1151.55, 1153.55, 1152.30};
+ ResultSet resultSet =
+ statement.executeQuery(
+ "select MasterRepair(s1,s2,s3,m1,m2,m3,'omega'='2','eta'='3.0','k'='5','output_column'='2') from root.testMasterRepair.d1");
+ int columnCount = resultSet.getMetaData().getColumnCount();
+ assertEquals(1 + 1, columnCount);
+ for (int i = 0; i < timestamps.length; i++) {
+ resultSet.next();
+ long expectedTimestamp = timestamps[i];
+ long actualTimestamp = Long.parseLong(resultSet.getString(1));
+ assertEquals(expectedTimestamp, actualTimestamp);
+
+ double expectedResult = r5[i];
+ double actualResult = resultSet.getDouble(2);
+ double delta = 0.001;
+ assertEquals(expectedResult, actualResult, delta);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 6
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r6 = {0.195, 0.193, 0.192, 0.194, 0.195, 0.193, 0.194, 0.190};
+ ResultSet resultSet =
Review Comment:
Updated.
##########
integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFBuiltinFunctionIT.java:
##########
@@ -1232,6 +1232,200 @@ private void testStrLength(Statement statement) {
}
}
+ @Test
+ public void testMasterRepair() {
+ // create time series with master data
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ statement.execute("SET STORAGE GROUP TO root.testMasterRepair");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s1 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s2 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s3 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m1 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m2 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m3 with datatype=FLOAT,encoding=PLAIN");
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ String[] INSERT_SQL = {
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (1,1704,1154.55,0.195,1704,1154.55,0.195)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (2,1702,1152.30,0.193,1702,1152.30,0.193)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (3,1702,1148.65,0.192,1702,1148.65,0.192)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (4,1701,1145.20,0.194,1701,1145.20,0.194)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (7,1703,1150.55,0.195,1703,1150.55,0.195)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (8,1694,1151.55,0.193,1704,1151.55,0.193)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (9,1705,1153.55,0.194,1705,1153.55,0.194)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (10,1706,1152.30,0.190,1706,1152.30,0.190)",
+ };
+
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ for (String dataGenerationSql : INSERT_SQL) {
+ statement.execute(dataGenerationSql);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 1
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r1 = {1704.0, 1702.0, 1702.0, 1701.0, 1703.0, 1702.0, 1705.0, 1706.0};
+ ResultSet resultSet =
+ statement.executeQuery(
+ "select MasterRepair(s1,s2,s3,m1,m2,m3) from root.testMasterRepair.d1");
+ int columnCount = resultSet.getMetaData().getColumnCount();
+ assertEquals(1 + 1, columnCount);
+ for (int i = 0; i < timestamps.length; i++) {
+ resultSet.next();
+ long expectedTimestamp = timestamps[i];
+ long actualTimestamp = Long.parseLong(resultSet.getString(1));
+ assertEquals(expectedTimestamp, actualTimestamp);
+
+ double expectedResult = r1[i];
+ double actualResult = resultSet.getDouble(2);
+ double delta = 0.001;
+ assertEquals(expectedResult, actualResult, delta);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 2
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r2 = {1154.55, 1152.30, 1148.65, 1145.20, 1150.55, 1152.30, 1153.55, 1152.30};
+
+ ResultSet resultSet =
+ statement.executeQuery(
+ "select MasterRepair(s1,s2,s3,m1,m2,m3,'output_column'='2') from root.testMasterRepair.d1");
+ int columnCount = resultSet.getMetaData().getColumnCount();
+ assertEquals(1 + 1, columnCount);
+ for (int i = 0; i < timestamps.length; i++) {
+ resultSet.next();
+ long expectedTimestamp = timestamps[i];
+ long actualTimestamp = Long.parseLong(resultSet.getString(1));
+ assertEquals(expectedTimestamp, actualTimestamp);
+
+ double expectedResult = r2[i];
+ double actualResult = resultSet.getDouble(2);
+ double delta = 0.001;
+ assertEquals(expectedResult, actualResult, delta);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 3
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r3 = {0.195, 0.193, 0.192, 0.194, 0.195, 0.193, 0.194, 0.190};
+ ResultSet resultSet =
+ statement.executeQuery(
+ "select MasterRepair(s1,s2,s3,m1,m2,m3,'output_column'='3') from root.testMasterRepair.d1");
+ int columnCount = resultSet.getMetaData().getColumnCount();
+ assertEquals(1 + 1, columnCount);
+ for (int i = 0; i < timestamps.length; i++) {
+ resultSet.next();
+ long expectedTimestamp = timestamps[i];
+ long actualTimestamp = Long.parseLong(resultSet.getString(1));
+ assertEquals(expectedTimestamp, actualTimestamp);
+
+ double expectedResult = r3[i];
+ double actualResult = resultSet.getDouble(2);
+ double delta = 0.001;
+ assertEquals(expectedResult, actualResult, delta);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 4
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r4 = {1704.0, 1702.0, 1702.0, 1701.0, 1703.0, 1704.0, 1705.0, 1706.0};
+ ResultSet resultSet =
+ statement.executeQuery(
+ "select MasterRepair(s1,s2,s3,m1,m2,m3,'omega'='2','eta'='3.0','k'='5') from root.testMasterRepair.d1");
+ int columnCount = resultSet.getMetaData().getColumnCount();
+ assertEquals(1 + 1, columnCount);
+ for (int i = 0; i < timestamps.length; i++) {
+ resultSet.next();
+ long expectedTimestamp = timestamps[i];
+ long actualTimestamp = Long.parseLong(resultSet.getString(1));
+ assertEquals(expectedTimestamp, actualTimestamp);
+
+ double expectedResult = r4[i];
+ double actualResult = resultSet.getDouble(2);
+ double delta = 0.001;
+ assertEquals(expectedResult, actualResult, delta);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 5
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r5 = {1154.55, 1152.30, 1148.65, 1145.20, 1150.55, 1151.55, 1153.55, 1152.30};
+ ResultSet resultSet =
Review Comment:
Updated.
##########
integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFBuiltinFunctionIT.java:
##########
@@ -1232,6 +1232,200 @@ private void testStrLength(Statement statement) {
}
}
+ @Test
+ public void testMasterRepair() {
+ // create time series with master data
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ statement.execute("SET STORAGE GROUP TO root.testMasterRepair");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s1 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s2 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s3 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m1 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m2 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m3 with datatype=FLOAT,encoding=PLAIN");
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ String[] INSERT_SQL = {
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (1,1704,1154.55,0.195,1704,1154.55,0.195)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (2,1702,1152.30,0.193,1702,1152.30,0.193)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (3,1702,1148.65,0.192,1702,1148.65,0.192)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (4,1701,1145.20,0.194,1701,1145.20,0.194)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (7,1703,1150.55,0.195,1703,1150.55,0.195)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (8,1694,1151.55,0.193,1704,1151.55,0.193)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (9,1705,1153.55,0.194,1705,1153.55,0.194)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (10,1706,1152.30,0.190,1706,1152.30,0.190)",
+ };
+
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ for (String dataGenerationSql : INSERT_SQL) {
+ statement.execute(dataGenerationSql);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 1
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r1 = {1704.0, 1702.0, 1702.0, 1701.0, 1703.0, 1702.0, 1705.0, 1706.0};
+ ResultSet resultSet =
+ statement.executeQuery(
+ "select MasterRepair(s1,s2,s3,m1,m2,m3) from root.testMasterRepair.d1");
+ int columnCount = resultSet.getMetaData().getColumnCount();
+ assertEquals(1 + 1, columnCount);
+ for (int i = 0; i < timestamps.length; i++) {
+ resultSet.next();
+ long expectedTimestamp = timestamps[i];
+ long actualTimestamp = Long.parseLong(resultSet.getString(1));
+ assertEquals(expectedTimestamp, actualTimestamp);
+
+ double expectedResult = r1[i];
+ double actualResult = resultSet.getDouble(2);
+ double delta = 0.001;
+ assertEquals(expectedResult, actualResult, delta);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 2
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r2 = {1154.55, 1152.30, 1148.65, 1145.20, 1150.55, 1152.30, 1153.55, 1152.30};
+
+ ResultSet resultSet =
+ statement.executeQuery(
+ "select MasterRepair(s1,s2,s3,m1,m2,m3,'output_column'='2') from root.testMasterRepair.d1");
+ int columnCount = resultSet.getMetaData().getColumnCount();
+ assertEquals(1 + 1, columnCount);
+ for (int i = 0; i < timestamps.length; i++) {
+ resultSet.next();
+ long expectedTimestamp = timestamps[i];
+ long actualTimestamp = Long.parseLong(resultSet.getString(1));
+ assertEquals(expectedTimestamp, actualTimestamp);
+
+ double expectedResult = r2[i];
+ double actualResult = resultSet.getDouble(2);
+ double delta = 0.001;
+ assertEquals(expectedResult, actualResult, delta);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 3
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r3 = {0.195, 0.193, 0.192, 0.194, 0.195, 0.193, 0.194, 0.190};
+ ResultSet resultSet =
Review Comment:
Updated.
##########
integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFBuiltinFunctionIT.java:
##########
@@ -1232,6 +1232,200 @@ private void testStrLength(Statement statement) {
}
}
+ @Test
+ public void testMasterRepair() {
+ // create time series with master data
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ statement.execute("SET STORAGE GROUP TO root.testMasterRepair");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s1 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s2 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s3 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m1 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m2 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m3 with datatype=FLOAT,encoding=PLAIN");
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ String[] INSERT_SQL = {
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (1,1704,1154.55,0.195,1704,1154.55,0.195)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (2,1702,1152.30,0.193,1702,1152.30,0.193)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (3,1702,1148.65,0.192,1702,1148.65,0.192)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (4,1701,1145.20,0.194,1701,1145.20,0.194)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (7,1703,1150.55,0.195,1703,1150.55,0.195)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (8,1694,1151.55,0.193,1704,1151.55,0.193)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (9,1705,1153.55,0.194,1705,1153.55,0.194)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (10,1706,1152.30,0.190,1706,1152.30,0.190)",
+ };
+
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ for (String dataGenerationSql : INSERT_SQL) {
+ statement.execute(dataGenerationSql);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 1
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r1 = {1704.0, 1702.0, 1702.0, 1701.0, 1703.0, 1702.0, 1705.0, 1706.0};
+ ResultSet resultSet =
+ statement.executeQuery(
+ "select MasterRepair(s1,s2,s3,m1,m2,m3) from root.testMasterRepair.d1");
+ int columnCount = resultSet.getMetaData().getColumnCount();
+ assertEquals(1 + 1, columnCount);
+ for (int i = 0; i < timestamps.length; i++) {
+ resultSet.next();
+ long expectedTimestamp = timestamps[i];
+ long actualTimestamp = Long.parseLong(resultSet.getString(1));
+ assertEquals(expectedTimestamp, actualTimestamp);
+
+ double expectedResult = r1[i];
+ double actualResult = resultSet.getDouble(2);
+ double delta = 0.001;
+ assertEquals(expectedResult, actualResult, delta);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 2
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r2 = {1154.55, 1152.30, 1148.65, 1145.20, 1150.55, 1152.30, 1153.55, 1152.30};
+
+ ResultSet resultSet =
Review Comment:
Updated.
##########
integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFBuiltinFunctionIT.java:
##########
@@ -1232,6 +1232,200 @@ private void testStrLength(Statement statement) {
}
}
+ @Test
+ public void testMasterRepair() {
+ // create time series with master data
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ statement.execute("SET STORAGE GROUP TO root.testMasterRepair");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s1 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s2 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s3 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m1 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m2 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m3 with datatype=FLOAT,encoding=PLAIN");
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ String[] INSERT_SQL = {
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (1,1704,1154.55,0.195,1704,1154.55,0.195)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (2,1702,1152.30,0.193,1702,1152.30,0.193)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (3,1702,1148.65,0.192,1702,1148.65,0.192)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (4,1701,1145.20,0.194,1701,1145.20,0.194)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (7,1703,1150.55,0.195,1703,1150.55,0.195)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (8,1694,1151.55,0.193,1704,1151.55,0.193)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (9,1705,1153.55,0.194,1705,1153.55,0.194)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (10,1706,1152.30,0.190,1706,1152.30,0.190)",
+ };
+
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ for (String dataGenerationSql : INSERT_SQL) {
+ statement.execute(dataGenerationSql);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 1
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r1 = {1704.0, 1702.0, 1702.0, 1701.0, 1703.0, 1702.0, 1705.0, 1706.0};
+ ResultSet resultSet =
+ statement.executeQuery(
+ "select MasterRepair(s1,s2,s3,m1,m2,m3) from root.testMasterRepair.d1");
+ int columnCount = resultSet.getMetaData().getColumnCount();
+ assertEquals(1 + 1, columnCount);
+ for (int i = 0; i < timestamps.length; i++) {
+ resultSet.next();
+ long expectedTimestamp = timestamps[i];
+ long actualTimestamp = Long.parseLong(resultSet.getString(1));
+ assertEquals(expectedTimestamp, actualTimestamp);
+
+ double expectedResult = r1[i];
+ double actualResult = resultSet.getDouble(2);
+ double delta = 0.001;
+ assertEquals(expectedResult, actualResult, delta);
+ }
Review Comment:
Updated.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@iotdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] SteveYurongSu commented on a diff in pull request #6892: Add a new UDF function: MasterRepair with docs
Posted by GitBox <gi...@apache.org>.
SteveYurongSu commented on code in PR #6892:
URL: https://github.com/apache/iotdb/pull/6892#discussion_r941412928
##########
node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/UDTFMasterRepair.java:
##########
@@ -0,0 +1,97 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.iotdb.commons.udf.builtin;
+
+import org.apache.iotdb.commons.udf.utils.MasterRepairUtil;
+import org.apache.iotdb.udf.api.UDTF;
+import org.apache.iotdb.udf.api.access.Row;
+import org.apache.iotdb.udf.api.collector.PointCollector;
+import org.apache.iotdb.udf.api.customizer.config.UDTFConfigurations;
+import org.apache.iotdb.udf.api.customizer.parameter.UDFParameterValidator;
+import org.apache.iotdb.udf.api.customizer.parameter.UDFParameters;
+import org.apache.iotdb.udf.api.customizer.strategy.RowByRowAccessStrategy;
+import org.apache.iotdb.udf.api.type.Type;
+
+import java.util.ArrayList;
+
+public class UDTFMasterRepair implements UDTF {
+ private MasterRepairUtil masterRepairUtil;
+ private int output_column;
Review Comment:
```suggestion
private int outputColumn;
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@iotdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] lancelly commented on a diff in pull request #6892: Add a new UDF function: MasterRepair with docs
Posted by GitBox <gi...@apache.org>.
lancelly commented on code in PR #6892:
URL: https://github.com/apache/iotdb/pull/6892#discussion_r939770304
##########
integration-test/pom.xml:
##########
@@ -77,6 +77,21 @@
<artifactId>rewrite-tsfile-tool</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
Review Comment:
Duplicate dependency？
##########
integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFBuiltinFunctionIT.java:
##########
@@ -1232,6 +1232,200 @@ private void testStrLength(Statement statement) {
}
}
+ @Test
+ public void testMasterRepair() {
+ // create time series with master data
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ statement.execute("SET STORAGE GROUP TO root.testMasterRepair");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s1 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s2 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s3 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m1 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m2 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m3 with datatype=FLOAT,encoding=PLAIN");
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ String[] INSERT_SQL = {
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (1,1704,1154.55,0.195,1704,1154.55,0.195)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (2,1702,1152.30,0.193,1702,1152.30,0.193)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (3,1702,1148.65,0.192,1702,1148.65,0.192)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (4,1701,1145.20,0.194,1701,1145.20,0.194)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (7,1703,1150.55,0.195,1703,1150.55,0.195)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (8,1694,1151.55,0.193,1704,1151.55,0.193)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (9,1705,1153.55,0.194,1705,1153.55,0.194)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (10,1706,1152.30,0.190,1706,1152.30,0.190)",
+ };
+
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ for (String dataGenerationSql : INSERT_SQL) {
+ statement.execute(dataGenerationSql);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 1
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r1 = {1704.0, 1702.0, 1702.0, 1701.0, 1703.0, 1702.0, 1705.0, 1706.0};
+ ResultSet resultSet =
+ statement.executeQuery(
+ "select MasterRepair(s1,s2,s3,m1,m2,m3) from root.testMasterRepair.d1");
+ int columnCount = resultSet.getMetaData().getColumnCount();
+ assertEquals(1 + 1, columnCount);
+ for (int i = 0; i < timestamps.length; i++) {
+ resultSet.next();
+ long expectedTimestamp = timestamps[i];
+ long actualTimestamp = Long.parseLong(resultSet.getString(1));
+ assertEquals(expectedTimestamp, actualTimestamp);
+
+ double expectedResult = r1[i];
+ double actualResult = resultSet.getDouble(2);
+ double delta = 0.001;
+ assertEquals(expectedResult, actualResult, delta);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 2
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r2 = {1154.55, 1152.30, 1148.65, 1145.20, 1150.55, 1152.30, 1153.55, 1152.30};
+
+ ResultSet resultSet =
+ statement.executeQuery(
+ "select MasterRepair(s1,s2,s3,m1,m2,m3,'output_column'='2') from root.testMasterRepair.d1");
+ int columnCount = resultSet.getMetaData().getColumnCount();
+ assertEquals(1 + 1, columnCount);
+ for (int i = 0; i < timestamps.length; i++) {
+ resultSet.next();
+ long expectedTimestamp = timestamps[i];
+ long actualTimestamp = Long.parseLong(resultSet.getString(1));
+ assertEquals(expectedTimestamp, actualTimestamp);
+
+ double expectedResult = r2[i];
+ double actualResult = resultSet.getDouble(2);
+ double delta = 0.001;
+ assertEquals(expectedResult, actualResult, delta);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 3
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r3 = {0.195, 0.193, 0.192, 0.194, 0.195, 0.193, 0.194, 0.190};
+ ResultSet resultSet =
Review Comment:
same as above
##########
integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFBuiltinFunctionIT.java:
##########
@@ -1232,6 +1232,200 @@ private void testStrLength(Statement statement) {
}
}
+ @Test
+ public void testMasterRepair() {
+ // create time series with master data
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ statement.execute("SET STORAGE GROUP TO root.testMasterRepair");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s1 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s2 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s3 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m1 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m2 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m3 with datatype=FLOAT,encoding=PLAIN");
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ String[] INSERT_SQL = {
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (1,1704,1154.55,0.195,1704,1154.55,0.195)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (2,1702,1152.30,0.193,1702,1152.30,0.193)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (3,1702,1148.65,0.192,1702,1148.65,0.192)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (4,1701,1145.20,0.194,1701,1145.20,0.194)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (7,1703,1150.55,0.195,1703,1150.55,0.195)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (8,1694,1151.55,0.193,1704,1151.55,0.193)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (9,1705,1153.55,0.194,1705,1153.55,0.194)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (10,1706,1152.30,0.190,1706,1152.30,0.190)",
+ };
+
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ for (String dataGenerationSql : INSERT_SQL) {
+ statement.execute(dataGenerationSql);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 1
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r1 = {1704.0, 1702.0, 1702.0, 1701.0, 1703.0, 1702.0, 1705.0, 1706.0};
+ ResultSet resultSet =
+ statement.executeQuery(
+ "select MasterRepair(s1,s2,s3,m1,m2,m3) from root.testMasterRepair.d1");
+ int columnCount = resultSet.getMetaData().getColumnCount();
+ assertEquals(1 + 1, columnCount);
+ for (int i = 0; i < timestamps.length; i++) {
+ resultSet.next();
+ long expectedTimestamp = timestamps[i];
+ long actualTimestamp = Long.parseLong(resultSet.getString(1));
+ assertEquals(expectedTimestamp, actualTimestamp);
+
+ double expectedResult = r1[i];
+ double actualResult = resultSet.getDouble(2);
+ double delta = 0.001;
+ assertEquals(expectedResult, actualResult, delta);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 2
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r2 = {1154.55, 1152.30, 1148.65, 1145.20, 1150.55, 1152.30, 1153.55, 1152.30};
+
+ ResultSet resultSet =
+ statement.executeQuery(
+ "select MasterRepair(s1,s2,s3,m1,m2,m3,'output_column'='2') from root.testMasterRepair.d1");
+ int columnCount = resultSet.getMetaData().getColumnCount();
+ assertEquals(1 + 1, columnCount);
+ for (int i = 0; i < timestamps.length; i++) {
+ resultSet.next();
+ long expectedTimestamp = timestamps[i];
+ long actualTimestamp = Long.parseLong(resultSet.getString(1));
+ assertEquals(expectedTimestamp, actualTimestamp);
+
+ double expectedResult = r2[i];
+ double actualResult = resultSet.getDouble(2);
+ double delta = 0.001;
+ assertEquals(expectedResult, actualResult, delta);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 3
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r3 = {0.195, 0.193, 0.192, 0.194, 0.195, 0.193, 0.194, 0.190};
+ ResultSet resultSet =
+ statement.executeQuery(
+ "select MasterRepair(s1,s2,s3,m1,m2,m3,'output_column'='3') from root.testMasterRepair.d1");
+ int columnCount = resultSet.getMetaData().getColumnCount();
+ assertEquals(1 + 1, columnCount);
+ for (int i = 0; i < timestamps.length; i++) {
+ resultSet.next();
+ long expectedTimestamp = timestamps[i];
+ long actualTimestamp = Long.parseLong(resultSet.getString(1));
+ assertEquals(expectedTimestamp, actualTimestamp);
+
+ double expectedResult = r3[i];
+ double actualResult = resultSet.getDouble(2);
+ double delta = 0.001;
+ assertEquals(expectedResult, actualResult, delta);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 4
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r4 = {1704.0, 1702.0, 1702.0, 1701.0, 1703.0, 1704.0, 1705.0, 1706.0};
+ ResultSet resultSet =
Review Comment:
same as above
##########
integration-test/src/main/java/org/apache/iotdb/itbase/constant/BuiltinTimeSeriesGeneratingFunctionEnum.java:
##########
@@ -74,7 +74,8 @@ public enum BuiltinTimeSeriesGeneratingFunctionEnum {
EQUAL_SIZE_BUCKET_AGG_SAMPLE("EQUAL_SIZE_BUCKET_AGG_SAMPLE"),
EQUAL_SIZE_BUCKET_M4_SAMPLE("EQUAL_SIZE_BUCKET_M4_SAMPLE"),
EQUAL_SIZE_BUCKET_OUTLIER_SAMPLE("EQUAL_SIZE_BUCKET_OUTLIER_SAMPLE"),
- JEXL("JEXL");
+ JEXL("JEXL"),
+ MasterRepair("MasterRepair");
Review Comment:
```suggestion
MASTER_REPAIR("MASTER_REPAIR");
```
##########
integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFBuiltinFunctionIT.java:
##########
@@ -1232,6 +1232,200 @@ private void testStrLength(Statement statement) {
}
}
+ @Test
+ public void testMasterRepair() {
+ // create time series with master data
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ statement.execute("SET STORAGE GROUP TO root.testMasterRepair");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s1 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s2 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s3 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m1 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m2 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m3 with datatype=FLOAT,encoding=PLAIN");
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ String[] INSERT_SQL = {
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (1,1704,1154.55,0.195,1704,1154.55,0.195)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (2,1702,1152.30,0.193,1702,1152.30,0.193)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (3,1702,1148.65,0.192,1702,1148.65,0.192)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (4,1701,1145.20,0.194,1701,1145.20,0.194)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (7,1703,1150.55,0.195,1703,1150.55,0.195)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (8,1694,1151.55,0.193,1704,1151.55,0.193)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (9,1705,1153.55,0.194,1705,1153.55,0.194)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (10,1706,1152.30,0.190,1706,1152.30,0.190)",
+ };
+
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ for (String dataGenerationSql : INSERT_SQL) {
+ statement.execute(dataGenerationSql);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 1
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r1 = {1704.0, 1702.0, 1702.0, 1701.0, 1703.0, 1702.0, 1705.0, 1706.0};
+ ResultSet resultSet =
+ statement.executeQuery(
+ "select MasterRepair(s1,s2,s3,m1,m2,m3) from root.testMasterRepair.d1");
+ int columnCount = resultSet.getMetaData().getColumnCount();
+ assertEquals(1 + 1, columnCount);
+ for (int i = 0; i < timestamps.length; i++) {
+ resultSet.next();
+ long expectedTimestamp = timestamps[i];
+ long actualTimestamp = Long.parseLong(resultSet.getString(1));
+ assertEquals(expectedTimestamp, actualTimestamp);
+
+ double expectedResult = r1[i];
+ double actualResult = resultSet.getDouble(2);
+ double delta = 0.001;
+ assertEquals(expectedResult, actualResult, delta);
+ }
Review Comment:
```suggestion
try(ResultSet resultSet =
statement.executeQuery(
"select MasterRepair(s1,s2,s3,m1,m2,m3) from root.testMasterRepair.d1")){
int columnCount = resultSet.getMetaData().getColumnCount();
assertEquals(1 + 1, columnCount);
for (int i = 0; i < timestamps.length; i++) {
resultSet.next();
long expectedTimestamp = timestamps[i];
long actualTimestamp = Long.parseLong(resultSet.getString(1));
assertEquals(expectedTimestamp, actualTimestamp);
double expectedResult = r1[i];
double actualResult = resultSet.getDouble(2);
double delta = 0.001;
assertEquals(expectedResult, actualResult, delta);
}
}
```
##########
integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFBuiltinFunctionIT.java:
##########
@@ -1232,6 +1232,200 @@ private void testStrLength(Statement statement) {
}
}
+ @Test
+ public void testMasterRepair() {
+ // create time series with master data
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ statement.execute("SET STORAGE GROUP TO root.testMasterRepair");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s1 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s2 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s3 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m1 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m2 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m3 with datatype=FLOAT,encoding=PLAIN");
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ String[] INSERT_SQL = {
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (1,1704,1154.55,0.195,1704,1154.55,0.195)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (2,1702,1152.30,0.193,1702,1152.30,0.193)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (3,1702,1148.65,0.192,1702,1148.65,0.192)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (4,1701,1145.20,0.194,1701,1145.20,0.194)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (7,1703,1150.55,0.195,1703,1150.55,0.195)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (8,1694,1151.55,0.193,1704,1151.55,0.193)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (9,1705,1153.55,0.194,1705,1153.55,0.194)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (10,1706,1152.30,0.190,1706,1152.30,0.190)",
+ };
+
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ for (String dataGenerationSql : INSERT_SQL) {
+ statement.execute(dataGenerationSql);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 1
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r1 = {1704.0, 1702.0, 1702.0, 1701.0, 1703.0, 1702.0, 1705.0, 1706.0};
+ ResultSet resultSet =
+ statement.executeQuery(
+ "select MasterRepair(s1,s2,s3,m1,m2,m3) from root.testMasterRepair.d1");
+ int columnCount = resultSet.getMetaData().getColumnCount();
+ assertEquals(1 + 1, columnCount);
+ for (int i = 0; i < timestamps.length; i++) {
+ resultSet.next();
+ long expectedTimestamp = timestamps[i];
+ long actualTimestamp = Long.parseLong(resultSet.getString(1));
+ assertEquals(expectedTimestamp, actualTimestamp);
+
+ double expectedResult = r1[i];
+ double actualResult = resultSet.getDouble(2);
+ double delta = 0.001;
+ assertEquals(expectedResult, actualResult, delta);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 2
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r2 = {1154.55, 1152.30, 1148.65, 1145.20, 1150.55, 1152.30, 1153.55, 1152.30};
+
+ ResultSet resultSet =
+ statement.executeQuery(
+ "select MasterRepair(s1,s2,s3,m1,m2,m3,'output_column'='2') from root.testMasterRepair.d1");
+ int columnCount = resultSet.getMetaData().getColumnCount();
+ assertEquals(1 + 1, columnCount);
+ for (int i = 0; i < timestamps.length; i++) {
+ resultSet.next();
+ long expectedTimestamp = timestamps[i];
+ long actualTimestamp = Long.parseLong(resultSet.getString(1));
+ assertEquals(expectedTimestamp, actualTimestamp);
+
+ double expectedResult = r2[i];
+ double actualResult = resultSet.getDouble(2);
+ double delta = 0.001;
+ assertEquals(expectedResult, actualResult, delta);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 3
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r3 = {0.195, 0.193, 0.192, 0.194, 0.195, 0.193, 0.194, 0.190};
+ ResultSet resultSet =
+ statement.executeQuery(
+ "select MasterRepair(s1,s2,s3,m1,m2,m3,'output_column'='3') from root.testMasterRepair.d1");
+ int columnCount = resultSet.getMetaData().getColumnCount();
+ assertEquals(1 + 1, columnCount);
+ for (int i = 0; i < timestamps.length; i++) {
+ resultSet.next();
+ long expectedTimestamp = timestamps[i];
+ long actualTimestamp = Long.parseLong(resultSet.getString(1));
+ assertEquals(expectedTimestamp, actualTimestamp);
+
+ double expectedResult = r3[i];
+ double actualResult = resultSet.getDouble(2);
+ double delta = 0.001;
+ assertEquals(expectedResult, actualResult, delta);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 4
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r4 = {1704.0, 1702.0, 1702.0, 1701.0, 1703.0, 1704.0, 1705.0, 1706.0};
+ ResultSet resultSet =
+ statement.executeQuery(
+ "select MasterRepair(s1,s2,s3,m1,m2,m3,'omega'='2','eta'='3.0','k'='5') from root.testMasterRepair.d1");
+ int columnCount = resultSet.getMetaData().getColumnCount();
+ assertEquals(1 + 1, columnCount);
+ for (int i = 0; i < timestamps.length; i++) {
+ resultSet.next();
+ long expectedTimestamp = timestamps[i];
+ long actualTimestamp = Long.parseLong(resultSet.getString(1));
+ assertEquals(expectedTimestamp, actualTimestamp);
+
+ double expectedResult = r4[i];
+ double actualResult = resultSet.getDouble(2);
+ double delta = 0.001;
+ assertEquals(expectedResult, actualResult, delta);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 5
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r5 = {1154.55, 1152.30, 1148.65, 1145.20, 1150.55, 1151.55, 1153.55, 1152.30};
+ ResultSet resultSet =
+ statement.executeQuery(
+ "select MasterRepair(s1,s2,s3,m1,m2,m3,'omega'='2','eta'='3.0','k'='5','output_column'='2') from root.testMasterRepair.d1");
+ int columnCount = resultSet.getMetaData().getColumnCount();
+ assertEquals(1 + 1, columnCount);
+ for (int i = 0; i < timestamps.length; i++) {
+ resultSet.next();
+ long expectedTimestamp = timestamps[i];
+ long actualTimestamp = Long.parseLong(resultSet.getString(1));
+ assertEquals(expectedTimestamp, actualTimestamp);
+
+ double expectedResult = r5[i];
+ double actualResult = resultSet.getDouble(2);
+ double delta = 0.001;
+ assertEquals(expectedResult, actualResult, delta);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 6
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r6 = {0.195, 0.193, 0.192, 0.194, 0.195, 0.193, 0.194, 0.190};
+ ResultSet resultSet =
Review Comment:
same as above
##########
node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/BuiltinTimeSeriesGeneratingFunction.java:
##########
@@ -88,7 +88,8 @@ public enum BuiltinTimeSeriesGeneratingFunction {
EQUAL_SIZE_BUCKET_M4_SAMPLE("EQUAL_SIZE_BUCKET_M4_SAMPLE", UDTFEqualSizeBucketM4Sample.class),
EQUAL_SIZE_BUCKET_OUTLIER_SAMPLE(
"EQUAL_SIZE_BUCKET_OUTLIER_SAMPLE", UDTFEqualSizeBucketOutlierSample.class),
- JEXL("JEXL", UDTFJexl.class);
+ JEXL("JEXL", UDTFJexl.class),
+ MasterRepair("MasterRepair", UDTFMasterRepair.class);
Review Comment:
same as above
##########
integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFBuiltinFunctionIT.java:
##########
@@ -1232,6 +1232,200 @@ private void testStrLength(Statement statement) {
}
}
+ @Test
+ public void testMasterRepair() {
+ // create time series with master data
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ statement.execute("SET STORAGE GROUP TO root.testMasterRepair");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s1 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s2 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s3 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m1 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m2 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m3 with datatype=FLOAT,encoding=PLAIN");
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ String[] INSERT_SQL = {
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (1,1704,1154.55,0.195,1704,1154.55,0.195)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (2,1702,1152.30,0.193,1702,1152.30,0.193)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (3,1702,1148.65,0.192,1702,1148.65,0.192)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (4,1701,1145.20,0.194,1701,1145.20,0.194)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (7,1703,1150.55,0.195,1703,1150.55,0.195)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (8,1694,1151.55,0.193,1704,1151.55,0.193)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (9,1705,1153.55,0.194,1705,1153.55,0.194)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (10,1706,1152.30,0.190,1706,1152.30,0.190)",
+ };
+
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ for (String dataGenerationSql : INSERT_SQL) {
+ statement.execute(dataGenerationSql);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 1
Review Comment:
Perhaps it's better that we put all tests in one try(Connection.......) block instead of six?
##########
integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFBuiltinFunctionIT.java:
##########
@@ -1232,6 +1232,200 @@ private void testStrLength(Statement statement) {
}
}
+ @Test
+ public void testMasterRepair() {
+ // create time series with master data
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ statement.execute("SET STORAGE GROUP TO root.testMasterRepair");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s1 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s2 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s3 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m1 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m2 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m3 with datatype=FLOAT,encoding=PLAIN");
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ String[] INSERT_SQL = {
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (1,1704,1154.55,0.195,1704,1154.55,0.195)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (2,1702,1152.30,0.193,1702,1152.30,0.193)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (3,1702,1148.65,0.192,1702,1148.65,0.192)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (4,1701,1145.20,0.194,1701,1145.20,0.194)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (7,1703,1150.55,0.195,1703,1150.55,0.195)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (8,1694,1151.55,0.193,1704,1151.55,0.193)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (9,1705,1153.55,0.194,1705,1153.55,0.194)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (10,1706,1152.30,0.190,1706,1152.30,0.190)",
+ };
+
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ for (String dataGenerationSql : INSERT_SQL) {
+ statement.execute(dataGenerationSql);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 1
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r1 = {1704.0, 1702.0, 1702.0, 1701.0, 1703.0, 1702.0, 1705.0, 1706.0};
+ ResultSet resultSet =
+ statement.executeQuery(
+ "select MasterRepair(s1,s2,s3,m1,m2,m3) from root.testMasterRepair.d1");
+ int columnCount = resultSet.getMetaData().getColumnCount();
+ assertEquals(1 + 1, columnCount);
+ for (int i = 0; i < timestamps.length; i++) {
+ resultSet.next();
+ long expectedTimestamp = timestamps[i];
+ long actualTimestamp = Long.parseLong(resultSet.getString(1));
+ assertEquals(expectedTimestamp, actualTimestamp);
+
+ double expectedResult = r1[i];
+ double actualResult = resultSet.getDouble(2);
+ double delta = 0.001;
+ assertEquals(expectedResult, actualResult, delta);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 2
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r2 = {1154.55, 1152.30, 1148.65, 1145.20, 1150.55, 1152.30, 1153.55, 1152.30};
+
+ ResultSet resultSet =
+ statement.executeQuery(
+ "select MasterRepair(s1,s2,s3,m1,m2,m3,'output_column'='2') from root.testMasterRepair.d1");
+ int columnCount = resultSet.getMetaData().getColumnCount();
+ assertEquals(1 + 1, columnCount);
+ for (int i = 0; i < timestamps.length; i++) {
+ resultSet.next();
+ long expectedTimestamp = timestamps[i];
+ long actualTimestamp = Long.parseLong(resultSet.getString(1));
+ assertEquals(expectedTimestamp, actualTimestamp);
+
+ double expectedResult = r2[i];
+ double actualResult = resultSet.getDouble(2);
+ double delta = 0.001;
+ assertEquals(expectedResult, actualResult, delta);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 3
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r3 = {0.195, 0.193, 0.192, 0.194, 0.195, 0.193, 0.194, 0.190};
+ ResultSet resultSet =
+ statement.executeQuery(
+ "select MasterRepair(s1,s2,s3,m1,m2,m3,'output_column'='3') from root.testMasterRepair.d1");
+ int columnCount = resultSet.getMetaData().getColumnCount();
+ assertEquals(1 + 1, columnCount);
+ for (int i = 0; i < timestamps.length; i++) {
+ resultSet.next();
+ long expectedTimestamp = timestamps[i];
+ long actualTimestamp = Long.parseLong(resultSet.getString(1));
+ assertEquals(expectedTimestamp, actualTimestamp);
+
+ double expectedResult = r3[i];
+ double actualResult = resultSet.getDouble(2);
+ double delta = 0.001;
+ assertEquals(expectedResult, actualResult, delta);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 4
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r4 = {1704.0, 1702.0, 1702.0, 1701.0, 1703.0, 1704.0, 1705.0, 1706.0};
+ ResultSet resultSet =
+ statement.executeQuery(
+ "select MasterRepair(s1,s2,s3,m1,m2,m3,'omega'='2','eta'='3.0','k'='5') from root.testMasterRepair.d1");
+ int columnCount = resultSet.getMetaData().getColumnCount();
+ assertEquals(1 + 1, columnCount);
+ for (int i = 0; i < timestamps.length; i++) {
+ resultSet.next();
+ long expectedTimestamp = timestamps[i];
+ long actualTimestamp = Long.parseLong(resultSet.getString(1));
+ assertEquals(expectedTimestamp, actualTimestamp);
+
+ double expectedResult = r4[i];
+ double actualResult = resultSet.getDouble(2);
+ double delta = 0.001;
+ assertEquals(expectedResult, actualResult, delta);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 5
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r5 = {1154.55, 1152.30, 1148.65, 1145.20, 1150.55, 1151.55, 1153.55, 1152.30};
+ ResultSet resultSet =
Review Comment:
same as above
##########
integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFBuiltinFunctionIT.java:
##########
@@ -1232,6 +1232,200 @@ private void testStrLength(Statement statement) {
}
}
+ @Test
+ public void testMasterRepair() {
+ // create time series with master data
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ statement.execute("SET STORAGE GROUP TO root.testMasterRepair");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s1 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s2 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s3 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m1 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m2 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m3 with datatype=FLOAT,encoding=PLAIN");
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ String[] INSERT_SQL = {
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (1,1704,1154.55,0.195,1704,1154.55,0.195)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (2,1702,1152.30,0.193,1702,1152.30,0.193)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (3,1702,1148.65,0.192,1702,1148.65,0.192)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (4,1701,1145.20,0.194,1701,1145.20,0.194)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (7,1703,1150.55,0.195,1703,1150.55,0.195)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (8,1694,1151.55,0.193,1704,1151.55,0.193)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (9,1705,1153.55,0.194,1705,1153.55,0.194)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (10,1706,1152.30,0.190,1706,1152.30,0.190)",
+ };
+
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ for (String dataGenerationSql : INSERT_SQL) {
+ statement.execute(dataGenerationSql);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 1
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r1 = {1704.0, 1702.0, 1702.0, 1701.0, 1703.0, 1702.0, 1705.0, 1706.0};
+ ResultSet resultSet =
+ statement.executeQuery(
+ "select MasterRepair(s1,s2,s3,m1,m2,m3) from root.testMasterRepair.d1");
+ int columnCount = resultSet.getMetaData().getColumnCount();
+ assertEquals(1 + 1, columnCount);
+ for (int i = 0; i < timestamps.length; i++) {
+ resultSet.next();
+ long expectedTimestamp = timestamps[i];
+ long actualTimestamp = Long.parseLong(resultSet.getString(1));
+ assertEquals(expectedTimestamp, actualTimestamp);
+
+ double expectedResult = r1[i];
+ double actualResult = resultSet.getDouble(2);
+ double delta = 0.001;
+ assertEquals(expectedResult, actualResult, delta);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 2
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ int[] timestamps = {1, 2, 3, 4, 7, 8, 9, 10};
+ double[] r2 = {1154.55, 1152.30, 1148.65, 1145.20, 1150.55, 1152.30, 1153.55, 1152.30};
+
+ ResultSet resultSet =
Review Comment:
same as above
##########
node-commons/pom.xml:
##########
@@ -122,6 +122,28 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math3</artifactId>
+ <version>3.1.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.collections</groupId>
+ <artifactId>eclipse-collections-api</artifactId>
+ <version>10.4.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.collections</groupId>
+ <artifactId>eclipse-collections-api</artifactId>
+ <version>11.1.0</version>
+ </dependency>
Review Comment:
please check this again, same dependency with different version.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@iotdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] Wei-hao-Li commented on a diff in pull request #6892: Add a new UDF function: MasterRepair with docs
Posted by GitBox <gi...@apache.org>.
Wei-hao-Li commented on code in PR #6892:
URL: https://github.com/apache/iotdb/pull/6892#discussion_r937389389
##########
library-udf/src/main/java/org/apache/iotdb/library/drepair/UDTFMasterRepair.java:
##########
@@ -0,0 +1,97 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.iotdb.library.drepair;
+
+import org.apache.iotdb.library.drepair.util.MasterRepairUtil;
+import org.apache.iotdb.udf.api.UDTF;
+import org.apache.iotdb.udf.api.access.Row;
+import org.apache.iotdb.udf.api.collector.PointCollector;
+import org.apache.iotdb.udf.api.customizer.config.UDTFConfigurations;
+import org.apache.iotdb.udf.api.customizer.parameter.UDFParameterValidator;
+import org.apache.iotdb.udf.api.customizer.parameter.UDFParameters;
+import org.apache.iotdb.udf.api.customizer.strategy.RowByRowAccessStrategy;
+import org.apache.iotdb.udf.api.type.Type;
+
+import java.util.ArrayList;
+
+public class UDTFMasterRepair implements UDTF {
+ private MasterRepairUtil masterRepairUtil;
+ private int output_column;
+
+ @Override
+ public void validate(UDFParameterValidator validator) throws Exception {
+ for (int i = 0; i < validator.getParameters().getAttributes().size(); i++) {
Review Comment:
validator.getParameters().getChildExpressionsSize()
##########
library-udf/src/main/java/org/apache/iotdb/library/drepair/util/KDTreeUtil.java:
##########
@@ -0,0 +1,354 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.iotdb.library.drepair.util;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Stack;
+
+import static java.lang.Math.min;
+import static java.lang.Math.sqrt;
+
+public class KDTreeUtil {
+ private Node kdtree;
+
+ private static class Node {
+ // 分割的维度
Review Comment:
We need to use English annotations in project
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@iotdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] Husaimawx commented on a diff in pull request #6892: Add a new UDF function: MasterRepair with docs
Posted by GitBox <gi...@apache.org>.
Husaimawx commented on code in PR #6892:
URL: https://github.com/apache/iotdb/pull/6892#discussion_r943045762
##########
tsfile/pom.xml:
##########
@@ -100,6 +100,12 @@
<artifactId>iotdb-antlr</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
Review Comment:
Updated
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@iotdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] Husaimawx commented on pull request #6892: Add a new UDF function: MasterRepair with docs
Posted by GitBox <gi...@apache.org>.
Husaimawx commented on PR #6892:
URL: https://github.com/apache/iotdb/pull/6892#issuecomment-1206094915
>
MasterRepair has been registered in 'BuiltinTimeSeriesGeneratingFunction'. And 6 tests for this UDF function have been added.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@iotdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] SteveYurongSu commented on a diff in pull request #6892: Add a new UDF function: MasterRepair with docs
Posted by GitBox <gi...@apache.org>.
SteveYurongSu commented on code in PR #6892:
URL: https://github.com/apache/iotdb/pull/6892#discussion_r941413601
##########
node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/UDTFMasterRepair.java:
##########
@@ -0,0 +1,97 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.iotdb.commons.udf.builtin;
+
+import org.apache.iotdb.commons.udf.utils.MasterRepairUtil;
+import org.apache.iotdb.udf.api.UDTF;
+import org.apache.iotdb.udf.api.access.Row;
+import org.apache.iotdb.udf.api.collector.PointCollector;
+import org.apache.iotdb.udf.api.customizer.config.UDTFConfigurations;
+import org.apache.iotdb.udf.api.customizer.parameter.UDFParameterValidator;
+import org.apache.iotdb.udf.api.customizer.parameter.UDFParameters;
+import org.apache.iotdb.udf.api.customizer.strategy.RowByRowAccessStrategy;
+import org.apache.iotdb.udf.api.type.Type;
+
+import java.util.ArrayList;
+
+public class UDTFMasterRepair implements UDTF {
+ private MasterRepairUtil masterRepairUtil;
+ private int output_column;
Review Comment:
Please notice the code style :)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@iotdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] Husaimawx commented on a diff in pull request #6892: Add a new UDF function: MasterRepair with docs
Posted by GitBox <gi...@apache.org>.
Husaimawx commented on code in PR #6892:
URL: https://github.com/apache/iotdb/pull/6892#discussion_r938486068
##########
library-udf/src/main/java/org/apache/iotdb/library/drepair/UDTFMasterRepair.java:
##########
@@ -0,0 +1,97 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.iotdb.library.drepair;
+
+import org.apache.iotdb.library.drepair.util.MasterRepairUtil;
+import org.apache.iotdb.udf.api.UDTF;
+import org.apache.iotdb.udf.api.access.Row;
+import org.apache.iotdb.udf.api.collector.PointCollector;
+import org.apache.iotdb.udf.api.customizer.config.UDTFConfigurations;
+import org.apache.iotdb.udf.api.customizer.parameter.UDFParameterValidator;
+import org.apache.iotdb.udf.api.customizer.parameter.UDFParameters;
+import org.apache.iotdb.udf.api.customizer.strategy.RowByRowAccessStrategy;
+import org.apache.iotdb.udf.api.type.Type;
+
+import java.util.ArrayList;
+
+public class UDTFMasterRepair implements UDTF {
+ private MasterRepairUtil masterRepairUtil;
+ private int output_column;
+
+ @Override
+ public void validate(UDFParameterValidator validator) throws Exception {
+ for (int i = 0; i < validator.getParameters().getAttributes().size(); i++) {
Review Comment:
Updated.
##########
library-udf/src/main/java/org/apache/iotdb/library/drepair/util/KDTreeUtil.java:
##########
@@ -0,0 +1,354 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.iotdb.library.drepair.util;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Stack;
+
+import static java.lang.Math.min;
+import static java.lang.Math.sqrt;
+
+public class KDTreeUtil {
+ private Node kdtree;
+
+ private static class Node {
+ // 分割的维度
Review Comment:
Updated.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@iotdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] Husaimawx commented on a diff in pull request #6892: Add a new UDF function: MasterRepair with docs
Posted by GitBox <gi...@apache.org>.
Husaimawx commented on code in PR #6892:
URL: https://github.com/apache/iotdb/pull/6892#discussion_r939818533
##########
node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/BuiltinTimeSeriesGeneratingFunction.java:
##########
@@ -88,7 +88,8 @@ public enum BuiltinTimeSeriesGeneratingFunction {
EQUAL_SIZE_BUCKET_M4_SAMPLE("EQUAL_SIZE_BUCKET_M4_SAMPLE", UDTFEqualSizeBucketM4Sample.class),
EQUAL_SIZE_BUCKET_OUTLIER_SAMPLE(
"EQUAL_SIZE_BUCKET_OUTLIER_SAMPLE", UDTFEqualSizeBucketOutlierSample.class),
- JEXL("JEXL", UDTFJexl.class);
+ JEXL("JEXL", UDTFJexl.class),
+ MasterRepair("MasterRepair", UDTFMasterRepair.class);
Review Comment:
Updated.
##########
node-commons/pom.xml:
##########
@@ -122,6 +122,28 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-math3</artifactId>
+ <version>3.1.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.collections</groupId>
+ <artifactId>eclipse-collections-api</artifactId>
+ <version>10.4.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.collections</groupId>
+ <artifactId>eclipse-collections-api</artifactId>
+ <version>11.1.0</version>
+ </dependency>
Review Comment:
Updated.
##########
integration-test/src/test/java/org/apache/iotdb/db/it/udf/IoTDBUDTFBuiltinFunctionIT.java:
##########
@@ -1232,6 +1232,200 @@ private void testStrLength(Statement statement) {
}
}
+ @Test
+ public void testMasterRepair() {
+ // create time series with master data
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ statement.execute("SET STORAGE GROUP TO root.testMasterRepair");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s1 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s2 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.s3 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m1 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m2 with datatype=FLOAT,encoding=PLAIN");
+ statement.execute(
+ "CREATE TIMESERIES root.testMasterRepair.d1.m3 with datatype=FLOAT,encoding=PLAIN");
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ String[] INSERT_SQL = {
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (1,1704,1154.55,0.195,1704,1154.55,0.195)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (2,1702,1152.30,0.193,1702,1152.30,0.193)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (3,1702,1148.65,0.192,1702,1148.65,0.192)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (4,1701,1145.20,0.194,1701,1145.20,0.194)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (7,1703,1150.55,0.195,1703,1150.55,0.195)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (8,1694,1151.55,0.193,1704,1151.55,0.193)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (9,1705,1153.55,0.194,1705,1153.55,0.194)",
+ "insert into root.testMasterRepair.d1(time, s1, s2, s3, m1, m2, m3) values (10,1706,1152.30,0.190,1706,1152.30,0.190)",
+ };
+
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+ for (String dataGenerationSql : INSERT_SQL) {
+ statement.execute(dataGenerationSql);
+ }
+ } catch (SQLException throwable) {
+ fail(throwable.getMessage());
+ }
+
+ // test 1
Review Comment:
Updated.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@iotdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] Husaimawx commented on a diff in pull request #6892: Add a new UDF function: MasterRepair with docs
Posted by GitBox <gi...@apache.org>.
Husaimawx commented on code in PR #6892:
URL: https://github.com/apache/iotdb/pull/6892#discussion_r939818727
##########
integration-test/src/main/java/org/apache/iotdb/itbase/constant/BuiltinTimeSeriesGeneratingFunctionEnum.java:
##########
@@ -74,7 +74,8 @@ public enum BuiltinTimeSeriesGeneratingFunctionEnum {
EQUAL_SIZE_BUCKET_AGG_SAMPLE("EQUAL_SIZE_BUCKET_AGG_SAMPLE"),
EQUAL_SIZE_BUCKET_M4_SAMPLE("EQUAL_SIZE_BUCKET_M4_SAMPLE"),
EQUAL_SIZE_BUCKET_OUTLIER_SAMPLE("EQUAL_SIZE_BUCKET_OUTLIER_SAMPLE"),
- JEXL("JEXL");
+ JEXL("JEXL"),
+ MasterRepair("MasterRepair");
Review Comment:
Updated.
##########
integration-test/pom.xml:
##########
@@ -77,6 +77,21 @@
<artifactId>rewrite-tsfile-tool</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
Review Comment:
Updated.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@iotdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [iotdb] SteveYurongSu commented on a diff in pull request #6892: Add a new UDF function: MasterRepair with docs
Posted by GitBox <gi...@apache.org>.
SteveYurongSu commented on code in PR #6892:
URL: https://github.com/apache/iotdb/pull/6892#discussion_r942046327
##########
tsfile/pom.xml:
##########
@@ -100,6 +100,12 @@
<artifactId>iotdb-antlr</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
Review Comment:
Why this dependency is necessary in tsfile module?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@iotdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org