Skip to content

backport: fix improper requestId retrieval in DAP #9257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 21, 2025
Merged

backport: fix improper requestId retrieval in DAP #9257

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions packages/cubejs-server-core/src/core/CompilerApi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,8 @@ export class CompilerApi {
return true;
}

async getCubesFromQuery(query) {
const sql = await this.getSql(query, { requestId: query.requestId });
async getCubesFromQuery(query, context) {
const sql = await this.getSql(query, { requestId: context.requestId });
return new Set(sql.memberNames.map(memberName => memberName.split('.')[0]));
}

Expand Down Expand Up @@ -243,7 +243,6 @@ export class CompilerApi {
const result = {
};
if (filter.memberReference) {
// TODO(maxim): will it work with different data types?
const evaluatedValues = cubeEvaluator.evaluateContextFunction(
cube,
filter.values,
Expand Down Expand Up @@ -273,14 +272,14 @@ export class CompilerApi {
* - combining cube and view filters with AND
*/
async applyRowLevelSecurity(query, context) {
const compilers = await this.getCompilers({ requestId: query.requestId });
const compilers = await this.getCompilers({ requestId: context.requestId });
const { cubeEvaluator } = compilers;

if (!cubeEvaluator.isRbacEnabled()) {
return query;
}

const queryCubes = await this.getCubesFromQuery(query);
const queryCubes = await this.getCubesFromQuery(query, context);

// We collect Cube and View filters separately because they have to be
// applied in "two layers": first Cube filters, then View filters on top
Expand Down
Loading