Skip to content
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

fix has within query error #1680

Merged
merged 4 commits into from
Dec 7, 2021
Merged

fix has within query error #1680

merged 4 commits into from
Dec 7, 2021

Conversation

zhoney
Copy link
Contributor

@zhoney zhoney commented Dec 3, 2021

fix #1534
Change-Id: I1179a7ec3f29bbf9ec10eeb3f93521b455c31ed8

Change-Id: I1179a7ec3f29bbf9ec10eeb3f93521b455c31ed8
@codecov
Copy link

codecov bot commented Dec 3, 2021

Codecov Report

Merging #1680 (ddf811b) into master (83180fb) will increase coverage by 2.51%.
The diff coverage is 66.66%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #1680      +/-   ##
============================================
+ Coverage     64.40%   66.92%   +2.51%     
- Complexity     6897     7065     +168     
============================================
  Files           421      421              
  Lines         34675    34679       +4     
  Branches       4803     4804       +1     
============================================
+ Hits          22334    23210     +876     
+ Misses        10058     9124     -934     
- Partials       2283     2345      +62     
Impacted Files Coverage Δ
...om/baidu/hugegraph/backend/query/QueryResults.java 70.09% <33.33%> (-1.34%) ⬇️
...ava/com/baidu/hugegraph/backend/page/IdHolder.java 79.78% <100.00%> (+0.21%) ⬆️
...va/com/baidu/hugegraph/backend/page/QueryList.java 87.06% <100.00%> (ø)
...ugegraph/backend/page/SortByCountIdHolderList.java 89.65% <100.00%> (+0.36%) ⬆️
...va/com/baidu/hugegraph/auth/HugeAuthenticator.java 34.78% <0.00%> (-5.44%) ⬇️
...va/com/baidu/hugegraph/task/ServerInfoManager.java 71.34% <0.00%> (-2.81%) ⬇️
...ain/java/com/baidu/hugegraph/task/TaskManager.java 69.06% <0.00%> (-1.44%) ⬇️
...in/java/com/baidu/hugegraph/auth/HugeResource.java 77.92% <0.00%> (-1.30%) ⬇️
.../java/com/baidu/hugegraph/auth/RolePermission.java 90.58% <0.00%> (-1.18%) ⬇️
.../baidu/hugegraph/backend/query/ConditionQuery.java 85.94% <0.00%> (+0.26%) ⬆️
... and 20 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 83180fb...ddf811b. Read the comment docs.

@@ -115,9 +115,21 @@ public R one() {
}

// Fill map with all elements
Map<Id, T> map = new HashMap<>();
Map<Id, T> map = new LinkedHashMap<>();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

InsertionOrderUtil.newMap

Change-Id: I30d81bfa275da9499fc42e0778955b055533246c
@javeme
Copy link
Contributor

javeme commented Dec 3, 2021

prefer update like this:
image

Because joint index does not need mustSortByInputIds, only search index is needed.

Change-Id: I72b52f77afbcbe780c9f30c726995c220f409606
@@ -59,6 +59,10 @@ public String toString() {

public abstract boolean paging();

public boolean keepOrder() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

prefer to move to line 52 or line 59, since this block is for abstract methods

@@ -221,7 +221,10 @@ public IndexQuery(IdHolderList holders, long batchSize) {
Query bindQuery = holder.query();
this.updateOffsetIfNeeded(bindQuery);

// Iterate by all
/*
* The search or joint index query may come here.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"come here" -- it means line 229

Change-Id: Ida82d4c4b6a117dd5782f9cbe2465d285fa89f9d
@zyxxoo
Copy link
Contributor

zyxxoo commented Dec 7, 2021 via email

1 similar comment
@Linary
Copy link
Contributor

Linary commented Dec 7, 2021 via email

@javeme javeme merged commit 0200dc6 into master Dec 7, 2021
@javeme javeme deleted the zy-fix-within-query-error branch December 7, 2021 09:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Question] 部分字段的within查询功能异常
5 participants