Fixing #1231. Adding order and status to trace query. #1255
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
|
OK. Let me change Ints to enum and resend the pull request. |
|
Thanks and look forward to have this soon. |
|
Updated the pull request as requested. |
|
@ajanthan Your CI fails. |
| searchRequestBuilder.addSort(SegmentDurationTable.START_TIME.getName(), SortOrder.DESC); | ||
| switch (traceState) { | ||
| case ERROR: | ||
| mustQueryList.add(QueryBuilders.matchQuery(SegmentDurationTable.IS_ERROR.getName(), 1)); |
| mustQueryList.add(QueryBuilders.matchQuery(SegmentDurationTable.IS_ERROR.getName(), 1)); | ||
| break; | ||
| case SUCCESS: | ||
| mustQueryList.add(QueryBuilders.matchQuery(SegmentDurationTable.IS_ERROR.getName(), 0)); |
| sql = sql + " and {" + paramIndex + "} = ?"; | ||
| switch (traceState) { | ||
| case ERROR: | ||
| params.add(1); |
| params.add(1); | ||
| break; | ||
| case SUCCESS: | ||
| params.add(0); |
| @@ -73,16 +75,30 @@ public TraceBrief loadTop(long startSecondTimeBucket, long endSecondTimeBucket, | |||
| boolQueryBuilder.must().add(rangeQueryBuilder); | |||
| } | |||
| if (StringUtils.isNotEmpty(operationName)) { | |||
| mustQueryList.add(QueryBuilders.matchPhraseQuery(SegmentDurationTable.SERVICE_NAME.getName(), operationName)); | |||
| mustQueryList.add(QueryBuilders.matchQuery(SegmentDurationTable.SERVICE_NAME.getName(), operationName)); | |||
There was a problem hiding this comment.
I forgot why chose the method matchPhraseQuery before. Please ensure these two service names can be searched by the method matchQuery.
- org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()
- /dubbox-case/case/dubbox-rest
There was a problem hiding this comment.
It is a mistake. Fixed it in the latest pull request.
|
@wu-sheng @peng-yongsheng I sent an updated pull request. Please review it. |
peng-yongsheng
approved these changes
May 24, 2018
wu-sheng
approved these changes
May 24, 2018
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.
Please answer these questions before submitting pull request
Why submit this pull request?
Bug fix
[ *] New feature provided
Improve performance
Related issues
Add order and status options in trace query. #1231
Bug fix
Bug description.
How to fix?
New feature or improvement
Added status and order to trace query API and updated UI