Support distinct count aggregation - #116

Closed
chloe-zh wants to merge 19 commits into
opensearch-project:developfrom
chloe-zh:issue/#100
Closed

Support distinct count aggregation#116
chloe-zh wants to merge 19 commits into
opensearch-project:developfrom
chloe-zh:issue/#100

Conversation

@chloe-zh

@chloe-zhchloe-zh commented Jun 9, 2021•
edited
Loading

Copy link
Copy Markdown
Contributor

Signed-off-by: Chloe Zhang chloezh1102@gmail.com

Description

  • Grammar: enabled distinct count
    SQL: count(DISTINCT field)
    PPL: distinct_count(field)/dc(field) in stats command
    Note that distinct all count(distinct *) is not supported, the grammar of MySQL to get the distinct count of all fields is to put all fields in the distinct count field: https://dev.mysql.com/doc/refman/8.0/en/aggregate-functions.html#function_count-distinct Not supported in this PR since the distinct count of multi-field is not implemented here. Will create another issue for this case.

  • Core engine
    Added distinct option in aggregators, and the distinct option is off by default, distinct count turns on this option.

  • Push down
    Distinct count of single field in OpenSearch is achieved by building the cardinality aggregation, for example:

select count(distinct Dest) from opensearch_dashboards_sample_data_flights
DSL:
{
"from":0,
"size":0,
"timeout":"1m",
"aggregations":{
"count(distinct Dest)":{
"cardinality":{
"field":"Dest"
}
}
}
}
Full explain:
{
"root": {
"name": "ProjectOperator",
"description": {
"fields": "[count(distinct Dest)]"
},
"children": [
{
"name": "OpenSearchIndexScan",
"description": {
"request": """OpenSearchQueryRequest(indexName=opensearch_dashboards_sample_data_flights, sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"count(distinct Dest)":{"cardinality":{"field":"Dest"}}}}, searchDone=false)"""
},
"children": []
}
]
}
}

Explain of distinct count with filter:

SELECT COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500) FROM opensearch_dashboards_sample_data_flights
{
"root": {
"name": "ProjectOperator",
"description": {
"fields": """[COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500)]"""
},
"children": [
{
"name": "OpenSearchIndexScan",
"description": {
"request": """OpenSearchQueryRequest(indexName=opensearch_dashboards_sample_data_flights, sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500)":{"filter":{"range":{"AvgTicketPrice":{"from":null,"to":500,"include_lower":true,"include_upper":false,"boost":1.0}}},"aggregations":{"COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500)":{"cardinality":{"field":"OriginWeather"}}}}}}, searchDone=false)"""
},
"children": []
}
]
}
}

SQL example:

SELECT COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500) FROM opensearch_dashboards_sample_data_flights
{
"schema": [
{
"name": """COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500)""",
"type": "integer"
}
],
"datarows": [
[
8
]
],
"total": 1,
"size": 1,
"status": 200
}

PPL example:

source=opensearch_dashboards_sample_data_flights | stats distinct_count(Dest) by Origin | head 3
{
"schema": [
{
"name": "distinct_count(Dest)",
"type": "integer"
},
{
"name": "Origin",
"type": "string"
}
],
"datarows": [
[
72,
"Abu Dhabi International Airport"
],
[
78,
"Adelaide International Airport"
],
[
72,
"Adolfo Suarez Madrid— Barajas Airport"
]
],
"total": 3,
"size": 3
}

@chloe-zh
support distinct count aggregation
6f5350d
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zhchloe-zh self-assigned this Jun 9, 2021
@chloe-zhchloe-zh added SQL Priority-High enhancement New feature or request PPL Piped processing language labels Jun 9, 2021
@chloe-zh
fixed tests
e30b685
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Merge remote-tracking branch 'upstream/develop' into issue/opensearch…
43dad8d
…-project#100
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Merge remote-tracking branch 'upstream/develop' into issue/opensearch…
866d71d
…-project#100
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
# Conflicts:
#	opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilder.java
@chloe-zh
update
8a6ca20
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
updated user doc
43cbd17
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
chloe-zh marked this pull request as ready for review June 9, 2021 20:33
@chloe-zh
chloe-zh requested review from dai-chen and penghuoJune 9, 2021 20:33
penghuo
penghuo reviewed Jun 10, 2021
View reviewed changes
Comment threadcore/src/main/java/org/opensearch/sql/expression/aggregation/MinAggregator.java Outdated
penghuo
penghuo reviewed Jun 10, 2021
View reviewed changes
Comment threadcore/src/main/java/org/opensearch/sql/expression/aggregation/Aggregator.java Outdated
dai-chen
dai-chen reviewed Jun 10, 2021
View reviewed changes
Comment threadinteg-test/src/test/resources/correctness/queries/aggregation.txt Outdated
Comment threadsql/src/main/antlr/OpenSearchSQLParser.g4 Outdated
chloe-zh added 10 commits June 10, 2021 21:09
@chloe-zh
Update: support only count for distinct aggregations
392c96c
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Update doc; removed distinct start
078eae7
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Removed unnecessary methods
f10b282
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
update
df81cfa
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Merge remote-tracking branch 'upstream/develop' into issue/opensearch…
5b02a43
…-project#100
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
# Conflicts:
#	core/src/main/java/org/opensearch/sql/expression/DSL.java
#	core/src/main/java/org/opensearch/sql/expression/aggregation/NamedAggregator.java
#	core/src/test/java/org/opensearch/sql/analysis/ExpressionAnalyzerTest.java
#	docs/user/dql/aggregations.rst
#	integ-test/src/test/resources/correctness/queries/aggregation.txt
#	opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilder.java
#	opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilderTest.java
#	sql/src/test/java/org/opensearch/sql/sql/parser/AstExpressionBuilderTest.java
@chloe-zh
update
94a045f
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
modified comparison test
11a9758
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
removed a comparison test and added it to aggregationIT
d5dc9eb
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
added ppl IT test cases; added window function test cases
684a742
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
moved distinct window function test cases to WindowsIT
c750f59
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
added ut
9fa771d
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
update
5d42554
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
chloe-zh requested review from dai-chen and penghuoJune 16, 2021 22:39
dai-chen
dai-chen reviewed Jun 16, 2021
View reviewed changes
Comment threadcore/src/main/java/org/opensearch/sql/expression/aggregation/CountAggregator.java Outdated
@chloe-zh
update
80a4c61
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@davidcui1225
davidcui1225 deleted the branch opensearch-project:developJune 26, 2021 00:47
This was referenced Jul 23, 2021
Closed
Merged
Yury-Fridlyand added a commit that referenced this pull request Nov 1, 2022
@Yury-FridlyandMaxKsyunz@forestmvey
Rework on error reporting to make it more verbose and human-friendly. (…
89b3e1a
…#116)
Co-authored-by: MaxKsyunz <maxk@bitquilltech.com>
Co-authored-by: forestmvey <forestv@bitquilltech.com>
Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dai-chendai-chendai-chen left review comments
@penghuopenghuoAwaiting requested review from penghuo

Assignees

@chloe-zhchloe-zh

Labels

enhancementNew feature or requestPPLPiped processing languageSQL

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@chloe-zh@penghuo@dai-chen@davidcui1225
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Support distinct count aggregation - #116
Closed
chloe-zh wants to merge 19 commits into
opensearch-project:developfrom 
chloe-zh:issue/#100
Closed
Support distinct count aggregation#116
chloe-zh wants to merge 19 commits into
opensearch-project:developfrom 
chloe-zh:issue/#100
Conversation
@chloe-zh
@chloe-zhchloe-zh
commented
Jun 9, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
Signed-off-by: Chloe Zhang chloezh1102@gmail.com
Description
  • Grammar: enabled distinct count
    
SQL: count(DISTINCT field)
    
PPL: distinct_count(field)/dc(field) in stats command
    
Note that distinct all count(distinct *) is not supported, the grammar of MySQL to get the distinct count of all fields is to put all fields in the distinct count field: https://dev.mysql.com/doc/refman/8.0/en/aggregate-functions.html#function_count-distinct Not supported in this PR since the distinct count of multi-field is not implemented here. Will create another issue for this case.
  • Core engine
    
Added distinct option in aggregators, and the distinct option is off by default, distinct count turns on this option.
  • Push down
    
Distinct count of single field in OpenSearch is achieved by building the cardinality aggregation, for example:
select count(distinct Dest) from opensearch_dashboards_sample_data_flights
DSL:
{
"from":0,
"size":0,
"timeout":"1m",
"aggregations":{
"count(distinct Dest)":{
"cardinality":{
"field":"Dest"
}
}
}
}
Full explain:
{
"root": {
"name": "ProjectOperator",
"description": {
"fields": "[count(distinct Dest)]"
},
"children": [
{
"name": "OpenSearchIndexScan",
"description": {
"request": """OpenSearchQueryRequest(indexName=opensearch_dashboards_sample_data_flights, sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"count(distinct Dest)":{"cardinality":{"field":"Dest"}}}}, searchDone=false)"""
},
"children": []
}
]
}
}

Explain of distinct count with filter:
SELECT COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500) FROM opensearch_dashboards_sample_data_flights
{
"root": {
"name": "ProjectOperator",
"description": {
"fields": """[COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500)]"""
},
"children": [
{
"name": "OpenSearchIndexScan",
"description": {
"request": """OpenSearchQueryRequest(indexName=opensearch_dashboards_sample_data_flights, sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500)":{"filter":{"range":{"AvgTicketPrice":{"from":null,"to":500,"include_lower":true,"include_upper":false,"boost":1.0}}},"aggregations":{"COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500)":{"cardinality":{"field":"OriginWeather"}}}}}}, searchDone=false)"""
},
"children": []
}
]
}
}

