in work

Author: waralexrom

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

@@ -1,6 +1,6 @@
 import type { BaseQuery } from './BaseQuery';
 import type { DimensionDefinition, SegmentDefinition } from '../compiler/CubeEvaluator';
-import { CubeSymbols } from "../compiler/CubeSymbols";
+import { CubeSymbols } from '../compiler/CubeSymbols';
 
 export class BaseDimension {
   public readonly expression: any;
@@ -28,6 +28,7 @@ export class BaseDimension {
       const dimensionPath = dimension as string | null;
       if (dimensionPath !== null) {
         const { path, joinHint } = CubeSymbols.joinHintFromPath(dimensionPath);
+        console.log("!!! dimension", dimensionPath, path, joinHint);
         this.dimension = path;
         this.joinHint = joinHint;
       }

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

@@ -1,7 +1,7 @@
 import { UserError } from '../compiler/UserError';
 import type { BaseQuery } from './BaseQuery';
 import { MeasureDefinition } from '../compiler/CubeEvaluator';
-import { CubeSymbols } from "../compiler/CubeSymbols";
+import { CubeSymbols } from '../compiler/CubeSymbols';
 
 export class BaseMeasure {
   public readonly expression: any;

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

@@ -24,7 +24,7 @@ import {
   timeSeriesFromCustomInterval
 } from '@cubejs-backend/shared';
 
-import { CubeSymbols } from "../compiler/CubeSymbols";
+import { CubeSymbols } from '../compiler/CubeSymbols';
 import { UserError } from '../compiler/UserError';
 import { SqlParser } from '../parser/SqlParser';
 import { BaseDimension } from './BaseDimension';
@@ -637,8 +637,8 @@ export class BaseQuery {
    */
   buildSqlAndParams(exportAnnotatedSql) {
     if (this.useNativeSqlPlanner) {
-      let isRelatedToPreAggregation = false;
-/*       if (this.options.preAggregationQuery) {
+      const isRelatedToPreAggregation = false;
+      /*       if (this.options.preAggregationQuery) {
         isRelatedToPreAggregation = true;
       } else if (!this.options.disableExternalPreAggregations && this.externalQueryClass) {
         if (this.externalPreAggregationQuery()) {
@@ -659,9 +659,11 @@ export class BaseQuery {
         return this.newQueryWithoutNative().buildSqlAndParams(exportAnnotatedSql);
       } */
 
+      console.log("!!!!!! EEEEEEEEEE");
       return this.buildSqlAndParamsRust(exportAnnotatedSql);
     }
 
+      console.log("!!!!!! RRRRRRRRR");
     if (!this.options.preAggregationQuery && !this.options.disableExternalPreAggregations && this.externalQueryClass) {
       if (this.externalPreAggregationQuery()) { // TODO performance
         return this.externalQuery().buildSqlAndParams(exportAnnotatedSql);
@@ -726,17 +728,15 @@ export class BaseQuery {
     return res;
   }
 
-  //FIXME Temporary solution
+  // FIXME Temporary solution
   findPreAggregationForQueryRust() {
     if (!this.preAggregations.preAggregationForQuery) {
       let optionsOrder = this.options.order;
       if (optionsOrder && !Array.isArray(optionsOrder)) {
         optionsOrder = [optionsOrder];
       }
       const order = optionsOrder ? R.pipe(
-        R.map((hash) => {
-          return ((!hash || !hash.id) ? null : hash);
-        }),
+        R.map((hash) => ((!hash || !hash.id) ? null : hash)),
         R.reject(R.isNil),
       )(optionsOrder) : undefined;
 
@@ -769,7 +769,7 @@ export class BaseQuery {
         }
       }
 
-    const res = buildResult.result;
+      const res = buildResult.result;
       if (res[2]) {
         this.preAggregations.preAggregationForQuery = res[2];
       }
@@ -973,7 +973,6 @@ export class BaseQuery {
       multiStageMembers,
     } = this.fullKeyQueryAggregateMeasures();
 
-
     if (!multipliedMeasures.length && !cumulativeMeasures.length && !multiStageMembers.length) {
       return this.simpleQuery();
     }
@@ -1211,7 +1210,6 @@ export class BaseQuery {
 
     const multipliedMeasures = measuresToRender(true, false)(measureToHierarchy);
     const regularMeasures = measuresToRender(false, false)(measureToHierarchy);
-
     const cumulativeMeasures =
       R.pipe(
         R.map(multiplied => R.xprod([multiplied], measuresToRender(multiplied, true)(measureToHierarchy))),
@@ -1335,6 +1333,7 @@ export class BaseQuery {
 
   childrenMultiStageContext(memberPath, queryContext, wouldNodeApplyFilters) {
     let member;
+    console.log("!!!! children ", memberPath);
     if (this.cubeEvaluator.isMeasure(memberPath)) {
       member = this.newMeasure(memberPath);
     } else if (this.cubeEvaluator.isDimension(memberPath)) {

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

@@ -1,5 +1,5 @@
 import type { BaseQuery } from './BaseQuery';
-import { CubeSymbols } from "../compiler/CubeSymbols";
+import { CubeSymbols } from '../compiler/CubeSymbols';
 
 export class BaseSegment {
   public readonly expression: any;

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

@@ -1,7 +1,7 @@
 import R from 'ramda';
 import { FROM_PARTITION_RANGE, getEnv, TO_PARTITION_RANGE } from '@cubejs-backend/shared';
 
-import { CubeSymbols } from "../compiler/CubeSymbols";
+import { CubeSymbols } from '../compiler/CubeSymbols';
 import { UserError } from '../compiler/UserError';
 
 export class PreAggregations {
@@ -21,6 +21,7 @@ export class PreAggregations {
    * @return {unknown[]}
    */
   preAggregationsDescription() {
+    return [];
     const preAggregations = [this.preAggregationsDescriptionLocal()].concat(
       this.query.subQueryDimensions.map(d => this.query.subQueryDescription(d).subQuery)
         .map(q => q.preAggregations.preAggregationsDescription())
@@ -311,8 +312,8 @@ export class PreAggregations {
     const dimensionsList = query.dimensions.map(dim => dim.expressionPath());
     const segmentsList = query.segments.map(s => s.expressionPath());
     const ownedDimensions = PreAggregations.ownedMembers(query, flattenDimensionMembers);
-    console.log("!!! dimensions", dimensionsList);
-    console.log("!!! ownedDimensions", ownedDimensions);
+    console.log('!!! dimensions', dimensionsList);
+    console.log('!!! ownedDimensions', ownedDimensions);
     const ownedTimeDimensions = query.timeDimensions.map(td => {
       const owned = PreAggregations.ownedMembers(query, [td]);
       let { dimension } = td;
@@ -833,6 +834,7 @@ export class PreAggregations {
    * @returns {Array<Object>}
    */
   rollupMatchResults() {
+    return [];
     const { query } = this;
 
     const canUsePreAggregation = this.canUsePreAggregationFn(query);

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

@@ -670,6 +670,7 @@ export class CubeEvaluator extends CubeSymbols {
 
     const cubeAndName = Array.isArray(path) ? path : path.split('.');
     if (!this.evaluatedCubes[cubeAndName[0]]) {
+      console.trace("!!!!");
       throw new UserError(`Cube '${cubeAndName[0]}' not found for path '${path}'`);
     }