-
Notifications
You must be signed in to change notification settings - Fork 104
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Implement automatic conversion of aggFun under table model. #464
Merged
OneSizeFitsQuorum
merged 8 commits into
thulab:master
from
YangYumings:supportTableQueryTest
Nov 25, 2024
Merged
Implement automatic conversion of aggFun under table model. #464
OneSizeFitsQuorum
merged 8 commits into
thulab:master
from
YangYumings:supportTableQueryTest
Nov 25, 2024
+151
−22
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
...0/src/main/java/cn/edu/tsinghua/iot/benchmark/iotdb200/ModelStrategy/IoTDBModelStrategy.java
Outdated
Show resolved
Hide resolved
iotdb-2.0/src/main/java/cn/edu/tsinghua/iot/benchmark/iotdb200/ModelStrategy/TableStrategy.java
Show resolved
Hide resolved
iotdb-2.0/src/main/java/cn/edu/tsinghua/iot/benchmark/iotdb200/ModelStrategy/TableStrategy.java
Outdated
Show resolved
Hide resolved
iotdb-2.0/src/main/java/cn/edu/tsinghua/iot/benchmark/iotdb200/ModelStrategy/TreeStrategy.java
Show resolved
Hide resolved
iotdb-2.0/src/main/java/cn/edu/tsinghua/iot/benchmark/iotdb200/ModelStrategy/TreeStrategy.java
Outdated
Show resolved
Hide resolved
...0/src/main/java/cn/edu/tsinghua/iot/benchmark/iotdb200/ModelStrategy/IoTDBModelStrategy.java
Outdated
Show resolved
Hide resolved
iotdb-2.0/src/main/java/cn/edu/tsinghua/iot/benchmark/iotdb200/ModelStrategy/TreeStrategy.java
Outdated
Show resolved
Hide resolved
iotdb-2.0/src/main/java/cn/edu/tsinghua/iot/benchmark/iotdb200/ModelStrategy/TableStrategy.java
Outdated
Show resolved
Hide resolved
OneSizeFitsQuorum
approved these changes
Nov 25, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
问题
1. 对于Q1,树模型与表模型查询的 device_id 不同;
修改后
2. 表模型 SQL 中的 sensor 数量比配置文件规定数量少 1;
for 循环中 i 的初始值由 1 改为 0;
3. 对于Q9,Q10,对于表模型 SQL 拼接 “order by device_id, time desc”, 树模型保持 “order by time desc”;
新建 addOrderByTimeDesc() 方法,树表模型分别重写。
4. 表模型自动完成下述 aggFun 的转换:
左侧的 aggFun 表模型不支持,但存在等效的 aggFun 。
5. 两个模型不支持 max_by、min_by,此外表模型不支持 time_duration;
新建 loadAndConvertAggregateFunction() 方法,实现加载配置参数 QUERY_AGGREGATE_FUN 和转换。
在 checkConfig 中添加对上述三种 aggFun 的检查。