SQL example:
SELECT COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500) FROM opensearch_dashboards_sample_data_flights
{
"schema": [
{
"name": """COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500)""",
"type": "integer"
}
],
"datarows": [
[
8
]
],
"total": 1,
"size": 1,
"status": 200
}

PPL example:
source=opensearch_dashboards_sample_data_flights | stats distinct_count(Dest) by Origin | head 3
{
"schema": [
{
"name": "distinct_count(Dest)",
"type": "integer"
},
{
"name": "Origin",
"type": "string"
}
],
"datarows": [
[
72,
"Abu Dhabi International Airport"
],
[
78,
"Adelaide International Airport"
],
[
72,
"Adolfo Suarez Madrid— Barajas Airport"
]
],
"total": 3,
"size": 3
}

@chloe-zh
support distinct count aggregation
6f5350d
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zhchloe-zh
self-assigned this
Jun 9, 2021
@chloe-zhchloe-zh
added

SQL

Priority-High

enhancement
New feature or request
PPL
Piped processing language
labels
Jun 9, 2021
@chloe-zh
fixed tests
e30b685
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Merge remote-tracking branch 'upstream/develop' into issue/opensearch…
43dad8d
…-project#100
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Merge remote-tracking branch 'upstream/develop' into issue/opensearch…
866d71d
…-project#100
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
# Conflicts:
#	opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilder.java
@chloe-zh
update
8a6ca20
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
updated user doc
43cbd17
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
chloe-zh
marked this pull request as ready for review
June 9, 2021 20:33
@chloe-zh
chloe-zh
requested review from
dai-chen and penghuoJune 9, 2021 20:33
penghuo
penghuo
reviewed
Jun 10, 2021
View reviewed changes
Comment threadcore/src/main/java/org/opensearch/sql/expression/aggregation/MinAggregator.java
Outdated

penghuo
penghuo
reviewed
Jun 10, 2021
View reviewed changes
Comment threadcore/src/main/java/org/opensearch/sql/expression/aggregation/Aggregator.java
Outdated

dai-chen
dai-chen
reviewed
Jun 10, 2021
View reviewed changes
Comment threadinteg-test/src/test/resources/correctness/queries/aggregation.txt
Outdated

Comment threadsql/src/main/antlr/OpenSearchSQLParser.g4
Outdated

chloe-zh
added 10 commits
June 10, 2021 21:09
@chloe-zh
Update: support only count for distinct aggregations
392c96c
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Update doc; removed distinct start
078eae7
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Removed unnecessary methods
f10b282
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
update
df81cfa
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Merge remote-tracking branch 'upstream/develop' into issue/opensearch…
5b02a43
…-project#100
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
# Conflicts:
#	core/src/main/java/org/opensearch/sql/expression/DSL.java
#	core/src/main/java/org/opensearch/sql/expression/aggregation/NamedAggregator.java
#	core/src/test/java/org/opensearch/sql/analysis/ExpressionAnalyzerTest.java
#	docs/user/dql/aggregations.rst
#	integ-test/src/test/resources/correctness/queries/aggregation.txt
#	opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilder.java
#	opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilderTest.java
#	sql/src/test/java/org/opensearch/sql/sql/parser/AstExpressionBuilderTest.java
@chloe-zh
update
94a045f
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
modified comparison test
11a9758
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
removed a comparison test and added it to aggregationIT
d5dc9eb
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
added ppl IT test cases; added window function test cases
684a742
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
moved distinct window function test cases to WindowsIT
c750f59
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
added ut
9fa771d
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
update
5d42554
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
chloe-zh
requested review from
dai-chen and penghuoJune 16, 2021 22:39
dai-chen
dai-chen
reviewed
Jun 16, 2021
View reviewed changes
Comment threadcore/src/main/java/org/opensearch/sql/expression/aggregation/CountAggregator.java
Outdated

@chloe-zh
update
80a4c61
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@davidcui1225
davidcui1225
deleted the branch
opensearch-project:developJune 26, 2021 00:47

This was referenced Jul 23, 2021
 Closed

 Merged

