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

[Backport 0.5] Optimize prepareStatementExecution request freq #842

Merged
merged 1 commit into from
Oct 30, 2024
Merged

[Backport 0.5] Optimize prepareStatementExecution request freq #842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions spark-sql-application/src/main/scala/org/apache/spark/sql/FlintREPL.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,13 @@ object FlintREPL extends Logging with FlintJobExecutor {
val threadPool = threadPoolFactory.newDaemonThreadPoolScheduledExecutor("flint-repl-query", 1)
implicit val executionContext = ExecutionContext.fromExecutor(threadPool)
val queryResultWriter = instantiateQueryResultWriter(spark, commandContext)
var futurePrepareQueryExecution: Future[Either[String, Unit]] = null

val statementsExecutionManager =
instantiateStatementExecutionManager(commandContext)

var futurePrepareQueryExecution: Future[Either[String, Unit]] = Future {
statementsExecutionManager.prepareStatementExecution()
}
try {
logInfo(s"""Executing session with sessionId: ${sessionId}""")

Expand All @@ -324,12 +330,6 @@ object FlintREPL extends Logging with FlintJobExecutor {
var lastCanPickCheckTime = 0L
while (currentTimeProvider
.currentEpochMillis() - lastActivityTime <= commandContext.inactivityLimitMillis && canPickUpNextStatement) {
val statementsExecutionManager =
instantiateStatementExecutionManager(commandContext)

futurePrepareQueryExecution = Future {
statementsExecutionManager.prepareStatementExecution()
}

try {
val commandState = CommandState(
Expand Down
20 changes: 12 additions & 8 deletions ...k-sql-application/src/main/scala/org/apache/spark/sql/StatementExecutionManagerImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package org.apache.spark.sql

import org.opensearch.flint.common.model.FlintStatement
import org.opensearch.flint.core.storage.OpenSearchUpdater
import org.opensearch.flint.core.storage.{FlintReader, OpenSearchUpdater}
import org.opensearch.search.sort.SortOrder

import org.apache.spark.internal.Logging
Expand All @@ -29,8 +29,8 @@ class StatementExecutionManagerImpl(commandContext: CommandContext)
context("flintSessionIndexUpdater").asInstanceOf[OpenSearchUpdater]

// Using one reader client within same session will cause concurrency issue.
// To resolve this move the reader creation and getNextStatement method to mirco-batch level
private val flintReader = createOpenSearchQueryReader()
// To resolve this move the reader creation to getNextStatement method at mirco-batch level
private var currentReader: Option[FlintReader] = None

override def prepareStatementExecution(): Either[String, Unit] = {
checkAndCreateIndex(osClient, resultIndex)
Expand All @@ -39,12 +39,17 @@ class StatementExecutionManagerImpl(commandContext: CommandContext)
flintSessionIndexUpdater.update(statement.statementId, FlintStatement.serialize(statement))
}
override def terminateStatementExecution(): Unit = {
flintReader.close()
currentReader.foreach(_.close())
currentReader = None
}

override def getNextStatement(): Option[FlintStatement] = {
if (flintReader.hasNext) {
val rawStatement = flintReader.next()
if (currentReader.isEmpty) {
currentReader = Some(createOpenSearchQueryReader())
}

if (currentReader.get.hasNext) {
val rawStatement = currentReader.get.next()
val flintStatement = FlintStatement.deserialize(rawStatement)
logInfo(s"Next statement to execute: $flintStatement")
Some(flintStatement)
Expand Down Expand Up @@ -100,7 +105,6 @@ class StatementExecutionManagerImpl(commandContext: CommandContext)
| ]
| }
|}""".stripMargin
val flintReader = osClient.createQueryReader(sessionIndex, dsl, "submitTime", SortOrder.ASC)
flintReader
osClient.createQueryReader(sessionIndex, dsl, "submitTime", SortOrder.ASC)
}
}
3 changes: 2 additions & 1 deletion spark-sql-application/src/test/scala/org/apache/spark/sql/FlintREPLTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1387,7 +1387,8 @@ class FlintREPLTest

val expectedCalls =
Math.ceil(inactivityLimit.toDouble / DEFAULT_QUERY_LOOP_EXECUTION_FREQUENCY).toInt
verify(mockOSClient, Mockito.atMost(expectedCalls)).getIndexMetadata(*)
verify(mockOSClient, times(1)).getIndexMetadata(*)
verify(mockOSClient, Mockito.atMost(expectedCalls)).createQueryReader(*, *, *, *)
}

val testCases = Table(
Expand Down
Loading