metadata: rename CassResultData -> CassResultMetadata

Author: muzarski

scylla-rust-wrapper/src/prepared.rs

@@ -5,7 +5,7 @@ use crate::{
     argconv::*,
     cass_error::CassError,
     cass_types::{get_column_type, CassDataType},
-    query_result::CassResultData,
+    query_result::CassResultMetadata,
     statement::{CassStatement, Statement},
     types::size_t,
 };
@@ -18,7 +18,7 @@ pub struct CassPrepared {
 
     // Cached result metadata. Arc'ed since we want to share it
     // with result metadata after execution.
-    pub result_metadata: Arc<CassResultData>,
+    pub result_metadata: Arc<CassResultMetadata>,
     pub statement: PreparedStatement,
 }
 
@@ -30,7 +30,7 @@ impl CassPrepared {
             .map(|col_spec| Arc::new(get_column_type(col_spec.typ())))
             .collect();
 
-        let result_metadata = Arc::new(CassResultData::from_column_specs(
+        let result_metadata = Arc::new(CassResultMetadata::from_column_specs(
             statement.get_result_set_col_specs(),
         ));
 

scylla-rust-wrapper/src/query_result.rs

@@ -18,18 +18,18 @@ use uuid::Uuid;
 
 pub struct CassResult {
     pub rows: Option<Vec<CassRow>>,
-    pub metadata: Arc<CassResultData>,
+    pub metadata: Arc<CassResultMetadata>,
     pub tracing_id: Option<Uuid>,
     pub paging_state_response: PagingStateResponse,
 }
 
 #[derive(Debug)]
-pub struct CassResultData {
+pub struct CassResultMetadata {
     pub col_specs: Vec<CassColumnSpec>,
 }
 
-impl CassResultData {
-    pub fn from_column_specs(col_specs: &[ColumnSpec<'_>]) -> CassResultData {
+impl CassResultMetadata {
+    pub fn from_column_specs(col_specs: &[ColumnSpec<'_>]) -> CassResultMetadata {
         let col_specs = col_specs
             .iter()
             .map(|col_spec| {
@@ -40,15 +40,15 @@ impl CassResultData {
             })
             .collect();
 
-        CassResultData { col_specs }
+        CassResultMetadata { col_specs }
     }
 }
 
 /// The lifetime of CassRow is bound to CassResult.
 /// It will be freed, when CassResult is freed.(see #[cass_result_free])
 pub struct CassRow {
     pub columns: Vec<CassValue>,
-    pub result_metadata: Arc<CassResultData>,
+    pub result_metadata: Arc<CassResultMetadata>,
 }
 
 pub enum Value {
@@ -1395,7 +1395,9 @@ mod tests {
         session::create_cass_rows_from_rows,
     };
 
-    use super::{cass_result_column_count, cass_result_column_type, CassResult, CassResultData};
+    use super::{
+        cass_result_column_count, cass_result_column_type, CassResult, CassResultMetadata,
+    };
 
     fn col_spec(name: &'static str, typ: ColumnType<'static>) -> ColumnSpec<'static> {
         ColumnSpec::borrowed(name, typ, TableSpec::borrowed("ks", "tbl"))
@@ -1405,7 +1407,7 @@ mod tests {
     const SECOND_COLUMN_NAME: &str = "varint_col";
     const THIRD_COLUMN_NAME: &str = "list_double_col";
     fn create_cass_rows_result() -> CassResult {
-        let metadata = Arc::new(CassResultData::from_column_specs(&[
+        let metadata = Arc::new(CassResultMetadata::from_column_specs(&[
             col_spec(FIRST_COLUMN_NAME, ColumnType::BigInt),
             col_spec(SECOND_COLUMN_NAME, ColumnType::Varint),
             col_spec(
@@ -1520,7 +1522,7 @@ mod tests {
     }
 
     fn create_non_rows_cass_result() -> CassResult {
-        let metadata = Arc::new(CassResultData::from_column_specs(&[]));
+        let metadata = Arc::new(CassResultMetadata::from_column_specs(&[]));
         CassResult {
             rows: None,
             metadata,

scylla-rust-wrapper/src/session.rs

@@ -10,7 +10,7 @@ use crate::metadata::create_table_metadata;
 use crate::metadata::{CassKeyspaceMeta, CassMaterializedViewMeta, CassSchemaMeta};
 use crate::prepared::CassPrepared;
 use crate::query_result::Value::{CollectionValue, RegularValue};
-use crate::query_result::{CassResult, CassResultData, CassRow, CassValue, Collection, Value};
+use crate::query_result::{CassResult, CassResultMetadata, CassRow, CassValue, Collection, Value};
 use crate::statement::CassStatement;
 use crate::statement::Statement;
 use crate::types::{cass_uint64_t, size_t};
@@ -220,7 +220,7 @@ pub unsafe extern "C" fn cass_session_execute_batch(
         match query_res {
             Ok(_result) => Ok(CassResultValue::QueryResult(Arc::new(CassResult {
                 rows: None,
-                metadata: Arc::new(CassResultData::from_column_specs(&[])),
+                metadata: Arc::new(CassResultMetadata::from_column_specs(&[])),
                 tracing_id: None,
                 paging_state_response: PagingStateResponse::NoMorePages,
             }))),
@@ -300,7 +300,7 @@ pub unsafe extern "C" fn cass_session_execute(
                 // Since `query.query` is consumed, we cannot match the statement
                 // after execution, to retrieve the cached metadata in case
                 // of prepared statements.
-                Option<Arc<CassResultData>>,
+                Option<Arc<CassResultMetadata>>,
             ),
             QueryError,
         >;
@@ -329,7 +329,7 @@ pub unsafe extern "C" fn cass_session_execute(
             }
             Statement::Prepared(prepared) => {
                 // Clone result metadata, so we don't need to construct it from scratch in
-                // `CassResultData::from_column_specs` - it requires a lot of allocations for complex types.
+                // `CassResultMetadata::from_column_specs` - it requires a lot of allocations for complex types.
                 let maybe_result_metadata = Some(Arc::clone(&prepared.result_metadata));
 
                 if paging_enabled {
@@ -358,7 +358,7 @@ pub unsafe extern "C" fn cass_session_execute(
                 // - Some(_) for prepared statements
                 // - None for unprepared statements
                 let metadata = maybe_result_metadata.unwrap_or_else(|| {
-                    Arc::new(CassResultData::from_column_specs(result.col_specs()))
+                    Arc::new(CassResultMetadata::from_column_specs(result.col_specs()))
                 });
                 let cass_rows = result
                     .rows
@@ -386,7 +386,7 @@ pub unsafe extern "C" fn cass_session_execute(
 
 pub(crate) fn create_cass_rows_from_rows(
     rows: Vec<Row>,
-    metadata: &Arc<CassResultData>,
+    metadata: &Arc<CassResultMetadata>,
 ) -> Vec<CassRow> {
     rows.into_iter()
         .map(|r| CassRow {
@@ -396,7 +396,7 @@ pub(crate) fn create_cass_rows_from_rows(
         .collect()
 }
 
-fn create_cass_row_columns(row: Row, metadata: &Arc<CassResultData>) -> Vec<CassValue> {
+fn create_cass_row_columns(row: Row, metadata: &Arc<CassResultMetadata>) -> Vec<CassValue> {
     row.columns
         .into_iter()
         .zip(metadata.col_specs.iter())