Yury-Fridlyand added a commit
that referenced
this pull request
Nov 1, 2022
@Yury-FridlyandMaxKsyunz@forestmvey
Rework on error reporting to make it more verbose and human-friendly. (…
89b3e1a
…#116)
Co-authored-by: MaxKsyunz <maxk@bitquilltech.com>
Co-authored-by: forestmvey <forestv@bitquilltech.com>
Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@dai-chendai-chendai-chen left review comments
@penghuopenghuoAwaiting requested review from penghuo

Assignees

@chloe-zhchloe-zh

Labels

enhancementNew feature or requestPPLPiped processing languageSQL

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@chloe-zh@penghuo@dai-chen@davidcui1225

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Support distinct count aggregation - #116
Closed
chloe-zh wants to merge 19 commits into
opensearch-project:developfrom 
chloe-zh:issue/#100
Closed
Support distinct count aggregation#116
chloe-zh wants to merge 19 commits into
opensearch-project:developfrom 
chloe-zh:issue/#100
Conversation
@chloe-zh
@chloe-zhchloe-zh
commented
Jun 9, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
Signed-off-by: Chloe Zhang chloezh1102@gmail.com
Description
  • Grammar: enabled distinct count
    
SQL: count(DISTINCT field)
    
PPL: distinct_count(field)/dc(field) in stats command
    
Note that distinct all count(distinct *) is not supported, the grammar of MySQL to get the distinct count of all fields is to put all fields in the distinct count field: https://dev.mysql.com/doc/refman/8.0/en/aggregate-functions.html#function_count-distinct Not supported in this PR since the distinct count of multi-field is not implemented here. Will create another issue for this case.
  • Core engine
    
Added distinct option in aggregators, and the distinct option is off by default, distinct count turns on this option.
  • Push down
    
Distinct count of single field in OpenSearch is achieved by building the cardinality aggregation, for example:
select count(distinct Dest) from opensearch_dashboards_sample_data_flights
DSL:
{
"from":0,
"size":0,
"timeout":"1m",
"aggregations":{
"count(distinct Dest)":{
"cardinality":{
"field":"Dest"
}
}
}
}
Full explain:
{
"root": {
"name": "ProjectOperator",
"description": {
"fields": "[count(distinct Dest)]"
},
"children": [
{
"name": "OpenSearchIndexScan",
"description": {
"request": """OpenSearchQueryRequest(indexName=opensearch_dashboards_sample_data_flights, sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"count(distinct Dest)":{"cardinality":{"field":"Dest"}}}}, searchDone=false)"""
},
"children": []
}
]
}
}

Explain of distinct count with filter:
SELECT COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500) FROM opensearch_dashboards_sample_data_flights
{
"root": {
"name": "ProjectOperator",
"description": {
"fields": """[COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500)]"""
},
"children": [
{
"name": "OpenSearchIndexScan",
"description": {
"request": """OpenSearchQueryRequest(indexName=opensearch_dashboards_sample_data_flights, sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500)":{"filter":{"range":{"AvgTicketPrice":{"from":null,"to":500,"include_lower":true,"include_upper":false,"boost":1.0}}},"aggregations":{"COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500)":{"cardinality":{"field":"OriginWeather"}}}}}}, searchDone=false)"""
},
"children": []
}
]
}
}

SQL example:
SELECT COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500) FROM opensearch_dashboards_sample_data_flights
{
"schema": [
{
"name": """COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500)""",
"type": "integer"
}
],
"datarows": [
[
8
]
],
"total": 1,
"size": 1,
"status": 200
}

PPL example:
source=opensearch_dashboards_sample_data_flights | stats distinct_count(Dest) by Origin | head 3
{
"schema": [
{
"name": "distinct_count(Dest)",
"type": "integer"
},
{
"name": "Origin",
"type": "string"
}
],
"datarows": [
[
72,
"Abu Dhabi International Airport"
],
[
78,
"Adelaide International Airport"
],
[
72,
"Adolfo Suarez Madrid— Barajas Airport"
]
],
"total": 3,
"size": 3
}

@chloe-zh
support distinct count aggregation
6f5350d
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zhchloe-zh
self-assigned this
Jun 9, 2021
@chloe-zhchloe-zh
added

SQL

Priority-High

enhancement
New feature or request
PPL
Piped processing language
labels
Jun 9, 2021
@chloe-zh
fixed tests
e30b685
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Merge remote-tracking branch 'upstream/develop' into issue/opensearch…
43dad8d
…-project#100
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Merge remote-tracking branch 'upstream/develop' into issue/opensearch…
866d71d
…-project#100
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
# Conflicts:
#	opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilder.java
@chloe-zh
update
8a6ca20
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
updated user doc
43cbd17
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
chloe-zh
marked this pull request as ready for review
June 9, 2021 20:33
@chloe-zh
chloe-zh
requested review from
dai-chen and penghuoJune 9, 2021 20:33
penghuo
penghuo
reviewed
Jun 10, 2021
View reviewed changes
Comment threadcore/src/main/java/org/opensearch/sql/expression/aggregation/MinAggregator.java
Outdated

penghuo
penghuo
reviewed
Jun 10, 2021
View reviewed changes
Comment threadcore/src/main/java/org/opensearch/sql/expression/aggregation/Aggregator.java
Outdated

dai-chen
dai-chen
reviewed
Jun 10, 2021
View reviewed changes
Comment threadinteg-test/src/test/resources/correctness/queries/aggregation.txt
Outdated

Comment threadsql/src/main/antlr/OpenSearchSQLParser.g4
Outdated

chloe-zh
added 10 commits
June 10, 2021 21:09
@chloe-zh
Update: support only count for distinct aggregations
392c96c
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Update doc; removed distinct start
078eae7
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Removed unnecessary methods
f10b282
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
update
df81cfa
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Merge remote-tracking branch 'upstream/develop' into issue/opensearch…
5b02a43
…-project#100
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
# Conflicts:
#	core/src/main/java/org/opensearch/sql/expression/DSL.java
#	core/src/main/java/org/opensearch/sql/expression/aggregation/NamedAggregator.java
#	core/src/test/java/org/opensearch/sql/analysis/ExpressionAnalyzerTest.java
#	docs/user/dql/aggregations.rst
#	integ-test/src/test/resources/correctness/queries/aggregation.txt
#	opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilder.java
#	opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilderTest.java
#	sql/src/test/java/org/opensearch/sql/sql/parser/AstExpressionBuilderTest.java
@chloe-zh
update
94a045f
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
modified comparison test
11a9758
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
removed a comparison test and added it to aggregationIT
d5dc9eb
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
added ppl IT test cases; added window function test cases
684a742
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
moved distinct window function test cases to WindowsIT
c750f59
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
added ut
9fa771d
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
update
5d42554
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
chloe-zh
requested review from
dai-chen and penghuoJune 16, 2021 22:39
dai-chen
dai-chen
reviewed
Jun 16, 2021
View reviewed changes
Comment threadcore/src/main/java/org/opensearch/sql/expression/aggregation/CountAggregator.java
Outdated

@chloe-zh
update
80a4c61
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@davidcui1225
davidcui1225
deleted the branch
opensearch-project:developJune 26, 2021 00:47

This was referenced Jul 23, 2021
 Closed

 Merged

