@cubejs-backend/schema-compiler 0.30.43 → 0.30.47

package/CHANGELOG.md

@@ -3,6 +3,37 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.30.47](https://github.com/cube-js/cube.js/compare/v0.30.46...v0.30.47) (2022-08-12)
+
+
+### Features
+
+* **cubejs:** LambdaView: hybrid query of source tables and pre-aggregation tables. ([#4718](https://github.com/cube-js/cube.js/issues/4718)) ([4ae826b](https://github.com/cube-js/cube.js/commit/4ae826b4d27afbfce366830150e130f29c7fcbbf))
+
+
+
+
+
+## [0.30.46](https://github.com/cube-js/cube.js/compare/v0.30.45...v0.30.46) (2022-08-10)
+
+
+### Features
+
+* **drivers:** Bootstraps CrateDB driver ([#4929](https://github.com/cube-js/cube.js/issues/4929)) ([db87b8f](https://github.com/cube-js/cube.js/commit/db87b8f18686607498467c6ff0f71abcd1e38c5d))
+* **schema-compiler:** aggregated sub query group by clause ([#5078](https://github.com/cube-js/cube.js/issues/5078)) ([473398d](https://github.com/cube-js/cube.js/commit/473398d0a4a983730aba115766afc53f2dd829a6))
+
+
+
+
+
+## [0.30.45](https://github.com/cube-js/cube.js/compare/v0.30.44...v0.30.45) (2022-08-05)
+
+**Note:** Version bump only for package @cubejs-backend/schema-compiler
+
+
+
+
+
 ## [0.30.43](https://github.com/cube-js/cube.js/compare/v0.30.42...v0.30.43) (2022-07-28)
 
 **Note:** Version bump only for package @cubejs-backend/schema-compiler

package/dist/src/adapter/AWSElasticSearchQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AWSElasticSearchQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/AWSElasticSearchQuery.js"],"names":[],"mappings":"AAuBA;IAwDW,0CAiBC;IAnBV,4BAoBC;CAKF"}
+{"version":3,"file":"AWSElasticSearchQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/AWSElasticSearchQuery.js"],"names":[],"mappings":"AAuBA;IAwDwD,0CAqBjD;IAvBL,4BAoBC;CAKF"}

package/dist/src/adapter/BaseQuery.d.ts

@@ -80,9 +80,11 @@ export class BaseQuery {
     newParamAllocator(): ParamAllocator;
     newPreAggregations(): PreAggregations;
     /**
-     * Wrap cpecified column with the double quote.
+     * Wrap specified column/table name with the double quote.
+     * @param {string} name
+     * @returns {string}
      */
-    escapeColumnName(name: any): string;
+    escapeColumnName(name: string): string;
     /**
      * Returns SQL query string.
      * @returns {string}
@@ -102,6 +104,11 @@ export class BaseQuery {
      * @returns {Array<string>}
      */
     buildSqlAndParams(): Array<string>;
+    /**
+     * Returns a dictionary mapping each preagregation to its corresponding query fragment.
+     * @returns {Record<string, Array<string>>}
+     */
+    buildLambdaQuery(): Record<string, Array<string>>;
     externalQuery(): any;
     runningTotalDateJoinCondition(): any;
     rollingWindowDateJoinCondition(trailingInterval: any, leadingInterval: any, offset: any): any;
@@ -172,14 +179,21 @@ export class BaseQuery {
     };
     subQueryName(cubeName: any, name: any): string;
     regularMeasuresSubQuery(measures: any, filters: any): string;
-    aggregateSubQuery(keyCubeName: any, measures: any, filters: any): string;
+    /**
+     * Returns SQL query for the "aggregating on top of sub-queries" uses cases.
+     * @param {string} keyCubeName
+     * @param {Array<BaseMeasure>} measures
+     * @param {Array<BaseFilter>} filters
+     * @returns {string}
+     */
+    aggregateSubQuery(keyCubeName: string, measures: Array<BaseMeasure>, filters: Array<BaseFilter>): string;
     checkShouldBuildJoinForMeasureSelect(measures: any, keyCubeName: any): any;
     aggregateSubQueryMeasureJoin(keyCubeName: any, measures: any, measuresJoin: any, primaryKeyDimensions: any, measureSubQueryDimensions: any): any;
     groupedUngroupedSelect(select: any, ungrouped: any, granularityOverride: any): any;
     ungroupedMeasureSelect(select: any): any;
     keysQuery(primaryKeyDimensions: any, filters: any): string;
     keysSelect(primaryKeyDimensions: any): string;
-    keyDimensions(primaryKeyDimensions: any): any[];
+    keyDimensions(primaryKeyDimensions: any): BaseDimension[];
     cubeSql(cube: any): any;
     traverseSymbol(s: any): any;
     collectCubeNames(excludeTimeDimensions: any): any;
@@ -187,17 +201,41 @@ export class BaseQuery {
     collectFrom(membersToCollectFrom: any, fn: any, methodName: any, cache: any): any[];
     collectSubQueryDimensionsFor(fn: any): never[];
     rewriteInlineWhere(fn: any, inlineWhereConditions: any): any;
+    /**
+     * Returns `GROUP BY` clause for the "aggregating on top of sub-queries" uses
+     * cases. By the default returns the result of the `groupByClause` method.
+     * @returns {string}
+     */
+    aggregateSubQueryGroupByClause(): string;
+    /**
+     * Returns `GROUP BY` clause for the basic uses cases.
+     * @returns {string}
+     */
     groupByClause(): string;
     getFieldIndex(id: any): any;
     orderBy(): string;
-    dimensionAliasNames(): any[];
-    dimensionColumns(cubeAlias: any): string[];
+    /**
+     * Returns a complete list of the aliased dimensions, including time
+     * dimensions.
+     * @returns {Array<string>}
+     */
+    dimensionAliasNames(): Array<string>;
+    /**
+     * Returns an array of column names correlated to the specified cube dimensions.
+     * @param {string} cubeAlias
+     * @returns {Array<string>}
+     */
+    dimensionColumns(cubeAlias: string): Array<string>;
     groupByDimensionLimit(): string;
     topLimit(): string;
     baseSelect(): string;
     selectAllDimensionsAndMeasures(measures: any): string;
-    forSelect(): any;
-    dimensionsForSelect(): any;
+    forSelect(): BaseDimension[];
+    /**
+     * Returns a complete list of the dimensions, including time dimensions.
+     * @returns {Array<BaseDimension>}
+     */
+    dimensionsForSelect(): Array<BaseDimension>;
     dimensionSql(dimension: any): any;
     segmentSql(segment: any): any;
     measureSql(measure: any): any;
@@ -284,7 +322,7 @@ export class BaseQuery {
     evaluateIndexColumns(cube: any, index: any): any;
     createIndexSql(indexName: any, tableName: any, escapedColumns: any): string;
     preAggregationSql(cube: any, preAggregation: any): any;
-    preAggregationReadOnly(cube: any, preAggregation: any): boolean;
+    preAggregationReadOnly(_cube: any, _preAggregation: any): boolean;
     preAggregationQueryForSqlEvaluation(cube: any, preAggregation: any): any;
     parseCronSyntax(every: any): {
         start: cronParser.CronDate;

package/dist/src/adapter/BaseQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/BaseQuery.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"BaseQuery.d.ts","sourceRoot":"","sources":["../../../src/adapter/BaseQuery.js"],"names":[],"mappings":"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"}

package/dist/src/adapter/BaseQuery.js

@@ -364,7 +364,9 @@ class BaseQuery {
         return new PreAggregations_1.PreAggregations(this, this.options.historyQueries || [], this.options.cubeLatticeCache);
     }
     /**
-     * Wrap cpecified column with the double quote.
+     * Wrap specified column/table name with the double quote.
+     * @param {string} name
+     * @returns {string}
      */
     escapeColumnName(name) {
         return `"${name}"`;
@@ -437,6 +439,44 @@ class BaseQuery {
         }
         return this.compilers.compiler.withQuery(this, () => this.cacheValue(['buildSqlAndParams'], () => this.paramAllocator.buildSqlAndParams(this.buildParamAnnotatedSql()), { cache: this.queryCache }));
     }
+    /**
+     * Returns a dictionary mapping each preagregation to its corresponding query fragment.
+     * @returns {Record<string, Array<string>>}
+     */
+    buildLambdaQuery() {
+        var _a;
+        const preAggForQuery = this.preAggregations.findPreAggregationForQuery();
+        const result = {};
+        if (preAggForQuery && preAggForQuery.preAggregation.unionWithSourceData) {
+            // TODO(cristipp) Use source query instead of preaggregation references.
+            const references = this.cubeEvaluator.evaluatePreAggregationReferences(preAggForQuery.cube, preAggForQuery.preAggregation);
+            const lambdaQuery = this.newSubQuery({
+                measures: references.measures,
+                dimensions: references.dimensions,
+                timeDimensions: references.timeDimensions,
+                filters: [
+                    ...(_a = this.options.filters) !== null && _a !== void 0 ? _a : [],
+                    references.timeDimensions.length > 0
+                        ? {
+                            member: references.timeDimensions[0].dimension,
+                            operator: 'afterDate',
+                            values: [shared_1.FROM_PARTITION_RANGE]
+                        }
+                        : [],
+                ],
+                segments: this.options.segments,
+                order: [],
+                limit: undefined,
+                offset: undefined,
+                rowLimit: shared_1.MAX_SOURCE_ROW_LIMIT,
+                preAggregationQuery: true,
+            });
+            const sqlAndParams = lambdaQuery.buildSqlAndParams();
+            const cacheKeyQueries = this.evaluateSymbolSqlWithContext(() => this.cacheKeyQueries(), { preAggregationQuery: true });
+            result[this.preAggregations.preAggregationId(preAggForQuery)] = { sqlAndParams, cacheKeyQueries };
+        }
+        return result;
+    }
     externalQuery() {
         const ExternalQuery = this.externalQueryClass;
         return new ExternalQuery(this.compilers, {
@@ -821,6 +861,13 @@ class BaseQuery {
         return `SELECT ${this.selectAllDimensionsAndMeasures(measures)} FROM ${query} ${this.baseWhere(filters.concat(inlineWhereConditions))}` +
             (!this.safeEvaluateSymbolContext().ungrouped && this.groupByClause() || '');
     }
+    /**
+     * Returns SQL query for the "aggregating on top of sub-queries" uses cases.
+     * @param {string} keyCubeName
+     * @param {Array<BaseMeasure>} measures
+     * @param {Array<BaseFilter>} filters
+     * @returns {string}
+     */
     aggregateSubQuery(keyCubeName, measures, filters) {
         filters = filters || this.allFilters;
         const primaryKeyDimensions = this.primaryKeyNames(keyCubeName).map((k) => this.newDimension(k));
@@ -845,23 +892,30 @@ class BaseQuery {
         const selectedMeasures = shouldBuildJoinForMeasureSelect ? this.evaluateSymbolSqlWithContext(measureSelectFn, {
             ungroupedAliases: ramda_1.default.fromPairs(measures.map(m => [m.measure, m.aliasName()]))
         }) : measureSelectFn();
-        const columnsForSelect = this.dimensionColumns(this.escapeColumnName('keys')).concat(selectedMeasures).filter(s => !!s).join(', ');
-        const primaryKeyJoinConditions = primaryKeyDimensions.map((pkd) => `${this.escapeColumnName('keys')}.${pkd.aliasName()} = ${shouldBuildJoinForMeasureSelect ?
-            `${this.cubeAlias(keyCubeName)}.${pkd.aliasName()}` :
-            this.dimensionSql(pkd)}`).join(' AND ');
+        const columnsForSelect = this
+            .dimensionColumns(this.escapeColumnName(shared_1.QueryAlias.AGG_SUB_QUERY_KEYS))
+            .concat(selectedMeasures)
+            .filter(s => !!s)
+            .join(', ');
+        const primaryKeyJoinConditions = primaryKeyDimensions.map((pkd) => (`${this.escapeColumnName(shared_1.QueryAlias.AGG_SUB_QUERY_KEYS)}.${pkd.aliasName()} = ${shouldBuildJoinForMeasureSelect
+            ? `${this.cubeAlias(keyCubeName)}.${pkd.aliasName()}`
+            : this.dimensionSql(pkd)}`)).join(' AND ');
         const subQueryJoins = shouldBuildJoinForMeasureSelect ? [] : measureSubQueryDimensions.map(d => this.subQueryJoin(d));
         const joinSql = this.joinSql([
-            { sql: `(${this.keysQuery(primaryKeyDimensions, filters)})`, alias: this.escapeColumnName('keys') },
+            {
+                sql: `(${this.keysQuery(primaryKeyDimensions, filters)})`,
+                alias: this.escapeColumnName(shared_1.QueryAlias.AGG_SUB_QUERY_KEYS),
+            },
             {
                 sql: keyCubeSql,
                 alias: keyCubeAlias,
                 on: `${primaryKeyJoinConditions}
-             ${keyCubeInlineLeftJoinConditions ? ` AND (${keyCubeInlineLeftJoinConditions})` : ''}`
+             ${keyCubeInlineLeftJoinConditions ? ` AND (${keyCubeInlineLeftJoinConditions})` : ''}`,
             },
             ...subQueryJoins
         ]);
         return `SELECT ${columnsForSelect} FROM ${joinSql}` +
-            (!this.safeEvaluateSymbolContext().ungrouped && this.groupByClause() || '');
+            (!this.safeEvaluateSymbolContext().ungrouped && this.aggregateSubQueryGroupByClause() || '');
     }
     checkShouldBuildJoinForMeasureSelect(measures, keyCubeName) {
         return measures.map(measure => {
@@ -955,6 +1009,18 @@ class BaseQuery {
         const context = { inlineWhereConditions };
         return this.evaluateSymbolSqlWithContext(fn, context);
     }
+    /**
+     * Returns `GROUP BY` clause for the "aggregating on top of sub-queries" uses
+     * cases. By the default returns the result of the `groupByClause` method.
+     * @returns {string}
+     */
+    aggregateSubQueryGroupByClause() {
+        return this.groupByClause();
+    }
+    /**
+     * Returns `GROUP BY` clause for the basic uses cases.
+     * @returns {string}
+     */
     groupByClause() {
         if (this.ungrouped) {
             return '';
@@ -997,14 +1063,32 @@ class BaseQuery {
         }
         return ` ORDER BY ${orderByString}`;
     }
+    /**
+     * Returns a complete list of the aliased dimensions, including time
+     * dimensions.
+     * @returns {Array<string>}
+     */
     dimensionAliasNames() {
         return ramda_1.default.flatten(this.dimensionsForSelect().map(d => d.aliasName()).filter(d => !!d));
     }
+    /**
+     * Returns an array of column names correlated to the specified cube dimensions.
+     * @param {string} cubeAlias
+     * @returns {Array<string>}
+     */
     dimensionColumns(cubeAlias) {
         return this.dimensionAliasNames().map(alias => `${cubeAlias && `${cubeAlias}.` || ''}${alias}`);
     }
     groupByDimensionLimit() {
-        const limitClause = this.rowLimit === null ? '' : ` LIMIT ${this.rowLimit && parseInt(this.rowLimit, 10) || 10000}`;
+        let limitClause = '';
+        if (this.rowLimit !== null) {
+            if (this.rowLimit === shared_1.MAX_SOURCE_ROW_LIMIT) {
+                limitClause = ` LIMIT ${this.paramAllocator.allocateParam(shared_1.MAX_SOURCE_ROW_LIMIT)}`;
+            }
+            else {
+                limitClause = ` LIMIT ${this.rowLimit && parseInt(this.rowLimit, 10) || 10000}`;
+            }
+        }
         const offsetClause = this.offset ? ` OFFSET ${parseInt(this.offset, 10)}` : '';
         return `${limitClause}${offsetClause}`;
     }
@@ -1020,6 +1104,10 @@ class BaseQuery {
     forSelect() {
         return this.dimensionsForSelect().concat(this.measures);
     }
+    /**
+     * Returns a complete list of the dimensions, including time dimensions.
+     * @returns {Array<BaseDimension>}
+     */
     dimensionsForSelect() {
         return this.dimensions.concat(this.timeDimensions);
     }
@@ -1573,7 +1661,7 @@ class BaseQuery {
             throw new UserError_1.UserError(`Unknown pre-aggregation type '${preAggregation.type}' in '${cube}'`);
         }, { inputProps: { collectOriginalSqlPreAggregations: [] }, cache: this.queryCache });
     }
-    preAggregationReadOnly(cube, preAggregation) {
+    preAggregationReadOnly(_cube, _preAggregation) {
         return false;
     }
     // eslint-disable-next-line consistent-return