Refactoring

README.md

@@ -20,7 +20,7 @@ This project provides a trait-based interface (`ElasticClientApi`) that aggregat
 By relying on these concrete implementations, developers can switch between versions with minimal changes to their business logic.
 
 **SQL to Elasticsearch Query Translation**  
-Elastic Client includes a parser capable of translating SQL `SELECT` queries into Elasticsearch queries. The parser produces an intermediate representation, which is then converted into [Elastic4s](https://github.com/sksamuel/elastic4s) DSL queries and ultimately into native Elasticsearch queries. This allows data engineers and analysts to express queries in familiar SQL syntax.
+Elastic Client includes a parser capable of translating SQL `SELECT` queries into Elasticsearch queries. The parser produces an intermediate representation, which is then converted into [Elastic4s](https://github.com/sksamuel/elastic4s) DSL queries and ultimately into native Elasticsearch queries. This allows data engineers and analysts to express queries in familiar [SQL](documentation/README.md) syntax.
 
 **Dynamic Mapping Migration**  
 Elastic Client provides tools to analyze and compare existing mappings with new ones. If differences are detected, it can automatically perform safe migrations. This includes creating temporary indices, reindexing, and renaming — all while preserving data integrity. This eliminates the need for manual mapping migrations and reduces downtime.

build.sbt

@@ -19,7 +19,7 @@ ThisBuild / organization := "app.softnetwork"
 
 name := "softclient4es"
 
-ThisBuild / version := "0.8.0"
+ThisBuild / version := "0.9.0"
 
 ThisBuild / scalaVersion := scala213
 

core/src/main/scala/app/softnetwork/elastic/client/AggregateResult.scala

@@ -1,6 +1,6 @@
 package app.softnetwork.elastic.client
 
-import app.softnetwork.elastic.sql.AggregateFunction
+import app.softnetwork.elastic.sql.function.aggregate.AggregateFunction
 
 sealed trait AggregateResult {
   def field: String

core/src/main/scala/app/softnetwork/elastic/client/ElasticClientApi.scala

@@ -8,7 +8,7 @@ import _root_.akka.stream.{FlowShape, Materializer}
 import akka.stream.scaladsl._
 import app.softnetwork.persistence.model.Timestamped
 import app.softnetwork.serialization._
-import app.softnetwork.elastic.sql.{SQLQuery, SQLSearchRequest}
+import app.softnetwork.elastic.sql.query.{SQLQuery, SQLSearchRequest}
 import com.google.gson.JsonParser
 import com.typesafe.config.{Config, ConfigFactory}
 import org.json4s.{DefaultFormats, Formats}

core/src/main/scala/app/softnetwork/elastic/client/MappingComparator.scala

@@ -3,7 +3,7 @@ package app.softnetwork.elastic.client
 import com.google.gson._
 import com.typesafe.scalalogging.StrictLogging
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.util.{Failure, Success, Try}
 
 object MappingComparator extends StrictLogging {

core/src/main/scala/app/softnetwork/elastic/client/package.scala

@@ -13,7 +13,7 @@ import scala.collection.mutable
 import scala.language.reflectiveCalls
 import scala.util.{Failure, Success, Try}
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 /** Created by smanciot on 30/06/2018.
   */

core/src/main/scala/app/softnetwork/elastic/persistence/query/ElasticProvider.scala

@@ -1,7 +1,7 @@
 package app.softnetwork.elastic.persistence.query
 
 import app.softnetwork.elastic.client.ElasticClientApi
-import app.softnetwork.elastic.sql.SQLQuery
+import app.softnetwork.elastic.sql.query.SQLQuery
 import mustache.Mustache
 import org.json4s.Formats
 import app.softnetwork.persistence._

core/testkit/src/main/scala/app/softnetwork/elastic/client/ElasticClientSpec.scala

@@ -4,7 +4,7 @@ import akka.actor.ActorSystem
 import app.softnetwork.elastic.model.{Binary, Child, Parent, Sample}
 import app.softnetwork.elastic.persistence.query.ElasticProvider
 import app.softnetwork.elastic.scalatest.ElasticDockerTestKit
-import app.softnetwork.elastic.sql.SQLQuery
+import app.softnetwork.elastic.sql.query.SQLQuery
 import app.softnetwork.persistence._
 import app.softnetwork.persistence.person.model.Person
 import com.fasterxml.jackson.core.JsonParseException

core/testkit/src/main/scala/app/softnetwork/elastic/client/MockElasticClientApi.scala

@@ -3,7 +3,7 @@ package app.softnetwork.elastic.client
 import akka.NotUsed
 import akka.actor.ActorSystem
 import akka.stream.scaladsl.Flow
-import app.softnetwork.elastic.sql.{SQLQuery, SQLSearchRequest}
+import app.softnetwork.elastic.sql.query.{SQLQuery, SQLSearchRequest}
 import org.json4s.Formats
 import app.softnetwork.persistence.model.Timestamped
 import org.slf4j.{Logger, LoggerFactory}

documentation/README.md

@@ -0,0 +1,15 @@
+# SQL Engine Documentation
+
+Welcome to the SQL Engine Documentation. Navigate through the sections below:
+
+- [Query Structure](request_structure.md)
+- [Operators](operators.md)
+- [Operator Precedence](operator_precedence.md)
+- [Aggregate Functions](functions_aggregate.md)
+- [Date/Time Functions](functions_date_time.md)
+- [Math Functions](functions_math.md)
+- [String Functions](functions_string.md)
+- [Type Conversion](type_conversion.md)
+- [Conditional Functions](functions_conditional.md)
+- [Geo Functions](functions_geo.md)
+- [Keywords](keywords.md)

documentation/functions_aggregate.md

@@ -0,0 +1,171 @@
+[Back to index](./README.md)
+
+# Aggregate Functions
+
+**Navigation:** [Functions — Date / Time](./functions_date_time.md) · [Functions — Conditional](./functions_conditional.md)
+
+This page documents aggregate functions.
+
+---
+
+### Function: COUNT
+**Description:**  
+Count rows or non-null expressions.  
+With `DISTINCT` counts distinct values.
+
+**Inputs:** 
+- `expr` or `*`; optional `DISTINCT`
+
+**Output:** 
+- `BIGINT`
+
+**Example:**
+```sql
+SELECT COUNT(*) AS total FROM emp;
+-- Result: total = 42
+
+SELECT COUNT(DISTINCT salary) AS distinct_salaries FROM emp;
+-- Result: 8
+```
+
+---
+
+### Function: SUM
+**Description:**  
+Sum of values.
+
+**Inputs:** 
+- `expr` (`NUMERIC`)
+
+**Output:** 
+- `NUMERIC`
+
+**Example:**
+```sql
+SELECT SUM(salary) AS total_salary FROM emp;
+```
+
+---
+
+### Function: AVG
+**Description:**  
+Average of values.
+
+**Inputs:** 
+- `expr` (`NUMERIC`)
+
+**Output:** 
+- `DOUBLE`
+
+**Example:**
+```sql
+SELECT AVG(salary) AS avg_salary FROM emp;
+```
+
+---
+
+### Function: MIN
+**Description:**  
+Minimum value in group.
+
+**Inputs:** 
+- `expr` (comparable)
+
+**Output:** 
+- same as input
+
+**Example:**
+```sql
+SELECT MIN(hire_date) AS earliest FROM emp;
+```
+
+---
+
+### Function: MAX
+**Description:**  
+Maximum value in group.
+
+**Inputs:** 
+- `expr` (comparable)
+
+**Output:** 
+- same as input
+
+**Example:**
+```sql
+SELECT MAX(salary) AS top_salary FROM emp;
+```
+
+---
+
+### Function: FIRST_VALUE
+**Description:**  
+Window: first value ordered by `ORDER BY`. Pushed as `top_hits size=1` to ES when possible.
+
+**Inputs:** 
+- `expr` with optional `OVER (PARTITION BY ... ORDER BY ...)`  
+If `OVER` is not provided, only the expr column name is used for the sorting.
+
+**Output:** 
+- same as input
+
+**Example:**
+```sql
+SELECT FIRST_VALUE(salary) 
+OVER (
+    PARTITION BY department 
+    ORDER BY hire_date ASC
+) AS first_salary
+FROM emp;
+```
+
+---
+
+### Function: LAST_VALUE
+**Description:**  
+Window: last value ordered by `ORDER BY. Pushed to ES by flipping sort order in `top_hits`.
+
+**Inputs:** 
+- `expr` with optional `OVER (PARTITION BY ... ORDER BY ...)`  
+If `OVER` is not provided, only the expr column name is used for the sorting.
+
+**Output:** 
+- same as input
+
+**Example:**
+```sql
+SELECT LAST_VALUE(salary) 
+OVER (
+    PARTITION BY department 
+    ORDER BY hire_date ASC
+) AS last_salary
+FROM emp;
+```
+
+---
+
+### Function: ARRAY_AGG
+**Description:**  
+Collect values into an array for each partition. Implemented using `OVER` and pushed to ES as `top_hits`. Post-processing converts hits to an array of scalars.
+
+**Inputs:** 
+- `expr` with optional `OVER (PARTITION BY ... ORDER BY ... LIMIT n)`  
+If `OVER` is not provided, only the expr column name is used for the sorting.
+
+**Output:** 
+- `ARRAY<type_of_expr>`
+
+**Example:**
+```sql
+SELECT department, 
+ARRAY_AGG(name) OVER (
+    PARTITION BY department 
+    ORDER BY hire_date ASC 
+    LIMIT 100
+) AS employees
+FROM emp;
+-- Result: employees as an array of name values 
+-- per department (sorted and limited)
+```
+
+[Back to index](./README.md)