Yury-Fridlyand added a commit
that referenced
this pull request
Nov 1, 2022
@Yury-FridlyandMaxKsyunz@forestmvey
Rework on error reporting to make it more verbose and human-friendly. (…
89b3e1a
…#116)
Co-authored-by: MaxKsyunz <maxk@bitquilltech.com>
Co-authored-by: forestmvey <forestv@bitquilltech.com>
Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@dai-chendai-chendai-chen left review comments
@penghuopenghuoAwaiting requested review from penghuo

Assignees

@chloe-zhchloe-zh

Labels

enhancementNew feature or requestPPLPiped processing languageSQL

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@chloe-zh@penghuo@dai-chen@davidcui1225

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Support distinct count aggregation - #116
Closed
chloe-zh wants to merge 19 commits into
opensearch-project:developfrom 
chloe-zh:issue/#100
Closed
Support distinct count aggregation#116
chloe-zh wants to merge 19 commits into
opensearch-project:developfrom 
chloe-zh:issue/#100
Conversation
@chloe-zh
@chloe-zhchloe-zh
commented
Jun 9, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
Signed-off-by: Chloe Zhang chloezh1102@gmail.com
Description
  • Grammar: enabled distinct count
    
SQL: count(DISTINCT field)
    
PPL: distinct_count(field)/dc(field) in stats command
    
Note that distinct all count(distinct *) is not supported, the grammar of MySQL to get the distinct count of all fields is to put all fields in the distinct count field: https://dev.mysql.com/doc/refman/8.0/en/aggregate-functions.html#function_count-distinct Not supported in this PR since the distinct count of multi-field is not implemented here. Will create another issue for this case.
  • Core engine
    
Added distinct option in aggregators, and the distinct option is off by default, distinct count turns on this option.
  • Push down
    
Distinct count of single field in OpenSearch is achieved by building the cardinality aggregation, for example:
select count(distinct Dest) from opensearch_dashboards_sample_data_flights
DSL:
{
"from":0,
"size":0,
"timeout":"1m",
"aggregations":{
"count(distinct Dest)":{
"cardinality":{
"field":"Dest"
}
}
}
}
Full explain:
{
"root": {
"name": "ProjectOperator",
"description": {
"fields": "[count(distinct Dest)]"
},
"children": [
{
"name": "OpenSearchIndexScan",
"description": {
"request": """OpenSearchQueryRequest(indexName=opensearch_dashboards_sample_data_flights, sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"count(distinct Dest)":{"cardinality":{"field":"Dest"}}}}, searchDone=false)"""
},
"children": []
}
]
}
}

Explain of distinct count with filter:
SELECT COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500) FROM opensearch_dashboards_sample_data_flights
{
"root": {
"name": "ProjectOperator",
"description": {
"fields": """[COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500)]"""
},
"children": [
{
"name": "OpenSearchIndexScan",
"description": {
"request": """OpenSearchQueryRequest(indexName=opensearch_dashboards_sample_data_flights, sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500)":{"filter":{"range":{"AvgTicketPrice":{"from":null,"to":500,"include_lower":true,"include_upper":false,"boost":1.0}}},"aggregations":{"COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500)":{"cardinality":{"field":"OriginWeather"}}}}}}, searchDone=false)"""
},
"children": []
}
]
}
}

SQL example:
SELECT COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500) FROM opensearch_dashboards_sample_data_flights
{
"schema": [
{
"name": """COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500)""",
"type": "integer"
}
],
"datarows": [
[
8
]
],
"total": 1,
"size": 1,
"status": 200
}

PPL example:
source=opensearch_dashboards_sample_data_flights | stats distinct_count(Dest) by Origin | head 3
{
"schema": [
{
"name": "distinct_count(Dest)",
"type": "integer"
},
{
"name": "Origin",
"type": "string"
}
],
"datarows": [
[
72,
"Abu Dhabi International Airport"
],
[
78,
"Adelaide International Airport"
],
[
72,
"Adolfo Suarez Madrid— Barajas Airport"
]
],
"total": 3,
"size": 3
}

@chloe-zh
support distinct count aggregation
6f5350d
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zhchloe-zh
self-assigned this
Jun 9, 2021
@chloe-zhchloe-zh
added

SQL

Priority-High

enhancement
New feature or request
PPL
Piped processing language
labels
Jun 9, 2021
@chloe-zh
fixed tests
e30b685
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Merge remote-tracking branch 'upstream/develop' into issue/opensearch…
43dad8d
…-project#100
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Merge remote-tracking branch 'upstream/develop' into issue/opensearch…
866d71d
…-project#100
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
# Conflicts:
#	opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilder.java
@chloe-zh
update
8a6ca20
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
updated user doc
43cbd17
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
chloe-zh
marked this pull request as ready for review
June 9, 2021 20:33
@chloe-zh
chloe-zh
requested review from
dai-chen and penghuoJune 9, 2021 20:33
penghuo
penghuo
reviewed
Jun 10, 2021
View reviewed changes
Comment threadcore/src/main/java/org/opensearch/sql/expression/aggregation/MinAggregator.java
Outdated

penghuo
penghuo
reviewed
Jun 10, 2021
View reviewed changes
Comment threadcore/src/main/java/org/opensearch/sql/expression/aggregation/Aggregator.java
Outdated

dai-chen
dai-chen
reviewed
Jun 10, 2021
View reviewed changes
Comment threadinteg-test/src/test/resources/correctness/queries/aggregation.txt
Outdated

Comment threadsql/src/main/antlr/OpenSearchSQLParser.g4
Outdated

chloe-zh
added 10 commits
June 10, 2021 21:09
@chloe-zh
Update: support only count for distinct aggregations
392c96c
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Update doc; removed distinct start
078eae7
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Removed unnecessary methods
f10b282
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
update
df81cfa
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Merge remote-tracking branch 'upstream/develop' into issue/opensearch…
5b02a43
…-project#100
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
# Conflicts:
#	core/src/main/java/org/opensearch/sql/expression/DSL.java
#	core/src/main/java/org/opensearch/sql/expression/aggregation/NamedAggregator.java
#	core/src/test/java/org/opensearch/sql/analysis/ExpressionAnalyzerTest.java
#	docs/user/dql/aggregations.rst
#	integ-test/src/test/resources/correctness/queries/aggregation.txt
#	opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilder.java
#	opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilderTest.java
#	sql/src/test/java/org/opensearch/sql/sql/parser/AstExpressionBuilderTest.java
@chloe-zh
update
94a045f
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
modified comparison test
11a9758
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
removed a comparison test and added it to aggregationIT
d5dc9eb
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
added ppl IT test cases; added window function test cases
684a742
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
moved distinct window function test cases to WindowsIT
c750f59
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
added ut
9fa771d
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
update
5d42554
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
chloe-zh
requested review from
dai-chen and penghuoJune 16, 2021 22:39
dai-chen
dai-chen
reviewed
Jun 16, 2021
View reviewed changes
Comment threadcore/src/main/java/org/opensearch/sql/expression/aggregation/CountAggregator.java
Outdated

@chloe-zh
update
80a4c61
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@davidcui1225
davidcui1225
deleted the branch
opensearch-project:developJune 26, 2021 00:47

This was referenced Jul 23, 2021
 Closed

 Merged

