@l-v-yonsama/multi-platform-database-drivers 2.0.1 → 2.1.0

package/built/src/drivers/aws/AwsDynamoServiceClient.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AwsDynamoServiceClient = void 0;
+exports.AwsDynamoServiceClient = exports.DYNAMODB_COMPLETE_READ_TIMEOUT_MS = exports.DYNAMODB_COMPLETE_READ_MAX_EVALUATED_ITEMS = exports.DYNAMODB_COMPLETE_READ_MAX_PAGES = exports.DYNAMODB_OBSERVED_READ_MAX_ITEMS = void 0;
 const tslib_1 = require("tslib");
 const client_dynamodb_1 = require("@aws-sdk/client-dynamodb");
 const lib_dynamodb_1 = require("@aws-sdk/lib-dynamodb");
@@ -12,6 +12,27 @@ const utils_1 = require("../../utils");
 const AwsServiceClient_1 = require("./AwsServiceClient");
 const helpers_1 = require("../../helpers");
 const util_dynamodb_1 = require("@aws-sdk/util-dynamodb");
+const dynamoDbCapacity_1 = require("../providers/performance/dynamoDbCapacity");
+const dynamoDbRdhSummary_1 = require("./dynamoDbRdhSummary");
+const dynamoDbResultMetadata_1 = require("./dynamoDbResultMetadata");
+exports.DYNAMODB_OBSERVED_READ_MAX_ITEMS = 100;
+exports.DYNAMODB_COMPLETE_READ_MAX_PAGES = 10;
+exports.DYNAMODB_COMPLETE_READ_MAX_EVALUATED_ITEMS = 1000;
+exports.DYNAMODB_COMPLETE_READ_TIMEOUT_MS = 30000;
+function withTimeout(promise, timeoutMs) {
+    if (!timeoutMs)
+        return promise;
+    return new Promise((resolve, reject) => {
+        const timer = setTimeout(() => reject(new Error('Run Observed Read timed out.')), timeoutMs);
+        promise.then((value) => {
+            clearTimeout(timer);
+            resolve(value);
+        }, (err) => {
+            clearTimeout(timer);
+            reject(err);
+        });
+    });
+}
 class AwsDynamoServiceClient extends AwsServiceClient_1.AwsServiceClient {
     constructor(conRes, config, awsDriver) {
         super(conRes, config, awsDriver);
@@ -65,6 +86,30 @@ class AwsDynamoServiceClient extends AwsServiceClient_1.AwsServiceClient {
             return res.Table.ItemCount;
         });
     }
+    describeTable(tableName) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const res = yield this.client.send(new client_dynamodb_1.DescribeTableCommand({ TableName: tableName }));
+            return res.Table;
+        });
+    }
+    describeTimeToLive(tableName) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const res = yield this.client.send(new client_dynamodb_1.DescribeTimeToLiveCommand({ TableName: tableName }));
+            return res.TimeToLiveDescription;
+        });
+    }
+    describeContributorInsights(tableName, indexName) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const res = yield this.client.send(new client_dynamodb_1.DescribeContributorInsightsCommand({
+                TableName: tableName,
+                IndexName: indexName,
+            }));
+            return {
+                status: res.ContributorInsightsStatus,
+                mode: res.ContributorInsightsMode,
+            };
+        });
+    }
     listTables() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             let tableNames = yield this.listTableNames();
@@ -109,7 +154,7 @@ class AwsDynamoServiceClient extends AwsServiceClient_1.AwsServiceClient {
     }
     getInfomationSchemas() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
             if (!this.conRes) {
                 return null;
             }
@@ -125,17 +170,22 @@ class AwsDynamoServiceClient extends AwsServiceClient_1.AwsServiceClient {
                         TableSizeBytes: table.TableSizeBytes,
                         ItemCount: table.ItemCount,
                         TableArn: table.TableArn,
+                        BillingMode: (_c = table.BillingModeSummary) === null || _c === void 0 ? void 0 : _c.BillingMode,
+                        OnDemandMaxReadRequestUnits: (_d = table.OnDemandThroughput) === null || _d === void 0 ? void 0 : _d.MaxReadRequestUnits,
+                        OnDemandMaxWriteRequestUnits: (_e = table.OnDemandThroughput) === null || _e === void 0 ? void 0 : _e.MaxWriteRequestUnits,
                         ttl: table.ttl,
-                        lsi: (_d = (_c = table.LocalSecondaryIndexes) === null || _c === void 0 ? void 0 : _c.map((it) => {
+                        lsi: (_g = (_f = table.LocalSecondaryIndexes) === null || _f === void 0 ? void 0 : _f.map((it) => {
                             return {
                                 IndexName: it.IndexName,
                                 KeySchema: it.KeySchema,
                                 IndexSizeBytes: it.IndexSizeBytes,
                                 ItemCount: it.ItemCount,
                                 IndexArn: it.IndexArn,
+                                Projection: it.Projection,
                             };
-                        })) !== null && _d !== void 0 ? _d : [],
-                        gsi: (_f = (_e = table.GlobalSecondaryIndexes) === null || _e === void 0 ? void 0 : _e.map((it) => {
+                        })) !== null && _g !== void 0 ? _g : [],
+                        gsi: (_j = (_h = table.GlobalSecondaryIndexes) === null || _h === void 0 ? void 0 : _h.map((it) => {
+                            var _a, _b, _c, _d;
                             return {
                                 IndexName: it.IndexName,
                                 KeySchema: it.KeySchema,
@@ -143,17 +193,22 @@ class AwsDynamoServiceClient extends AwsServiceClient_1.AwsServiceClient {
                                 IndexSizeBytes: it.IndexSizeBytes,
                                 ItemCount: it.ItemCount,
                                 IndexArn: it.IndexArn,
+                                Projection: it.Projection,
+                                ReadCapacityUnits: (_a = it.ProvisionedThroughput) === null || _a === void 0 ? void 0 : _a.ReadCapacityUnits,
+                                WriteCapacityUnits: (_b = it.ProvisionedThroughput) === null || _b === void 0 ? void 0 : _b.WriteCapacityUnits,
+                                OnDemandMaxReadRequestUnits: (_c = it.OnDemandThroughput) === null || _c === void 0 ? void 0 : _c.MaxReadRequestUnits,
+                                OnDemandMaxWriteRequestUnits: (_d = it.OnDemandThroughput) === null || _d === void 0 ? void 0 : _d.MaxWriteRequestUnits,
                             };
-                        })) !== null && _f !== void 0 ? _f : [],
+                        })) !== null && _j !== void 0 ? _j : [],
                     });
