Skip to content

Commit

Permalink
[query] Lift backend state into {Service|Py4J}BackendApi
Browse files Browse the repository at this point in the history
  • Loading branch information
ehigham committed Jan 24, 2025
1 parent 796a644 commit 14bf960
Show file tree
Hide file tree
Showing 59 changed files with 1,298 additions and 1,421 deletions.
5 changes: 2 additions & 3 deletions hail/hail/src/is/hail/backend/Backend.scala
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import is.hail.io.fs.FS
import is.hail.types.RTable
import is.hail.types.encoded.EType
import is.hail.types.physical.PTuple
import is.hail.utils.ExecutionTimer.Timings
import is.hail.utils.fatal

import scala.reflect.ClassTag
Expand Down Expand Up @@ -105,7 +104,7 @@ abstract class Backend extends Closeable {
def tableToTableStage(ctx: ExecuteContext, inputIR: TableIR, analyses: LoweringAnalyses)
: TableStage

def withExecuteContext[T](f: ExecuteContext => T)(implicit E: Enclosing): (T, Timings)

def execute(ctx: ExecuteContext, ir: IR): Either[Unit, (PTuple, Long)]

def backendContext(ctx: ExecuteContext): BackendContext
}
4 changes: 0 additions & 4 deletions hail/hail/src/is/hail/backend/BackendRpc.scala
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,4 @@ trait HttpLikeBackendRpc[A] extends BackendRpc {
)
}
}

implicit protected def Ask: Routing
implicit protected def Write: Write[A]
implicit protected def Context: Context[A]
}
123 changes: 0 additions & 123 deletions hail/hail/src/is/hail/backend/BackendServer.scala

This file was deleted.

14 changes: 2 additions & 12 deletions hail/hail/src/is/hail/backend/ExecuteContext.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package is.hail.backend

import is.hail.{HailContext, HailFeatureFlags}
import is.hail.HailFeatureFlags
import is.hail.annotations.{Region, RegionPool}
import is.hail.asm4s.HailClassLoader
import is.hail.backend.local.LocalTaskContext
Expand All @@ -23,7 +23,7 @@ trait TempFileManager extends AutoCloseable {
def newTmpPath(tmpdir: String, prefix: String, extension: String = null): String
}

class OwningTempFileManager(fs: FS) extends TempFileManager {
class OwningTempFileManager(val fs: FS) extends TempFileManager {
private[this] val tmpPaths = mutable.ArrayBuffer[String]()

override def newTmpPath(tmpdir: String, prefix: String, extension: String): String = {
Expand Down Expand Up @@ -55,11 +55,6 @@ object NonOwningTempFileManager {
}

object ExecuteContext {
def scoped[T](f: ExecuteContext => T)(implicit E: Enclosing): T =
HailContext.sparkBackend.withExecuteContext(
selfContainedExecution = false
)(f)

def scoped[T](
tmpdir: String,
localTmpdir: String,
Expand All @@ -70,7 +65,6 @@ object ExecuteContext {
tempFileManager: TempFileManager,
theHailClassLoader: HailClassLoader,
flags: HailFeatureFlags,
backendContext: BackendContext,
irMetadata: IrMetadata,
blockMatrixCache: mutable.Map[String, BlockMatrix],
codeCache: mutable.Map[CodeCacheKey, CompiledFunction[_]],
Expand All @@ -92,7 +86,6 @@ object ExecuteContext {
tempFileManager,
theHailClassLoader,
flags,
backendContext,
irMetadata,
blockMatrixCache,
codeCache,
Expand Down Expand Up @@ -125,7 +118,6 @@ class ExecuteContext(
_tempFileManager: TempFileManager,
val theHailClassLoader: HailClassLoader,
val flags: HailFeatureFlags,
val backendContext: BackendContext,
val irMetadata: IrMetadata,
val BlockMatrixCache: mutable.Map[String, BlockMatrix],
val CodeCache: mutable.Map[CodeCacheKey, CompiledFunction[_]],
Expand Down Expand Up @@ -196,7 +188,6 @@ class ExecuteContext(
tempFileManager: TempFileManager = NonOwningTempFileManager(this.tempFileManager),
theHailClassLoader: HailClassLoader = this.theHailClassLoader,
flags: HailFeatureFlags = this.flags,
backendContext: BackendContext = this.backendContext,
irMetadata: IrMetadata = this.irMetadata,
blockMatrixCache: mutable.Map[String, BlockMatrix] = this.BlockMatrixCache,
codeCache: mutable.Map[CodeCacheKey, CompiledFunction[_]] = this.CodeCache,
Expand All @@ -216,7 +207,6 @@ class ExecuteContext(
tempFileManager,
theHailClassLoader,
flags,
backendContext,
irMetadata,
blockMatrixCache,
codeCache,
Expand Down
Loading

0 comments on commit 14bf960

Please sign in to comment.