Yury-Fridlyand added a commit
that referenced
this pull request
Nov 1, 2022
@Yury-FridlyandMaxKsyunz@forestmvey
Rework on error reporting to make it more verbose and human-friendly. (…
89b3e1a
…#116)
Co-authored-by: MaxKsyunz <maxk@bitquilltech.com>
Co-authored-by: forestmvey <forestv@bitquilltech.com>
Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@dai-chendai-chendai-chen left review comments
@penghuopenghuoAwaiting requested review from penghuo

Assignees

@chloe-zhchloe-zh

Labels

enhancementNew feature or requestPPLPiped processing languageSQL

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@chloe-zh@penghuo@dai-chen@davidcui1225

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Support distinct count aggregation - #116
Closed
chloe-zh wants to merge 19 commits into
opensearch-project:developfrom 
chloe-zh:issue/#100
Closed
Support distinct count aggregation#116
chloe-zh wants to merge 19 commits into
opensearch-project:developfrom 
chloe-zh:issue/#100
Conversation
@chloe-zh
@chloe-zhchloe-zh
commented
Jun 9, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
Signed-off-by: Chloe Zhang chloezh1102@gmail.com
Description
  • Grammar: enabled distinct count
    
SQL: count(DISTINCT field)
    
PPL: distinct_count(field)/dc(field) in stats command
    
Note that distinct all count(distinct *) is not supported, the grammar of MySQL to get the distinct count of all fields is to put all fields in the distinct count field: https://dev.mysql.com/doc/refman/8.0/en/aggregate-functions.html#function_count-distinct Not supported in this PR since the distinct count of multi-field is not implemented here. Will create another issue for this case.
  • Core engine
    
Added distinct option in aggregators, and the distinct option is off by default, distinct count turns on this option.
  • Push down
    
Distinct count of single field in OpenSearch is achieved by building the cardinality aggregation, for example:
select count(distinct Dest) from opensearch_dashboards_sample_data_flights
DSL:
{
"from":0,
"size":0,
"timeout":"1m",
"aggregations":{
"count(distinct Dest)":{
"cardinality":{
"field":"Dest"
}
}
}
}
Full explain:
{
"root": {
"name": "ProjectOperator",
"description": {
"fields": "[count(distinct Dest)]"
},
"children": [
{
"name": "OpenSearchIndexScan",
"description": {
"request": """OpenSearchQueryRequest(indexName=opensearch_dashboards_sample_data_flights, sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"count(distinct Dest)":{"cardinality":{"field":"Dest"}}}}, searchDone=false)"""
},
"children": []
}
]
}
}

Explain of distinct count with filter:
SELECT COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500) FROM opensearch_dashboards_sample_data_flights
{
"root": {
"name": "ProjectOperator",
"description": {
"fields": """[COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500)]"""
},
"children": [
{
"name": "OpenSearchIndexScan",
"description": {
"request": """OpenSearchQueryRequest(indexName=opensearch_dashboards_sample_data_flights, sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500)":{"filter":{"range":{"AvgTicketPrice":{"from":null,"to":500,"include_lower":true,"include_upper":false,"boost":1.0}}},"aggregations":{"COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500)":{"cardinality":{"field":"OriginWeather"}}}}}}, searchDone=false)"""
},
"children": []
}
]
}
}

SQL example:
SELECT COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500) FROM opensearch_dashboards_sample_data_flights
{
"schema": [
{
"name": """COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500)""",
"type": "integer"
}
],
"datarows": [
[
8
]
],
"total": 1,
"size": 1,
"status": 200
}

PPL example:
source=opensearch_dashboards_sample_data_flights | stats distinct_count(Dest) by Origin | head 3
{
"schema": [
{
"name": "distinct_count(Dest)",
"type": "integer"
},
{
"name": "Origin",
"type": "string"
}
],
"datarows": [
[
72,
"Abu Dhabi International Airport"
],
[
78,
"Adelaide International Airport"
],
[
72,
"Adolfo Suarez Madrid— Barajas Airport"
]
],
"total": 3,
"size": 3
}

@chloe-zh
support distinct count aggregation
6f5350d
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zhchloe-zh
self-assigned this
Jun 9, 2021
@chloe-zhchloe-zh
added

SQL

Priority-High

enhancement
New feature or request
PPL
Piped processing language
labels
Jun 9, 2021
@chloe-zh
fixed tests
e30b685
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Merge remote-tracking branch 'upstream/develop' into issue/opensearch…
43dad8d
…-project#100
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Merge remote-tracking branch 'upstream/develop' into issue/opensearch…
866d71d
…-project#100
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
# Conflicts:
#	opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilder.java
@chloe-zh
update
8a6ca20
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
updated user doc
43cbd17
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
chloe-zh
marked this pull request as ready for review
June 9, 2021 20:33
@chloe-zh
chloe-zh
requested review from
dai-chen and penghuoJune 9, 2021 20:33
penghuo
penghuo
reviewed
Jun 10, 2021
View reviewed changes
Comment threadcore/src/main/java/org/opensearch/sql/expression/aggregation/MinAggregator.java
Outdated

penghuo
penghuo
reviewed
Jun 10, 2021
View reviewed changes
Comment threadcore/src/main/java/org/opensearch/sql/expression/aggregation/Aggregator.java
Outdated

dai-chen
dai-chen
reviewed
Jun 10, 2021
View reviewed changes
Comment threadinteg-test/src/test/resources/correctness/queries/aggregation.txt
Outdated

Comment threadsql/src/main/antlr/OpenSearchSQLParser.g4
Outdated

chloe-zh
added 10 commits
June 10, 2021 21:09
@chloe-zh
Update: support only count for distinct aggregations
392c96c
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Update doc; removed distinct start
078eae7
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Removed unnecessary methods
f10b282
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
update
df81cfa
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Merge remote-tracking branch 'upstream/develop' into issue/opensearch…
5b02a43
…-project#100
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
# Conflicts:
#	core/src/main/java/org/opensearch/sql/expression/DSL.java
#	core/src/main/java/org/opensearch/sql/expression/aggregation/NamedAggregator.java
#	core/src/test/java/org/opensearch/sql/analysis/ExpressionAnalyzerTest.java
#	docs/user/dql/aggregations.rst
#	integ-test/src/test/resources/correctness/queries/aggregation.txt
#	opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilder.java
#	opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilderTest.java
#	sql/src/test/java/org/opensearch/sql/sql/parser/AstExpressionBuilderTest.java
@chloe-zh
update
94a045f
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
modified comparison test
11a9758
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
removed a comparison test and added it to aggregationIT
d5dc9eb
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
added ppl IT test cases; added window function test cases
684a742
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
moved distinct window function test cases to WindowsIT
c750f59
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
added ut
9fa771d
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
update
5d42554
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
chloe-zh
requested review from
dai-chen and penghuoJune 16, 2021 22:39
dai-chen
dai-chen
reviewed
Jun 16, 2021
View reviewed changes
Comment threadcore/src/main/java/org/opensearch/sql/expression/aggregation/CountAggregator.java
Outdated

@chloe-zh
update
80a4c61
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@davidcui1225
davidcui1225
deleted the branch
opensearch-project:developJune 26, 2021 00:47

This was referenced Jul 23, 2021
 Closed

 Merged

