Skip to content

Commit ffa0714

Browse files
authored
[query] Remove PSubsetStruct (#15926)
It has been supplanted by other struct STypes for projections. And it's not used at current and cannot be constructed outside of the parser. It was never serialized in a durable fashion and so its removal is safe. ## Security Assessment - This change cannot impact the Hail Batch instance as deployed by Broad Institute in GCP
1 parent de32429 commit ffa0714

3 files changed

Lines changed: 1 addition & 191 deletions

File tree

‎hail/hail/src/is/hail/expr/ir/Parser.scala‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -454,13 +454,6 @@ object IRParser {
454454
punctuation(it, "}")
455455
val fields = args.zipWithIndex.map { case ((id, t), i) => PField(id, t, i) }
456456
PCanonicalStruct(fields, req)
457-
case "PSubsetStruct" =>
458-
punctuation(it, "{")
459-
val parent = ptype_expr(rgs)(it).asInstanceOf[PStruct]
460-
punctuation(it, "{")
461-
val args = repsepUntil(it, identifier, PunctuationToken(","), PunctuationToken("}"))
462-
punctuation(it, "}")
463-
PSubsetStruct(parent, args)
464457
}
465458
assert(typ.required == req)
466459
typ

‎hail/hail/src/is/hail/types/physical/PSubsetStruct.scala‎

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

‎hail/hail/test/src/is/hail/types/physical/PhysicalTestUtils.scala‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@ abstract class PhysicalTestUtils extends Logging {
2525
val srcRegion = Region(pool = pool)
2626
val region = Region(pool = pool)
2727

28-
val srcAddress = sourceType match {
29-
case x: PSubsetStruct => ScalaToRegionValue(srcRegion, x.ps, sourceValue)
30-
case _ => ScalaToRegionValue(srcRegion, sourceType, sourceValue)
31-
}
28+
val srcAddress = ScalaToRegionValue(srcRegion, sourceType, sourceValue)
3229

3330
if (interpret) {
3431
try {

0 commit comments

Comments
 (0)