fix(elasticsearch): correct totals and CAT JSON output

This commit is contained in:
onenewcode authored and GitHub committed 2026-07-23 17:06:23 +08:00
1 parent a8e5e8d8f9
commit f07509b5ad
27 files changed
+855 -70

No files matched your search

+4
View File
@@ -476,6 +476,10 @@ async fn main() {
.route("/document-store/list-databases", post(routes::document_store::list_databases))
.route("/document-store/list-collections", post(routes::document_store::list_collections))
.route("/document-store/find-documents", post(routes::document_store::find_documents))
.route(
"/document-store/elasticsearch-count-documents",
post(routes::document_store::elasticsearch_count_documents),
)
.route("/document-store/list-gridfs-buckets", post(routes::document_store::list_gridfs_buckets))
.route("/document-store/create-gridfs-bucket", post(routes::document_store::create_gridfs_bucket))
.route("/document-store/delete-gridfs-bucket", post(routes::document_store::delete_gridfs_bucket))
+28 -1
View File
@@ -69,6 +69,15 @@ pub struct DocumentFindRequest {
pub execution_id: Option<String>,
}
#[derive(Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct ElasticsearchCountDocumentsRequest {
pub connection_id: String,
pub index: String,
pub filter: Option<String>,
pub execution_id: Option<String>,
}
#[derive(Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct DocumentInsertRequest {
@@ -167,7 +176,7 @@ pub async fn list_collections(
pub async fn find_documents(
State(state): State<Arc<WebState>>,
Json(req): Json<DocumentFindRequest>,
) -> Result<Json<dbx_core::db::mongo_driver::MongoDocumentResult>, AppError> {
) -> Result<Json<dbx_core::db::document_result::DocumentQueryResult>, AppError> {
let result = run_cancellable(
&state,
req.execution_id,
@@ -187,6 +196,24 @@ pub async fn find_documents(
Ok(Json(result))
}
pub async fn elasticsearch_count_documents(
State(state): State<Arc<WebState>>,
Json(req): Json<ElasticsearchCountDocumentsRequest>,
) -> Result<Json<u64>, AppError> {
let result = run_cancellable(
&state,
req.execution_id,
dbx_core::document_ops::count_elasticsearch_documents_core(
&state.app,
&req.connection_id,
&req.index,
req.filter.as_deref(),
),
)
.await?;
Ok(Json(result))
}
pub async fn insert_document(
State(state): State<Arc<WebState>>,
Json(req): Json<DocumentInsertRequest>,