feat(redshift): column compression encodings and comments can now be customised

packages/@aws-cdk/aws-redshift/README.md

@@ -200,17 +200,32 @@ new Table(this, 'Table', {
 });
 ```
 
-Tables can also be configured with a comment:
+Tables and their respective columns can be configured to contain comments:
 
 ```ts fixture=cluster
 new Table(this, 'Table', {
   tableColumns: [
-    { name: 'col1', dataType: 'varchar(4)' }, 
-    { name: 'col2', dataType: 'float' }
+    { name: 'col1', dataType: 'varchar(4)', comment: 'This is a column comment' }, 
+    { name: 'col2', dataType: 'float', comment: 'This is a another column comment' }
+  ],
+  cluster: cluster,
+  databaseName: 'databaseName',
+  tableComment: 'This is a table comment',
+});
+```
+
+Table columns can be configured to use a specific compression encoding:
+
+```ts fixture=cluster
+import { ColumnEncoding } from '@aws-cdk/aws-redshift';
+
+new Table(this, 'Table', {
+  tableColumns: [
+    { name: 'col1', dataType: 'varchar(4)', encoding: ColumnEncoding.TEXT32K },
+    { name: 'col2', dataType: 'float', encoding: ColumnEncoding.DELTA32K },
   ],
   cluster: cluster,
   databaseName: 'databaseName',
-  comment: 'This is a comment',
 });
 ```
 
@@ -417,14 +432,16 @@ Some Amazon Redshift features require Amazon Redshift to access other AWS servic
 When you create an IAM role and set it as the default for the cluster using console, you don't have to provide the IAM role's Amazon Resource Name (ARN) to perform authentication and authorization.
 
 ```ts
+import * as ec2 from '@aws-cdk/aws-ec2';
+import * as iam from '@aws-cdk/aws-iam';
 declare const vpc: ec2.Vpc;
 
 const defaultRole = new iam.Role(this, 'DefaultRole', {
   assumedBy: new iam.ServicePrincipal('redshift.amazonaws.com'),
 },
 );
 
