[IOTDB-2679] Support logical operators in select clauses by flashzxi · Pull Request #5273 · apache/iotdb

flashzxi · 2022-03-17T12:01:40Z

Description

Add some functions to support select logical expression in select clauses.

Details

Now you can select logical expressions like a>b, fore example

select a, a>10, !(a<20) && a<30 from root.test;

output:

IoTDB> select a, a>10, !(a<20) && a<30 from root.test;
+-----------------------------+-----------+----------------+--------------------------------------+
|                         Time|root.test.a|root.test.a > 10|!root.test.a < 20 & (root.test.a < 30)|
+-----------------------------+-----------+----------------+--------------------------------------+
|1970-01-01T08:00:00.001+08:00|         23|            true|                                  true|
|1970-01-01T08:00:00.002+08:00|         33|            true|                                 false|
|1970-01-01T08:00:00.004+08:00|         13|            true|                                 false|
|1970-01-01T08:00:00.005+08:00|         26|            true|                                  true|
|1970-01-01T08:00:00.008+08:00|          1|           false|                                 false|
|1970-01-01T08:00:00.010+08:00|         23|            true|                                  true|
+-----------------------------+-----------+----------------+--------------------------------------+

coveralls · 2022-03-17T14:21:42Z

Coverage decreased (-0.007%) to 65.427% when pulling 473eb33 on flashzxi:compareExpression into 31108de on apache:master.

SteveYurongSu · 2022-03-21T01:22:57Z

Hi @cornmonster @ericpai, PTAL :D

SteveYurongSu

What a great feature! I will take a look ASAP.

Please add some docs for this PR.

integration/src/test/java/org/apache/iotdb/db/integration/IoTDBSelectCompareExpressionIT.java

antlr/src/main/antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4

.../src/main/java/org/apache/iotdb/db/query/udf/core/transformer/CompareEqualToTransformer.java

...main/java/org/apache/iotdb/db/query/udf/core/transformer/CompareGreaterEqualTransformer.java

.../main/java/org/apache/iotdb/db/query/udf/core/transformer/CompareGreaterThanTransformer.java

...rc/main/java/org/apache/iotdb/db/query/udf/core/transformer/CompareLessEqualTransformer.java

...src/main/java/org/apache/iotdb/db/query/udf/core/transformer/CompareOperatorTransformer.java

server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/LogicAndTransformer.java

server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/LogicNotTransformer.java

server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/LogicOrTransformer.java

ericpai · 2022-03-21T04:09:01Z

Description

Add some functions to support select logical expression in select clauses.

Details

Now you can select logical expressions like a>b, fore example

select a, a>10, !(a<20) && a<30 from root.test;

output:

IoTDB> select a, a>10, !(a<20) && a<30 from root.test;
+-----------------------------+-----------+----------------+--------------------------------------+
|                         Time|root.test.a|root.test.a > 10|!root.test.a < 20 & (root.test.a < 30)|
+-----------------------------+-----------+----------------+--------------------------------------+
|1970-01-01T08:00:00.001+08:00|         23|            true|                                  true|
|1970-01-01T08:00:00.002+08:00|         33|            true|                                 false|
|1970-01-01T08:00:00.004+08:00|         13|            true|                                 false|
|1970-01-01T08:00:00.005+08:00|         26|            true|                                  true|
|1970-01-01T08:00:00.008+08:00|          1|           false|                                 false|
|1970-01-01T08:00:00.010+08:00|         23|            true|                                  true|
+-----------------------------+-----------+----------------+--------------------------------------+

@flashzxi Could you add some docs about this excellent feature in English and Chinese :)

integration/src/test/java/org/apache/iotdb/db/integration/IoTDBSelectCompareExpressionIT.java

flashzxi · 2022-03-25T08:09:50Z

@ericpai Please take a look

ericpai · 2022-03-25T08:42:07Z

@flashzxi why the file mod of .bat and .sh are changed to 100644? They should be excutable.

flashzxi · 2022-03-25T11:02:01Z

@flashzxi why the file mod of .bat and .sh are changed to 100644? They should be excutable.
I haven't modified them. Maybe caused by the difference of \n and \r\n on win and mac platform?

server/src/main/java/org/apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java

server/src/main/java/org/apache/iotdb/db/query/expression/unary/LogicNotExpression.java

