Skip to content

fix terms agg #26

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.

Sign up for GitHub

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

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

fix terms agg #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d1c232
fix terms agg
fupelaqu Nov 19, 2025
2181ac2
remove .keyword
fupelaqu Nov 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,13 +264,13 @@ val results = client.search(SQLQuery(sqlQuery))
"aggs": {
"restaurant_name": {
"terms": {
"field": "restaurant_name.keyword",
"field": "restaurant_name",
"size": 1000
},
"aggs": {
"restaurant_city": {
"terms": {
"field": "restaurant_city.keyword",
"field": "restaurant_city",
"size": 1000
},
"aggs": {
Expand All @@ -296,7 +296,7 @@ val results = client.search(SQLQuery(sqlQuery))
"aggs": {
"menu_category": {
"terms": {
"field": "menus.category.keyword",
"field": "menus.category",
"size": 1000
},
"aggs": {
Expand All @@ -307,7 +307,7 @@ val results = client.search(SQLQuery(sqlQuery))
"aggs": {
"dish_name": {
"terms": {
"field": "menus.dishes.name.keyword",
"field": "menus.dishes.name",
"size": 1000
},
"aggs": {
Expand Down Expand Up @@ -339,7 +339,7 @@ val results = client.search(SQLQuery(sqlQuery))
},
"ingredient_name": {
"terms": {
"field": "menus.dishes.ingredients.name.keyword",
"field": "menus.dishes.ingredients.name",
"size": 1000
},
"aggs": {
Expand Down Expand Up @@ -787,18 +787,18 @@ ThisBuild / resolvers ++= Seq(

// For Elasticsearch 6
// Using Jest client
libraryDependencies += "app.softnetwork.elastic" %% s"softclient4es6-jest-client" % 0.13.0
libraryDependencies += "app.softnetwork.elastic" %% s"softclient4es6-jest-client" % 0.13.1
// Or using Rest High Level client
libraryDependencies += "app.softnetwork.elastic" %% s"softclient4es6-rest-client" % 0.13.0
libraryDependencies += "app.softnetwork.elastic" %% s"softclient4es6-rest-client" % 0.13.1

// For Elasticsearch 7
libraryDependencies += "app.softnetwork.elastic" %% s"softclient4es7-rest-client" % 0.13.0
libraryDependencies += "app.softnetwork.elastic" %% s"softclient4es7-rest-client" % 0.13.1

// For Elasticsearch 8
libraryDependencies += "app.softnetwork.elastic" %% s"softclient4es8-java-client" % 0.13.0
libraryDependencies += "app.softnetwork.elastic" %% s"softclient4es8-java-client" % 0.13.1

// For Elasticsearch 9
libraryDependencies += "app.softnetwork.elastic" %% s"softclient4es9-java-client" % 0.13.0
libraryDependencies += "app.softnetwork.elastic" %% s"softclient4es9-java-client" % 0.13.1
```

### **Quick Example**
Expand Down
4 changes: 2 additions & 2 deletions bridge/src/main/scala/app/softnetwork/elastic/sql/bridge/ElasticAggregation.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,13 +271,13 @@ object ElasticAggregation {
var agg = {
bucketsDirection.get(bucket.identifier.identifierName) match {
case Some(direction) =>
termsAgg(bucket.name, s"$currentBucketPath.keyword")
termsAgg(bucket.name, currentBucketPath)
.order(Seq(direction match {
case Asc => TermsOrder("_key", asc = true)
case _ => TermsOrder("_key", asc = false)
}))
case None =>
termsAgg(bucket.name, s"$currentBucketPath.keyword")
termsAgg(bucket.name, currentBucketPath)
}
}
bucket.size.foreach(s => agg = agg.size(s))
Expand Down
24 changes: 12 additions & 12 deletions bridge/src/test/scala/app/softnetwork/elastic/sql/SQLQuerySpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
| "aggs": {
| "Country": {
| "terms": {
| "field": "Country.keyword",
| "field": "Country",
| "exclude": ["USA"],
| "order": {
| "_key": "asc"
Expand All @@ -539,7 +539,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
| "aggs": {
| "City": {
| "terms": {
| "field": "City.keyword",
| "field": "City",
| "exclude": ["Berlin"],
| "order": {
| "cnt": "desc"
Expand Down Expand Up @@ -793,7 +793,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
| "aggs": {
| "cat": {
| "terms": {
| "field": "products.category.keyword",
| "field": "products.category",
| "size": 10
| },
| "aggs": {
Expand Down Expand Up @@ -1009,7 +1009,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
| "aggs": {
| "userId": {
| "terms": {
| "field": "userId.keyword"
| "field": "userId"
| },
| "aggs": {
| "lastSeen": {
Expand Down Expand Up @@ -1053,7 +1053,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
| "aggs": {
| "Country": {
| "terms": {
| "field": "Country.keyword",
| "field": "Country",
| "exclude": ["USA"],
| "order": {
| "_key": "asc"
Expand All @@ -1062,7 +1062,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
| "aggs": {
| "City": {
| "terms": {
| "field": "City.keyword",
| "field": "City",
| "exclude": ["Berlin"]
| },
| "aggs": {
Expand Down Expand Up @@ -1118,7 +1118,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
| "aggs": {
| "Country": {
| "terms": {
| "field": "Country.keyword",
| "field": "Country",
| "exclude": [
| "USA"
| ],
Expand All @@ -1129,7 +1129,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
| "aggs": {
| "City": {
| "terms": {
| "field": "City.keyword",
| "field": "City",
| "exclude": [
| "Berlin"
| ]
Expand Down Expand Up @@ -1193,7 +1193,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
| "aggs": {
| "identifier": {
| "terms": {
| "field": "identifier.keyword",
| "field": "identifier",
| "order": {
| "ct": "desc"
| }
Expand Down Expand Up @@ -1360,7 +1360,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
| "aggs": {
| "identifier": {
| "terms": {
| "field": "identifier.keyword",
| "field": "identifier",
| "order": {
| "ct": "desc"
| }
Expand Down Expand Up @@ -1517,7 +1517,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
| "aggs": {
| "identifier": {
| "terms": {
| "field": "identifier.keyword"
| "field": "identifier"
| },
| "aggs": {
| "max_diff": {
Expand Down Expand Up @@ -2758,7 +2758,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
| "aggs": {
| "dept": {
| "terms": {
| "field": "department.keyword"
| "field": "department"
| },
| "aggs": {
| "cnt": {
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ThisBuild / organization := "app.softnetwork"

name := "softclient4es"

ThisBuild / version := "0.13.0"
ThisBuild / version := "0.13.1"

ThisBuild / scalaVersion := scala213

Expand Down
4 changes: 2 additions & 2 deletions es6/bridge/src/main/scala/app/softnetwork/elastic/sql/bridge/ElasticAggregation.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,13 +268,13 @@ object ElasticAggregation {
var agg = {
bucketsDirection.get(bucket.identifier.identifierName) match {
case Some(direction) =>
termsAgg(bucket.name, s"$currentBucketPath.keyword")
termsAgg(bucket.name, currentBucketPath)
.order(Seq(direction match {
case Asc => TermsOrder("_key", asc = true)
case _ => TermsOrder("_key", asc = false)
}))
case None =>
termsAgg(bucket.name, s"$currentBucketPath.keyword")
termsAgg(bucket.name, currentBucketPath)
}
}
bucket.size.foreach(s => agg = agg.size(s))
Expand Down
31 changes: 19 additions & 12 deletions es6/bridge/src/test/scala/app/softnetwork/elastic/sql/SQLQuerySpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
| "aggs": {
| "Country": {
| "terms": {
| "field": "Country.keyword",
| "field": "Country",
| "exclude": "USA",
| "order": {
| "_key": "asc"
Expand All @@ -539,7 +539,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
| "aggs": {
| "City": {
| "terms": {
| "field": "City.keyword",
| "field": "City",
| "exclude": "Berlin",
| "order": {
| "cnt": "desc"
Expand Down Expand Up @@ -793,7 +793,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
| "aggs": {
| "cat": {
| "terms": {
| "field": "products.category.keyword",
| "field": "products.category",
| "size": 10
| },
| "aggs": {
Expand Down Expand Up @@ -1009,7 +1009,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
| "aggs": {
| "userId": {
| "terms": {
| "field": "userId.keyword"
| "field": "userId"
| },
| "aggs": {
| "lastSeen": {
Expand Down Expand Up @@ -1053,7 +1053,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
| "aggs": {
| "Country": {
| "terms": {
| "field": "Country.keyword",
| "field": "Country",
| "exclude": "USA",
| "order": {
| "_key": "asc"
Expand All @@ -1062,7 +1062,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
| "aggs": {
| "City": {
| "terms": {
| "field": "City.keyword",
| "field": "City",
| "exclude": "Berlin"
| },
| "aggs": {
Expand Down Expand Up @@ -1118,7 +1118,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
| "aggs": {
| "Country": {
| "terms": {
| "field": "Country.keyword",
| "field": "Country",
| "exclude": "USA",
| "order": {
| "_key": "asc"
Expand All @@ -1127,7 +1127,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
| "aggs": {
| "City": {
| "terms": {
| "field": "City.keyword",
| "field": "City",
| "exclude": "Berlin"
| },
| "aggs": {
Expand Down Expand Up @@ -1189,7 +1189,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
| "aggs": {
| "identifier": {
| "terms": {
| "field": "identifier.keyword",
| "field": "identifier",
| "order": {
| "ct": "desc"
| }
Expand Down Expand Up @@ -1356,7 +1356,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
| "aggs": {
| "identifier": {
| "terms": {
| "field": "identifier.keyword",
| "field": "identifier",
| "order": {
| "ct": "desc"
| }
Expand Down Expand Up @@ -1513,7 +1513,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
| "aggs": {
| "identifier": {
| "terms": {
| "field": "identifier.keyword"
| "field": "identifier"
| },
| "aggs": {
| "max_diff": {
Expand Down Expand Up @@ -2754,7 +2754,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
| "aggs": {
| "dept": {
| "terms": {
| "field": "department.keyword"
| "field": "department"
| },
| "aggs": {
| "cnt": {
Expand Down Expand Up @@ -3729,4 +3729,11 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
|}""".stripMargin.replaceAll("\\s+", "")
}

it should "test" in {
val query =
"""SELECT name FROM users WHERE status = 'active' AND age > 25
|""".stripMargin
val select: ElasticSearchRequest = SQLQuery(query)
println(select.query)
}
}