Skip to content

Commit 02b037a

Browse files
committed
remove not needed anymore native.transformQueryData
1 parent 429eab5 commit 02b037a

File tree

3 files changed

+1
-58
lines changed

3 files changed

+1
-58
lines changed

packages/cubejs-api-gateway/src/gateway.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ import {
1414
getFinalQueryResult,
1515
getFinalQueryResultArray,
1616
getFinalQueryResultMulti,
17-
transformData as transformDataNative,
18-
TransformDataResponse
1917
} from '@cubejs-backend/native';
2018
import type {
2119
Application as ExpressApplication,

packages/cubejs-backend-native/js/index.ts

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -107,17 +107,6 @@ export type DBResponsePrimitive =
107107
number |
108108
string;
109109

110-
export type TransformDataResponse = {
111-
members: string[],
112-
dataset: DBResponsePrimitive[][]
113-
} | {
114-
[member: string]: DBResponsePrimitive
115-
}[];
116-
117-
export type TransformDataResponseNative = {
118-
result: string
119-
};
120-
121110
let loadedNative: any = null;
122111

123112
export function loadNative() {
@@ -387,12 +376,6 @@ export const getCubestoreResult = (ref: CubeStoreResultWrapper): ResultRow[] =>
387376
return native.getCubestoreResult(ref);
388377
};
389378

390-
export const transformData = (transformDataObj: Object, rows: any): Promise<TransformDataResponseNative> => {
391-
const native = loadNative();
392-
393-
return native.transformQueryData(transformDataObj, rows);
394-
};
395-
396379
export const getFinalQueryResult = (transformDataObj: Object, rows: any, resultData: Object): Promise<ArrayBuffer> => {
397380
const native = loadNative();
398381

packages/cubejs-backend-native/src/orchestrator.rs

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
use crate::node_obj_deserializer::JsValueDeserializer;
22
use cubeorchestrator::query_message_parser::QueryResult;
33
use cubeorchestrator::query_result_transform::{
4-
get_final_cubestore_result_array, RequestResultArray, RequestResultData,
5-
RequestResultDataMulti, TransformedData,
4+
get_final_cubestore_result_array, RequestResultArray, RequestResultData, RequestResultDataMulti,
65
};
76
use cubeorchestrator::transport::{JsRawData, TransformDataRequest};
87
use neon::context::{Context, FunctionContext, ModuleContext};
@@ -21,7 +20,6 @@ pub fn register_module(cx: &mut ModuleContext) -> NeonResult<()> {
2120
parse_cubestore_result_message,
2221
)?;
2322
cx.export_function("getCubestoreResult", get_cubestore_result)?;
24-
cx.export_function("transformQueryData", transform_query_data)?;
2523
cx.export_function("getFinalQueryResult", final_query_result)?;
2624
cx.export_function("getFinalQueryResultMulti", final_query_result_multi)?;
2725
cx.export_function("getFinalQueryResultArray", final_query_result_array)?;
@@ -110,42 +108,6 @@ pub fn get_cubestore_result(mut cx: FunctionContext) -> JsResult<JsValue> {
110108
Ok(js_array.upcast())
111109
}
112110

113-
pub fn transform_query_data(mut cx: FunctionContext) -> JsResult<JsPromise> {
114-
let transform_data_js_object = cx.argument::<JsValue>(0)?;
115-
let deserializer = JsValueDeserializer::new(&mut cx, transform_data_js_object);
116-
117-
let request_data: TransformDataRequest = match Deserialize::deserialize(deserializer) {
118-
Ok(data) => data,
119-
Err(err) => return cx.throw_error(err.to_string()),
120-
};
121-
122-
let cube_store_result = cx.argument::<JsBox<Arc<QueryResult>>>(1)?;
123-
let cube_store_result = Arc::clone(&cube_store_result);
124-
125-
let promise = cx
126-
.task(move || {
127-
let transformed = TransformedData::transform(&request_data, &cube_store_result)?;
128-
129-
match serde_json::to_string(&transformed) {
130-
Ok(json) => Ok(json),
131-
Err(err) => Err(anyhow::Error::from(err)),
132-
}
133-
})
134-
.promise(move |mut cx, json_data| match json_data {
135-
Ok(json_data) => {
136-
let js_string = cx.string(json_data);
137-
138-
let js_result = cx.empty_object();
139-
js_result.set(&mut cx, "result", js_string)?;
140-
141-
Ok(js_result)
142-
}
143-
Err(err) => cx.throw_error(err.to_string()),
144-
});
145-
146-
Ok(promise)
147-
}
148-
149111
pub fn final_query_result(mut cx: FunctionContext) -> JsResult<JsPromise> {
150112
let transform_data_js_object = cx.argument::<JsValue>(0)?;
151113
let deserializer = JsValueDeserializer::new(&mut cx, transform_data_js_object);

0 commit comments

Comments
 (0)