@cubejs-backend/schema-compiler 1.2.32 → 1.2.33
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/adapter/BaseDimension.d.ts +0 -1
- package/dist/src/adapter/BaseDimension.d.ts.map +1 -1
- package/dist/src/adapter/BaseDimension.js +0 -10
- package/dist/src/adapter/BaseDimension.js.map +1 -1
- package/dist/src/adapter/BaseMeasure.d.ts +0 -1
- package/dist/src/adapter/BaseMeasure.d.ts.map +1 -1
- package/dist/src/adapter/BaseMeasure.js +0 -8
- package/dist/src/adapter/BaseMeasure.js.map +1 -1
- package/dist/src/adapter/BaseQuery.d.ts +12 -32
- package/dist/src/adapter/BaseQuery.d.ts.map +1 -1
- package/dist/src/adapter/BaseQuery.js +14 -60
- package/dist/src/adapter/BaseQuery.js.map +1 -1
- package/dist/src/adapter/BaseSegment.d.ts +0 -1
- package/dist/src/adapter/BaseSegment.d.ts.map +1 -1
- package/dist/src/adapter/BaseSegment.js +0 -8
- package/dist/src/adapter/BaseSegment.js.map +1 -1
- package/dist/src/adapter/PreAggregations.d.ts +4 -11
- package/dist/src/adapter/PreAggregations.d.ts.map +1 -1
- package/dist/src/adapter/PreAggregations.js +4 -28
- package/dist/src/adapter/PreAggregations.js.map +1 -1
- package/dist/src/compiler/CubeEvaluator.d.ts.map +1 -1
- package/dist/src/compiler/CubeEvaluator.js +5 -5
- package/dist/src/compiler/CubeEvaluator.js.map +1 -1
- package/dist/src/compiler/CubeSymbols.d.ts +0 -8
- package/dist/src/compiler/CubeSymbols.d.ts.map +1 -1
- package/dist/src/compiler/CubeSymbols.js +0 -21
- package/dist/src/compiler/CubeSymbols.js.map +1 -1
- package/dist/src/compiler/DataSchemaCompiler.d.ts +14 -1
- package/dist/src/compiler/DataSchemaCompiler.d.ts.map +1 -1
- package/dist/src/compiler/DataSchemaCompiler.js +87 -14
- package/dist/src/compiler/DataSchemaCompiler.js.map +1 -1
- package/dist/src/compiler/transpilers/ImportExportTranspiler.d.ts.map +1 -1
- package/dist/src/compiler/transpilers/ImportExportTranspiler.js +2 -3
- package/dist/src/compiler/transpilers/ImportExportTranspiler.js.map +1 -1
- package/package.json +6 -6
|
@@ -7,7 +7,6 @@ export declare class BaseDimension {
|
|
|
7
7
|
readonly expressionCubeName: any;
|
|
8
8
|
readonly expressionName: string | undefined;
|
|
9
9
|
readonly isMemberExpression: boolean;
|
|
10
|
-
readonly joinHint: Array<string>;
|
|
11
10
|
constructor(query: BaseQuery, dimension: any);
|
|
12
11
|
selectColumns(): string[] | null;
|
|
13
12
|
hasNoRemapping(): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseDimension.d.ts","sourceRoot":"","sources":["../../../src/adapter/BaseDimension.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAExF,qBAAa,aAAa;
|
|
1
|
+
{"version":3,"file":"BaseDimension.d.ts","sourceRoot":"","sources":["../../../src/adapter/BaseDimension.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAExF,qBAAa,aAAa;IAUtB,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS;aACnB,SAAS,EAAE,GAAG;IAVhC,SAAgB,UAAU,EAAE,GAAG,CAAC;IAEhC,SAAgB,kBAAkB,EAAE,GAAG,CAAC;IAExC,SAAgB,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IAEnD,SAAgB,kBAAkB,EAAE,OAAO,CAAS;gBAG/B,KAAK,EAAE,SAAS,EACnB,SAAS,EAAE,GAAG;IAWzB,aAAa,IAAI,MAAM,EAAE,GAAG,IAAI;IAIhC,cAAc;IAId,uBAAuB;IAIvB,YAAY;IAWZ,oCAAoC,CAAC,GAAG,KAAA;IAUxC,aAAa;IAIb,UAAU;IAIV,YAAY;IAOZ,IAAI;IAOJ,mBAAmB,IAAI,mBAAmB,GAAG,iBAAiB;IAQ9D,UAAU,IAAI,mBAAmB,GAAG,iBAAiB;IAYrD,SAAS,IAAI,MAAM,GAAG,IAAI;IAK1B,kBAAkB,IAAI,MAAM;IAQ5B,aAAa;IAIb,IAAI;IAYJ,cAAc;CAMtB"}
|
|
@@ -8,7 +8,6 @@ class BaseDimension {
|
|
|
8
8
|
expressionCubeName;
|
|
9
9
|
expressionName;
|
|
10
10
|
isMemberExpression = false;
|
|
11
|
-
joinHint = [];
|
|
12
11
|
constructor(query, dimension) {
|
|
13
12
|
this.query = query;
|
|
14
13
|
this.dimension = dimension;
|
|
@@ -19,15 +18,6 @@ class BaseDimension {
|
|
|
19
18
|
this.expressionName = dimension.expressionName || `${dimension.cubeName}.${dimension.name}`;
|
|
20
19
|
this.isMemberExpression = !!dimension.definition;
|
|
21
20
|
}
|
|
22
|
-
else {
|
|
23
|
-
// TODO move this `as` to static types
|
|
24
|
-
const dimensionPath = dimension;
|
|
25
|
-
if (dimensionPath !== null) {
|
|
26
|
-
const { path, joinHint } = this.query.cubeEvaluator.joinHintFromPath(dimensionPath);
|
|
27
|
-
this.dimension = path;
|
|
28
|
-
this.joinHint = joinHint;
|
|
29
|
-
}
|
|
30
|
-
}
|
|
31
21
|
}
|
|
32
22
|
selectColumns() {
|
|
33
23
|
return [`${this.dimensionSql()} ${this.aliasName()}`];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseDimension.js","sourceRoot":"","sources":["../../../src/adapter/BaseDimension.ts"],"names":[],"mappings":";;;AAGA,MAAa,aAAa;
|
|
1
|
+
{"version":3,"file":"BaseDimension.js","sourceRoot":"","sources":["../../../src/adapter/BaseDimension.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,6 @@ export declare class BaseMeasure {
|
|
|
8
8
|
readonly expressionName: any;
|
|
9
9
|
readonly isMemberExpression: boolean;
|
|
10
10
|
protected readonly patchedMeasure: MeasureDefinition | null;
|
|
11
|
-
readonly joinHint: Array<string>;
|
|
12
11
|
protected preparePatchedMeasure(sourceMeasure: string, newMeasureType: string | null, addFilters: Array<{
|
|
13
12
|
sql: Function;
|
|
14
13
|
}>): MeasureDefinition;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseMeasure.d.ts","sourceRoot":"","sources":["../../../src/adapter/BaseMeasure.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D,qBAAa,WAAW;
|
|
1
|
+
{"version":3,"file":"BaseMeasure.d.ts","sourceRoot":"","sources":["../../../src/adapter/BaseMeasure.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D,qBAAa,WAAW;IAwGpB,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS;aACnB,OAAO,EAAE,GAAG;IAxG9B,SAAgB,UAAU,EAAE,GAAG,CAAC;IAEhC,SAAgB,kBAAkB,EAAE,GAAG,CAAC;IAExC,SAAgB,cAAc,EAAE,GAAG,CAAC;IAEpC,SAAgB,kBAAkB,EAAE,OAAO,CAAS;IAEpD,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,iBAAiB,GAAG,IAAI,CAAQ;IAEnE,SAAS,CAAC,qBAAqB,CAAC,aAAa,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,EAAE,UAAU,EAAE,KAAK,CAAC;QAAC,GAAG,EAAE,QAAQ,CAAA;KAAC,CAAC,GAAG,iBAAiB;gBA6FvH,KAAK,EAAE,SAAS,EACnB,OAAO,EAAE,GAAG;IAmBvB,UAAU;IAIV,aAAa;IAIb,cAAc;IAId,uBAAuB;IAIvB,oBAAoB;IASpB,UAAU;IAQV,oCAAoC,CAAC,GAAG,KAAA;IAUxC,IAAI;IAOJ,iBAAiB;IAOjB,UAAU,IAAI,GAAG;IAcjB,SAAS;IAIT,kBAAkB;IAOlB,YAAY;IAOZ,YAAY;IAOZ,UAAU;WAYH,YAAY,CAAC,UAAU,KAAA;IAI9B,uBAAuB;IAWvB,iBAAiB;IAqBjB,iBAAiB;IAWjB,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,EAAE,YAAY,EAAE,MAAM,GAAG,SAAS;IAIjF,uBAAuB,CAAC,QAAQ,EAAE,MAAM;IAkBxC,0BAA0B;IAI1B,aAAa;IAIb,IAAI;IAOJ,cAAc;CAMtB"}
|
|
@@ -10,7 +10,6 @@ class BaseMeasure {
|
|
|
10
10
|
expressionName;
|
|
11
11
|
isMemberExpression = false;
|
|
12
12
|
patchedMeasure = null;
|
|
13
|
-
joinHint = [];
|
|
14
13
|
preparePatchedMeasure(sourceMeasure, newMeasureType, addFilters) {
|
|
15
14
|
const source = this.query.cubeEvaluator.measureByPath(sourceMeasure);
|
|
16
15
|
let resultMeasureType = source.type;
|
|
@@ -100,13 +99,6 @@ class BaseMeasure {
|
|
|
100
99
|
this.patchedMeasure = this.preparePatchedMeasure(measure.expression.sourceMeasure, measure.expression.replaceAggregationType, measure.expression.addFilters);
|
|
101
100
|
}
|
|
102
101
|
}
|
|
103
|
-
else {
|
|
104
|
-
// TODO move this `as` to static types
|
|
105
|
-
const measurePath = measure;
|
|
106
|
-
const { path, joinHint } = this.query.cubeEvaluator.joinHintFromPath(measurePath);
|
|
107
|
-
this.measure = path;
|
|
108
|
-
this.joinHint = joinHint;
|
|
109
|
-
}
|
|
110
102
|
}
|
|
111
103
|
getMembers() {
|
|
112
104
|
return [this];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseMeasure.js","sourceRoot":"","sources":["../../../src/adapter/BaseMeasure.ts"],"names":[],"mappings":";;;AAAA,qDAAkD;AAIlD,MAAa,WAAW;
|
|
1
|
+
{"version":3,"file":"BaseMeasure.js","sourceRoot":"","sources":["../../../src/adapter/BaseMeasure.ts"],"names":[],"mappings":"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"}
|
|
@@ -123,14 +123,10 @@ export class BaseQuery {
|
|
|
123
123
|
inputProps: any;
|
|
124
124
|
cache: any;
|
|
125
125
|
}): any;
|
|
126
|
-
get allCubeNames(): any
|
|
127
|
-
collectedCubeNames: any
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
* @returns {Array<Array<string>>}
|
|
131
|
-
*/
|
|
132
|
-
get allJoinHints(): string[][];
|
|
133
|
-
collectedJoinHints: string[][] | undefined;
|
|
126
|
+
get allCubeNames(): any;
|
|
127
|
+
collectedCubeNames: any;
|
|
128
|
+
get allJoinHints(): any;
|
|
129
|
+
collectedJoinHints: any;
|
|
134
130
|
get dataSource(): any;
|
|
135
131
|
cubeDataSource(cube: any): any;
|
|
136
132
|
get aliasNameToMember(): {
|
|
@@ -138,8 +134,8 @@ export class BaseQuery {
|
|
|
138
134
|
};
|
|
139
135
|
initUngrouped(): void;
|
|
140
136
|
ungrouped: any;
|
|
141
|
-
get subQueryDimensions(): any
|
|
142
|
-
_subQueryDimensions: any
|
|
137
|
+
get subQueryDimensions(): any;
|
|
138
|
+
_subQueryDimensions: any;
|
|
143
139
|
get asSyntaxTable(): string;
|
|
144
140
|
get asSyntaxJoin(): string;
|
|
145
141
|
newMeasure(measurePath: any): BaseMeasure;
|
|
@@ -340,12 +336,7 @@ export class BaseQuery {
|
|
|
340
336
|
* @returns {string}
|
|
341
337
|
*/
|
|
342
338
|
aggregateSubQuery(keyCubeName: string, measures: Array<BaseMeasure>, filters: Array<BaseFilter>): string;
|
|
343
|
-
|
|
344
|
-
* @param {Array<BaseMeasure>} measures
|
|
345
|
-
* @param {string} keyCubeName
|
|
346
|
-
* @returns {boolean}
|
|
347
|
-
*/
|
|
348
|
-
checkShouldBuildJoinForMeasureSelect(measures: Array<BaseMeasure>, keyCubeName: string): boolean;
|
|
339
|
+
checkShouldBuildJoinForMeasureSelect(measures: any, keyCubeName: any): any;
|
|
349
340
|
aggregateSubQueryMeasureJoin(keyCubeName: any, measures: any, measuresJoin: any, primaryKeyDimensions: any, measureSubQueryDimensions: any): any;
|
|
350
341
|
groupedUngroupedSelect(select: any, ungrouped: any, granularityOverride: any): any;
|
|
351
342
|
ungroupedMeasureSelect(select: any): any;
|
|
@@ -354,21 +345,10 @@ export class BaseQuery {
|
|
|
354
345
|
keyDimensions(primaryKeyDimensions: any): (BaseDimension | BaseTimeDimension)[];
|
|
355
346
|
cubeSql(cube: any): any;
|
|
356
347
|
traverseSymbol(s: any): any;
|
|
357
|
-
collectCubeNames(excludeTimeDimensions: any): any
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
* @returns {Array<Array<string>>}
|
|
362
|
-
*/
|
|
363
|
-
collectJoinHints(excludeTimeDimensions?: boolean | undefined): Array<Array<string>>;
|
|
364
|
-
collectJoinHintsFromMembers(members: any): any[];
|
|
365
|
-
collectFromMembers(excludeTimeDimensions: any, fn: any, methodName: any): any[];
|
|
366
|
-
/**
|
|
367
|
-
*
|
|
368
|
-
* @param {boolean} excludeTimeDimensions
|
|
369
|
-
* @returns {Array<BaseMeasure | BaseDimension | BaseSegment>}
|
|
370
|
-
*/
|
|
371
|
-
allMembersConcat(excludeTimeDimensions: boolean): Array<BaseMeasure | BaseDimension | BaseSegment>;
|
|
348
|
+
collectCubeNames(excludeTimeDimensions: any): any;
|
|
349
|
+
collectJoinHints(excludeTimeDimensions?: boolean): any;
|
|
350
|
+
collectFromMembers(excludeTimeDimensions: any, fn: any, methodName: any): any;
|
|
351
|
+
allMembersConcat(excludeTimeDimensions: any): any;
|
|
372
352
|
collectFrom(membersToCollectFrom: any, fn: any, methodName: any, cache: any): any[];
|
|
373
353
|
collectSubQueryDimensionsFor(fn: any): never[];
|
|
374
354
|
rewriteInlineWhere(fn: any, inlineWhereConditions: any): any;
|
|
@@ -529,7 +509,7 @@ export class BaseQuery {
|
|
|
529
509
|
refreshKeysByCubes(cubes: any, transformFn: any): any;
|
|
530
510
|
aggSelectForDimension(cube: any, dimension: any, aggFunction: any): string | null;
|
|
531
511
|
cubeCardinalityQueries(): {
|
|
532
|
-
[index: string]:
|
|
512
|
+
[index: string]: any;
|
|
533
513
|
};
|
|
534
514
|
renewalThreshold(refreshKeyAllSetManually: any): number;
|
|
535
515
|
nowTimestampSql(): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/BaseQuery.js"],"names":[],"mappings":"AA2DA;;;;;;;;;;GAUG;AAEH;;;;GAIG;AAEH;;;;;GAKG;AAEH;;GAEG;AAEH;;;;;;;;;;;;GAYG;AACH;
|
|
1
|
+
{"version":3,"file":"BaseQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/BaseQuery.js"],"names":[],"mappings":"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"}
|
|
@@ -280,19 +280,19 @@ class BaseQuery {
|
|
|
280
280
|
this.initUngrouped();
|
|
281
281
|
}
|
|
282
282
|
prebuildJoin() {
|
|
283
|
-
|
|
284
|
-
//
|
|
285
|
-
this.join
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
if (this.useNativeSqlPlanner) {
|
|
289
|
-
// Tesseract doesn't require join to be prebuilt and there's a case where single join can't be built for multi-fact query
|
|
290
|
-
// But we need this join for a fallback when using pre-aggregations. So we’ll try to obtain the join but ignore any errors (which may occur if the query is a multi-fact one).
|
|
283
|
+
if (this.useNativeSqlPlanner) {
|
|
284
|
+
// Tesseract doesn't require join to be prebuilt and there's a case where single join can't be built for multi-fact query
|
|
285
|
+
// But we need this join for a fallback when using pre-aggregations. So we’ll try to obtain the join but ignore any errors (which may occur if the query is a multi-fact one).
|
|
286
|
+
try {
|
|
287
|
+
this.join = this.joinGraph.buildJoin(this.allJoinHints);
|
|
291
288
|
}
|
|
292
|
-
|
|
293
|
-
|
|
289
|
+
catch (e) {
|
|
290
|
+
// Ignore
|
|
294
291
|
}
|
|
295
292
|
}
|
|
293
|
+
else {
|
|
294
|
+
this.join = this.joinGraph.buildJoin(this.allJoinHints);
|
|
295
|
+
}
|
|
296
296
|
}
|
|
297
297
|
cacheValue(key, fn, { contextPropNames, inputProps, cache } = {}) {
|
|
298
298
|
const currentContext = this.safeEvaluateSymbolContext();
|
|
@@ -333,10 +333,6 @@ class BaseQuery {
|
|
|
333
333
|
}
|
|
334
334
|
return this.collectedCubeNames;
|
|
335
335
|
}
|
|
336
|
-
/**
|
|
337
|
-
*
|
|
338
|
-
* @returns {Array<Array<string>>}
|
|
339
|
-
*/
|
|
340
336
|
get allJoinHints() {
|
|
341
337
|
if (!this.collectedJoinHints) {
|
|
342
338
|
this.collectedJoinHints = this.collectJoinHints();
|
|
@@ -904,16 +900,7 @@ class BaseQuery {
|
|
|
904
900
|
}
|
|
905
901
|
collectAllMultiStageMembers(allMemberChildren) {
|
|
906
902
|
const allMembers = ramda_1.default.uniq(ramda_1.default.flatten(Object.keys(allMemberChildren).map(k => [k].concat(allMemberChildren[k]))));
|
|
907
|
-
return ramda_1.default.fromPairs(allMembers.map(m =>
|
|
908
|
-
// When `m` is coming from `collectAllMemberChildren`, it can contain `granularities.customGranularityName` in path
|
|
909
|
-
// And it would mess up with join hints detection
|
|
910
|
-
const trimmedPath = this
|
|
911
|
-
.cubeEvaluator
|
|
912
|
-
.parsePathAnyType(m)
|
|
913
|
-
.slice(0, 2)
|
|
914
|
-
.join('.');
|
|
915
|
-
return [m, this.memberInstanceByPath(trimmedPath).isMultiStage()];
|
|
916
|
-
}));
|
|
903
|
+
return ramda_1.default.fromPairs(allMembers.map(m => ([m, this.memberInstanceByPath(m).isMultiStage()])));
|
|
917
904
|
}
|
|
918
905
|
memberInstanceByPath(m) {
|
|
919
906
|
let member;
|
|
@@ -1518,7 +1505,7 @@ class BaseQuery {
|
|
|
1518
1505
|
let keyCubeInlineLeftJoinConditions;
|
|
1519
1506
|
const measureSubQueryDimensions = this.collectFrom(measures, this.collectSubQueryDimensionsFor.bind(this), 'collectSubQueryDimensionsFor');
|
|
1520
1507
|
if (shouldBuildJoinForMeasureSelect) {
|
|
1521
|
-
const joinHints = this.
|
|
1508
|
+
const joinHints = this.collectFrom(measures, this.collectJoinHintsFor.bind(this), 'collectJoinHintsFor');
|
|
1522
1509
|
const measuresJoin = this.joinGraph.buildJoin(joinHints);
|
|
1523
1510
|
if (measuresJoin.multiplicationFactor[keyCubeName]) {
|
|
1524
1511
|
throw new UserError_1.UserError(`'${measures.map(m => m.measure).join(', ')}' reference cubes that lead to row multiplication.`);
|
|
@@ -1558,11 +1545,6 @@ class BaseQuery {
|
|
|
1558
1545
|
return `SELECT ${columnsForSelect} FROM ${joinSql}` +
|
|
1559
1546
|
(!this.safeEvaluateSymbolContext().ungrouped && this.aggregateSubQueryGroupByClause() || '');
|
|
1560
1547
|
}
|
|
1561
|
-
/**
|
|
1562
|
-
* @param {Array<BaseMeasure>} measures
|
|
1563
|
-
* @param {string} keyCubeName
|
|
1564
|
-
* @returns {boolean}
|
|
1565
|
-
*/
|
|
1566
1548
|
checkShouldBuildJoinForMeasureSelect(measures, keyCubeName) {
|
|
1567
1549
|
// When member expression references view, it would have to collect join hints from view
|
|
1568
1550
|
// Consider join A->B, as many-to-one, so B is multiplied and A is not, and member expression like SUM(AB_view.dimB)
|
|
@@ -1577,11 +1559,7 @@ class BaseQuery {
|
|
|
1577
1559
|
.map(member => this.memberInstanceByPath(member))
|
|
1578
1560
|
.filter(member => member.definition().ownedByCube);
|
|
1579
1561
|
const cubes = this.collectFrom(nonViewMembers, this.collectCubeNamesFor.bind(this), 'collectCubeNamesFor');
|
|
1580
|
-
|
|
1581
|
-
const joinHints = [
|
|
1582
|
-
measure.joinHint,
|
|
1583
|
-
...this.collectJoinHintsFromMembers(nonViewMembers),
|
|
1584
|
-
];
|
|
1562
|
+
const joinHints = this.collectFrom(nonViewMembers, this.collectJoinHintsFor.bind(this), 'collectJoinHintsFor');
|
|
1585
1563
|
if (ramda_1.default.any(cubeName => keyCubeName !== cubeName, cubes)) {
|
|
1586
1564
|
const measuresJoin = this.joinGraph.buildJoin(joinHints);
|
|
1587
1565
|
if (measuresJoin.multiplicationFactor[keyCubeName]) {
|
|
@@ -1661,27 +1639,8 @@ class BaseQuery {
|
|
|
1661
1639
|
collectCubeNames(excludeTimeDimensions) {
|
|
1662
1640
|
return this.collectFromMembers(excludeTimeDimensions, this.collectCubeNamesFor.bind(this), 'collectCubeNamesFor');
|
|
1663
1641
|
}
|
|
1664
|
-
/**
|
|
1665
|
-
*
|
|
1666
|
-
* @param {boolean} [excludeTimeDimensions=false]
|
|
1667
|
-
* @returns {Array<Array<string>>}
|
|
1668
|
-
*/
|
|
1669
1642
|
collectJoinHints(excludeTimeDimensions = false) {
|
|
1670
|
-
|
|
1671
|
-
.concat(this.join ? this.join.joins.map(j => ({
|
|
1672
|
-
getMembers: () => [{
|
|
1673
|
-
path: () => null,
|
|
1674
|
-
cube: () => this.cubeEvaluator.cubeFromPath(j.originalFrom),
|
|
1675
|
-
definition: () => j.join,
|
|
1676
|
-
}]
|
|
1677
|
-
})) : []);
|
|
1678
|
-
return this.collectJoinHintsFromMembers(membersToCollectFrom);
|
|
1679
|
-
}
|
|
1680
|
-
collectJoinHintsFromMembers(members) {
|
|
1681
|
-
return [
|
|
1682
|
-
...members.map(m => m.joinHint).filter(h => h?.length > 0),
|
|
1683
|
-
...this.collectFrom(members, this.collectJoinHintsFor.bind(this), 'collectJoinHintsFromMembers'),
|
|
1684
|
-
];
|
|
1643
|
+
return this.collectFromMembers(excludeTimeDimensions, this.collectJoinHintsFor.bind(this), 'collectJoinHintsFor');
|
|
1685
1644
|
}
|
|
1686
1645
|
collectFromMembers(excludeTimeDimensions, fn, methodName) {
|
|
1687
1646
|
const membersToCollectFrom = this.allMembersConcat(excludeTimeDimensions)
|
|
@@ -1694,11 +1653,6 @@ class BaseQuery {
|
|
|
1694
1653
|
})) : []);
|
|
1695
1654
|
return this.collectFrom(membersToCollectFrom, fn, methodName);
|
|
1696
1655
|
}
|
|
1697
|
-
/**
|
|
1698
|
-
*
|
|
1699
|
-
* @param {boolean} excludeTimeDimensions
|
|
1700
|
-
* @returns {Array<BaseMeasure | BaseDimension | BaseSegment>}
|
|
1701
|
-
*/
|
|
1702
1656
|
allMembersConcat(excludeTimeDimensions) {
|
|
1703
1657
|
return this.measures
|
|
1704
1658
|
.concat(this.dimensions)
|