-                    const cols = (_h = (_g = table.AttributeDefinitions) === null || _g === void 0 ? void 0 : _g.map((attr) => {
+                    const cols = (_l = (_k = table.AttributeDefinitions) === null || _k === void 0 ? void 0 : _k.map((attr) => {
                         var _a, _b;
                         const pk = (_a = table.KeySchema) === null || _a === void 0 ? void 0 : _a.some((it) => it.AttributeName === attr.AttributeName &&
                             it.KeyType === 'HASH');
                         const sk = (_b = table.KeySchema) === null || _b === void 0 ? void 0 : _b.some((it) => it.AttributeName === attr.AttributeName &&
                             it.KeyType === 'RANGE');
                         return new resource_1.DbDynamoTableColumn(attr.AttributeName, attr.AttributeType, pk, sk);
-                    })) !== null && _h !== void 0 ? _h : [];
+                    })) !== null && _l !== void 0 ? _l : [];
                     cols
                         .sort((a, b) => {
                         const n = (it) => (it.pk ? -2 : it.sk ? -1 : 0);
@@ -168,7 +223,7 @@ class AwsDynamoServiceClient extends AwsServiceClient_1.AwsServiceClient {
                         return a.name.localeCompare(b.name);
                     })
                         .forEach((it) => dynamoTable.addChild(it));
-                    (_j = table.ExtraItems) === null || _j === void 0 ? void 0 : _j.forEach((item) => {
+                    (_m = table.ExtraItems) === null || _m === void 0 ? void 0 : _m.forEach((item) => {
                         if (!dynamoTable.getChildByName(item.name)) {
                             const attrType = Object.keys(item.value)[0];
                             dynamoTable.addChild(new resource_1.DbDynamoTableColumn(item.name, attrType, false, false));
@@ -214,81 +269,88 @@ class AwsDynamoServiceClient extends AwsServiceClient_1.AwsServiceClient {
             };
         });
     }
-    scanItems(params) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            let LastEvaluatedKey = undefined;
-            let CapacityUnits = 0;
-            if (params.ExclusiveStartKey) {
-                LastEvaluatedKey = params.ExclusiveStartKey;
-            }
-            const Items = [];
+    collectScanItems(_a) {
+        return tslib_1.__awaiter(this, arguments, void 0, function* ({ limit, exclusiveStartKey, fetchPage, }) {
+            var _b;
+            let lastEvaluatedKey = exclusiveStartKey;
+            const items = [];
+            const tracker = new dynamoDbCapacity_1.DynamoDbExecutionMetaTracker();
             do {
-                const command = new lib_dynamodb_1.ScanCommand(Object.assign(Object.assign({}, params), { Limit: params.Limit ? params.Limit - Items.length : undefined, ExclusiveStartKey: LastEvaluatedKey ? LastEvaluatedKey : undefined, ReturnConsumedCapacity: 'TOTAL' }));
-                const response = yield this.client.send(command);
-                LastEvaluatedKey = response.LastEvaluatedKey;
-                CapacityUnits += (_b = (_a = response.ConsumedCapacity) === null || _a === void 0 ? void 0 : _a.CapacityUnits) !== null && _b !== void 0 ? _b : 0;
-                Items.push(...response.Items);
-                if (params.Limit && Items.length >= params.Limit) {
+                const remainingLimit = limit ? limit - items.length : undefined;
+                const response = yield fetchPage(remainingLimit, lastEvaluatedKey);
+                if (!response) {
                     break;
                 }
-            } while (LastEvaluatedKey);
+                tracker.recordResponse(response, { trackNativeCounts: true });
+                lastEvaluatedKey = response.LastEvaluatedKey;
+                items.push(...((_b = response.Items) !== null && _b !== void 0 ? _b : []));
+                if (limit && items.length >= limit) {
+                    break;
+                }
+            } while (lastEvaluatedKey);
             return {
-                Items,
-                LastEvaluatedKey,
-                Count: Items.length,
-                CapacityUnits,
+                items,
+                lastEvaluatedKey,
+                meta: tracker.build(!!lastEvaluatedKey),
+            };
+        });
+    }
+    scanItems(params) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const { items, lastEvaluatedKey, meta } = yield this.collectScanItems({
+                limit: params.Limit,
+                exclusiveStartKey: params.ExclusiveStartKey,
+                fetchPage: (remainingLimit, exclusiveStartKey) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    return yield this.docClient.send(new lib_dynamodb_1.ScanCommand(Object.assign(Object.assign({}, params), { Limit: remainingLimit, ExclusiveStartKey: exclusiveStartKey, ReturnConsumedCapacity: 'INDEXES' })));
+                }),
+            });
+            return {
+                Items: items,
+                LastEvaluatedKey: lastEvaluatedKey,
+                Count: items.length,
+                CapacityUnits: (_a = meta.capacityBreakdown) === null || _a === void 0 ? void 0 : _a.capacityUnits,
+                meta,
             };
         });
     }
     queryItems(params) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            let LastEvaluatedKey = undefined;
