Skip to content

Commit ccf3923

Browse files
committed
[query] extract utils into new module
1 parent 3c34d5c commit ccf3923

File tree

445 files changed

+1829
-2134
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

445 files changed

+1829
-2134
lines changed

hail/build.mill

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ trait HailScalaModule extends ScalaModule, HailJavaModule, ScalafmtModule, Scala
126126
"-Wconf:cat=deprecation&msg=symbol literal is deprecated:s",
127127
raw"-Wconf:cat=unused-imports&origin=scala\.collection\.compat\._:s",
128128
raw"-Wconf:cat=unused-imports&origin=scala\.Option\.option2Iterable:s",
129-
raw"-Wconf:cat=unused-imports&origin=is\.hail\.utils\.compat\._:s",
129+
raw"-Wconf:cat=unused-imports&origin=is\.hail\.collection\.compat\._:s",
130130
raw"-Wconf:msg=unused value of type org\.scalatest\..*Assertion:s",
131131
raw"-Wconf:msg=unused value of type org\.mockito\.stubbing\.ScalaOngoingStubbing:s",
132132
)

hail/hail/ir-gen/src/Main.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1213,9 +1213,10 @@ object Main {
12131213
val pack = "package is.hail.expr.ir.defs"
12141214
val imports = Seq(
12151215
"is.hail.annotations.Annotation",
1216+
"is.hail.collection.FastSeq",
12161217
"is.hail.io.{AbstractTypedCodecSpec, BufferSpec}",
12171218
"is.hail.types.virtual.{Type, TArray, TStream, TVoid, TStruct, TTuple}",
1218-
"is.hail.utils.{FastSeq, StringEscapeUtils}",
1219+
"is.hail.utils.StringEscapeUtils",
12191220
"is.hail.expr.ir.{AggOp, BaseIR, IR, TableIR, MatrixIR, BlockMatrixIR, Name, UnaryOp, BinaryOp, " +
12201221
"ComparisonOp, CanEmit, EmitParamType, TableWriter, " +
12211222
"WrappedMatrixNativeMultiWriter, MatrixWriter, MatrixNativeMultiWriter, BlockMatrixWriter, " +

hail/hail/package.mill

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ trait RootHailModule extends CrossScalaModule, HailScalaModule:
2525

2626
override def moduleDeps: Seq[JavaModule] =
2727
Seq(
28+
build.hail.utils(crossValue),
2829
build.hail.memory(if buildMode == CI then "debug" else "release"),
2930
)
3031

hail/hail/src-2.12/is/hail/utils/compat/package.scala

Lines changed: 0 additions & 26 deletions
This file was deleted.

hail/hail/src/is/hail/HailFeatureFlags.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package is.hail
22

33
import is.hail.backend.ExecutionCache
44
import is.hail.backend.spark.SparkBackend
5+
import is.hail.collection.implicits.toRichIterable
56
import is.hail.expr.ir.{agg, Optimize}
67
import is.hail.io.fs.RequesterPaysConfig
78
import is.hail.types.encoded.EType
8-
import is.hail.utils._
99

1010
import scala.collection.mutable
1111

hail/hail/src/is/hail/annotations/Annotation.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package is.hail.annotations
22

3+
import is.hail.collection.implicits.toRichIterable
34
import is.hail.types.virtual._
45
import is.hail.utils._
56

hail/hail/src/is/hail/annotations/BroadcastValue.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ import is.hail.expr.ir.defs.EncodedLiteral
66
import is.hail.io.{BufferSpec, Decoder, TypedCodecSpec}
77
import is.hail.types.physical.{PArray, PStruct, PType}
88
import is.hail.types.virtual.{TBaseStruct, TStruct}
9-
import is.hail.utils.{formatSpace, ArrayOfByteArrayOutputStream, Logging}
10-
import is.hail.utils.prettyPrint.ArrayOfByteArrayInputStream
9+
import is.hail.utils.{
10+
formatSpace, ArrayOfByteArrayInputStream, ArrayOfByteArrayOutputStream, Logging,
11+
}
1112

1213
import java.io.InputStream
1314

hail/hail/src/is/hail/annotations/ChunkCache.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package is.hail.annotations
22

3-
import is.hail.expr.ir.LongArrayBuilder
3+
import is.hail.collection.LongArrayBuilder
44

55
import scala.collection.mutable
66

hail/hail/src/is/hail/annotations/ExtendedOrdering.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package is.hail.annotations
22

3+
import is.hail.collection.implicits.toRichIterable
34
import is.hail.utils._
45

56
import org.apache.spark.sql.Row

hail/hail/src/is/hail/annotations/OrderedRVIterator.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package is.hail.annotations
22

33
import is.hail.backend.HailStateManager
4+
import is.hail.collection.{FlipbookIterator, StagingIterator, StateMachine}
5+
import is.hail.collection.compat.mutable.Growable
6+
import is.hail.collection.implicits.toRichIterator
47
import is.hail.rvd.{RVDContext, RVDType}
58
import is.hail.types.physical.PInterval
69
import is.hail.utils._
7-
import is.hail.utils.compat.mutable.Growable
810

911
import scala.collection.mutable
1012

0 commit comments

Comments
 (0)