Small tweaks and comment changes

malloydata · Nov 15, 2024 · 8e2b010 · 8e2b010
1 parent 2234699
commit 8e2b010
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 18 deletions.
diff --git a/packages/malloy/src/lang/ast/source-elements/cube-source.ts b/packages/malloy/src/lang/ast/source-elements/cube-source.ts
@@ -37,13 +37,6 @@ export class CubeSource extends Source {
     parameterSpace: ParameterSpace | undefined,
     pList: HasParameter[] | undefined
   ): SourceDef {
-    // TODO think about params for cube sources and test that this works...
-    /**
-     * source: foo(a is 1) is cube(
-     *   duckdb.table('foo') extend { dimension: x is a },
-     *   duckdb.table('bar') extend { dimension: x is a }
-     * )
-     */
     const sourceDefs = this.sources.map(source =>
       source.withParameters(parameterSpace, pList)
     );
@@ -79,7 +72,8 @@ export class CubeSource extends Source {
             as: undefined,
             e: {node: 'cubeField'},
             cubeUsage: {fields: [fieldName], joinedUsage: {}},
-            // TODO code and location are wrong...
+            code: this.code,
+            location: this.codeLocation,
           };
           fields.push(cubeField);
         }

diff --git a/packages/malloy/src/lang/ast/struct-utils.ts b/packages/malloy/src/lang/ast/struct-utils.ts
@@ -70,8 +70,7 @@ export function opOutputStruct(
       logTo.logError(
         'failed-to-compute-output-schema',
         `INTERNAL ERROR model/Segment.nextStructDef: ${e.message}\n` +
-          `QUERY: ${inspect(opDesc, {breakLength: 72, depth: Infinity})}\n` +
-          `STACK: ${e.stack}`
+          `QUERY: ${inspect(opDesc, {breakLength: 72, depth: Infinity})}`
       );
     }
   }

diff --git a/packages/malloy/src/model/cube_utils.ts b/packages/malloy/src/model/cube_utils.ts
@@ -15,8 +15,6 @@ import {
   SourceDef,
 } from './malloy_types';
 
-// TODO handle joins...
-
 type CubeError =
   | {code: 'not_a_cube'; data: {path: string[]}}
   | {code: 'cube_not_defined'; data: {path: string[]}}
@@ -34,11 +32,12 @@ function _resolveCubeSources(
     if (source.type === 'cube') {
       let found = false;
       overSources: for (const inputSource of source.sources) {
+        const fieldNames = new Set<string>();
+        for (const field of inputSource.fields) {
+          fieldNames.add(field.as ?? field.name);
+        }
         for (const usage of cubeUsage.fields) {
-          // TODO handle joins
-          if (
-            inputSource.fields.find(f => f.as ?? f.name === usage) === undefined
-          ) {
+          if (!fieldNames.has(usage)) {
             continue overSources;
           }
         }
@@ -266,7 +265,6 @@ function cubeUsageWithoutNonCubeFields(
   }
   return {
     fields: cubeUsage.fields.filter(f => isCubeField(sourceFieldsByName[f])),
-    // TODO not sure about this?
     joinedUsage: cubeUsage.joinedUsage,
   };
 }
diff --git a/packages/malloy/src/model/malloy_types.ts b/packages/malloy/src/model/malloy_types.ts
@@ -1062,7 +1062,8 @@ export interface TableSourceDef extends SourceDefBase {
 
 export interface CubeSourceDef extends SourceDefBase {
   type: 'cube';
-  sources: SourceDef[]; // TODO maybe this should be StructRef[], but that makes a lot of stuff harder.
+  // TODO make cube sources support StructRefs
+  sources: SourceDef[];
 }
 
 /*