server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/BinaryTransformer.java

server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/LogicOrTransformer.java

docs/zh/UserGuide/Query-Data/Select-Expression.md

ericpai · 2022-03-26T11:35:11Z

LGTM. Thanks for the excellent feature!

ericpai · 2022-03-26T11:41:31Z

@SteveYurongSu Are there any other comments?

ericpai · 2022-03-26T12:08:20Z

The tests are failure caused by other modules, please rebase and sync with the master code. @flashzxi

SteveYurongSu · 2022-03-27T09:44:13Z

@ericpai Thanks for the reviewing :D

SteveYurongSu

Overall LGTM. This is great :D

…er_meta * remotes/upstream/master: Rename SchemaEngine to LocalSchemaProcessor and Rename SchemaRegionManager to SchemaEngine (apache#5359) Add SchemaRegion Interfaces to SchemaEngine (apache#5349) [IOTDB-2803] adapt metadata write operation to plannode (apache#5344) [IOTDB-2679] Support logical operators in select clauses (apache#5273) [IOTDB-2671][metrics] Improve the implementation of iotdbReporter (apache#5338) # Conflicts: # server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/LogicalPlanner.java # server/src/test/java/org/apache/iotdb/db/mpp/sql/plan/LogicalPlannerTest.java

SteveYurongSu requested review from SteveYurongSu and ericpai March 21, 2022 01:22

SteveYurongSu reviewed Mar 21, 2022

View reviewed changes

integration/src/test/java/org/apache/iotdb/db/integration/IoTDBSelectCompareExpressionIT.java Outdated Show resolved Hide resolved

SteveYurongSu reviewed Mar 21, 2022

View reviewed changes

integration/src/test/java/org/apache/iotdb/db/integration/IoTDBSelectCompareExpressionIT.java Outdated Show resolved Hide resolved

SteveYurongSu reviewed Mar 21, 2022

View reviewed changes

integration/src/test/java/org/apache/iotdb/db/integration/IoTDBSelectCompareExpressionIT.java Outdated Show resolved Hide resolved

ericpai requested changes Mar 21, 2022

View reviewed changes

ericpai reviewed Mar 21, 2022

View reviewed changes

integration/src/test/java/org/apache/iotdb/db/integration/IoTDBSelectCompareExpressionIT.java Show resolved Hide resolved

flashzxi added 2 commits March 25, 2022 19:54

remove mode change

de23214

remove mode change

98e7e76

flashzxi force-pushed the compareExpression branch from def963b to 98e7e76 Compare March 25, 2022 12:06

ericpai reviewed Mar 26, 2022

View reviewed changes

ericpai requested changes Mar 26, 2022

View reviewed changes

server/src/main/java/org/apache/iotdb/db/query/udf/core/transformer/LogicOrTransformer.java Outdated Show resolved Hide resolved

flashzxi added 2 commits March 26, 2022 13:58

Split logic and compare expressions

cc70592

Fix == and != to support boolean type

2091665

ericpai reviewed Mar 26, 2022

View reviewed changes

docs/zh/UserGuide/Query-Data/Select-Expression.md Outdated Show resolved Hide resolved

flashzxi added 2 commits March 26, 2022 19:14

Add priority description about operators

307225a

Add priority description about operators

25cc81d

ericpai approved these changes Mar 26, 2022

View reviewed changes

Merge branch 'apache:master' into compareExpression

5aa4fb9

SteveYurongSu approved these changes Mar 27, 2022

View reviewed changes

SteveYurongSu merged commit 1705a8a into apache:master Mar 27, 2022

Conversation

flashzxi commented Mar 17, 2022

Description

Details

Uh oh!

coveralls commented Mar 17, 2022

Uh oh!

SteveYurongSu commented Mar 21, 2022

Uh oh!

SteveYurongSu left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ericpai commented Mar 21, 2022

Description

Details

Uh oh!

Uh oh!

flashzxi commented Mar 25, 2022

Uh oh!

ericpai commented Mar 25, 2022

Uh oh!

flashzxi commented Mar 25, 2022

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ericpai commented Mar 26, 2022

Uh oh!

ericpai commented Mar 26, 2022

Uh oh!

ericpai commented Mar 26, 2022

Uh oh!

SteveYurongSu commented Mar 27, 2022

Uh oh!

SteveYurongSu left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants