prepare release v9.x

fupelaqu · fupelaqu · commit dd6df54a0fe0 · 2025-07-22T05:16:48.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -30,6 +30,12 @@ jobs:
       JAVA_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
       JVM_OPTS:  -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
     steps:
+    - name: Env
+      run: |
+        echo "JFROG_USER=${{ secrets.JFROG_USER }}" >>  $GITHUB_ENV
+        echo "JFROG_PASSWORD=${{ secrets.JFROG_PASSWORD }}" >>  $GITHUB_ENV
+        echo "GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}" >>  $GITHUB_ENV
+        echo "CODECOV_TOKEN=${{ secrets.CODECOV_TOKEN }}" >>  $GITHUB_ENV
     - name: Checkout
       uses: actions/checkout@v3
     - name: Set up JDK 17
@@ -43,7 +49,7 @@ jobs:
     - name: Set vm.max_map_count
       run: sudo sysctl -w vm.max_map_count=262144
     - name: Run tests
-      run: sbt test
+      run: SBT_OPTS="-Xss4M -Xms1g -Xmx4g -Dfile.encoding=UTF-8" sbt test
 
   lint:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,7 +8,7 @@ name: Release
 on:
   workflow_dispatch:
   push:
-    branches: 
+    branches:
       - 'main'
 #      - '*'         # matches every branch that doesn't contain a '/'
 #      - '*/*'       # matches every branch containing a single '/'
@@ -27,6 +27,12 @@ jobs:
       JAVA_OPTS: -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
       JVM_OPTS:  -Xms2048M -Xmx2048M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8
     steps:
+    - name: Env
+      run: |
+        echo "JFROG_USER=${{ secrets.JFROG_USER }}" >>  $GITHUB_ENV
+        echo "JFROG_PASSWORD=${{ secrets.JFROG_PASSWORD }}" >>  $GITHUB_ENV
+        echo "GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}" >>  $GITHUB_ENV
+        echo "CODECOV_TOKEN=${{ secrets.CODECOV_TOKEN }}" >>  $GITHUB_ENV
     - name: Checkout
       uses: actions/checkout@v3
     - name: Set up JDK 17
@@ -42,7 +48,7 @@ jobs:
     - name: Set vm.max_map_count
       run: sudo sysctl -w vm.max_map_count=262144
     - name: Run tests & Coverage Report
-      run: sbt coverage test coverageReport coverageAggregate
+      run: SBT_OPTS="-Xss4M -Xms1g -Xmx4g -Dfile.encoding=UTF-8" sbt coverage test coverageReport coverageAggregate
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v3
       with:
@@ -51,4 +57,4 @@ jobs:
         fail_ci_if_error: false
         verbose: true
     - name: Publish
-      run: sbt publish
+      run: SBT_OPTS="-Xss4M -Xms1g -Xmx4g -Dfile.encoding=UTF-8" sbt publish
diff --git a/client/src/main/scala/app/softnetwork/elastic/client/AggregateResult.scala b/client/src/main/scala/app/softnetwork/elastic/client/AggregateResult.scala
@@ -11,9 +11,23 @@ sealed trait MetricAgregateResult extends AggregateResult {
   def function: AggregateFunction
 }
 
+sealed trait AggregateValue
+case class NumericValue(value: Double) extends AggregateValue
+case class StringValue(value: String) extends AggregateValue
+case object EmptyValue extends AggregateValue
+
 case class SingleValueAggregateResult(
   field: String,
   function: AggregateFunction,
-  value: Double,
+  value: AggregateValue,
   error: Option[String] = None
-) extends MetricAgregateResult
+) extends MetricAgregateResult {
+  def asDoubleOption: Option[Double] = value match {
+    case NumericValue(v) => Some(v)
+    case _               => None
+  }
+  def asStringOption: Option[String] = value match {
+    case StringValue(v) => Some(v)
+    case _              => None
+  }
+}
diff --git a/java/src/main/scala/app/softnetwork/elastic/client/java/ElasticsearchClientApi.scala b/java/src/main/scala/app/softnetwork/elastic/client/java/ElasticsearchClientApi.scala
@@ -124,12 +124,13 @@ trait ElasticsearchClientSettingsApi extends SettingsApi with ElasticsearchClien
   }
 
   override def loadSettings(): String = {
-    apply()
+    val settings = apply()
       .indices()
       .getSettings(
         new GetIndicesSettingsRequest.Builder().index("*").build()
       )
       .toString
+    settings.substring(settings.indexOf(':') + 1).trim
   }
 }
 
@@ -144,12 +145,13 @@ trait ElasticsearchClientMappingApi extends MappingApi with ElasticsearchClientC
   }
 
   override def getMapping(index: String): String = {
-    apply()
+    val mapping = apply()
       .indices()
       .getMapping(
         new GetMappingRequest.Builder().index(index).build()
       )
       .toString
+    mapping.substring(mapping.indexOf(':') + 1).trim
   }
 }
 
@@ -190,11 +192,26 @@ trait ElasticsearchClientCountApi extends CountApi with ElasticsearchClientCompa
         .toDouble
     )
   }
+
+  override def countAsync(query: client.JSONQuery)(implicit
+    ec: ExecutionContext
+  ): Future[Option[Double]] = {
+    fromCompletableFuture(
+      async()
+        .count(
+          new CountRequest.Builder().index(query.indices.asJava).build()
+        )
+    ).map(response => Option(response.count().toDouble))
+  }
 }
 
 trait ElasticsearchClientSingleValueAggregateApi
     extends SingleValueAggregateApi
     with ElasticsearchClientCountApi {
+  private[this] def aggregateValue(value: Double, valueAsString: String): AggregateValue =
+    if (valueAsString.nonEmpty) StringValue(valueAsString)
+    else NumericValue(value)
+
   override def aggregate(
     sqlQuery: SQLQuery
   )(implicit ec: ExecutionContext): Future[Seq[SingleValueAggregateResult]] = {
@@ -220,13 +237,15 @@ trait ElasticsearchClientSingleValueAggregateApi
                 SingleValueAggregateResult(
                   field,
                   aggType,
-                  result.getOrElse(0d),
+                  NumericValue(result.getOrElse(0d)),
                   None
                 )
               )
             case Failure(f) =>
               logger.error(f.getMessage, f.fillInStackTrace())
-              promise.success(SingleValueAggregateResult(field, aggType, 0d, Some(f.getMessage)))
+              promise.success(
+                SingleValueAggregateResult(field, aggType, EmptyValue, Some(f.getMessage))
+              )
           }
           promise.future
         case _ =>
@@ -236,6 +255,9 @@ trait ElasticsearchClientSingleValueAggregateApi
             collection.immutable.Seq.empty[String]
           )
           import jsonQuery._
+          logger.info(
+            s"Aggregating with query: ${jsonQuery.query} on indices: ${indices.mkString(", ")}"
+          )
           // Create a parser for the query
           Try(
             apply().search(
@@ -248,6 +270,9 @@ trait ElasticsearchClientSingleValueAggregateApi
             )
           ) match {
             case Success(response) =>
+              logger.whenDebugEnabled(
+                s"Aggregation response: ${response.toString}"
+              )
               val agg = aggName.split("\\.").last
 
               val itAgg = aggName.split("\\.").iterator
@@ -269,20 +294,25 @@ trait ElasticsearchClientSingleValueAggregateApi
                   aggType,
                   aggType match {
                     case sql.Count =>
-                      if (aggregation.distinct) {
-                        root.get(agg).cardinality().value().toDouble
-                      } else {
-                        root.get(agg).valueCount().value().toDouble
-                      }
+                      NumericValue(
+                        if (aggregation.distinct) {
+                          root.get(agg).cardinality().value()
+                        } else {
+                          root.get(agg).valueCount().value()
+                        }
+                      )
                     case sql.Sum =>
-                      root.get(agg).sum().value().toDouble
+                      NumericValue(root.get(agg).sum().value())
                     case sql.Avg =>
-                      root.get(agg).avg().value().toDouble
+                      val avgAgg = root.get(agg).avg()
+                      aggregateValue(avgAgg.value(), avgAgg.valueAsString())
                     case sql.Min =>
-                      root.get(agg).min().value().toDouble
+                      val minAgg = root.get(agg).min()
+                      aggregateValue(minAgg.value(), minAgg.valueAsString())
                     case sql.Max =>
-                      root.get(agg).max().value().toDouble
-                    case _ => 0d
+                      val maxAgg = root.get(agg).max()
+                      aggregateValue(maxAgg.value(), maxAgg.valueAsString())
+                    case _ => EmptyValue
                   },
                   None
                 )
@@ -293,7 +323,7 @@ trait ElasticsearchClientSingleValueAggregateApi
                 SingleValueAggregateResult(
                   field,
                   aggType,
-                  0d,
+                  EmptyValue,
                   Some(exception.getMessage)
                 )
               )
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -4,14 +4,14 @@ libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionSch
 
 resolvers += "Softnetwork releases" at "https://softnetwork.jfrog.io/artifactory/releases/"
 
-addSbtPlugin("app.softnetwork.sbt-softnetwork" % "sbt-softnetwork-git" % "0.1.7")
+addSbtPlugin("app.softnetwork.sbt-softnetwork" % "sbt-softnetwork-git" % "0.2.0")
 
-addSbtPlugin("app.softnetwork.sbt-softnetwork" % "sbt-softnetwork-info" % "0.1.7")
+addSbtPlugin("app.softnetwork.sbt-softnetwork" % "sbt-softnetwork-info" % "0.2.0")
 
-addSbtPlugin("app.softnetwork.sbt-softnetwork" % "sbt-softnetwork-publish" % "0.1.7")
+addSbtPlugin("app.softnetwork.sbt-softnetwork" % "sbt-softnetwork-publish" % "0.2.0")
 
 addDependencyTreePlugin
 
 addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2")
 
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.3.0")
diff --git a/testkit/src/main/scala/app/softnetwork/elastic/scalatest/ElasticTestKit.scala b/testkit/src/main/scala/app/softnetwork/elastic/scalatest/ElasticTestKit.scala
@@ -15,7 +15,7 @@ import org.scalatest.matchers.{MatchResult, Matcher}
 import org.slf4j.Logger
 
 import scala.concurrent.{ExecutionContext, Future}
-import scala.util.{Failure, Success}
+import scala.util.{Failure, Success, Try}
 
 /** Created by smanciot on 18/05/2021.
   */
@@ -195,6 +195,25 @@ trait ElasticTestKit extends ElasticDsl with CompletionTestKit with BeforeAndAft
     }
   }
 
+  def isIndexOpened(name: String): Boolean = {
+    elasticClient
+      .execute {
+        indexStats(name)
+      }
+      .complete() match {
+      case Success(s) =>
+        Try(s.result.indices.contains(name)) match {
+          case Success(_) => true
+          case Failure(_) => false
+        }
+      case _ => false
+    }
+  }
+
+  def isIndexClosed(name: String): Boolean = {
+    doesIndexExists(name) && !isIndexOpened(name)
+  }
+
   def doesAliasExists(name: String): Boolean = {
     elasticClient
       .execute {
diff --git a/testkit/src/test/scala/app/softnetwork/elastic/client/ElasticClientSpec.scala b/testkit/src/test/scala/app/softnetwork/elastic/client/ElasticClientSpec.scala
