Skip to content
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

Jump to bottom

Feature/query executor #156

Merged
merged 4 commits into from
Nov 13, 2023
Merged

Feature/query executor #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
85ab901
WIP: Refactoring QueryExecutor
Nov 13, 2023
41acf05
Added query method
Nov 13, 2023
6982401
Added query method
Nov 13, 2023
09704ad
Re
Nov 13, 2023
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
6 changes: 3 additions & 3 deletions dsl/src/it/scala/com/crobox/clickhouse/DslITSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ trait DslITSpec extends ClickhouseClientSpec with ClickhouseSpec with TestSchema
} yield {}
whenReady(tables) { _ =>
val inserts = for {
_ <- table1Entries.into(OneTestTable)
_ <- table2Entries.into(TwoTestTable)
_ <- table3Entries.into(ThreeTestTable)
_ <- queryExecutor.insert(OneTestTable, table1Entries)
_ <- queryExecutor.insert(TwoTestTable, table2Entries)
_ <- queryExecutor.insert(ThreeTestTable, table3Entries)
} yield {}
inserts.futureValue
}
Expand Down
14 changes: 11 additions & 3 deletions dsl/src/main/scala/com/crobox/clickhouse/dsl/execution/ClickhouseQueryExecutor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,19 @@ trait ClickhouseQueryExecutor extends QueryExecutor {
query: Query
)(implicit executionContext: ExecutionContext, settings: QuerySettings = QuerySettings()): Future[QueryResult[V]] = {
import QueryResult._
val queryResult = client.query(toSql(query.internalQuery)(ctx = TokenizeContext(client.serverVersion)))
val queryResult = client.query(toSql(query.internalQuery)(ctx = TokenizeContext(client.serverVersion)))(settings)
queryResult.map(_.parseJson.convertTo[QueryResult[V]])
}

// override def execute[V: JsonReader](
override def query[V: JsonReader](
sql: String
)(implicit executionContext: ExecutionContext, settings: QuerySettings = QuerySettings()): Future[QueryResult[V]] = {
import QueryResult._
val queryResult = client.query(sql)(settings)
queryResult.map(_.parseJson.convertTo[QueryResult[V]])
}

// override def execute[V: JsonReader](
// sql: String
// )(implicit executionContext: ExecutionContext, settings: QuerySettings = QuerySettings()): Future[QueryResult[V]] =
// client.query(sql).map(_.parseJson.convertTo[QueryResult[V]])
Expand All @@ -45,7 +53,7 @@ trait ClickhouseQueryExecutor extends QueryExecutor {
Future {
values.map(_.toJson.compactPrint).mkString("\n") + "\n"
}.flatMap(
entity => client.execute(s"INSERT INTO ${table.quoted} FORMAT JSONEachRow", entity)
entity => client.execute(s"INSERT INTO ${table.quoted} FORMAT JSONEachRow", entity)(settings)
)
}

Expand Down
3 changes: 3 additions & 0 deletions dsl/src/main/scala/com/crobox/clickhouse/dsl/execution/QueryExecutor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ trait QueryExecutor { self: TokenizerModule =>

def serverVersion: ClickhouseServerVersion

def query[V: JsonReader](sql: String)(implicit executionContext: ExecutionContext,
settings: QuerySettings = QuerySettings()): Future[QueryResult[V]]

def execute[V: JsonReader](query: Query)(implicit executionContext: ExecutionContext,
settings: QuerySettings = QuerySettings()): Future[QueryResult[V]]

Expand Down
19 changes: 0 additions & 19 deletions dsl/src/main/scala/com/crobox/clickhouse/dsl/package.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
package com.crobox.clickhouse

import com.crobox.clickhouse.dsl.column.ClickhouseColumnFunctions
import com.crobox.clickhouse.dsl.execution.{QueryExecutor, QueryResult}
import com.crobox.clickhouse.dsl.marshalling.{QueryValue, QueryValueFormats}
import spray.json.{JsonReader, JsonWriter}

import scala.concurrent.{ExecutionContext, Future}
import scala.util.Try

package object dsl extends ClickhouseColumnFunctions with QueryFactory with QueryValueFormats {
Expand All @@ -14,22 +11,6 @@ package object dsl extends ClickhouseColumnFunctions with QueryFactory with Quer
trait Contra[-A]
type Union[A, B] = Contra[A] <:< Contra[B]

implicit class QueryExecution(query: Query) {

def execute[V: JsonReader](
implicit executionContext: ExecutionContext,
queryExecutor: QueryExecutor
): Future[QueryResult[V]] = queryExecutor.execute(query)
}

implicit class ValueInsertion[V: JsonWriter](values: Seq[V]) {

def into(table: Table)(
implicit executionContext: ExecutionContext,
queryExecutor: QueryExecutor
): Future[String] = queryExecutor.insert(table, values)
}

/**
* Exposes the OperationalQuery.+ operator on Try[OperationalQuery]
*/
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.8.3
sbt.version=1.9.6
Loading