Yury-Fridlyand added a commit
that referenced
this pull request
Nov 1, 2022
@Yury-FridlyandMaxKsyunz@forestmvey
Rework on error reporting to make it more verbose and human-friendly. (…
89b3e1a
…#116)
Co-authored-by: MaxKsyunz <maxk@bitquilltech.com>
Co-authored-by: forestmvey <forestv@bitquilltech.com>
Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@dai-chendai-chendai-chen left review comments
@penghuopenghuoAwaiting requested review from penghuo

Assignees

@chloe-zhchloe-zh

Labels

enhancementNew feature or requestPPLPiped processing languageSQL

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@chloe-zh@penghuo@dai-chen@davidcui1225

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Support distinct count aggregation - #116
Closed
chloe-zh wants to merge 19 commits into
opensearch-project:developfrom 
chloe-zh:issue/#100
Closed
Support distinct count aggregation#116
chloe-zh wants to merge 19 commits into
opensearch-project:developfrom 
chloe-zh:issue/#100
Conversation
@chloe-zh
@chloe-zhchloe-zh
commented
Jun 9, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
Signed-off-by: Chloe Zhang chloezh1102@gmail.com
Description
  • Grammar: enabled distinct count
    
SQL: count(DISTINCT field)
    
PPL: distinct_count(field)/dc(field) in stats command
    
Note that distinct all count(distinct *) is not supported, the grammar of MySQL to get the distinct count of all fields is to put all fields in the distinct count field: https://dev.mysql.com/doc/refman/8.0/en/aggregate-functions.html#function_count-distinct Not supported in this PR since the distinct count of multi-field is not implemented here. Will create another issue for this case.
  • Core engine
    
Added distinct option in aggregators, and the distinct option is off by default, distinct count turns on this option.
  • Push down
    
Distinct count of single field in OpenSearch is achieved by building the cardinality aggregation, for example:
select count(distinct Dest) from opensearch_dashboards_sample_data_flights
DSL:
{
"from":0,
"size":0,
"timeout":"1m",
"aggregations":{
"count(distinct Dest)":{
"cardinality":{
"field":"Dest"
}
}
}
}
Full explain:
{
"root": {
"name": "ProjectOperator",
"description": {
"fields": "[count(distinct Dest)]"
},
"children": [
{
"name": "OpenSearchIndexScan",
"description": {
"request": """OpenSearchQueryRequest(indexName=opensearch_dashboards_sample_data_flights, sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"count(distinct Dest)":{"cardinality":{"field":"Dest"}}}}, searchDone=false)"""
},
"children": []
}
]
}
}

Explain of distinct count with filter:
SELECT COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500) FROM opensearch_dashboards_sample_data_flights
{
"root": {
"name": "ProjectOperator",
"description": {
"fields": """[COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500)]"""
},
"children": [
{
"name": "OpenSearchIndexScan",
"description": {
"request": """OpenSearchQueryRequest(indexName=opensearch_dashboards_sample_data_flights, sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500)":{"filter":{"range":{"AvgTicketPrice":{"from":null,"to":500,"include_lower":true,"include_upper":false,"boost":1.0}}},"aggregations":{"COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500)":{"cardinality":{"field":"OriginWeather"}}}}}}, searchDone=false)"""
},
"children": []
}
]
}
}

SQL example:
SELECT COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500) FROM opensearch_dashboards_sample_data_flights
{
"schema": [
{
"name": """COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500)""",
"type": "integer"
}
],
"datarows": [
[
8
]
],
"total": 1,
"size": 1,
"status": 200
}

PPL example:
source=opensearch_dashboards_sample_data_flights | stats distinct_count(Dest) by Origin | head 3
{
"schema": [
{
"name": "distinct_count(Dest)",
"type": "integer"
},
{
"name": "Origin",
"type": "string"
}
],
"datarows": [
[
72,
"Abu Dhabi International Airport"
],
[
78,
"Adelaide International Airport"
],
[
72,
"Adolfo Suarez Madrid— Barajas Airport"
]
],
"total": 3,
"size": 3
}

@chloe-zh
support distinct count aggregation
6f5350d
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zhchloe-zh
self-assigned this
Jun 9, 2021
@chloe-zhchloe-zh
added

SQL

Priority-High

enhancement
New feature or request
PPL
Piped processing language
labels
Jun 9, 2021
@chloe-zh
fixed tests
e30b685
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Merge remote-tracking branch 'upstream/develop' into issue/opensearch…
43dad8d
…-project#100
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Merge remote-tracking branch 'upstream/develop' into issue/opensearch…
866d71d
…-project#100
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
# Conflicts:
#	opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilder.java
@chloe-zh
update
8a6ca20
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
updated user doc
43cbd17
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
chloe-zh
marked this pull request as ready for review
June 9, 2021 20:33
@chloe-zh
chloe-zh
requested review from
dai-chen and penghuoJune 9, 2021 20:33
penghuo
penghuo
reviewed
Jun 10, 2021
View reviewed changes
Comment threadcore/src/main/java/org/opensearch/sql/expression/aggregation/MinAggregator.java
Outdated

penghuo
penghuo
reviewed
Jun 10, 2021
View reviewed changes
Comment threadcore/src/main/java/org/opensearch/sql/expression/aggregation/Aggregator.java
Outdated

dai-chen
dai-chen
reviewed
Jun 10, 2021
View reviewed changes
Comment threadinteg-test/src/test/resources/correctness/queries/aggregation.txt
Outdated

Comment threadsql/src/main/antlr/OpenSearchSQLParser.g4
Outdated

chloe-zh
added 10 commits
June 10, 2021 21:09
@chloe-zh
Update: support only count for distinct aggregations
392c96c
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Update doc; removed distinct start
078eae7
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Removed unnecessary methods
f10b282
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
update
df81cfa
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Merge remote-tracking branch 'upstream/develop' into issue/opensearch…
5b02a43
…-project#100
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
# Conflicts:
#	core/src/main/java/org/opensearch/sql/expression/DSL.java
#	core/src/main/java/org/opensearch/sql/expression/aggregation/NamedAggregator.java
#	core/src/test/java/org/opensearch/sql/analysis/ExpressionAnalyzerTest.java
#	docs/user/dql/aggregations.rst
#	integ-test/src/test/resources/correctness/queries/aggregation.txt
#	opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilder.java
#	opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilderTest.java
#	sql/src/test/java/org/opensearch/sql/sql/parser/AstExpressionBuilderTest.java
@chloe-zh
update
94a045f
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
modified comparison test
11a9758
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
removed a comparison test and added it to aggregationIT
d5dc9eb
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
added ppl IT test cases; added window function test cases
684a742
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
moved distinct window function test cases to WindowsIT
c750f59
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
added ut
9fa771d
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
update
5d42554
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
chloe-zh
requested review from
dai-chen and penghuoJune 16, 2021 22:39
dai-chen
dai-chen
reviewed
Jun 16, 2021
View reviewed changes
Comment threadcore/src/main/java/org/opensearch/sql/expression/aggregation/CountAggregator.java
Outdated

@chloe-zh
update
80a4c61
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@davidcui1225
davidcui1225
deleted the branch
opensearch-project:developJune 26, 2021 00:47

This was referenced Jul 23, 2021
 Closed

 Merged