-            let CapacityUnits = 0;
-            if (params.ExclusiveStartKey) {
-                LastEvaluatedKey = params.ExclusiveStartKey;
-            }
-            const Items = [];
-            do {
-                const command = new lib_dynamodb_1.QueryCommand(Object.assign(Object.assign({}, params), { Limit: params.Limit ? params.Limit - Items.length : undefined, ExclusiveStartKey: LastEvaluatedKey ? LastEvaluatedKey : undefined, ReturnConsumedCapacity: 'TOTAL' }));
-                const response = yield this.docClient.send(command);
-                LastEvaluatedKey = response.LastEvaluatedKey;
-                CapacityUnits += (_b = (_a = response.ConsumedCapacity) === null || _a === void 0 ? void 0 : _a.CapacityUnits) !== null && _b !== void 0 ? _b : 0;
-                Items.push(...response.Items);
-                if (params.Limit && Items.length >= params.Limit) {
-                    break;
-                }
-            } while (LastEvaluatedKey);
+            var _a;
+            const { items, lastEvaluatedKey, meta } = yield this.collectScanItems({
+                limit: params.Limit,
+                exclusiveStartKey: params.ExclusiveStartKey,
+                fetchPage: (remainingLimit, exclusiveStartKey) => this.docClient.send(new lib_dynamodb_1.QueryCommand(Object.assign(Object.assign({}, params), { Limit: remainingLimit, ExclusiveStartKey: exclusiveStartKey, ReturnConsumedCapacity: 'INDEXES' }))),
+            });
             return {
-                Items,
-                LastEvaluatedKey,
-                Count: Items.length,
-                CapacityUnits,
+                Items: items,
+                LastEvaluatedKey: lastEvaluatedKey,
+                Count: items.length,
+                CapacityUnits: (_a = meta.capacityBreakdown) === null || _a === void 0 ? void 0 : _a.capacityUnits,
+                meta,
             };
         });
     }
     queryItemsAtClient(params) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
             const { TableName, IndexName } = params;
             let LastEvaluatedKey = undefined;
-            let CapacityUnits = 0;
             const qst = {
                 ast: { type: 'select' },
-                names: { tableName: TableName },
+                names: { tableName: TableName, indexName: IndexName },
             };
             const dbTable = this.getDbTable(qst);
             const Items = [];
             const allAttributeTypes = new Map();
             const startTime = new Date().getTime();
+            const tracker = new dynamoDbCapacity_1.DynamoDbExecutionMetaTracker();
             do {
                 const command = new client_dynamodb_1.QueryCommand(Object.assign(Object.assign({}, params), { TableName,
-                    IndexName, Limit: params.Limit ? params.Limit - Items.length : undefined, ExclusiveStartKey: LastEvaluatedKey ? LastEvaluatedKey : undefined, ReturnConsumedCapacity: 'TOTAL' }));
+                    IndexName, Limit: params.Limit ? params.Limit - Items.length : undefined, ExclusiveStartKey: LastEvaluatedKey ? LastEvaluatedKey : undefined, ReturnConsumedCapacity: 'INDEXES' }));
                 try {
                     const response = yield this.client.send(command);
+                    tracker.recordResponse(response, { trackNativeCounts: true });
                     LastEvaluatedKey = response.LastEvaluatedKey;
-                    CapacityUnits += (_b = (_a = response.ConsumedCapacity) === null || _a === void 0 ? void 0 : _a.CapacityUnits) !== null && _b !== void 0 ? _b : 0;
                     Items.push(...response.Items);
                     response.Items.forEach((item) => {
                         Object.keys(item)
@@ -323,9 +385,66 @@ class AwsDynamoServiceClient extends AwsServiceClient_1.AwsServiceClient {
                 },
                 qst,
                 elapsedTimeMilli,
-                capacityUnits: CapacityUnits,
                 dbTable,
                 allAttributeTypes,
+                meta: tracker.build(!!LastEvaluatedKey),
+                apiOperation: 'Query',
+            });
+            rs.meta.queryInput = JSON.stringify(params, null, 2);
+            return rs;
+        });
+    }
+    scanItemsAtClient(params) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const { TableName, IndexName } = params;
+            const qst = {
+                ast: { type: 'select' },
+                names: { tableName: TableName, indexName: IndexName },
+            };
+            const dbTable = this.getDbTable(qst);
+            const startTime = new Date().getTime();
+            const { items: Items, meta } = yield this.collectScanItems({
+                limit: params.Limit,
+                exclusiveStartKey: params.ExclusiveStartKey,
+                fetchPage: (remainingLimit, exclusiveStartKey) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    try {
+                        return yield this.client.send(new client_dynamodb_1.ScanCommand(Object.assign(Object.assign({}, params), { TableName, Limit: remainingLimit, ExclusiveStartKey: exclusiveStartKey, ReturnConsumedCapacity: 'INDEXES' })));
+                    }
+                    catch (e) {
+                        if (e.name === 'ResourceNotFoundException') {
+                            return undefined;
+                        }
+                        throw e;
+                    }
+                }),
+            });
+            const allAttributeTypes = new Map();
+            Items.forEach((item) => {
+                Object.keys(item)
+                    .filter((it) => !allAttributeTypes.has(it))
+                    .forEach((it) => {
+                    const colType = this.parseDynamoAttrTypeByNameAndItem(it, item);
+                    allAttributeTypes.set(it, colType);
+                });
+            });
+            const elapsedTimeMilli = new Date().getTime() - startTime;
+            const rs = this.itemsToResultSetData({
+                Count: Items.length,
+                Items,
+                params: {
+                    sql: '',
+                    conditions: {},
+                    meta: {
+                        type: 'select',
+                        tableName: TableName,
+                    },
+                },
+                qst,
+                elapsedTimeMilli,
+                dbTable,
+                allAttributeTypes,
+                meta,
+                apiOperation: 'Scan',
             });
             rs.meta.queryInput = JSON.stringify(params, null, 2);
             return rs;
