update grpc-proto to 22.2 with null type, empty list, etc.

Author: rekby

ydb-grpc/build.rs

@@ -1,8 +1,10 @@
-use ydb_grpc_helpers::ProtoModule;
 use std::cmp::Ordering;
 use std::collections::HashMap;
-use std::fs;
-use std::io::{Read, Write};
+use std::fs::OpenOptions;
+use std::io::{Read, Seek, SeekFrom, Write};
+use std::{fs, io};
+use walkdir::WalkDir;
+use ydb_grpc_helpers::ProtoModule;
 
 const COMPILE_DIRS: &[(&str, &str)] = &[
     // src, dst
@@ -20,12 +22,13 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     if std::env::var("CARGO_FEATURE_REGENERATE_SOURCES").unwrap_or("0".into()) != "1" {
         println!("skip regenerate sources");
-        return Ok(())
+        return Ok(());
     }
 
     for (src, dst) in COMPILE_DIRS {
         clean_dst_dir(dst)?;
         compile_proto_dir(src, INCLUDE_DIRS, dst)?;
+        rewrite_generated_files(dst)?;
         generate_mod_file(dst)?;
     }
 
@@ -59,6 +62,46 @@ fn compile_files(files: &[&str], include_dirs: &[&str], dst_dir: &str) {
         .expect("failed to compile protobuf");
 }
 
+fn rewrite_generated_file(fpath: &std::path::Path) -> io::Result<()> {
+    println!("rewrite file: '{}'", fpath.to_str().unwrap_or("<empty>"));
+    let mut f = OpenOptions::new().read(true).write(true).open(fpath)?;
+    let mut contents = String::new();
+    let _ = f.read_to_string(&mut contents).unwrap();
+
+    let lines: Vec<&str> = contents
+        .split_terminator("\n")
+        .filter(|line| line.trim() != "///")
+        .collect();
+
+    println!("1");
+    let contents = lines.join("\n");
+    f.seek(SeekFrom::Start(0))?;
+    f.set_len(0)?;
+    println!("2");
+    f.write_all(contents.as_bytes())?;
+    println!("3");
+    return Ok(());
+}
+
+fn rewrite_generated_files(dir: &str) -> io::Result<()> {
+    for item in WalkDir::new(dir) {
+        let item = item?;
+        let item_path = item.path().to_str().unwrap_or("<empty>");
+        if !item.path().ends_with(".rs") {
+            println!("skip rewrite file: '{}'", item_path)
+        }
+        if !item.metadata()?.is_file() {
+            println!("skip not file: '{}'", item_path);
+            continue;
+        }
+        println!("rewrite file '{}'", item_path);
+
+        rewrite_generated_file(item.path())?;
+    }
+
+    return Ok(());
+}
+
 fn compile_proto_dir(
     src_dir: &str,
     include_dirs: &[&str],

ydb-grpc/src/generated/google.protobuf.rs

@@ -1 +0,0 @@
-

ydb-grpc/src/generated/mod.rs

@@ -29,6 +29,9 @@ pub mod ydb {
       include!("ydb.export.v1.rs");
     }
   }
+  pub mod formats {
+    include!("ydb.formats.rs");
+  }
   pub mod import {
     include!("ydb.import.rs");
     pub mod v1 {
@@ -52,6 +55,14 @@ pub mod ydb {
   pub mod operations {
     include!("ydb.operations.rs");
   }
+  pub mod pers_queue {
+    pub mod cluster_discovery {
+      include!("ydb.pers_queue.cluster_discovery.rs");
+    }
+    pub mod v1 {
+      include!("ydb.pers_queue.v1.rs");
+    }
+  }
   pub mod rate_limiter {
     include!("ydb.rate_limiter.rs");
     pub mod v1 {

ydb-grpc/src/generated/ydb.cms.rs

@@ -68,13 +68,6 @@ pub struct DatabaseOptions {
     #[prost(uint32, tag = "3")]
     pub plan_resolution: u32,
 }
-#[derive(Clone, PartialEq, ::prost::Message)]
-pub struct Attribute {
-    #[prost(string, tag = "1")]
-    pub name: ::prost::alloc::string::String,
-    #[prost(string, tag = "2")]
-    pub value: ::prost::alloc::string::String,
-}
 /// A set of quotas for schema operations
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct SchemaOperationQuotas {
@@ -110,6 +103,13 @@ pub struct DatabaseQuotas {
     /// A maximum count of shards in all data streams.
     #[prost(uint64, tag = "3")]
     pub data_stream_shards_quota: u64,
+    /// A maximum storage that will be reserved for all data stream shards.
+    #[prost(uint64, tag = "5")]
+    pub data_stream_reserved_storage_quota: u64,
+    /// A minimum value of `TtlSettings.run_interval_seconds` that can be specified.
+    /// Default is 1800 (15 minutes).
+    #[prost(uint32, tag = "4")]
+    pub ttl_min_run_internal_seconds: u32,
 }
 /// Request to create a new database. For successfull creation
 /// specified database shouldn't exist. At least one storage
@@ -125,8 +125,9 @@ pub struct CreateDatabaseRequest {
     #[prost(message, optional, tag = "4")]
     pub options: ::core::option::Option<DatabaseOptions>,
     /// Attach attributes to database.
-    #[prost(message, repeated, tag = "5")]
-    pub attributes: ::prost::alloc::vec::Vec<Attribute>,
+    #[prost(map = "string, string", tag = "5")]
+    pub attributes:
+        ::std::collections::HashMap<::prost::alloc::string::String, ::prost::alloc::string::String>,
     /// Optional quotas for schema operations
     #[prost(message, optional, tag = "8")]
     pub schema_operation_quotas: ::core::option::Option<SchemaOperationQuotas>,
@@ -261,6 +262,10 @@ pub struct AlterDatabaseRequest {
     /// Change quotas for the database
     #[prost(message, optional, tag = "11")]
     pub database_quotas: ::core::option::Option<DatabaseQuotas>,
+    /// Alter attributes. Leave the value blank to drop an attribute.
+    #[prost(map = "string, string", tag = "12")]
+    pub alter_attributes:
+        ::std::collections::HashMap<::prost::alloc::string::String, ::prost::alloc::string::String>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct AlterDatabaseResponse {
@@ -345,4 +350,4 @@ pub struct DescribeDatabaseOptionsResult {
     pub availability_zones: ::prost::alloc::vec::Vec<AvailabilityZoneDescription>,
     #[prost(message, repeated, tag = "3")]
     pub computational_units: ::prost::alloc::vec::Vec<ComputationalUnitDescription>,
-}
+}

ydb-grpc/src/generated/ydb.cms.v1.rs

@@ -156,4 +156,4 @@ pub mod cms_service_client {
             self.inner.unary(request.into_request(), path, codec).await
         }
     }
-}
+}

ydb-grpc/src/generated/ydb.coordination.rs

@@ -1,6 +1,5 @@
 ///*
 /// Stub for unsupported messages
-///
 /// Intentionally empty
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Unsupported {}
@@ -14,7 +13,7 @@ pub struct Config {
     /// Period in milliseconds for self-checks (default 1 second)
     #[prost(uint32, tag = "2")]
     pub self_check_period_millis: u32,
-    /// Grace period for sessions on master change (default 10 seconds)
+    /// Grace period for sessions on leader change (default 10 seconds)
     #[prost(uint32, tag = "3")]
     pub session_grace_period_millis: u32,
     /// Concistency mode for read operations
@@ -137,15 +136,12 @@ pub mod session_request {
     }
     ///*
     /// Last message used to cleanly stop session before its timeout expires
-    ///
     /// nothing
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct SessionStop {}
     ///*
     /// Used to acquire a semaphore
-    ///
     /// WARNING: a single session cannot acquire the same semaphore multiple times
-    ///
     /// Later requests override previous operations with the same semaphore,
     /// e.g. to reduce acquired count, change timeout or attached data.
     #[derive(Clone, PartialEq, ::prost::Message)]
@@ -173,9 +169,7 @@ pub mod session_request {
     }
     ///*
     /// Used to release a semaphore
-    ///
     /// WARNING: a single session cannot release the same semaphore multiple times
-    ///
     /// The release operation will either remove current session from waiters
     /// queue or release an already owned semaphore.
     #[derive(Clone, PartialEq, ::prost::Message)]
@@ -189,7 +183,6 @@ pub mod session_request {
     }
     ///*
     /// Used to describe semaphores and watch them for changes
-    ///
     /// WARNING: a describe operation will cancel previous watches on the same semaphore
     #[derive(Clone, PartialEq, ::prost::Message)]
     pub struct DescribeSemaphore {
@@ -539,7 +532,7 @@ pub struct DescribeNodeResult {
 pub enum ConsistencyMode {
     /// The default or current value
     Unset = 0,
-    /// Strict mode makes sure operations may only complete on current master
+    /// Strict mode makes sure operations may only complete on current leader
     Strict = 1,
     /// Relaxed mode allows operations to complete on stale masters
     Relaxed = 2,
@@ -555,4 +548,4 @@ pub enum RateLimiterCountersMode {
     Aggregated = 1,
     /// Counters on every resource
     Detailed = 2,
-}
+}

ydb-grpc/src/generated/ydb.coordination.v1.rs

@@ -156,4 +156,4 @@ pub mod coordination_service_client {
             self.inner.unary(request.into_request(), path, codec).await
         }
     }
-}
+}

ydb-grpc/src/generated/ydb.discovery.rs

@@ -7,6 +7,7 @@ pub struct ListEndpointsRequest {
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct EndpointInfo {
+    /// This is an address (usually fqdn) and port of this node's grpc endpoint
     #[prost(string, tag = "1")]
     pub address: ::prost::alloc::string::String,
     #[prost(uint32, tag = "2")]
@@ -21,6 +22,18 @@ pub struct EndpointInfo {
     pub location: ::prost::alloc::string::String,
     #[prost(uint32, tag = "7")]
     pub node_id: u32,
+    /// Optional ipv4 and/or ipv6 addresses of the endpoint, which clients may
+    /// use instead of a dns name in the address field.
+    #[prost(string, repeated, tag = "8")]
+    pub ip_v4: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
+    #[prost(string, repeated, tag = "9")]
+    pub ip_v6: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
+    /// Optional value for grpc.ssl_target_name_override option that must be
+    /// used when connecting to this endpoint. This may be specified when an ssl
+    /// endpoint is using certificate chain valid for a balancer hostname, and
+    /// not this specific node hostname.
+    #[prost(string, tag = "10")]
+    pub ssl_target_name_override: ::prost::alloc::string::String,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ListEndpointsResult {
@@ -53,4 +66,4 @@ pub struct WhoAmIResult {
 pub struct WhoAmIResponse {
     #[prost(message, optional, tag = "1")]
     pub operation: ::core::option::Option<super::operations::Operation>,
-}
+}

ydb-grpc/src/generated/ydb.discovery.v1.rs

@@ -90,4 +90,4 @@ pub mod discovery_service_client {
             self.inner.unary(request.into_request(), path, codec).await
         }
     }
-}
+}

ydb-grpc/src/generated/ydb.export.rs

@@ -161,4 +161,4 @@ pub struct ExportToS3Response {
     /// operation.metadata = ExportToS3Metadata
     #[prost(message, optional, tag = "1")]
     pub operation: ::core::option::Option<super::operations::Operation>,
-}
+}