Skip to content

Fix Haskell/Rust IR JSON encoding inconsistencies #120

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
georgefst wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix Haskell/Rust IR JSON encoding inconsistencies #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3186fa9
Match Haskell JSON encoding for singleton types to what Rust expects
georgefst Aug 7, 2026
81bac24
Match Rust JSON encoding for untagged enums to what Haskell provides
georgefst Aug 7, 2026
58c134a
Use field name in materialization type so that derived JSON matches c…
georgefst Aug 7, 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
1 change: 1 addition & 0 deletions packages/coln-compiler/src/Coln/Backend/IR.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ aeOptions :: AE.Options
aeOptions =
AE.defaultOptions
{ AE.allNullaryToStringTag = False
, AE.tagSingleConstructors = True
, AE.constructorTagModifier = \x -> fmap toLower (take 1 x) ++ (drop 1 x)
}

Expand Down
6 changes: 4 additions & 2 deletions packages/coln-flir-rs/src/ir/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ pub enum ColType {
}

#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(tag = "tag", rename_all = "camelCase")]
#[serde(rename_all = "camelCase")]
pub enum Materialization {
Recomputed,
Memoized,
Expand All @@ -90,7 +90,9 @@ pub enum IndexMethod {
#[serde(tag = "tag", rename_all = "camelCase")]
pub enum EntityVariant {
Table,
View(Materialization),
View {
materialization: Materialization,
},
Index {
method: IndexMethod,
columns: Vec<ColName>,
Expand Down
6 changes: 4 additions & 2 deletions packages/coln-store/src/commit/wire/root.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ fn read_column_entry(data: &[u8], pos: &mut usize) -> Result<ColumnEntry, CodecE
fn write_entity_variant(buf: &mut Vec<u8>, variant: &EntityVariant) -> Result<(), CodecError> {
match variant {
EntityVariant::Table => write_u8(buf, 0),
EntityVariant::View(materialization) => {
EntityVariant::View { materialization } => {
write_u8(buf, 1)?;
write_materialization(buf, materialization)
}
Expand All @@ -194,7 +194,9 @@ fn write_entity_variant(buf: &mut Vec<u8>, variant: &EntityVariant) -> Result<()
fn read_entity_variant(data: &[u8], pos: &mut usize) -> Result<EntityVariant, CodecError> {
match read_u8(data, pos, "entity variant tag")? {
0 => Ok(EntityVariant::Table),
1 => Ok(EntityVariant::View(read_materialization(data, pos)?)),
1 => Ok(EntityVariant::View {
materialization: read_materialization(data, pos)?,
}),
2 => {
let method = read_index_method(data, pos)?;
let column_count = commit_leb128::read_len(data, pos, "index column count")?;
Expand Down
Loading