feat(cube): Renaming of Post Aggregate into Multi Stage

Author: waralexrom

packages/cubejs-schema-compiler/src/adapter/BaseDimension.ts

@@ -64,11 +64,11 @@ export class BaseDimension {
     return [this];
   }
 
-  public isPostAggregate() {
+  public isMultiStage() {
     if (this.expression) { // TODO
       return false;
     }
-    return this.definition().postAggregate;
+    return this.definition().multiStage;
   }
 
   public cube() {

packages/cubejs-schema-compiler/src/adapter/BaseMeasure.ts

@@ -106,19 +106,19 @@ export class BaseMeasure {
     return BaseMeasure.isCumulative(this.measureDefinition());
   }
 
-  public isPostAggregate() {
+  public isMultiStage() {
     if (this.expression) { // TODO
       return false;
     }
-    return this.definition().postAggregate;
+    return this.definition().multiStage;
   }
 
   public isAdditive() {
     if (this.expression) { // TODO
       return false;
     }
     const definition = this.measureDefinition();
-    if (definition.postAggregate) {
+    if (definition.multiStage) {
       return false;
     }
     return definition.type === 'sum' || definition.type === 'count' || definition.type === 'countDistinctApprox' ||

packages/cubejs-schema-compiler/src/adapter/BaseQuery.js

@@ -41,11 +41,11 @@ export class BaseSegment {
     return this.query.cubeEvaluator.segmentByPath(this.segment);
   }
 
-  public isPostAggregate() {
+  public isMultiStage() {
     if (this.expression) { // TODO
       return false;
     }
-    return this.definition().postAggregate;
+    return this.definition().multiStage;
   }
 
   public definition(): any {

packages/cubejs-schema-compiler/src/adapter/BaseSegment.ts

@@ -373,7 +373,7 @@ export class PreAggregations {
       );
 
     const isAdditive = R.all(m => m.isAdditive(), query.measures);
-    const hasPostAggregate = R.any(m => m.isPostAggregate(), query.measures);
+    const hasMultiStage = R.any(m => m.isMultiStage(), query.measures);
     const leafMeasures = leafMeasurePaths.map(path => query.newMeasure(path));
     const leafMeasureAdditive = R.all(m => m.isAdditive(), leafMeasures);
     const cumulativeMeasures = leafMeasures
@@ -416,7 +416,7 @@ export class PreAggregations {
       ungrouped: query.ungrouped,
       sortedUsedCubePrimaryKeys,
       sortedAllCubeNames,
-      hasPostAggregate
+      hasMultiStage
     };
   }
 
@@ -707,7 +707,7 @@ export class PreAggregations {
      */
     const canUseFn =
       (
-        transformedQuery.leafMeasureAdditive && !transformedQuery.hasMultipliedMeasures && !transformedQuery.hasPostAggregate || transformedQuery.ungrouped
+        transformedQuery.leafMeasureAdditive && !transformedQuery.hasMultipliedMeasures && !transformedQuery.hasMultiStage || transformedQuery.ungrouped
       ) ? (r) => canUsePreAggregationLeafMeasureAdditive(r) ||
           canUsePreAggregationNotAdditive(r)
         : canUsePreAggregationNotAdditive;

packages/cubejs-schema-compiler/src/adapter/PreAggregations.js

@@ -14,7 +14,7 @@ export type SegmentDefinition = {
   ownedByCube: boolean,
   fieldType?: string,
   // TODO should we have it here?
-  postAggregate?: boolean,
+  multiStage?: boolean,
 };
 
 export type DimensionDefinition = {
@@ -23,7 +23,7 @@ export type DimensionDefinition = {
   primaryKey?: true,
   ownedByCube: boolean,
   fieldType?: string,
-  postAggregate?: boolean,
+  multiStage?: boolean,
   shiftInterval?: string,
 };
 
@@ -47,7 +47,7 @@ export type MeasureDefinition = {
   filters?: any
   primaryKey?: true,
   drillFilters?: any,
-  postAggregate?: boolean,
+  multiStage?: boolean,
   groupBy?: Function,
   reduceBy?: Function,
   addGroupBy?: Function,
@@ -107,8 +107,8 @@ export class CubeEvaluator extends CubeSymbols {
     this.prepareMembers(cube.dimensions, cube, errorReporter);
     this.prepareMembers(cube.segments, cube, errorReporter);
 
-    this.evaluatePostAggregateReferences(cube.name, cube.measures);
-    this.evaluatePostAggregateReferences(cube.name, cube.dimensions);
+    this.evaluateMultiStageReferences(cube.name, cube.measures);
+    this.evaluateMultiStageReferences(cube.name, cube.dimensions);
 
     this.prepareHierarchies(cube);
 
@@ -165,14 +165,14 @@ export class CubeEvaluator extends CubeSymbols {
     return [];
   }
 
-  private evaluatePostAggregateReferences(cubeName: string, obj: { [key: string]: MeasureDefinition }) {
+  private evaluateMultiStageReferences(cubeName: string, obj: { [key: string]: MeasureDefinition }) {
     if (!obj) {
       return;
     }
 
     // eslint-disable-next-line no-restricted-syntax
     for (const member of Object.values(obj)) {
-      if (member.postAggregate) {
+      if (member.multiStage) {
         if (member.groupBy) {
           member.groupByReferences = this.evaluateReferences(cubeName, member.groupBy);
         }

packages/cubejs-schema-compiler/src/compiler/CubeEvaluator.ts

@@ -556,17 +556,17 @@ const measureTypeWithCount = Joi.string().valid(
   'count', 'number', 'string', 'boolean', 'time', 'sum', 'avg', 'min', 'max', 'countDistinct', 'runningTotal', 'countDistinctApprox'
 );
 
-const postAggregateMeasureType = Joi.string().valid(
+const multiStageMeasureType = Joi.string().valid(
   'count', 'number', 'string', 'boolean', 'time', 'sum', 'avg', 'min', 'max', 'countDistinct', 'runningTotal', 'countDistinctApprox',
   'rank'
 );
 
-const MeasuresSchema = Joi.object().pattern(identifierRegex, Joi.alternatives().conditional(Joi.ref('.postAggregate'), [
+const MeasuresSchema = Joi.object().pattern(identifierRegex, Joi.alternatives().conditional(Joi.ref('.multiStage'), [
   {
     is: true,
     then: inherit(BaseMeasure, {
-      postAggregate: Joi.boolean().strict(),
-      type: postAggregateMeasureType.required(),
+      multiStage: Joi.boolean().strict(),
+      type: multiStageMeasureType.required(),
       sql: Joi.func(), // TODO .required(),
       groupBy: Joi.func(),
       reduceBy: Joi.func(),
@@ -679,7 +679,7 @@ const baseSchema = {
       sql: Joi.func().required()
     }),
     inherit(BaseDimension, {
-      postAggregate: Joi.boolean().valid(true),
+      multiStage: Joi.boolean().valid(true),
       type: Joi.any().valid('number').required(),
       sql: Joi.func().required(),
       addGroupBy: Joi.func(),