Skip to content

Support hyphens in LTree labels and increase max label length #1272

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

Merged
mpilquist merged 1 commit into from
Mar 20, 2026
Merged

Support hyphens in LTree labels and increase max label length #1272

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
6 changes: 3 additions & 3 deletions modules/core/shared/src/main/scala/data/LTree.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ object LTree {

labels.foreach(l => l match {
case ValidLabelRegex() => ()
case _ => fail(s"invalid ltree label '$l'. Only alphanumeric characters and '_' are allowed.")
case _ => fail(s"invalid ltree label '$l'. Only alphanumeric characters, '_' and '-' are allowed.")
})

if(failure != null)
Expand All @@ -49,11 +49,11 @@ object LTree {
}
}

final val MaxLabelLength = 255
final val MaxLabelLength = 1000
final val MaxTreeLength = 65535

private final val Separator = '.'
private final val ValidLabelRegex = s"""^[\\p{L}0-9_]{1,$MaxLabelLength}$$""".r
private final val ValidLabelRegex = s"""^[\\p{L}0-9_-]{1,$MaxLabelLength}$$""".r

implicit val ltreeEq: Eq[LTree] = Eq.fromUniversalEquals[LTree]
}
2 changes: 2 additions & 0 deletions modules/tests/shared/src/test/scala/data/LTreeTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ class LTreeTest extends ffstest.FTest {
assert(LTree.fromString("abc1.d_f2").isRight, "regex failed")
assert(LTree.fromString("foo.βar.baΣΩ").isRight, "regex failed")
assert(LTree.fromString("foo.βar.❤").isLeft, "regex failed")
assert(LTree.fromString("abc.d-f").isRight, "hyphen in label failed")
assert(LTree.fromString("a-b.c-d.e-f").isRight, "hyphens in multiple labels failed")

assert(LTree.fromString(List.fill(LTree.MaxTreeLength)("a").mkString(".")).isRight, "max tree len failed")
assert(LTree.fromString(List.fill(LTree.MaxTreeLength + 1)("a").mkString(".")).isLeft, "max tree len failed")
Expand Down
Loading