Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/client/src/reducers/evaluationReducers/treeReducer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const evaluatedTreeReducer = createImmerReducer(initialState, {
}>,
) => {
const { dataTree, updates } = action.payload;
if (Object.keys(dataTree).length) {
if (updates.length === 0) {
return dataTree;
}
for (const update of updates) {
Expand Down
6 changes: 5 additions & 1 deletion app/client/src/sagas/EvaluationsSaga.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import {
} from "./PostEvaluationSagas";
import { getAppMode } from "selectors/applicationSelectors";
import { APP_MODE } from "entities/App";
import { diff } from "deep-diff";

let widgetTypeConfigMap: WidgetTypeConfigMap;

Expand Down Expand Up @@ -71,14 +72,17 @@ function* evaluateTreeSaga(
evaluationOrder,
logs,
unEvalUpdates,
updates,
} = workerResponse;
PerformanceTracker.stopAsyncTracking(
PerformanceTransactionName.DATA_TREE_EVALUATION,
);
PerformanceTracker.startAsyncTracking(
PerformanceTransactionName.SET_EVALUATED_TREE,
);
const oldDataTree = yield select(getDataTree);

const updates = diff(oldDataTree, dataTree) || [];

yield put(setEvaluatedTree(dataTree, updates));
PerformanceTracker.stopAsyncTracking(
PerformanceTransactionName.SET_EVALUATED_TREE,
Expand Down
6 changes: 0 additions & 6 deletions app/client/src/workers/DataTreeEvaluator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,9 @@ export default class DataTreeEvaluator {
updateDataTree(
unEvalTree: DataTree,
): {
updates: Diff<DataTree, DataTree>[];
evaluationOrder: string[];
unEvalUpdates: DataTreeDiff[];
} {
const oldEvalTree = _.cloneDeep(this.evalTree);
const totalStart = performance.now();
// Calculate diff
const diffCheckTimeStart = performance.now();
Expand All @@ -136,7 +134,6 @@ export default class DataTreeEvaluator {
// We want to check if no diffs are present and bail out early
if (differences.length === 0) {
return {
updates: [],
evaluationOrder: [],
unEvalUpdates: [],
};
Expand Down Expand Up @@ -197,8 +194,6 @@ export default class DataTreeEvaluator {

const evalTreeDiffsStart = performance.now();

const evaluationChanges = diff(oldEvalTree, newEvalTree);

const evalTreeDiffsStop = performance.now();

const totalEnd = performance.now();
Expand All @@ -220,7 +215,6 @@ export default class DataTreeEvaluator {
};
this.logs.push({ timeTakenForSubTreeEval });
return {
updates: evaluationChanges || [],
evaluationOrder,
unEvalUpdates: translatedDiffs,
};
Expand Down
5 changes: 1 addition & 4 deletions app/client/src/workers/evaluation.worker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import {
validateWidgetProperty,
} from "./evaluationUtils";
import DataTreeEvaluator from "workers/DataTreeEvaluator";
import { Diff } from "deep-diff";

const ctx: Worker = self as any;

Expand Down Expand Up @@ -51,7 +50,6 @@ ctx.addEventListener(
let errors: EvalError[] = [];
let logs: any[] = [];
let dependencies: DependencyMap = {};
let updates: Diff<DataTree, DataTree>[] = [];
let evaluationOrder: string[] = [];
let unEvalUpdates: DataTreeDiff[] = [];
try {
Expand All @@ -65,9 +63,9 @@ ctx.addEventListener(
} else {
dataTree = {};
const updateResponse = dataTreeEvaluator.updateDataTree(unevalTree);
updates = JSON.parse(JSON.stringify(updateResponse.updates));
evaluationOrder = updateResponse.evaluationOrder;
unEvalUpdates = updateResponse.unEvalUpdates;
dataTree = JSON.parse(JSON.stringify(dataTreeEvaluator.evalTree));
}
dependencies = dataTreeEvaluator.inverseDependencyMap;
errors = dataTreeEvaluator.errors;
Expand Down Expand Up @@ -95,7 +93,6 @@ ctx.addEventListener(
errors,
evaluationOrder,
logs,
updates,
unEvalUpdates,
};
}
Expand Down