-new Cluster(stack, 'Redshift', {
+new Cluster(this, 'Redshift', {
     masterUser: {
       masterUsername: 'admin',
     },
@@ -437,14 +454,16 @@ new Cluster(stack, 'Redshift', {
 A default role can also be added to a cluster using the `addDefaultIamRole` method.
 
 ```ts
+import * as ec2 from '@aws-cdk/aws-ec2';
+import * as iam from '@aws-cdk/aws-iam';
 declare const vpc: ec2.Vpc;
 
 const defaultRole = new iam.Role(this, 'DefaultRole', {
   assumedBy: new iam.ServicePrincipal('redshift.amazonaws.com'),
 },
 );
 
-const redshiftCluster = new Cluster(stack, 'Redshift', {
+const redshiftCluster = new Cluster(this, 'Redshift', {
     masterUser: {
       masterUsername: 'admin',
     },

packages/@aws-cdk/aws-redshift/lib/private/database-query-provider/index.ts

@@ -18,3 +18,5 @@ export async function handler(event: AWSLambda.CloudFormationCustomResourceEvent
   }
   return subHandler(event.ResourceProperties, event);
 }
+
+export { ColumnEncoding } from './types';

packages/@aws-cdk/aws-redshift/lib/private/database-query-provider/privileges.ts

@@ -1,9 +1,9 @@
 /* eslint-disable-next-line import/no-unresolved */
 import * as AWSLambda from 'aws-lambda';
-import { TablePrivilege, UserTablePrivilegesHandlerProps } from '../handler-props';
 import { executeStatement } from './redshift-data';
 import { ClusterProps } from './types';
 import { makePhysicalId } from './util';
+import { TablePrivilege, UserTablePrivilegesHandlerProps } from '../handler-props';
 
 export async function handler(props: UserTablePrivilegesHandlerProps & ClusterProps, event: AWSLambda.CloudFormationCustomResourceEvent) {
   const username = props.username;

packages/@aws-cdk/aws-redshift/lib/private/database-query-provider/table.ts

@@ -1,9 +1,9 @@
 /* eslint-disable-next-line import/no-unresolved */
 import * as AWSLambda from 'aws-lambda';
-import { Column } from '../../table';
 import { executeStatement } from './redshift-data';
-import { ClusterProps, TableAndClusterProps, TableSortStyle } from './types';
+import { ClusterProps, ColumnEncoding, TableAndClusterProps, TableSortStyle } from './types';
 import { areColumnsEqual, getDistKeyColumn, getSortKeyColumns } from './util';
+import { Column } from '../../table';
 
 export async function handler(props: TableAndClusterProps, event: AWSLambda.CloudFormationCustomResourceEvent) {
   const tableNamePrefix = props.tableName.prefix;
@@ -40,7 +40,7 @@ async function createTable(
   tableAndClusterProps: TableAndClusterProps,
 ): Promise<string> {
   const tableName = tableNamePrefix + tableNameSuffix;
-  const tableColumnsString = tableColumns.map(column => `${column.name} ${column.dataType}`).join();
+  const tableColumnsString = tableColumns.map(column => `${column.name} ${column.dataType}${getEncodingColumnString(column)}`).join();
 
   let statement = `CREATE TABLE ${tableName} (${tableColumnsString})`;
 
@@ -61,6 +61,11 @@ async function createTable(
 
   await executeStatement(statement, tableAndClusterProps);
 
+  for (const column of tableColumns) {
+    if (column.comment) {
+      await executeStatement(`COMMENT ON COLUMN ${tableName}.${column.name} IS '${column.comment}'`, tableAndClusterProps);
+    }
+  }
   if (tableAndClusterProps.tableComment) {
     await executeStatement(`COMMENT ON TABLE ${tableName} IS '${tableAndClusterProps.tableComment}'`, tableAndClusterProps);
   }
@@ -107,6 +112,20 @@ async function updateTable(
     alterationStatements.push(...columnAdditions.map(addition => `ALTER TABLE ${tableName} ${addition}`));
   }
 
+  const columnEncoding = tableColumns.filter(column => {
+    return oldTableColumns.some(oldColumn => column.name === oldColumn.name && column.encoding !== oldColumn.encoding);
+  }).map(column => `ALTER COLUMN ${column.name} ENCODE ${column.encoding || ColumnEncoding.AUTO}`);
+  if (columnEncoding.length > 0) {
+    alterationStatements.push(`ALTER TABLE ${tableName} ${columnEncoding.join(', ')}`);
+  }
+
+  const columnComments = tableColumns.filter(column => {
+    return oldTableColumns.some(oldColumn => column.name === oldColumn.name && column.comment !== oldColumn.comment);
+  }).map(column => `COMMENT ON COLUMN ${tableName}.${column.name} IS ${column.comment ? `'${column.comment}'` : 'NULL'}`);
+  if (columnComments.length > 0) {
+    alterationStatements.push(...columnComments);
+  }
+
   const oldDistStyle = oldResourceProperties.distStyle;
   if ((!oldDistStyle && tableAndClusterProps.distStyle) ||
     (oldDistStyle && !tableAndClusterProps.distStyle)) {
@@ -162,3 +181,10 @@ async function updateTable(
 function getSortKeyColumnsString(sortKeyColumns: Column[]) {
   return sortKeyColumns.map(column => column.name).join();
 }
+
+function getEncodingColumnString(column: Column): string {
+  if (column.encoding) {
+    return ` ENCODE ${column.encoding}`;
+  }
+  return '';
+}

packages/@aws-cdk/aws-redshift/lib/private/database-query-provider/types.ts

@@ -24,3 +24,112 @@ export enum TableSortStyle {
    */
   INTERLEAVED = 'INTERLEAVED',
 }
+
+/**
+ * The compression encoding of a column.
+ *
+ * @see https://docs.aws.amazon.com/redshift/latest/dg/c_Compression_encodings.html
+ */
+export enum ColumnEncoding {
+  /**
+   * Amazon Redshift assigns an optimal encoding based on the column data.
+   * This is the default.
+   */
+  AUTO = 'AUTO',
+
+  /**
+   * The column is not compressed.
+   *
+   * @see https://docs.aws.amazon.com/redshift/latest/dg/c_Raw_encoding.html
+   */
+  RAW = 'RAW',
+
+  /**
+   * The column is compressed using the AZ64 algorithm.
+   *
+   * @see https://docs.aws.amazon.com/redshift/latest/dg/az64-encoding.html
+   */
+  AZ64 = 'AZ64',
+
+  /**
+   * The column is compressed using a separate dictionary for each block column value on disk.
+   *
+   * @see https://docs.aws.amazon.com/redshift/latest/dg/c_Byte_dictionary_encoding.html
+   */
+  BYTEDICT = 'BYTEDICT',
+
+  /**
+   * The column is compressed based on the difference between values in the column.
+   * This records differences as 1-byte values.
+   *
+   * @see https://docs.aws.amazon.com/redshift/latest/dg/c_Delta_encoding.html
+   */
+  DELTA = 'DELTA',
+
+  /**
+   * The column is compressed based on the difference between values in the column.
+   * This records differences as 2-byte values.
+   *
+   * @see https://docs.aws.amazon.com/redshift/latest/dg/c_Delta_encoding.html
+   */
+  DELTA32K = 'DELTA32K',
+
+  /**
+   * The column is compressed using the LZO algorithm.
+   *
+   * @see https://docs.aws.amazon.com/redshift/latest/dg/lzo-encoding.html
+   */
+  LZO = 'LZO',
+
+  /**
+   * The column is compressed to a smaller storage size than the original data type.
+   * The compressed storage size is 1 byte.
+   *
+   * @see https://docs.aws.amazon.com/redshift/latest/dg/c_MostlyN_encoding.html
+   */
+  MOSTLY8 = 'MOSTLY8',
+
+  /**
+   * The column is compressed to a smaller storage size than the original data type.
+   * The compressed storage size is 2 bytes.
+   *
+   * @see https://docs.aws.amazon.com/redshift/latest/dg/c_MostlyN_encoding.html
+   */
+  MOSTLY16 = 'MOSTLY16',
+
+  /**
+   * The column is compressed to a smaller storage size than the original data type.
+   * The compressed storage size is 4 bytes.
+   *
+   * @see https://docs.aws.amazon.com/redshift/latest/dg/c_MostlyN_encoding.html
+   */
+  MOSTLY32 = 'MOSTLY32',
+
+  /**
+   * The column is compressed by recording the number of occurrences of each value in the column.
+   *
+   * @see https://docs.aws.amazon.com/redshift/latest/dg/c_Runlength_encoding.html
+   */
+  RUNLENGTH = 'RUNLENGTH',
+
+  /**
+   * The column is compressed by recording the first 245 unique words and then using a 1-byte index to represent each word.
+   *
+   * @see https://docs.aws.amazon.com/redshift/latest/dg/c_Text255_encoding.html
+   */
+  TEXT255 = 'TEXT255',
+
+  /**
+   * The column is compressed by recording the first 32K unique words and then using a 2-byte index to represent each word.
+   *
+   * @see https://docs.aws.amazon.com/redshift/latest/dg/c_Text255_encoding.html
+   */
+  TEXT32K = 'TEXT32K',
+
+  /**
+   * The column is compressed using the ZSTD algorithm.
+   *
+   * @see https://docs.aws.amazon.com/redshift/latest/dg/zstd-encoding.html
+   */
+  ZSTD = 'ZSTD',
+}

packages/@aws-cdk/aws-redshift/lib/private/database-query-provider/user.ts

@@ -2,10 +2,10 @@
 import * as AWSLambda from 'aws-lambda';
 /* eslint-disable-next-line import/no-extraneous-dependencies */
 import * as SecretsManager from 'aws-sdk/clients/secretsmanager';
-import { UserHandlerProps } from '../handler-props';
 import { executeStatement } from './redshift-data';
 import { ClusterProps } from './types';
 import { makePhysicalId } from './util';
+import { UserHandlerProps } from '../handler-props';
 
 const secretsManager = new SecretsManager();
 

packages/@aws-cdk/aws-redshift/lib/private/database-query-provider/util.ts

@@ -1,5 +1,5 @@
-import { Column } from '../../table';
 import { ClusterProps } from './types';
+import { Column } from '../../table';
 
 export function makePhysicalId(resourceName: string, clusterProps: ClusterProps, requestId: string): string {
   return `${clusterProps.clusterName}:${clusterProps.databaseName}:${resourceName}:${requestId}`;

packages/@aws-cdk/aws-redshift/lib/private/database-query.ts

@@ -5,9 +5,9 @@ import * as secretsmanager from '@aws-cdk/aws-secretsmanager';
 import * as cdk from '@aws-cdk/core';
 import * as customresources from '@aws-cdk/custom-resources';
 import { Construct } from 'constructs';
+import { DatabaseQueryHandlerProps } from './handler-props';
 import { Cluster } from '../cluster';
 import { DatabaseOptions } from '../database-options';
-import { DatabaseQueryHandlerProps } from './handler-props';
 
 export interface DatabaseQueryProps<HandlerProps> extends DatabaseOptions {
   readonly handler: string;

packages/@aws-cdk/aws-redshift/lib/private/privileges.ts

@@ -1,11 +1,11 @@
 import * as cdk from '@aws-cdk/core';
 import { Construct } from 'constructs';
-import { DatabaseOptions } from '../database-options';
-import { ITable, TableAction } from '../table';
-import { IUser } from '../user';
 import { DatabaseQuery } from './database-query';
 import { HandlerName } from './database-query-provider/handler-name';
 import { TablePrivilege as SerializedTablePrivilege, UserTablePrivilegesHandlerProps } from './handler-props';
+import { DatabaseOptions } from '../database-options';
+import { ITable, TableAction } from '../table';
+import { IUser } from '../user';
 
 /**
  * The Redshift table and action that make up a privilege that can be granted to a Redshift user.

packages/@aws-cdk/aws-redshift/lib/table.ts

@@ -3,6 +3,7 @@ import { Construct, IConstruct } from 'constructs';
 import { ICluster } from './cluster';
 import { DatabaseOptions } from './database-options';
 import { DatabaseQuery } from './private/database-query';
+import { ColumnEncoding } from './private/database-query-provider';
 import { HandlerName } from './private/database-query-provider/handler-name';
 import { getDistKeyColumn, getSortKeyColumns } from './private/database-query-provider/util';
 import { TableHandlerProps } from './private/handler-props';
@@ -79,6 +80,20 @@ export interface Column {
    * @default - column is not a SORTKEY
    */
   readonly sortKey?: boolean;
+
+  /**
+   * The encoding to use for the column.
+   *
+   * @default - Amazon Redshift determines the encoding based on the data type.
+   */
+  readonly encoding?: ColumnEncoding;
+
+  /**
+   * A comment to attach to the column.
+   *
+   * @default - no comment
+   */
+  readonly comment?: string;
 }
 
 /**
@@ -344,3 +359,5 @@ export enum TableSortStyle {
    */
   INTERLEAVED = 'INTERLEAVED',
 }
+
+export { ColumnEncoding } from './private/database-query-provider';