@@ -333,23 +452,23 @@ class AwsDynamoServiceClient extends AwsServiceClient_1.AwsServiceClient {
     }
     executeStatementAtDocClient(params) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _a;
             this.interrupted = false;
             let LastEvaluatedKey = undefined;
             let NextToken = params.NextToken;
-            let CapacityUnits = 0;
             const allAttributeNames = new Set();
             const Items = [];
+            const tracker = new dynamoDbCapacity_1.DynamoDbExecutionMetaTracker();
             do {
                 if (this.interrupted) {
                     this.interrupted = false;
                     throw new Error('INTERRUPT');
                 }
-                const command = new lib_dynamodb_1.ExecuteStatementCommand(Object.assign(Object.assign({}, params), { Limit: params.Limit ? params.Limit - Items.length : undefined, NextToken, ReturnConsumedCapacity: 'TOTAL' }));
+                const command = new lib_dynamodb_1.ExecuteStatementCommand(Object.assign(Object.assign({}, params), { Limit: params.Limit ? params.Limit - Items.length : undefined, NextToken, ReturnConsumedCapacity: 'INDEXES' }));
                 const response = yield this.docClient.send(command);
+                tracker.recordResponse(response);
                 LastEvaluatedKey = response.LastEvaluatedKey;
                 NextToken = response.NextToken;
-                CapacityUnits += (_b = (_a = response.ConsumedCapacity) === null || _a === void 0 ? void 0 : _a.CapacityUnits) !== null && _b !== void 0 ? _b : 0;
                 Items.push(...response.Items);
                 response.Items.forEach((item) => {
                     Object.keys(item)
@@ -362,37 +481,39 @@ class AwsDynamoServiceClient extends AwsServiceClient_1.AwsServiceClient {
                     break;
                 }
             } while (LastEvaluatedKey || NextToken);
+            const meta = tracker.build(!!(LastEvaluatedKey || NextToken));
             return {
                 Items,
                 LastEvaluatedKey,
                 NextToken,
                 Count: Items.length,
-                CapacityUnits,
+                CapacityUnits: (_a = meta.capacityBreakdown) === null || _a === void 0 ? void 0 : _a.capacityUnits,
                 extra: {
                     allAttributeNames: [...allAttributeNames],
                 },
+                meta,
             };
         });
     }
     executeStatementAtClient(params) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _a;
             this.interrupted = false;
             let LastEvaluatedKey = undefined;
             let NextToken = params.NextToken;
-            let CapacityUnits = 0;
             const allAttributeTypes = new Map();
             const Items = [];
+            const tracker = new dynamoDbCapacity_1.DynamoDbExecutionMetaTracker();
             do {
                 if (this.interrupted) {
                     this.interrupted = false;
                     throw new Error('INTERRUPT');
                 }
-                const command = new client_dynamodb_1.ExecuteStatementCommand(Object.assign(Object.assign({}, params), { Limit: params.Limit ? params.Limit - Items.length : undefined, NextToken, ReturnConsumedCapacity: 'TOTAL' }));
+                const command = new client_dynamodb_1.ExecuteStatementCommand(Object.assign(Object.assign({}, params), { Limit: params.Limit ? params.Limit - Items.length : undefined, NextToken, ReturnConsumedCapacity: 'INDEXES' }));
                 const response = yield this.client.send(command);
+                tracker.recordResponse(response);
                 LastEvaluatedKey = response.LastEvaluatedKey;
                 NextToken = response.NextToken;
-                CapacityUnits += (_b = (_a = response.ConsumedCapacity) === null || _a === void 0 ? void 0 : _a.CapacityUnits) !== null && _b !== void 0 ? _b : 0;
                 Items.push(...response.Items);
                 response.Items.forEach((item) => {
                     Object.keys(item)
@@ -406,15 +527,17 @@ class AwsDynamoServiceClient extends AwsServiceClient_1.AwsServiceClient {
                     break;
                 }
             } while (LastEvaluatedKey || NextToken);
+            const meta = tracker.build(!!(LastEvaluatedKey || NextToken));
             return {
                 Items,
                 LastEvaluatedKey,
                 NextToken,
                 Count: Items.length,
-                CapacityUnits,
+                CapacityUnits: (_a = meta.capacityBreakdown) === null || _a === void 0 ? void 0 : _a.capacityUnits,
                 extra: {
                     allAttributeTypes,
                 },
+                meta,
             };
         });
     }