Yury-Fridlyand added a commit
that referenced
this pull request
Nov 1, 2022
@Yury-FridlyandMaxKsyunz@forestmvey
Rework on error reporting to make it more verbose and human-friendly. (…
89b3e1a
…#116)
Co-authored-by: MaxKsyunz <maxk@bitquilltech.com>
Co-authored-by: forestmvey <forestv@bitquilltech.com>
Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@dai-chendai-chendai-chen left review comments
@penghuopenghuoAwaiting requested review from penghuo

Assignees

@chloe-zhchloe-zh

Labels

enhancementNew feature or requestPPLPiped processing languageSQL

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@chloe-zh@penghuo@dai-chen@davidcui1225

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Support distinct count aggregation - #116
Closed
chloe-zh wants to merge 19 commits into
opensearch-project:developfrom 
chloe-zh:issue/#100
Closed
Support distinct count aggregation#116
chloe-zh wants to merge 19 commits into
opensearch-project:developfrom 
chloe-zh:issue/#100
Conversation
@chloe-zh
@chloe-zhchloe-zh
commented
Jun 9, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
Signed-off-by: Chloe Zhang chloezh1102@gmail.com
Description
  • Grammar: enabled distinct count
    
SQL: count(DISTINCT field)
    
PPL: distinct_count(field)/dc(field) in stats command
    
Note that distinct all count(distinct *) is not supported, the grammar of MySQL to get the distinct count of all fields is to put all fields in the distinct count field: https://dev.mysql.com/doc/refman/8.0/en/aggregate-functions.html#function_count-distinct Not supported in this PR since the distinct count of multi-field is not implemented here. Will create another issue for this case.
  • Core engine
    
Added distinct option in aggregators, and the distinct option is off by default, distinct count turns on this option.
  • Push down
    
Distinct count of single field in OpenSearch is achieved by building the cardinality aggregation, for example:
select count(distinct Dest) from opensearch_dashboards_sample_data_flights
DSL:
{
"from":0,
"size":0,
"timeout":"1m",
"aggregations":{
"count(distinct Dest)":{
"cardinality":{
"field":"Dest"
}
}
}
}
Full explain:
{
"root": {
"name": "ProjectOperator",
"description": {
"fields": "[count(distinct Dest)]"
},
"children": [
{
"name": "OpenSearchIndexScan",
"description": {
"request": """OpenSearchQueryRequest(indexName=opensearch_dashboards_sample_data_flights, sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"count(distinct Dest)":{"cardinality":{"field":"Dest"}}}}, searchDone=false)"""
},
"children": []
}
]
}
}

Explain of distinct count with filter:
SELECT COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500) FROM opensearch_dashboards_sample_data_flights
{
"root": {
"name": "ProjectOperator",
"description": {
"fields": """[COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500)]"""
},
"children": [
{
"name": "OpenSearchIndexScan",
"description": {
"request": """OpenSearchQueryRequest(indexName=opensearch_dashboards_sample_data_flights, sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500)":{"filter":{"range":{"AvgTicketPrice":{"from":null,"to":500,"include_lower":true,"include_upper":false,"boost":1.0}}},"aggregations":{"COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500)":{"cardinality":{"field":"OriginWeather"}}}}}}, searchDone=false)"""
},
"children": []
}
]
}
}

SQL example:
SELECT COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500) FROM opensearch_dashboards_sample_data_flights
{
"schema": [
{
"name": """COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500)""",
"type": "integer"
}
],
"datarows": [
[
8
]
],
"total": 1,
"size": 1,
"status": 200
}

PPL example:
source=opensearch_dashboards_sample_data_flights | stats distinct_count(Dest) by Origin | head 3
{
"schema": [
{
"name": "distinct_count(Dest)",
"type": "integer"
},
{
"name": "Origin",
"type": "string"
}
],
"datarows": [
[
72,
"Abu Dhabi International Airport"
],
[
78,
"Adelaide International Airport"
],
[
72,
"Adolfo Suarez Madrid— Barajas Airport"
]
],
"total": 3,
"size": 3
}

@chloe-zh
support distinct count aggregation
6f5350d
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zhchloe-zh
self-assigned this
Jun 9, 2021
@chloe-zhchloe-zh
added

SQL

Priority-High

enhancement
New feature or request
PPL
Piped processing language
labels
Jun 9, 2021
@chloe-zh
fixed tests
e30b685
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Merge remote-tracking branch 'upstream/develop' into issue/opensearch…
43dad8d
…-project#100
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Merge remote-tracking branch 'upstream/develop' into issue/opensearch…
866d71d
…-project#100
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
# Conflicts:
#	opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilder.java
@chloe-zh
update
8a6ca20
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
updated user doc
43cbd17
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
chloe-zh
marked this pull request as ready for review
June 9, 2021 20:33
@chloe-zh
chloe-zh
requested review from
dai-chen and penghuoJune 9, 2021 20:33
penghuo
penghuo
reviewed
Jun 10, 2021
View reviewed changes
Comment threadcore/src/main/java/org/opensearch/sql/expression/aggregation/MinAggregator.java
Outdated

penghuo
penghuo
reviewed
Jun 10, 2021
View reviewed changes
Comment threadcore/src/main/java/org/opensearch/sql/expression/aggregation/Aggregator.java
Outdated

dai-chen
dai-chen
reviewed
Jun 10, 2021
View reviewed changes
Comment threadinteg-test/src/test/resources/correctness/queries/aggregation.txt
Outdated

Comment threadsql/src/main/antlr/OpenSearchSQLParser.g4
Outdated

chloe-zh
added 10 commits
June 10, 2021 21:09
@chloe-zh
Update: support only count for distinct aggregations
392c96c
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Update doc; removed distinct start
078eae7
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Removed unnecessary methods
f10b282
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
update
df81cfa
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Merge remote-tracking branch 'upstream/develop' into issue/opensearch…
5b02a43
…-project#100
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
# Conflicts:
#	core/src/main/java/org/opensearch/sql/expression/DSL.java
#	core/src/main/java/org/opensearch/sql/expression/aggregation/NamedAggregator.java
#	core/src/test/java/org/opensearch/sql/analysis/ExpressionAnalyzerTest.java
#	docs/user/dql/aggregations.rst
#	integ-test/src/test/resources/correctness/queries/aggregation.txt
#	opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilder.java
#	opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilderTest.java
#	sql/src/test/java/org/opensearch/sql/sql/parser/AstExpressionBuilderTest.java
@chloe-zh
update
94a045f
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
modified comparison test
11a9758
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
removed a comparison test and added it to aggregationIT
d5dc9eb
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
added ppl IT test cases; added window function test cases
684a742
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
moved distinct window function test cases to WindowsIT
c750f59
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
added ut
9fa771d
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
update
5d42554
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
chloe-zh
requested review from
dai-chen and penghuoJune 16, 2021 22:39
dai-chen
dai-chen
reviewed
Jun 16, 2021
View reviewed changes
Comment threadcore/src/main/java/org/opensearch/sql/expression/aggregation/CountAggregator.java
Outdated

@chloe-zh
update
80a4c61
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@davidcui1225
davidcui1225
deleted the branch
opensearch-project:developJune 26, 2021 00:47

This was referenced Jul 23, 2021
 Closed

 Merged

