Skip to content

Commit 6d1c232

Browse files
fupelaqufupelaqu
committed
fix terms agg
1 parent 071737b commit 6d1c232

File tree

6 files changed

+41
-34
lines changed

6 files changed

+41
-34
lines changed

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -787,18 +787,18 @@ ThisBuild / resolvers ++= Seq(
787787

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

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

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

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

804804
### **Quick Example**

‎bridge/src/main/scala/app/softnetwork/elastic/sql/bridge/ElasticAggregation.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,13 +271,13 @@ object ElasticAggregation {
271271
var agg = {
272272
bucketsDirection.get(bucket.identifier.identifierName) match {
273273
case Some(direction) =>
274-
termsAgg(bucket.name, s"$currentBucketPath.keyword")
274+
termsAgg(bucket.name, currentBucketPath)
275275
.order(Seq(direction match {
276276
case Asc => TermsOrder("_key", asc = true)
277277
case _ => TermsOrder("_key", asc = false)
278278
}))
279279
case None =>
280-
termsAgg(bucket.name, s"$currentBucketPath.keyword")
280+
termsAgg(bucket.name, currentBucketPath)
281281
}
282282
}
283283
bucket.size.foreach(s => agg = agg.size(s))

‎bridge/src/test/scala/app/softnetwork/elastic/sql/SQLQuerySpec.scala‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
530530
| "aggs": {
531531
| "Country": {
532532
| "terms": {
533-
| "field": "Country.keyword",
533+
| "field": "Country",
534534
| "exclude": ["USA"],
535535
| "order": {
536536
| "_key": "asc"
@@ -539,7 +539,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
539539
| "aggs": {
540540
| "City": {
541541
| "terms": {
542-
| "field": "City.keyword",
542+
| "field": "City",
543543
| "exclude": ["Berlin"],
544544
| "order": {
545545
| "cnt": "desc"
@@ -793,7 +793,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
793793
| "aggs": {
794794
| "cat": {
795795
| "terms": {
796-
| "field": "products.category.keyword",
796+
| "field": "products.category",
797797
| "size": 10
798798
| },
799799
| "aggs": {
@@ -1009,7 +1009,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
10091009
| "aggs": {
10101010
| "userId": {
10111011
| "terms": {
1012-
| "field": "userId.keyword"
1012+
| "field": "userId"
10131013
| },
10141014
| "aggs": {
10151015
| "lastSeen": {
@@ -1053,7 +1053,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
10531053
| "aggs": {
10541054
| "Country": {
10551055
| "terms": {
1056-
| "field": "Country.keyword",
1056+
| "field": "Country",
10571057
| "exclude": ["USA"],
10581058
| "order": {
10591059
| "_key": "asc"
@@ -1062,7 +1062,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
10621062
| "aggs": {
10631063
| "City": {
10641064
| "terms": {
1065-
| "field": "City.keyword",
1065+
| "field": "City",
10661066
| "exclude": ["Berlin"]
10671067
| },
10681068
| "aggs": {
@@ -1118,7 +1118,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
11181118
| "aggs": {
11191119
| "Country": {
11201120
| "terms": {
1121-
| "field": "Country.keyword",
1121+
| "field": "Country",
11221122
| "exclude": [
11231123
| "USA"
11241124
| ],
@@ -1129,7 +1129,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
11291129
| "aggs": {
11301130
| "City": {
11311131
| "terms": {
1132-
| "field": "City.keyword",
1132+
| "field": "City",
11331133
| "exclude": [
11341134
| "Berlin"
11351135
| ]
@@ -1193,7 +1193,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
11931193
| "aggs": {
11941194
| "identifier": {
11951195
| "terms": {
1196-
| "field": "identifier.keyword",
1196+
| "field": "identifier",
11971197
| "order": {
11981198
| "ct": "desc"
11991199
| }
@@ -1360,7 +1360,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
13601360
| "aggs": {
13611361
| "identifier": {
13621362
| "terms": {
1363-
| "field": "identifier.keyword",
1363+
| "field": "identifier",
13641364
| "order": {
13651365
| "ct": "desc"
13661366
| }
@@ -1517,7 +1517,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
15171517
| "aggs": {
15181518
| "identifier": {
15191519
| "terms": {
1520-
| "field": "identifier.keyword"
1520+
| "field": "identifier"
15211521
| },
15221522
| "aggs": {
15231523
| "max_diff": {
@@ -2758,7 +2758,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
27582758
| "aggs": {
27592759
| "dept": {
27602760
| "terms": {
2761-
| "field": "department.keyword"
2761+
| "field": "department"
27622762
| },
27632763
| "aggs": {
27642764
| "cnt": {

‎build.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ThisBuild / organization := "app.softnetwork"
1919

2020
name := "softclient4es"
2121

22-
ThisBuild / version := "0.13.0"
22+
ThisBuild / version := "0.13.1"
2323

2424
ThisBuild / scalaVersion := scala213
2525

‎es6/bridge/src/main/scala/app/softnetwork/elastic/sql/bridge/ElasticAggregation.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,13 +268,13 @@ object ElasticAggregation {
268268
var agg = {
269269
bucketsDirection.get(bucket.identifier.identifierName) match {
270270
case Some(direction) =>
271-
termsAgg(bucket.name, s"$currentBucketPath.keyword")
271+
termsAgg(bucket.name, currentBucketPath)
272272
.order(Seq(direction match {
273273
case Asc => TermsOrder("_key", asc = true)
274274
case _ => TermsOrder("_key", asc = false)
275275
}))
276276
case None =>
277-
termsAgg(bucket.name, s"$currentBucketPath.keyword")
277+
termsAgg(bucket.name, currentBucketPath)
278278
}
279279
}
280280
bucket.size.foreach(s => agg = agg.size(s))

‎es6/bridge/src/test/scala/app/softnetwork/elastic/sql/SQLQuerySpec.scala‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
530530
| "aggs": {
531531
| "Country": {
532532
| "terms": {
533-
| "field": "Country.keyword",
533+
| "field": "Country",
534534
| "exclude": "USA",
535535
| "order": {
536536
| "_key": "asc"
@@ -539,7 +539,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
539539
| "aggs": {
540540
| "City": {
541541
| "terms": {
542-
| "field": "City.keyword",
542+
| "field": "City",
543543
| "exclude": "Berlin",
544544
| "order": {
545545
| "cnt": "desc"
@@ -793,7 +793,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
793793
| "aggs": {
794794
| "cat": {
795795
| "terms": {
796-
| "field": "products.category.keyword",
796+
| "field": "products.category",
797797
| "size": 10
798798
| },
799799
| "aggs": {
@@ -1009,7 +1009,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
10091009
| "aggs": {
10101010
| "userId": {
10111011
| "terms": {
1012-
| "field": "userId.keyword"
1012+
| "field": "userId"
10131013
| },
10141014
| "aggs": {
10151015
| "lastSeen": {
@@ -1053,7 +1053,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
10531053
| "aggs": {
10541054
| "Country": {
10551055
| "terms": {
1056-
| "field": "Country.keyword",
1056+
| "field": "Country",
10571057
| "exclude": "USA",
10581058
| "order": {
10591059
| "_key": "asc"
@@ -1062,7 +1062,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
10621062
| "aggs": {
10631063
| "City": {
10641064
| "terms": {
1065-
| "field": "City.keyword",
1065+
| "field": "City",
10661066
| "exclude": "Berlin"
10671067
| },
10681068
| "aggs": {
@@ -1118,7 +1118,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
11181118
| "aggs": {
11191119
| "Country": {
11201120
| "terms": {
1121-
| "field": "Country.keyword",
1121+
| "field": "Country",
11221122
| "exclude": "USA",
11231123
| "order": {
11241124
| "_key": "asc"
@@ -1127,7 +1127,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
11271127
| "aggs": {
11281128
| "City": {
11291129
| "terms": {
1130-
| "field": "City.keyword",
1130+
| "field": "City",
11311131
| "exclude": "Berlin"
11321132
| },
11331133
| "aggs": {
@@ -1189,7 +1189,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
11891189
| "aggs": {
11901190
| "identifier": {
11911191
| "terms": {
1192-
| "field": "identifier.keyword",
1192+
| "field": "identifier",
11931193
| "order": {
11941194
| "ct": "desc"
11951195
| }
@@ -1356,7 +1356,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
13561356
| "aggs": {
13571357
| "identifier": {
13581358
| "terms": {
1359-
| "field": "identifier.keyword",
1359+
| "field": "identifier",
13601360
| "order": {
13611361
| "ct": "desc"
13621362
| }
@@ -1513,7 +1513,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
15131513
| "aggs": {
15141514
| "identifier": {
15151515
| "terms": {
1516-
| "field": "identifier.keyword"
1516+
| "field": "identifier"
15171517
| },
15181518
| "aggs": {
15191519
| "max_diff": {
@@ -2754,7 +2754,7 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
27542754
| "aggs": {
27552755
| "dept": {
27562756
| "terms": {
2757-
| "field": "department.keyword"
2757+
| "field": "department"
27582758
| },
27592759
| "aggs": {
27602760
| "cnt": {
@@ -3729,4 +3729,11 @@ class SQLQuerySpec extends AnyFlatSpec with Matchers {
37293729
|}""".stripMargin.replaceAll("\\s+", "")
37303730
}
37313731

3732+
it should "test" in {
3733+
val query =
3734+
"""SELECT name FROM users WHERE status = 'active' AND age > 25
3735+
|""".stripMargin
3736+
val select: ElasticSearchRequest = SQLQuery(query)
3737+
println(select.query)
3738+
}
37323739
}

0 commit comments

Comments
 (0)