@@ -462,7 +585,7 @@ class AwsDynamoServiceClient extends AwsServiceClient_1.AwsServiceClient {
             if (binds && binds.length > 0) {
                 input.Parameters = (0, util_dynamodb_1.marshall)(binds);
             }
-            const { CapacityUnits: capacityUnits, Count, Items, extra: { allAttributeTypes }, } = yield this.executeStatementAtClient(input);
+            const { Count, Items, extra: { allAttributeTypes }, meta, } = yield this.executeStatementAtClient(input);
             const elapsedTimeMilli = new Date().getTime() - startTime;
             return this.itemsToResultSetData({
                 Count,
@@ -470,32 +593,168 @@ class AwsDynamoServiceClient extends AwsServiceClient_1.AwsServiceClient {
                 params,
                 qst,
                 elapsedTimeMilli,
-                capacityUnits,
                 dbTable,
                 allAttributeTypes,
+                meta,
+                apiOperation: 'ExecuteStatement',
             });
         });
     }
-    itemsToResultSetData({ Count, Items, params, qst, elapsedTimeMilli, capacityUnits, dbTable, allAttributeTypes, }) {
-        var _a, _b, _c, _d, _e;
-        let rdb = undefined;
-        const record = Count === 0 ? {} : Items[0];
-        const pkAndSk = dbTable === null || dbTable === void 0 ? void 0 : dbTable.getPkAndSkByIndex((_a = qst === null || qst === void 0 ? void 0 : qst.names) === null || _a === void 0 ? void 0 : _a.indexName);
+    observeNativeQueryRead(params) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e, _f;
+            const limit = Math.min((_a = params.maxEvaluatedItems) !== null && _a !== void 0 ? _a : exports.DYNAMODB_OBSERVED_READ_MAX_ITEMS, exports.DYNAMODB_OBSERVED_READ_MAX_ITEMS);
+            const startTime = Date.now();
+            const command = new client_dynamodb_1.QueryCommand(Object.assign(Object.assign({}, params.input), { Limit: limit, ExclusiveStartKey: undefined, ReturnConsumedCapacity: 'INDEXES' }));
+            const response = yield withTimeout(this.client.send(command, { abortSignal: params.signal }), params.timeoutMs);
+            return {
+                returnedItemCount: (_d = (_b = response.Count) !== null && _b !== void 0 ? _b : (_c = response.Items) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : 0,
+                scannedItemCount: response.ScannedCount,
+                hasMorePages: !!response.LastEvaluatedKey,
+                capacityBreakdown: (0, dynamoDbCapacity_1.aggregateConsumedCapacity)([response.ConsumedCapacity]),
+                clientElapsedTimeMs: Date.now() - startTime,
+                requestCount: 1,
+                retryCount: Math.max(0, ((_f = (_e = response.$metadata) === null || _e === void 0 ? void 0 : _e.attempts) !== null && _f !== void 0 ? _f : 1) - 1),
+            };
+        });
+    }
+    observePartiqlRead(params) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e, _f;
+            const qst = (0, helpers_1.parseQuery)(params.statement);
+            if (!qst || ((_a = qst.ast) === null || _a === void 0 ? void 0 : _a.type) !== 'select') {
+                throw new Error('Run Observed Read only supports a single SELECT statement.');
+            }
+            const limit = Math.min((_b = params.maxEvaluatedItems) !== null && _b !== void 0 ? _b : exports.DYNAMODB_OBSERVED_READ_MAX_ITEMS, exports.DYNAMODB_OBSERVED_READ_MAX_ITEMS);
+            const startTime = Date.now();
+            const input = {
+                Statement: params.statement,
+                Limit: limit,
+                ReturnConsumedCapacity: 'INDEXES',
+            };
+            if (params.parameters && params.parameters.length > 0) {
+                input.Parameters = (0, util_dynamodb_1.marshall)(params.parameters);
+            }
+            const response = yield withTimeout(this.client.send(new client_dynamodb_1.ExecuteStatementCommand(input), {
+                abortSignal: params.signal,
+            }), params.timeoutMs);
+            return {
+                returnedItemCount: (_d = (_c = response.Items) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : 0,
+                scannedItemCount: undefined,
+                hasMorePages: !!(response.LastEvaluatedKey || response.NextToken),
+                capacityBreakdown: (0, dynamoDbCapacity_1.aggregateConsumedCapacity)([response.ConsumedCapacity]),
+                clientElapsedTimeMs: Date.now() - startTime,
+                requestCount: 1,
+                retryCount: Math.max(0, ((_f = (_e = response.$metadata) === null || _e === void 0 ? void 0 : _e.attempts) !== null && _f !== void 0 ? _f : 1) - 1),
+            };
+        });
+    }
+    observeNativeQueryReadComplete(params) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+            const maxPages = Math.min((_a = params.maxPages) !== null && _a !== void 0 ? _a : exports.DYNAMODB_COMPLETE_READ_MAX_PAGES, exports.DYNAMODB_COMPLETE_READ_MAX_PAGES);
+            const maxEvaluatedItems = Math.min((_b = params.maxEvaluatedItems) !== null && _b !== void 0 ? _b : exports.DYNAMODB_COMPLETE_READ_MAX_EVALUATED_ITEMS, exports.DYNAMODB_COMPLETE_READ_MAX_EVALUATED_ITEMS);
+            const timeoutMs = Math.min((_c = params.timeoutMs) !== null && _c !== void 0 ? _c : exports.DYNAMODB_COMPLETE_READ_TIMEOUT_MS, exports.DYNAMODB_COMPLETE_READ_TIMEOUT_MS);
+            const startedAt = Date.now();
+            let exclusiveStartKey;
+            let returnedItemCount = 0;
+            let scannedItemCount = 0;
+            let pageCount = 0;
+            let hasMorePages = false;
+            const tracker = new dynamoDbCapacity_1.DynamoDbExecutionMetaTracker();
+            do {
+                const remainingItems = maxEvaluatedItems - scannedItemCount;
+                if (remainingItems <= 0 || pageCount >= maxPages)
+                    break;
+                const response = yield withTimeout(this.client.send(new client_dynamodb_1.QueryCommand(Object.assign(Object.assign({}, params.input), { Limit: Math.min(exports.DYNAMODB_OBSERVED_READ_MAX_ITEMS, remainingItems), ExclusiveStartKey: exclusiveStartKey, ReturnConsumedCapacity: 'INDEXES' })), { abortSignal: params.signal }), Math.max(1, timeoutMs - (Date.now() - startedAt)));
+                tracker.recordResponse(response, { trackNativeCounts: true });
+                pageCount += 1;
+                returnedItemCount += (_f = (_d = response.Count) !== null && _d !== void 0 ? _d : (_e = response.Items) === null || _e === void 0 ? void 0 : _e.length) !== null && _f !== void 0 ? _f : 0;
+                scannedItemCount +=
+                    (_k = (_h = (_g = response.ScannedCount) !== null && _g !== void 0 ? _g : response.Count) !== null && _h !== void 0 ? _h : (_j = response.Items) === null || _j === void 0 ? void 0 : _j.length) !== null && _k !== void 0 ? _k : 0;
+                exclusiveStartKey = response.LastEvaluatedKey;
+                hasMorePages = !!exclusiveStartKey;
+            } while (hasMorePages);
+            const meta = tracker.build(hasMorePages);
+            return {
+                returnedItemCount,
+                scannedItemCount,
+                hasMorePages,
+                capacityBreakdown: meta.capacityBreakdown,
+                clientElapsedTimeMs: Date.now() - startedAt,
+                requestCount: meta.requestCount,
+                retryCount: meta.retryCount,
+            };
+        });
+    }
+    observePartiqlReadComplete(params) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e;
+            const qst = (0, helpers_1.parseQuery)(params.statement);
+            if (!qst || ((_a = qst.ast) === null || _a === void 0 ? void 0 : _a.type) !== 'select') {
+                throw new Error('Complete-result Benchmark only supports a single SELECT statement.');
+            }
+            const maxPages = Math.min((_b = params.maxPages) !== null && _b !== void 0 ? _b : exports.DYNAMODB_COMPLETE_READ_MAX_PAGES, exports.DYNAMODB_COMPLETE_READ_MAX_PAGES);
+            const timeoutMs = Math.min((_c = params.timeoutMs) !== null && _c !== void 0 ? _c : exports.DYNAMODB_COMPLETE_READ_TIMEOUT_MS, exports.DYNAMODB_COMPLETE_READ_TIMEOUT_MS);
+            const startedAt = Date.now();
+            let nextToken;
+            let returnedItemCount = 0;
+            let pageCount = 0;
+            let hasMorePages = false;
+            const tracker = new dynamoDbCapacity_1.DynamoDbExecutionMetaTracker();
+            do {
+                if (pageCount >= maxPages)
+                    break;
+                const input = {
+                    Statement: params.statement,
+                    Limit: exports.DYNAMODB_OBSERVED_READ_MAX_ITEMS,
+                    NextToken: nextToken,
+                    ReturnConsumedCapacity: 'INDEXES',
+                };
+                if (params.parameters && params.parameters.length > 0)
+                    input.Parameters = (0, util_dynamodb_1.marshall)(params.parameters);
+                const response = yield withTimeout(this.client.send(new client_dynamodb_1.ExecuteStatementCommand(input), {
+                    abortSignal: params.signal,
+                }), Math.max(1, timeoutMs - (Date.now() - startedAt)));
+                tracker.recordResponse(response);
+                pageCount += 1;
+                returnedItemCount += (_e = (_d = response.Items) === null || _d === void 0 ? void 0 : _d.length) !== null && _e !== void 0 ? _e : 0;
+                nextToken = response.NextToken;
+                hasMorePages = !!(response.NextToken || response.LastEvaluatedKey);
+                if (!nextToken && hasMorePages)
+                    break;
+            } while (hasMorePages);
+            const meta = tracker.build(hasMorePages);
+            return {
+                returnedItemCount,
+                scannedItemCount: undefined,
+                hasMorePages,
+                capacityBreakdown: meta.capacityBreakdown,
+                clientElapsedTimeMs: Date.now() - startedAt,
+                requestCount: meta.requestCount,
+                retryCount: meta.retryCount,
+            };
+        });
+    }
+    static classifyPartiqlOperationFromText(sql) {
+        const withoutLeadingComments = sql.replace(/^(\s*(?:--[^\n]*\n|\/\*[\s\S]*?\*\/))*\s*/, '');
+        const m = withoutLeadingComments.match(/^(select|insert|update|delete)\b/i);
+        return m
+            ? m[1].toLowerCase()
+            : undefined;
+    }
+    itemsToResultSetData({ Count, Items, params, qst, elapsedTimeMilli, dbTable, allAttributeTypes, meta, apiOperation, }) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+        const materializedItems = Items !== null && Items !== void 0 ? Items : [];
+        const record = Count === 0 ? {} : (_a = materializedItems[0]) !== null && _a !== void 0 ? _a : {};
+        const indexName = (_b = qst === null || qst === void 0 ? void 0 : qst.names) === null || _b === void 0 ? void 0 : _b.indexName;
+        const accessPath = (0, dynamoDbResultMetadata_1.resolveDynamoDbAccessPath)(dbTable, indexName);
         const createRdhKeyFromName = (name) => {
             const col = dbTable === null || dbTable === void 0 ? void 0 : dbTable.getChildByName(name);
             const type = (col === null || col === void 0 ? void 0 : col.attrType)
                 ? (0, types_1.parseDynamoAttrType)(col.attrType)
                 : allAttributeTypes.get(name);
-            let comment = '';
-            let required = false;
-            if ((col === null || col === void 0 ? void 0 : col.name) === (pkAndSk === null || pkAndSk === void 0 ? void 0 : pkAndSk.pk)) {
-                comment = '(pk)';
-                required = true;
-            }
-            if ((col === null || col === void 0 ? void 0 : col.name) === (pkAndSk === null || pkAndSk === void 0 ? void 0 : pkAndSk.sk)) {
-                comment = '(sk)';
-                required = true;
-            }
+            const { comment, required } = (0, dynamoDbResultMetadata_1.describeDynamoDbResultKey)(dbTable, indexName, name);
             return (0, rdh_1.createRdhKey)({
                 name,
                 type,
@@ -504,43 +763,31 @@ class AwsDynamoServiceClient extends AwsServiceClient_1.AwsServiceClient {
             });
         };
         const keys = Object.keys(record).map((it) => createRdhKeyFromName(it));
+        const keyNames = new Set(keys.map((key) => key.name));
         for (const [attrName, colType] of allAttributeTypes) {
-            if (!keys.map((key) => key.name).includes(attrName)) {
+            if (!keyNames.has(attrName)) {
                 keys.push((0, rdh_1.createRdhKey)({
                     name: attrName,
                     type: colType,
                 }));
+                keyNames.add(attrName);
             }
         }
-        if (((_b = qst === null || qst === void 0 ? void 0 : qst.ast) === null || _b === void 0 ? void 0 : _b.type) === 'select' &&
-            ((_c = qst === null || qst === void 0 ? void 0 : qst.ast) === null || _c === void 0 ? void 0 : _c.columns) &&
-            ((_d = qst === null || qst === void 0 ? void 0 : qst.ast) === null || _d === void 0 ? void 0 : _d.columns.length) === 1) {
+        if (((_c = qst === null || qst === void 0 ? void 0 : qst.ast) === null || _c === void 0 ? void 0 : _c.type) === 'select' &&
+            ((_d = qst === null || qst === void 0 ? void 0 : qst.ast) === null || _d === void 0 ? void 0 : _d.columns) &&
+            ((_e = qst === null || qst === void 0 ? void 0 : qst.ast) === null || _e === void 0 ? void 0 : _e.columns.length) === 1) {
             const { expr } = qst.ast.columns[0];
             if (expr.type === 'ref' && expr.name === '*') {
                 if (Count === 0 && keys.length === 0) {
-                    if (pkAndSk === null || pkAndSk === void 0 ? void 0 : pkAndSk.pk) {
-                        keys.push(createRdhKeyFromName(pkAndSk === null || pkAndSk === void 0 ? void 0 : pkAndSk.pk));
-                    }
-                    if (pkAndSk === null || pkAndSk === void 0 ? void 0 : pkAndSk.sk) {
-                        keys.push(createRdhKeyFromName(pkAndSk === null || pkAndSk === void 0 ? void 0 : pkAndSk.sk));
+                    for (const keyName of (0, dynamoDbResultMetadata_1.getDynamoDbResultKeyNames)(dbTable, indexName)) {
+                        keys.push(createRdhKeyFromName(keyName));
                     }
                 }
-                keys.sort((a, b) => {
-                    const n = (it) => it.name === (pkAndSk === null || pkAndSk === void 0 ? void 0 : pkAndSk.pk) ? -2 : it.name === (pkAndSk === null || pkAndSk === void 0 ? void 0 : pkAndSk.sk) ? -1 : 0;
-                    const an = n(a);
-                    const bn = n(b);
-                    if (an < bn) {
-                        return -1;
-                    }
-                    if (an > bn) {
-                        return 1;
-                    }
-                    return a.name.localeCompare(b.name);
-                });
+                keys.sort((a, b) => (0, dynamoDbResultMetadata_1.compareDynamoDbResultKeys)(dbTable, indexName, a.name, b.name));
             }
         }
-        rdb = new rdh_1.ResultSetDataBuilder(keys);
-        Items.forEach((item) => {
+        const rdb = new rdh_1.ResultSetDataBuilder(keys);
+        materializedItems.forEach((item) => {
             const values = (0, util_dynamodb_1.unmarshall)(item);
             Object.entries(values).forEach(([key, value]) => {
                 const attrType = Object.keys(item[key])[0];
@@ -556,14 +803,63 @@ class AwsDynamoServiceClient extends AwsServiceClient_1.AwsServiceClient {
             connectionName: this.conRes.name,
             params,
             rdb,
-            type: (_e = qst === null || qst === void 0 ? void 0 : qst.ast) === null || _e === void 0 ? void 0 : _e.type,
+            type: (_f = qst === null || qst === void 0 ? void 0 : qst.ast) === null || _f === void 0 ? void 0 : _f.type,
             qst,
             dbTable,
         });
+        const operation = (_h = (_g = qst === null || qst === void 0 ? void 0 : qst.ast) === null || _g === void 0 ? void 0 : _g.type) !== null && _h !== void 0 ? _h : AwsDynamoServiceClient.classifyPartiqlOperationFromText(params.sql);
+        const isKnownWrite = operation === 'insert' ||
+            operation === 'update' ||
+            operation === 'delete';
+        const selectedRows = isKnownWrite ? undefined : rdb.rs.rows.length;
+        const affectedRows = undefined;
+        const capacityUnits = (_j = meta === null || meta === void 0 ? void 0 : meta.capacityBreakdown) === null || _j === void 0 ? void 0 : _j.capacityUnits;
+        if ((meta === null || meta === void 0 ? void 0 : meta.reportedCount) !== undefined &&
+            selectedRows !== undefined &&
+            meta.reportedCount !== selectedRows) {
+            console.warn(`[AwsDynamoServiceClient] DynamoDB-reported Count (${meta.reportedCount}) does not match the number of items materialized into ResultSetData (${selectedRows}) for table "${(_m = (_k = dbTable === null || dbTable === void 0 ? void 0 : dbTable.name) !== null && _k !== void 0 ? _k : (_l = params.meta) === null || _l === void 0 ? void 0 : _l.tableName) !== null && _m !== void 0 ? _m : 'unknown'}".`);
+        }
+        const dynamoDb = meta
+            ? {
+                apiOperation,
+                accessPath,
+                returnedItemCount: selectedRows,
+                evaluatedItemCount: meta.scannedCount,
+                successfulResponseCount: meta.requestCount,
+                sdkRetryCount: meta.retryCount,
+                continuationTokenPresent: meta.hasMorePages,
+                consumedCapacity: meta.capacityBreakdown
+                    ? {
+                        totalCapacityUnits: meta.capacityBreakdown.capacityUnits,
+                        totalReadCapacityUnits: meta.capacityBreakdown.readCapacityUnits,
+                        totalWriteCapacityUnits: meta.capacityBreakdown.writeCapacityUnits,
+                        table: meta.capacityBreakdown.table,
+                        localSecondaryIndexes: meta.capacityBreakdown.localSecondaryIndexes,
+                        globalSecondaryIndexes: meta.capacityBreakdown.globalSecondaryIndexes,
+                    }
+                    : undefined,
+            }
+            : undefined;
         rdb.setSummary({
+            info: (0, dynamoDbRdhSummary_1.buildDynamoDbRdhSummaryInfo)({
+                operation,
+                elapsedTimeMilli,
+                selectedRows,
+                affectedRows,
+                scannedRows: meta === null || meta === void 0 ? void 0 : meta.scannedCount,
+                requestCount: meta === null || meta === void 0 ? void 0 : meta.requestCount,
+                retryCount: meta === null || meta === void 0 ? void 0 : meta.retryCount,
+                capacityUnits,
+                readCapacityUnits: (_o = meta === null || meta === void 0 ? void 0 : meta.capacityBreakdown) === null || _o === void 0 ? void 0 : _o.readCapacityUnits,
+                writeCapacityUnits: (_p = meta === null || meta === void 0 ? void 0 : meta.capacityBreakdown) === null || _p === void 0 ? void 0 : _p.writeCapacityUnits,
+                hasMoreRows: meta === null || meta === void 0 ? void 0 : meta.hasMorePages,
+                accessPath,
+            }),
             elapsedTimeMilli,
-            selectedRows: rdb.rs.rows.length,
+            selectedRows,
+            affectedRows,
             capacityUnits,
+            dynamoDb,
         });
         return rdb.build();
     }