Yury-Fridlyand added a commit
that referenced
this pull request
Nov 1, 2022
@Yury-FridlyandMaxKsyunz@forestmvey
Rework on error reporting to make it more verbose and human-friendly. (…
89b3e1a
…#116)
Co-authored-by: MaxKsyunz <maxk@bitquilltech.com>
Co-authored-by: forestmvey <forestv@bitquilltech.com>
Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@dai-chendai-chendai-chen left review comments
@penghuopenghuoAwaiting requested review from penghuo

Assignees

@chloe-zhchloe-zh

Labels

enhancementNew feature or requestPPLPiped processing languageSQL

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@chloe-zh@penghuo@dai-chen@davidcui1225

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Support distinct count aggregation - #116
Closed
chloe-zh wants to merge 19 commits into
opensearch-project:developfrom 
chloe-zh:issue/#100
Closed
Support distinct count aggregation#116
chloe-zh wants to merge 19 commits into
opensearch-project:developfrom 
chloe-zh:issue/#100
Conversation
@chloe-zh
@chloe-zhchloe-zh
commented
Jun 9, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
Signed-off-by: Chloe Zhang chloezh1102@gmail.com
Description
  • Grammar: enabled distinct count
    
SQL: count(DISTINCT field)
    
PPL: distinct_count(field)/dc(field) in stats command
    
Note that distinct all count(distinct *) is not supported, the grammar of MySQL to get the distinct count of all fields is to put all fields in the distinct count field: https://dev.mysql.com/doc/refman/8.0/en/aggregate-functions.html#function_count-distinct Not supported in this PR since the distinct count of multi-field is not implemented here. Will create another issue for this case.
  • Core engine
    
Added distinct option in aggregators, and the distinct option is off by default, distinct count turns on this option.
  • Push down
    
Distinct count of single field in OpenSearch is achieved by building the cardinality aggregation, for example:
select count(distinct Dest) from opensearch_dashboards_sample_data_flights
DSL:
{
"from":0,
"size":0,
"timeout":"1m",
"aggregations":{
"count(distinct Dest)":{
"cardinality":{
"field":"Dest"
}
}
}
}
Full explain:
{
"root": {
"name": "ProjectOperator",
"description": {
"fields": "[count(distinct Dest)]"
},
"children": [
{
"name": "OpenSearchIndexScan",
"description": {
"request": """OpenSearchQueryRequest(indexName=opensearch_dashboards_sample_data_flights, sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"count(distinct Dest)":{"cardinality":{"field":"Dest"}}}}, searchDone=false)"""
},
"children": []
}
]
}
}

Explain of distinct count with filter:
SELECT COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500) FROM opensearch_dashboards_sample_data_flights
{
"root": {
"name": "ProjectOperator",
"description": {
"fields": """[COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500)]"""
},
"children": [
{
"name": "OpenSearchIndexScan",
"description": {
"request": """OpenSearchQueryRequest(indexName=opensearch_dashboards_sample_data_flights, sourceBuilder={"from":0,"size":0,"timeout":"1m","aggregations":{"COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500)":{"filter":{"range":{"AvgTicketPrice":{"from":null,"to":500,"include_lower":true,"include_upper":false,"boost":1.0}}},"aggregations":{"COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500)":{"cardinality":{"field":"OriginWeather"}}}}}}, searchDone=false)"""
},
"children": []
}
]
}
}

SQL example:
SELECT COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500) FROM opensearch_dashboards_sample_data_flights
{
"schema": [
{
"name": """COUNT(distinct OriginWeather) filter(where AvgTicketPrice < 500)""",
"type": "integer"
}
],
"datarows": [
[
8
]
],
"total": 1,
"size": 1,
"status": 200
}

PPL example:
source=opensearch_dashboards_sample_data_flights | stats distinct_count(Dest) by Origin | head 3
{
"schema": [
{
"name": "distinct_count(Dest)",
"type": "integer"
},
{
"name": "Origin",
"type": "string"
}
],
"datarows": [
[
72,
"Abu Dhabi International Airport"
],
[
78,
"Adelaide International Airport"
],
[
72,
"Adolfo Suarez Madrid— Barajas Airport"
]
],
"total": 3,
"size": 3
}

@chloe-zh
support distinct count aggregation
6f5350d
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zhchloe-zh
self-assigned this
Jun 9, 2021
@chloe-zhchloe-zh
added

SQL

Priority-High

enhancement
New feature or request
PPL
Piped processing language
labels
Jun 9, 2021
@chloe-zh
fixed tests
e30b685
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Merge remote-tracking branch 'upstream/develop' into issue/opensearch…
43dad8d
…-project#100
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Merge remote-tracking branch 'upstream/develop' into issue/opensearch…
866d71d
…-project#100
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
# Conflicts:
#	opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilder.java
@chloe-zh
update
8a6ca20
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
updated user doc
43cbd17
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
chloe-zh
marked this pull request as ready for review
June 9, 2021 20:33
@chloe-zh
chloe-zh
requested review from
dai-chen and penghuoJune 9, 2021 20:33
penghuo
penghuo
reviewed
Jun 10, 2021
View reviewed changes
Comment threadcore/src/main/java/org/opensearch/sql/expression/aggregation/MinAggregator.java
Outdated

penghuo
penghuo
reviewed
Jun 10, 2021
View reviewed changes
Comment threadcore/src/main/java/org/opensearch/sql/expression/aggregation/Aggregator.java
Outdated

dai-chen
dai-chen
reviewed
Jun 10, 2021
View reviewed changes
Comment threadinteg-test/src/test/resources/correctness/queries/aggregation.txt
Outdated

Comment threadsql/src/main/antlr/OpenSearchSQLParser.g4
Outdated

chloe-zh
added 10 commits
June 10, 2021 21:09
@chloe-zh
Update: support only count for distinct aggregations
392c96c
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Update doc; removed distinct start
078eae7
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Removed unnecessary methods
f10b282
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
update
df81cfa
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
Merge remote-tracking branch 'upstream/develop' into issue/opensearch…
5b02a43
…-project#100
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
# Conflicts:
#	core/src/main/java/org/opensearch/sql/expression/DSL.java
#	core/src/main/java/org/opensearch/sql/expression/aggregation/NamedAggregator.java
#	core/src/test/java/org/opensearch/sql/analysis/ExpressionAnalyzerTest.java
#	docs/user/dql/aggregations.rst
#	integ-test/src/test/resources/correctness/queries/aggregation.txt
#	opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilder.java
#	opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilderTest.java
#	sql/src/test/java/org/opensearch/sql/sql/parser/AstExpressionBuilderTest.java
@chloe-zh
update
94a045f
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
modified comparison test
11a9758
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
removed a comparison test and added it to aggregationIT
d5dc9eb
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
added ppl IT test cases; added window function test cases
684a742
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
moved distinct window function test cases to WindowsIT
c750f59
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
added ut
9fa771d
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
update
5d42554
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@chloe-zh
chloe-zh
requested review from
dai-chen and penghuoJune 16, 2021 22:39
dai-chen
dai-chen
reviewed
Jun 16, 2021
View reviewed changes
Comment threadcore/src/main/java/org/opensearch/sql/expression/aggregation/CountAggregator.java
Outdated

@chloe-zh
update
80a4c61
Signed-off-by: chloe-zh <chloezh1102@gmail.com>
@davidcui1225
davidcui1225
deleted the branch
opensearch-project:developJune 26, 2021 00:47

This was referenced Jul 23, 2021
 Closed

 Merged

Yury-Fridlyand added a commit
that referenced
this pull request
Nov 1, 2022
@Yury-FridlyandMaxKsyunz@forestmvey
Rework on error reporting to make it more verbose and human-friendly. (…
89b3e1a
…#116)
Co-authored-by: MaxKsyunz <maxk@bitquilltech.com>
Co-authored-by: forestmvey <forestv@bitquilltech.com>
Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com>
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@dai-chendai-chendai-chen left review comments
@penghuopenghuoAwaiting requested review from penghuo

Assignees

@chloe-zhchloe-zh

Labels

enhancementNew feature or requestPPLPiped processing languageSQL

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@chloe-zh@penghuo@dai-chen@davidcui1225