Skip to content

Add support for long types #243

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

Open
dlindhol wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add support for long types #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b66ae89
Update dependencies
dlindhol Jul 28, 2026
f5a1e95
Allow serving LaTiS datasets containing long data
dlindhol Jul 28, 2026
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
4 changes: 2 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ ThisBuild / scalaVersion := "3.3.8"

val fs2DataVersion = "1.8.1"
val http4sVersion = "0.23.36"
val latisVersion = "b66ec47"
val latisHapiVersion = "1a507d1"
val latisVersion = "c1531e77"
val latisHapiVersion = "1d65ba50"

lazy val root = (project in file("."))
.settings(
Expand Down
5 changes: 5 additions & 0 deletions src/main/scala/latis/ops/ConvertHapiTypes.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class ConvertHapiTypes extends MapOperation {

private def convertValue(data: Data): Data = data match {
case v: ShortValue => IntValue(v.value.toInt)
case v: LongValue => IntValue(v.value.toInt) //risk of overflow but no exception
case v: FloatValue => DoubleValue(v.value.toDouble)
case _ => data //no-op, shouldn't get here due to catalog filter
}
Expand All @@ -45,6 +46,10 @@ class ConvertHapiTypes extends MapOperation {
Scalar.fromMetadata(
scalar.metadata + ("type" -> "int")
).fold(throw _, identity) //should not fail
case LongValueType =>
Scalar.fromMetadata(
scalar.metadata + ("type" -> "int")
).fold(throw _, identity) //should not fail
case _ => scalar //no-op, shouldn't get here due to catalog filter
}
}
7 changes: 4 additions & 3 deletions src/main/scala/latis/service/hapi/HapiService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,17 @@ class HapiService(catalog: Catalog) extends ServiceInterface(catalog, OperationR
// This checks that:
// - The Dataset metadata has temporalCoverage
// - The single domain variable is of type Time
// - Each scalar in the range has a supported type
// - Each scalar in the range has a supported or convertible type
// - If the type of a scalar is string, its size is defined
private val filteredCatalog: Catalog = {
val covP: Metadata => Boolean = _.getProperty("temporalCoverage").isDefined
val typeP: Metadata => Boolean = md => md.getProperty("type").exists {
case "string" => md.getProperty("size").isDefined
case "double" => true
case "int" => true
case "float" => true //may be converted to double by ConvertHapiTypes
case "short" => true //may be converted to int by ConvertHapiTypes
case "long" => true //converted to int by ConvertHapiTypes
case "float" => true //converted to double by ConvertHapiTypes
case "short" => true //converted to int by ConvertHapiTypes
case _ => false
}

Expand Down