@malloydata/malloy 0.0.153-dev240719133924 → 0.0.153

package/dist/dialect/snowflake/snowflake.d.ts

@@ -34,6 +34,7 @@ export declare class SnowflakeDialect extends Dialect {
     sqlCoaleseMeasuresInline(groupSet: number, fieldList: DialectFieldList): string;
     sqlUnnestAlias(source: string, alias: string, _fieldList: DialectFieldList, _needDistinctKey: boolean, isArray: boolean, _isInNestedPipeline: boolean): string;
     sqlSumDistinctHashedKey(sqlDistinctKey: string): string;
+    sqlSumDistinct(key: string, value: string, funcName: string): string;
     sqlGenerateUUID(): string;
     sqlFieldReference(alias: string, fieldName: string, fieldType: string, isNested: boolean, _isArray: boolean): string;
     sqlUnnestPipelineHead(isSingleton: boolean, sourceSQLExpression: string): string;

package/dist/dialect/snowflake/snowflake.js

@@ -81,7 +81,7 @@ class SnowflakeDialect extends dialect_1.Dialect {
         this.udfPrefix = '__udf';
         this.hasFinalStage = false;
         this.divisionIsInteger = false;
-        this.supportsSumDistinctFunction = false;
+        this.supportsSumDistinctFunction = true;
         this.supportsSafeCast = true;
         this.supportsNesting = true;
         this.defaultSampling = { rows: 50000 };
@@ -179,8 +179,20 @@ class SnowflakeDialect extends dialect_1.Dialect {
         sqlDistinctKey = `${sqlDistinctKey}::STRING`;
         const upperPart = `to_number(substr(md5_hex(${sqlDistinctKey}), 1, 15), repeat('X', 15)) * 4294967296`;
         const lowerPart = `to_number(substr(md5_hex(${sqlDistinctKey}), 16, 8), repeat('X', 8))`;
-        const precisionShiftMultiplier = '0.000000001';
-        return `(${upperPart} + ${lowerPart}) * ${precisionShiftMultiplier}`;
+        return `(${upperPart} + ${lowerPart})`;
+    }
+    sqlSumDistinct(key, value, funcName) {
+        const hashKey = this.sqlSumDistinctHashedKey(key);
+        const scale = 100000000.0;
+        const v = `(COALESCE(${value},0)*${scale})`;
+        const sqlSum = `(SUM(DISTINCT ${hashKey} + ${v}) - SUM(DISTINCT ${hashKey}))/${scale}`;
+        if (funcName === 'SUM') {
+            return sqlSum;
+        }
+        else if (funcName === 'AVG') {
+            return `(${sqlSum})/NULLIF(COUNT(DISTINCT CASE WHEN ${value} IS NOT NULL THEN ${key} END),0)`;
+        }
+        throw new Error(`Unknown Symmetric Aggregate function ${funcName}`);
     }
     sqlGenerateUUID() {
         return 'UUID_STRING()';

package/dist/dialect/trino/trino.d.ts

@@ -37,7 +37,9 @@ export declare class TrinoDialect extends Dialect {
     sqlAnyValueLastTurtle(name: string, groupSet: number, sqlName: string): string;
     sqlCoaleseMeasuresInline(groupSet: number, fieldList: DialectFieldList): string;
     sqlUnnestAlias(source: string, alias: string, _fieldList: DialectFieldList, needDistinctKey: boolean, isArray: boolean, _isInNestedPipeline: boolean): string;
+    static dtype: string;
     sqlSumDistinctHashedKey(sqlDistinctKey: string): string;
+    sqlSumDistinct(key: string, value: string, funcName: string): string;
     sqlGenerateUUID(): string;
     sqlFieldReference(alias: string, fieldName: string, _fieldType: string, _isNested: boolean, _isArray: boolean): string;
     sqlUnnestPipelineHead(isSingleton: boolean, sourceSQLExpression: string): string;

package/dist/dialect/trino/trino.js

@@ -65,7 +65,7 @@ class TrinoDialect extends dialect_1.Dialect {
         this.udfPrefix = '__udf';
         this.hasFinalStage = false;
         this.divisionIsInteger = true;
-        this.supportsSumDistinctFunction = false;
+        this.supportsSumDistinctFunction = true;
         this.unnestWithNumbers = false;
         this.defaultSampling = { enable: false };
         this.supportUnnestArrayAgg = false;
@@ -265,10 +265,22 @@ class TrinoDialect extends dialect_1.Dialect {
     }
     sqlSumDistinctHashedKey(sqlDistinctKey) {
         sqlDistinctKey = `CAST(${sqlDistinctKey} AS VARCHAR)`;
-        const upperPart = `cast(from_base(substr(to_hex(md5(to_utf8(${sqlDistinctKey}))), 1, 15),16) as DECIMAL) * DECIMAL '4294967296' `;
-        const lowerPart = `cast(from_base(substr(to_hex(md5(to_utf8(${sqlDistinctKey}))), 16, 8),16) as DECIMAL) `;
-        const precisionShiftMultiplier = '0.000000001';
-        return `(${upperPart} + ${lowerPart}) * ${precisionShiftMultiplier}`;
+        const upperPart = `cast(from_base(substr(to_hex(md5(to_utf8(${sqlDistinctKey}))), 1, 15),16) as ${TrinoDialect.dtype}) * CAST('4294967296' AS ${TrinoDialect.dtype}) `;
+        const lowerPart = `cast(from_base(substr(to_hex(md5(to_utf8(${sqlDistinctKey}))), 16, 8),16) as ${TrinoDialect.dtype}) `;
+        return `(${upperPart} + ${lowerPart})`;
+    }
+    sqlSumDistinct(key, value, funcName) {
+        const hashKey = this.sqlSumDistinctHashedKey(key);
+        const scale = 100000000;
+        const v = `CAST(COALESCE(${value},0)*${scale} as ${TrinoDialect.dtype})`;
+        const sqlSum = `CAST(SUM(DISTINCT ${hashKey} + ${v}) - SUM(DISTINCT ${hashKey}) AS DOUBLE)/${scale}`;
+        if (funcName === 'SUM') {
+            return sqlSum;
+        }
+        else if (funcName === 'AVG') {
+            return `(${sqlSum})/NULLIF(COUNT(DISTINCT CASE WHEN ${value} IS NOT NULL THEN ${key} END),0)`;
+        }
+        throw new Error(`Unknown Symmetric Aggregate function ${funcName}`);
     }
     sqlGenerateUUID() {
         return 'UUID()';
@@ -494,6 +506,7 @@ ${(0, utils_1.indent)(sql)}
     }
 }
 exports.TrinoDialect = TrinoDialect;
+TrinoDialect.dtype = 'DECIMAL(38,0)';
 class PrestoDialect extends TrinoDialect {
     constructor() {
         super(...arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.153-dev240719133924",
+  "version": "0.0.153",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",