Skip to content

Commit

Permalink
FreeMarker code generation for mathematical functions and operators
Browse files Browse the repository at this point in the history
  • Loading branch information
@FearfulTomcat27
FearfulTomcat27 authored Sep 4, 2024
1 parent eb6a5d3 commit 380b0b4
Show file tree
Hide file tree
Showing 24 changed files with 1,658 additions and 341 deletions.
12 changes: 6 additions & 6 deletions ...rc/test/java/org/apache/iotdb/relational/it/db/it/IoTDBMultiIDsWithAttributesTableIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -395,12 +395,12 @@ public void subQueryTest1() {
String[] expectedHeader = new String[] {"time", "level", "device", "add_num"};
String[] retArray =
new String[] {
"1970-01-01T00:00:00.100Z,l5,d1,9.0,",
"1971-01-01T00:00:01.000Z,l4,d1,6.0,",
"1971-01-01T00:00:10.000Z,l5,d1,8.0,",
"1971-04-26T18:01:40.000Z,l4,d1,14.0,",
"1971-08-20T11:33:20.000Z,l5,d1,16.0,",
"1970-01-01T00:00:00.080Z,l4,d2,10.0,",
"1970-01-01T00:00:00.100Z,l5,d1,9,",
"1971-01-01T00:00:01.000Z,l4,d1,6,",
"1971-01-01T00:00:10.000Z,l5,d1,8,",
"1971-04-26T18:01:40.000Z,l4,d1,14,",
"1971-08-20T11:33:20.000Z,l5,d1,16,",
"1970-01-01T00:00:00.080Z,l4,d2,10,",
};

expectedHeader = new String[] {"time", "level", "device", "add_num"};
Expand Down
48 changes: 24 additions & 24 deletions ...-test/src/test/java/org/apache/iotdb/relational/it/query/old/IoTDBNestedQueryTableIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ public void testRawDataQueryWithConstants() {
for (int i = 1; i <= ITERATION_TIMES; i++) {
Assert.assertTrue(rs.next());
Assert.assertEquals(i, rs.getLong(1));
Assert.assertEquals(i + 1.0D, rs.getDouble(2), 0.01);
Assert.assertEquals(i + 1, rs.getInt(2), 0.01);
}
Assert.assertFalse(rs.next());
}
Expand All @@ -161,7 +161,7 @@ public void testRawDataQueryWithConstants() {
for (int i = 1; i <= ITERATION_TIMES; i++) {
Assert.assertTrue(rs.next());
Assert.assertEquals(i, rs.getLong(1));
Assert.assertEquals(i + 1.0D, rs.getDouble(2), 0.01);
Assert.assertEquals(i + 1, rs.getInt(2), 0.01);
}
Assert.assertFalse(rs.next());
}
Expand All @@ -182,8 +182,8 @@ public void testDuplicatedRawDataQueryWithConstants() {
for (int i = 1; i <= ITERATION_TIMES; i++) {
Assert.assertTrue(rs.next());
Assert.assertEquals(i, rs.getLong(1));
Assert.assertEquals(i + 1.0D, rs.getDouble(2), 0.01);
Assert.assertEquals(i + 1.0D, rs.getDouble(3), 0.01);
Assert.assertEquals(i + 1, rs.getInt(2), 0.01);
Assert.assertEquals(i + 1, rs.getInt(3), 0.01);
}
Assert.assertFalse(rs.next());
}
Expand All @@ -206,10 +206,10 @@ public void testCommutativeLaws() {
Assert.assertTrue(rs.next());
Assert.assertEquals(i, rs.getLong(1));
Assert.assertEquals(i, rs.getInt(2));
Assert.assertEquals(i + 1.0D, rs.getDouble(3), 0.01);
Assert.assertEquals(i + 1.0D, rs.getDouble(4), 0.01);
Assert.assertEquals(i * 2.0D, rs.getDouble(5), 0.01);
Assert.assertEquals(i * 2.0D, rs.getDouble(6), 0.01);
Assert.assertEquals(i + 1, rs.getInt(3), 0.01);
Assert.assertEquals(i + 1, rs.getInt(4), 0.01);
Assert.assertEquals(i * 2, rs.getInt(5), 0.01);
Assert.assertEquals(i * 2, rs.getInt(6), 0.01);
}
Assert.assertFalse(rs.next());
}
Expand All @@ -232,12 +232,12 @@ public void testAssociativeLaws() {
Assert.assertTrue(rs.next());
Assert.assertEquals(i, rs.getLong(1));
Assert.assertEquals(i, rs.getInt(2));
Assert.assertEquals(i + 3.0D, rs.getDouble(3), 0.01);
Assert.assertEquals(i + 3.0D, rs.getDouble(4), 0.01);
Assert.assertEquals(i + 3.0D, rs.getDouble(5), 0.01);
Assert.assertEquals(i * 6.0D, rs.getDouble(6), 0.01);
Assert.assertEquals(i * 6.0D, rs.getDouble(7), 0.01);
Assert.assertEquals(i * 6.0D, rs.getDouble(8), 0.01);
Assert.assertEquals(i + 3, rs.getInt(3), 0.01);
Assert.assertEquals(i + 3, rs.getInt(4), 0.01);
Assert.assertEquals(i + 3, rs.getInt(5), 0.01);
Assert.assertEquals(i * 6, rs.getInt(6), 0.01);
Assert.assertEquals(i * 6, rs.getInt(7), 0.01);
Assert.assertEquals(i * 6, rs.getInt(8), 0.01);
}
Assert.assertFalse(rs.next());
}
Expand All @@ -260,10 +260,10 @@ public void testDistributiveLaw() {
Assert.assertTrue(rs.next());
Assert.assertEquals(i, rs.getLong(1));
Assert.assertEquals(i, rs.getInt(2));
Assert.assertEquals(2 * i + 2.0D, rs.getDouble(3), 0.01);
Assert.assertEquals(2 * i + 2.0D, rs.getDouble(4), 0.01);
Assert.assertEquals(i / 2.0D + 0.5D, rs.getDouble(5), 0.01);
Assert.assertEquals(i / 2.0D + 0.5D, rs.getDouble(6), 0.01);
Assert.assertEquals(2 * i + 2, rs.getInt(3), 0.01);
Assert.assertEquals(2 * i + 2, rs.getInt(4), 0.01);
Assert.assertEquals((i + 1) / 2, rs.getInt(5), 0.01);
Assert.assertEquals(i / 2 + 1 / 2, rs.getInt(6), 0.01);
}
Assert.assertFalse(rs.next());
}
Expand All @@ -289,9 +289,9 @@ public void testOrderOfArithmeticOperations() {
for (int i = 1; i <= ITERATION_TIMES; i++) {
Assert.assertTrue(rs.next());
Assert.assertEquals(i, rs.getLong(1));
Assert.assertEquals(2 * i + 2.0D, rs.getDouble(2), 0.01);
Assert.assertEquals(2 * i + 3.0D, rs.getDouble(3), 0.01);
Assert.assertEquals(3 * i + 3.0D, rs.getDouble(4), 0.01);
Assert.assertEquals(2 * i + 2, rs.getInt(2), 0.01);
Assert.assertEquals(2 * i + 3, rs.getInt(3), 0.01);
Assert.assertEquals(3 * i + 3, rs.getInt(4), 0.01);
}
Assert.assertFalse(rs.next());
}
Expand All @@ -302,9 +302,9 @@ public void testOrderOfArithmeticOperations() {
for (int i = 1; i <= ITERATION_TIMES; i++) {
Assert.assertTrue(rs.next());
Assert.assertEquals(i, rs.getLong(1));
Assert.assertEquals(2.0D - i / 2.0D, rs.getDouble(2), 0.01);
Assert.assertEquals(1.5 - i / 2.0D, rs.getDouble(3), 0.01);
Assert.assertEquals((1.0D / 3.0D) * (1.0D - i), rs.getDouble(4), 0.01);
Assert.assertEquals(2 - i / 2, rs.getInt(2), 0.01);
Assert.assertEquals((1 - i) / 2 + 1, rs.getInt(3), 0.01);
Assert.assertEquals((1 - i) / (2 + 1), rs.getInt(4), 0.01);
}
Assert.assertFalse(rs.next());
}
Expand Down
16 changes: 8 additions & 8 deletions ...ava/org/apache/iotdb/relational/it/query/old/alignbydevice/IoTDBAlignByDeviceTableIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,14 +314,14 @@ public void duplicateProjectionsTest() {
String[] expectedHeader = new String[] {"Time", "device_id", "_col2", "_col3", "alias"};
String[] retArray =
new String[] {
"1970-01-01T00:00:00.001Z,d0,1102.0,1102.0,1102.0,",
"1970-01-01T00:00:00.002Z,d0,40001.0,40001.0,40001.0,",
"1970-01-01T00:00:00.050Z,d0,50001.0,50001.0,50001.0,",
"1970-01-01T00:00:00.100Z,d0,200.0,200.0,200.0,",
"1970-01-01T00:00:00.101Z,d0,200.0,200.0,200.0,",
"1970-01-01T00:00:00.103Z,d0,200.0,200.0,200.0,",
"1970-01-01T00:00:00.105Z,d0,200.0,200.0,200.0,",
"1970-01-01T00:00:01.000Z,d0,55556.0,55556.0,55556.0,",
"1970-01-01T00:00:00.001Z,d0,1102,1102,1102,",
"1970-01-01T00:00:00.002Z,d0,40001,40001,40001,",
"1970-01-01T00:00:00.050Z,d0,50001,50001,50001,",
"1970-01-01T00:00:00.100Z,d0,200,200,200,",
"1970-01-01T00:00:00.101Z,d0,200,200,200,",
"1970-01-01T00:00:00.103Z,d0,200,200,200,",
"1970-01-01T00:00:00.105Z,d0,200,200,200,",
"1970-01-01T00:00:01.000Z,d0,55556,55556,55556,",
};
tableResultSetEqualTest(
"select Time, device_id, s1+1, s1+1, s1+1 as alias from vehicle where (((\"time\" > 10) AND (\"s1\" > 190)) OR (\"s2\" > 190.0) OR ((\"time\" < 4) AND (\"s1\" > 100))) order by device_id, time",
Expand Down
Loading

0 comments on commit 380b0b4

Please sign in to comment.