Skip to content

Commit 9b170ba

Browse files
committed
[ntuple] remove unused kReference field type
1 parent 501b256 commit 9b170ba

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

tree/ntuple/v7/doc/specifications.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -343,9 +343,8 @@ The structural role of the field can have on of the following values
343343
| 0x00 | Leaf field in the schema tree |
344344
| 0x01 | The field is the mother of a collection (e.g., a vector) |
345345
| 0x02 | The field is the mother of a record (e.g., a struct) |
346-
| 0x03 | The field is the mother of a variant (e.g., a union) |
347-
| 0x04 | The field is a reference (pointer), TODO |
348-
| 0x05 | The field represents an unsplit object serialized with the ROOT streamer |
346+
| 0x03 | The field is the mother of a variant |
347+
| 0x04 | The field represents an unsplit object serialized with the ROOT streamer |
349348

350349

351350
#### Column Description

tree/ntuple/v7/inc/ROOT/RNTupleUtil.hxx

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ enum ENTupleStructure {
4040
kCollection,
4141
kRecord,
4242
kVariant,
43-
kReference, // unimplemented so far
4443
kUnsplit,
4544
kInvalid,
4645
};

tree/ntuple/v7/src/RNTupleSerialize.cxx

+2-4
Original file line numberDiff line numberDiff line change
@@ -582,8 +582,7 @@ std::uint16_t ROOT::Experimental::Internal::RNTupleSerializer::SerializeFieldStr
582582
case ENTupleStructure::kCollection: return SerializeUInt16(0x01, buffer);
583583
case ENTupleStructure::kRecord: return SerializeUInt16(0x02, buffer);
584584
case ENTupleStructure::kVariant: return SerializeUInt16(0x03, buffer);
585-
case ENTupleStructure::kReference: return SerializeUInt16(0x04, buffer);
586-
case ENTupleStructure::kUnsplit: return SerializeUInt16(0x05, buffer);
585+
case ENTupleStructure::kUnsplit: return SerializeUInt16(0x04, buffer);
587586
default: throw RException(R__FAIL("ROOT bug: unexpected field structure type"));
588587
}
589588
}
@@ -600,8 +599,7 @@ RResult<std::uint16_t> ROOT::Experimental::Internal::RNTupleSerializer::Deserial
600599
case 0x01: structure = ENTupleStructure::kCollection; break;
601600
case 0x02: structure = ENTupleStructure::kRecord; break;
602601
case 0x03: structure = ENTupleStructure::kVariant; break;
603-
case 0x04: structure = ENTupleStructure::kReference; break;
604-
case 0x05: structure = ENTupleStructure::kUnsplit; break;
602+
case 0x04: structure = ENTupleStructure::kUnsplit; break;
605603
default: return R__FAIL("unexpected on-disk field structure value");
606604
}
607605
return result;

0 commit comments

Comments
 (0)