sql search2 added
This commit is contained in:
filipriec
@@ -15,6 +15,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
"proto/tables_data.proto",
|
||||
"proto/table_script.proto",
|
||||
"proto/search.proto",
|
||||
"proto/search2.proto",
|
||||
],
|
||||
&["proto"],
|
||||
)?;
|
||||
|
||||
46
common/proto/search2.proto
Normal file
46
common/proto/search2.proto
Normal file
@@ -0,0 +1,46 @@
|
||||
// In common/proto/search2.proto
|
||||
syntax = "proto3";
|
||||
package komp_ac.search2;
|
||||
|
||||
service Search2 {
|
||||
rpc SearchTable(Search2Request) returns (Search2Response);
|
||||
}
|
||||
|
||||
message Search2Request {
|
||||
string profile_name = 1;
|
||||
string table_name = 2;
|
||||
repeated ColumnFilter column_filters = 3;
|
||||
optional string text_query = 4; // Optional fallback text search
|
||||
optional int32 limit = 5;
|
||||
optional string order_by = 6;
|
||||
optional bool order_desc = 7;
|
||||
}
|
||||
|
||||
message ColumnFilter {
|
||||
string column_name = 1;
|
||||
FilterType filter_type = 2;
|
||||
string value = 3;
|
||||
optional string value2 = 4; // For range queries
|
||||
}
|
||||
|
||||
enum FilterType {
|
||||
EQUALS = 0;
|
||||
CONTAINS = 1;
|
||||
STARTS_WITH = 2;
|
||||
ENDS_WITH = 3;
|
||||
RANGE = 4;
|
||||
GREATER_THAN = 5;
|
||||
LESS_THAN = 6;
|
||||
IS_NULL = 7;
|
||||
IS_NOT_NULL = 8;
|
||||
}
|
||||
|
||||
message Search2Response {
|
||||
message Hit {
|
||||
int64 id = 1;
|
||||
string content_json = 2; // No score - this is SQL-based
|
||||
optional string match_info = 3; // Info about which columns matched
|
||||
}
|
||||
repeated Hit hits = 1;
|
||||
int32 total_count = 2; // Total matching records (for pagination)
|
||||
}
|
||||
@@ -31,6 +31,9 @@ pub mod proto {
|
||||
pub mod search {
|
||||
include!("proto/komp_ac.search.rs");
|
||||
}
|
||||
pub mod search2 {
|
||||
include!("proto/komp_ac.search2.rs");
|
||||
}
|
||||
pub const FILE_DESCRIPTOR_SET: &[u8] =
|
||||
include_bytes!("proto/descriptor.bin");
|
||||
}
|
||||
|
||||
Binary file not shown.
394
common/src/proto/komp_ac.search2.rs
Normal file
394
common/src/proto/komp_ac.search2.rs
Normal file
@@ -0,0 +1,394 @@
|
||||
// This file is @generated by prost-build.
|
||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||
pub struct Search2Request {
|
||||
#[prost(string, tag = "1")]
|
||||
pub profile_name: ::prost::alloc::string::String,
|
||||
#[prost(string, tag = "2")]
|
||||
pub table_name: ::prost::alloc::string::String,
|
||||
#[prost(message, repeated, tag = "3")]
|
||||
pub column_filters: ::prost::alloc::vec::Vec<ColumnFilter>,
|
||||
/// Optional fallback text search
|
||||
#[prost(string, optional, tag = "4")]
|
||||
pub text_query: ::core::option::Option<::prost::alloc::string::String>,
|
||||
#[prost(int32, optional, tag = "5")]
|
||||
pub limit: ::core::option::Option<i32>,
|
||||
#[prost(string, optional, tag = "6")]
|
||||
pub order_by: ::core::option::Option<::prost::alloc::string::String>,
|
||||
#[prost(bool, optional, tag = "7")]
|
||||
pub order_desc: ::core::option::Option<bool>,
|
||||
}
|
||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||
pub struct ColumnFilter {
|
||||
#[prost(string, tag = "1")]
|
||||
pub column_name: ::prost::alloc::string::String,
|
||||
#[prost(enumeration = "FilterType", tag = "2")]
|
||||
pub filter_type: i32,
|
||||
#[prost(string, tag = "3")]
|
||||
pub value: ::prost::alloc::string::String,
|
||||
/// For range queries
|
||||
#[prost(string, optional, tag = "4")]
|
||||
pub value2: ::core::option::Option<::prost::alloc::string::String>,
|
||||
}
|
||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||
pub struct Search2Response {
|
||||
#[prost(message, repeated, tag = "1")]
|
||||
pub hits: ::prost::alloc::vec::Vec<search2_response::Hit>,
|
||||
/// Total matching records (for pagination)
|
||||
#[prost(int32, tag = "2")]
|
||||
pub total_count: i32,
|
||||
}
|
||||
/// Nested message and enum types in `Search2Response`.
|
||||
pub mod search2_response {
|
||||
#[derive(Clone, PartialEq, ::prost::Message)]
|
||||
pub struct Hit {
|
||||
#[prost(int64, tag = "1")]
|
||||
pub id: i64,
|
||||
/// No score - this is SQL-based
|
||||
#[prost(string, tag = "2")]
|
||||
pub content_json: ::prost::alloc::string::String,
|
||||
/// Info about which columns matched
|
||||
#[prost(string, optional, tag = "3")]
|
||||
pub match_info: ::core::option::Option<::prost::alloc::string::String>,
|
||||
}
|
||||
}
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
|
||||
#[repr(i32)]
|
||||
pub enum FilterType {
|
||||
Equals = 0,
|
||||
Contains = 1,
|
||||
StartsWith = 2,
|
||||
EndsWith = 3,
|
||||
Range = 4,
|
||||
GreaterThan = 5,
|
||||
LessThan = 6,
|
||||
IsNull = 7,
|
||||
IsNotNull = 8,
|
||||
}
|
||||
impl FilterType {
|
||||
/// String value of the enum field names used in the ProtoBuf definition.
|
||||
///
|
||||
/// The values are not transformed in any way and thus are considered stable
|
||||
/// (if the ProtoBuf definition does not change) and safe for programmatic use.
|
||||
pub fn as_str_name(&self) -> &'static str {
|
||||
match self {
|
||||
Self::Equals => "EQUALS",
|
||||
Self::Contains => "CONTAINS",
|
||||
Self::StartsWith => "STARTS_WITH",
|
||||
Self::EndsWith => "ENDS_WITH",
|
||||
Self::Range => "RANGE",
|
||||
Self::GreaterThan => "GREATER_THAN",
|
||||
Self::LessThan => "LESS_THAN",
|
||||
Self::IsNull => "IS_NULL",
|
||||
Self::IsNotNull => "IS_NOT_NULL",
|
||||
}
|
||||
}
|
||||
/// Creates an enum from field names used in the ProtoBuf definition.
|
||||
pub fn from_str_name(value: &str) -> ::core::option::Option<Self> {
|
||||
match value {
|
||||
"EQUALS" => Some(Self::Equals),
|
||||
"CONTAINS" => Some(Self::Contains),
|
||||
"STARTS_WITH" => Some(Self::StartsWith),
|
||||
"ENDS_WITH" => Some(Self::EndsWith),
|
||||
"RANGE" => Some(Self::Range),
|
||||
"GREATER_THAN" => Some(Self::GreaterThan),
|
||||
"LESS_THAN" => Some(Self::LessThan),
|
||||
"IS_NULL" => Some(Self::IsNull),
|
||||
"IS_NOT_NULL" => Some(Self::IsNotNull),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
/// Generated client implementations.
|
||||
pub mod search2_client {
|
||||
#![allow(
|
||||
unused_variables,
|
||||
dead_code,
|
||||
missing_docs,
|
||||
clippy::wildcard_imports,
|
||||
clippy::let_unit_value,
|
||||
)]
|
||||
use tonic::codegen::*;
|
||||
use tonic::codegen::http::Uri;
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct Search2Client<T> {
|
||||
inner: tonic::client::Grpc<T>,
|
||||
}
|
||||
impl Search2Client<tonic::transport::Channel> {
|
||||
/// Attempt to create a new client by connecting to a given endpoint.
|
||||
pub async fn connect<D>(dst: D) -> Result<Self, tonic::transport::Error>
|
||||
where
|
||||
D: TryInto<tonic::transport::Endpoint>,
|
||||
D::Error: Into<StdError>,
|
||||
{
|
||||
let conn = tonic::transport::Endpoint::new(dst)?.connect().await?;
|
||||
Ok(Self::new(conn))
|
||||
}
|
||||
}
|
||||
impl<T> Search2Client<T>
|
||||
where
|
||||
T: tonic::client::GrpcService<tonic::body::Body>,
|
||||
T::Error: Into<StdError>,
|
||||
T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
|
||||
<T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
|
||||
{
|
||||
pub fn new(inner: T) -> Self {
|
||||
let inner = tonic::client::Grpc::new(inner);
|
||||
Self { inner }
|
||||
}
|
||||
pub fn with_origin(inner: T, origin: Uri) -> Self {
|
||||
let inner = tonic::client::Grpc::with_origin(inner, origin);
|
||||
Self { inner }
|
||||
}
|
||||
pub fn with_interceptor<F>(
|
||||
inner: T,
|
||||
interceptor: F,
|
||||
) -> Search2Client<InterceptedService<T, F>>
|
||||
where
|
||||
F: tonic::service::Interceptor,
|
||||
T::ResponseBody: Default,
|
||||
T: tonic::codegen::Service<
|
||||
http::Request<tonic::body::Body>,
|
||||
Response = http::Response<
|
||||
<T as tonic::client::GrpcService<tonic::body::Body>>::ResponseBody,
|
||||
>,
|
||||
>,
|
||||
<T as tonic::codegen::Service<
|
||||
http::Request<tonic::body::Body>,
|
||||
>>::Error: Into<StdError> + std::marker::Send + std::marker::Sync,
|
||||
{
|
||||
Search2Client::new(InterceptedService::new(inner, interceptor))
|
||||
}
|
||||
/// Compress requests with the given encoding.
|
||||
///
|
||||
/// This requires the server to support it otherwise it might respond with an
|
||||
/// error.
|
||||
#[must_use]
|
||||
pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
|
||||
self.inner = self.inner.send_compressed(encoding);
|
||||
self
|
||||
}
|
||||
/// Enable decompressing responses.
|
||||
#[must_use]
|
||||
pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
|
||||
self.inner = self.inner.accept_compressed(encoding);
|
||||
self
|
||||
}
|
||||
/// Limits the maximum size of a decoded message.
|
||||
///
|
||||
/// Default: `4MB`
|
||||
#[must_use]
|
||||
pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
|
||||
self.inner = self.inner.max_decoding_message_size(limit);
|
||||
self
|
||||
}
|
||||
/// Limits the maximum size of an encoded message.
|
||||
///
|
||||
/// Default: `usize::MAX`
|
||||
#[must_use]
|
||||
pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
|
||||
self.inner = self.inner.max_encoding_message_size(limit);
|
||||
self
|
||||
}
|
||||
pub async fn search_table(
|
||||
&mut self,
|
||||
request: impl tonic::IntoRequest<super::Search2Request>,
|
||||
) -> std::result::Result<
|
||||
tonic::Response<super::Search2Response>,
|
||||
tonic::Status,
|
||||
> {
|
||||
self.inner
|
||||
.ready()
|
||||
.await
|
||||
.map_err(|e| {
|
||||
tonic::Status::unknown(
|
||||
format!("Service was not ready: {}", e.into()),
|
||||
)
|
||||
})?;
|
||||
let codec = tonic::codec::ProstCodec::default();
|
||||
let path = http::uri::PathAndQuery::from_static(
|
||||
"/komp_ac.search2.Search2/SearchTable",
|
||||
);
|
||||
let mut req = request.into_request();
|
||||
req.extensions_mut()
|
||||
.insert(GrpcMethod::new("komp_ac.search2.Search2", "SearchTable"));
|
||||
self.inner.unary(req, path, codec).await
|
||||
}
|
||||
}
|
||||
}
|
||||
/// Generated server implementations.
|
||||
pub mod search2_server {
|
||||
#![allow(
|
||||
unused_variables,
|
||||
dead_code,
|
||||
missing_docs,
|
||||
clippy::wildcard_imports,
|
||||
clippy::let_unit_value,
|
||||
)]
|
||||
use tonic::codegen::*;
|
||||
/// Generated trait containing gRPC methods that should be implemented for use with Search2Server.
|
||||
#[async_trait]
|
||||
pub trait Search2: std::marker::Send + std::marker::Sync + 'static {
|
||||
async fn search_table(
|
||||
&self,
|
||||
request: tonic::Request<super::Search2Request>,
|
||||
) -> std::result::Result<tonic::Response<super::Search2Response>, tonic::Status>;
|
||||
}
|
||||
#[derive(Debug)]
|
||||
pub struct Search2Server<T> {
|
||||
inner: Arc<T>,
|
||||
accept_compression_encodings: EnabledCompressionEncodings,
|
||||
send_compression_encodings: EnabledCompressionEncodings,
|
||||
max_decoding_message_size: Option<usize>,
|
||||
max_encoding_message_size: Option<usize>,
|
||||
}
|
||||
impl<T> Search2Server<T> {
|
||||
pub fn new(inner: T) -> Self {
|
||||
Self::from_arc(Arc::new(inner))
|
||||
}
|
||||
pub fn from_arc(inner: Arc<T>) -> Self {
|
||||
Self {
|
||||
inner,
|
||||
accept_compression_encodings: Default::default(),
|
||||
send_compression_encodings: Default::default(),
|
||||
max_decoding_message_size: None,
|
||||
max_encoding_message_size: None,
|
||||
}
|
||||
}
|
||||
pub fn with_interceptor<F>(
|
||||
inner: T,
|
||||
interceptor: F,
|
||||
) -> InterceptedService<Self, F>
|
||||
where
|
||||
F: tonic::service::Interceptor,
|
||||
{
|
||||
InterceptedService::new(Self::new(inner), interceptor)
|
||||
}
|
||||
/// Enable decompressing requests with the given encoding.
|
||||
#[must_use]
|
||||
pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self {
|
||||
self.accept_compression_encodings.enable(encoding);
|
||||
self
|
||||
}
|
||||
/// Compress responses with the given encoding, if the client supports it.
|
||||
#[must_use]
|
||||
pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self {
|
||||
self.send_compression_encodings.enable(encoding);
|
||||
self
|
||||
}
|
||||
/// Limits the maximum size of a decoded message.
|
||||
///
|
||||
/// Default: `4MB`
|
||||
#[must_use]
|
||||
pub fn max_decoding_message_size(mut self, limit: usize) -> Self {
|
||||
self.max_decoding_message_size = Some(limit);
|
||||
self
|
||||
}
|
||||
/// Limits the maximum size of an encoded message.
|
||||
///
|
||||
/// Default: `usize::MAX`
|
||||
#[must_use]
|
||||
pub fn max_encoding_message_size(mut self, limit: usize) -> Self {
|
||||
self.max_encoding_message_size = Some(limit);
|
||||
self
|
||||
}
|
||||
}
|
||||
impl<T, B> tonic::codegen::Service<http::Request<B>> for Search2Server<T>
|
||||
where
|
||||
T: Search2,
|
||||
B: Body + std::marker::Send + 'static,
|
||||
B::Error: Into<StdError> + std::marker::Send + 'static,
|
||||
{
|
||||
type Response = http::Response<tonic::body::Body>;
|
||||
type Error = std::convert::Infallible;
|
||||
type Future = BoxFuture<Self::Response, Self::Error>;
|
||||
fn poll_ready(
|
||||
&mut self,
|
||||
_cx: &mut Context<'_>,
|
||||
) -> Poll<std::result::Result<(), Self::Error>> {
|
||||
Poll::Ready(Ok(()))
|
||||
}
|
||||
fn call(&mut self, req: http::Request<B>) -> Self::Future {
|
||||
match req.uri().path() {
|
||||
"/komp_ac.search2.Search2/SearchTable" => {
|
||||
#[allow(non_camel_case_types)]
|
||||
struct SearchTableSvc<T: Search2>(pub Arc<T>);
|
||||
impl<T: Search2> tonic::server::UnaryService<super::Search2Request>
|
||||
for SearchTableSvc<T> {
|
||||
type Response = super::Search2Response;
|
||||
type Future = BoxFuture<
|
||||
tonic::Response<Self::Response>,
|
||||
tonic::Status,
|
||||
>;
|
||||
fn call(
|
||||
&mut self,
|
||||
request: tonic::Request<super::Search2Request>,
|
||||
) -> Self::Future {
|
||||
let inner = Arc::clone(&self.0);
|
||||
let fut = async move {
|
||||
<T as Search2>::search_table(&inner, request).await
|
||||
};
|
||||
Box::pin(fut)
|
||||
}
|
||||
}
|
||||
let accept_compression_encodings = self.accept_compression_encodings;
|
||||
let send_compression_encodings = self.send_compression_encodings;
|
||||
let max_decoding_message_size = self.max_decoding_message_size;
|
||||
let max_encoding_message_size = self.max_encoding_message_size;
|
||||
let inner = self.inner.clone();
|
||||
let fut = async move {
|
||||
let method = SearchTableSvc(inner);
|
||||
let codec = tonic::codec::ProstCodec::default();
|
||||
let mut grpc = tonic::server::Grpc::new(codec)
|
||||
.apply_compression_config(
|
||||
accept_compression_encodings,
|
||||
send_compression_encodings,
|
||||
)
|
||||
.apply_max_message_size_config(
|
||||
max_decoding_message_size,
|
||||
max_encoding_message_size,
|
||||
);
|
||||
let res = grpc.unary(method, req).await;
|
||||
Ok(res)
|
||||
};
|
||||
Box::pin(fut)
|
||||
}
|
||||
_ => {
|
||||
Box::pin(async move {
|
||||
let mut response = http::Response::new(
|
||||
tonic::body::Body::default(),
|
||||
);
|
||||
let headers = response.headers_mut();
|
||||
headers
|
||||
.insert(
|
||||
tonic::Status::GRPC_STATUS,
|
||||
(tonic::Code::Unimplemented as i32).into(),
|
||||
);
|
||||
headers
|
||||
.insert(
|
||||
http::header::CONTENT_TYPE,
|
||||
tonic::metadata::GRPC_CONTENT_TYPE,
|
||||
);
|
||||
Ok(response)
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
impl<T> Clone for Search2Server<T> {
|
||||
fn clone(&self) -> Self {
|
||||
let inner = self.inner.clone();
|
||||
Self {
|
||||
inner,
|
||||
accept_compression_encodings: self.accept_compression_encodings,
|
||||
send_compression_encodings: self.send_compression_encodings,
|
||||
max_decoding_message_size: self.max_decoding_message_size,
|
||||
max_encoding_message_size: self.max_encoding_message_size,
|
||||
}
|
||||
}
|
||||
}
|
||||
/// Generated gRPC service name
|
||||
pub const SERVICE_NAME: &str = "komp_ac.search2.Search2";
|
||||
impl<T> tonic::server::NamedService for Search2Server<T> {
|
||||
const NAME: &'static str = SERVICE_NAME;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user