Rename Definition -> DefinitionKey, StructValueType -> StructDefinition

vaticle · May 29, 2024 · 92985c1 · 92985c1
1 parent 212c82e
commit 92985c1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/encoding/graph/definition/definition.rs → encoding/graph/definition/definition_key.rs b/encoding/graph/definition/definition.rs → encoding/graph/definition/definition_key.rs
@@ -14,11 +14,11 @@ use crate::{AsBytes, EncodingKeyspace, Keyable, Prefixed};
 use crate::layout::prefix::{Prefix, PrefixID};
 
 #[derive(Clone, Debug, PartialEq, Eq, Hash, Ord, PartialOrd)]
-pub struct Definition<'a> {
+pub struct DefinitionKey<'a> {
     bytes: Bytes<'a, { BUFFER_KEY_INLINE }>,
 }
 
-impl<'a> Definition<'a> {
+impl<'a> DefinitionKey<'a> {
     pub(crate) const KEYSPACE: EncodingKeyspace = EncodingKeyspace::Schema;
     pub const FIXED_WIDTH_ENCODING: bool = true;
 
@@ -39,7 +39,7 @@ impl<'a> Definition<'a> {
     }
 }
 
-impl<'a> AsBytes<'a, BUFFER_KEY_INLINE> for Definition<'a> {
+impl<'a> AsBytes<'a, BUFFER_KEY_INLINE> for DefinitionKey<'a> {
     fn bytes(&'a self) -> ByteReference<'a> {
         self.bytes.as_reference()
     }
@@ -49,13 +49,13 @@ impl<'a> AsBytes<'a, BUFFER_KEY_INLINE> for Definition<'a> {
     }
 }
 
-impl<'a> Keyable<'a, BUFFER_KEY_INLINE> for Definition<'a> {
+impl<'a> Keyable<'a, BUFFER_KEY_INLINE> for DefinitionKey<'a> {
     fn keyspace(&self) -> EncodingKeyspace {
         Self::KEYSPACE
     }
 }
 
-impl<'a> Prefixed<'a, BUFFER_KEY_INLINE> for Definition<'a> {}
+impl<'a> Prefixed<'a, BUFFER_KEY_INLINE> for DefinitionKey<'a> {}
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub struct DefinitionID {

diff --git a/encoding/graph/definition/mod.rs b/encoding/graph/definition/mod.rs
@@ -5,4 +5,4 @@
  */
 
 pub mod r#struct;
-pub(crate) mod definition;
+pub(crate) mod definition_key;
diff --git a/encoding/graph/definition/struct.rs b/encoding/graph/definition/struct.rs
@@ -13,14 +13,14 @@ use crate::value::value_type::ValueType;
 
 /// Restrictions: maximum number fields is StructFieldNumber::MAX
 #[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq)]
-pub struct StructValueType {
+pub struct StructDefinition {
     name: String,
-    fields: Vec<StructField>,
+    fields: Vec<StructDefinitionField>,
     field_names: HashMap<String, StructFieldNumber>,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq)]
-pub struct StructField {
+pub struct StructDefinitionField {
     optional: bool,
     value_type: ValueType,
     index: StructFieldNumber,

diff --git a/encoding/value/struct_value.rs b/encoding/value/struct_value.rs
@@ -6,14 +6,14 @@
 
 
 use std::collections::HashMap;
-use crate::graph::definition::definition::Definition;
+use crate::graph::definition::definition_key::DefinitionKey;
 
 use crate::graph::definition::r#struct::StructFieldNumber;
 use crate::value::ValueEncodable;
 
 #[derive(Debug)]
 pub struct StructValue {
-    definition: Definition<'static>,
+    definition: DefinitionKey<'static>,
 
     // a map allows empty fields to not be recorded at all
     fields: HashMap<StructFieldNumber, Box<dyn ValueEncodable>>