use buf

liufuyang · Dec 4, 2024 · 1d5b588 · 1d5b588
1 parent 1f1d7aa
commit 1d5b588
Show file tree

Hide file tree

Showing 32 changed files with 89,360 additions and 5,250 deletions.
diff --git a/bigtable_rs/Cargo.toml b/bigtable_rs/Cargo.toml
@@ -12,19 +12,20 @@ readme = "../README.md"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-# tonic, prost, and prost-types are need for build generated rs files
+bytes = "1.9.0"
 http = "1.1.0"
 hyper-util = { version = "0.1.7", features = ["tokio"] }
 tokio = { version = "1.25.0", features = ["rt-multi-thread"] }
 tonic = { version = "0.12.2", features = ["tls", "transport"] }
 tower = { version = "0.5.1", features = ["util"] }
 prost = "0.13.1"
-prost-types = "0.13.1"
-prost-wkt = { version = "0.6.0" }
-prost-wkt-types = { version = "0.6.0" }
+#prost-types = "0.13.1"
+#prost-wkt = { version = "0.6.0" }
+#prost-wkt-types = { version = "0.6.0" }
 serde = { version = "1.0.192", features = ["derive"] }
-serde_with = { version = "3.4.0", features = ["base64"] }
-# end of above part
+serde_with = { version = "3.11.0", features = ["base64"] }
+pbjson = "0.7"
+pbjson-types = "0.7"
 futures-util = "0.3.31"
 gcp_auth = "0.12.2"
 log = "0.4.20"
@@ -33,7 +34,7 @@ thiserror = "2.0.3"
 [dev-dependencies]
 env_logger = "0.11.1"
 serde_json = "1.0.85"
-serde_path_to_error = "0.1.8"
+serde_path_to_error = "0.1.16"
 
 [build-dependencies]
 tonic-build = { version = "0.12.2", features = ["cleanup-markdown"] }

diff --git a/bigtable_rs/src/bigtable/read_rows.rs b/bigtable_rs/src/bigtable/read_rows.rs
@@ -143,8 +143,11 @@ pub fn decode_read_rows_response_to_vec(
             // Close up the cell
             if cell_name.is_some() {
                 let row_cell = RowCell {
-                    family_name: cell_family_name.clone().unwrap_or("".to_owned()),
-                    qualifier: cell_name.clone().unwrap(), // checked above
+                    family_name: cell_family_name
+                        .clone()
+                        .map(|n| n.value)
+                        .unwrap_or("".to_owned()),
+                    qualifier: cell_name.clone().unwrap().value.to_vec(), // checked above
                     value: cell_value,
                     timestamp_micros: cell_timestamp,
                     labels: cell_labels,

diff --git a/bigtable_rs/src/google.rs b/bigtable_rs/src/google.rs