Merge pull request #50 from JupiterOne/NOTICKET-remove-default-query-…

…limit

Remove default query limit

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupiterone/dynamodb-dao",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "description": "DynamoDB Data Access Object (DAO) helper library",
   "repository": {
     "type": "git",

src/constants.ts

@@ -1,3 +1,2 @@
-export const DEFAULT_QUERY_LIMIT = 50;
 export const MAX_BATCH_OPERATIONS = 25;
 export const DEFAULT_LOCK_INCREMENT = 1;

src/index.test.ts

@@ -2,7 +2,6 @@ import * as AWS from 'aws-sdk';
 import { v4 as uuid } from 'uuid';
 import DynamoDbDao from '.';
 import mockLogger from '../test/helpers/mockLogger';
-import { DEFAULT_QUERY_LIMIT } from './constants';
 import { CountOutput } from './types';
 import { generateUpdateParams } from './update/generateUpdateParams';
 
@@ -211,7 +210,6 @@ test(`#query should have default query limit`, async () => {
   expect(documentClient.query).toHaveBeenCalledWith({
     TableName: tableName,
     IndexName: index,
-    Limit: DEFAULT_QUERY_LIMIT,
     ExclusiveStartKey: undefined,
     KeyConditionExpression: keyConditionExpression,
     ExpressionAttributeValues: attributeValues,
@@ -509,7 +507,6 @@ test('#scan should allow consistent reads', async () => {
 
   expect(documentClient.scan).toHaveBeenCalledWith({
     ConsistentRead: true,
-    Limit: 50,
     TableName: tableName,
   });
 });

src/index.ts

@@ -2,11 +2,7 @@ import { sleep } from '@lifeomic/attempt';
 import { DocumentClient } from 'aws-sdk/clients/dynamodb';
 import chunk from 'lodash.chunk';
 import pMap from 'p-map';
-import {
-  DEFAULT_LOCK_INCREMENT,
-  DEFAULT_QUERY_LIMIT,
-  MAX_BATCH_OPERATIONS,
-} from './constants';
+import { DEFAULT_LOCK_INCREMENT, MAX_BATCH_OPERATIONS } from './constants';
 import { buildOptimisticLockOptions } from './locking/buildOptimisticLockOptions';
 import {
   decodeQueryUntilLimitCursor,
@@ -181,7 +177,10 @@ export default class DynamoDbDao<DataModel, KeySchema> {
 
       // If the version attribute is supplied, increment it, otherwise only
       // set the default if directed to do so
-      if (versionAttribute in data && !isNaN(dataAsMap[versionAttribute])) {
+      if (
+        versionAttribute in dataAsMap &&
+        !isNaN(dataAsMap[versionAttribute])
+      ) {
         dataAsMap[versionAttribute] += DEFAULT_LOCK_INCREMENT;
       } else if (this.autoInitiateLockingAttribute) {
         dataAsMap[versionAttribute] = DEFAULT_LOCK_INCREMENT;
@@ -354,7 +353,7 @@ export default class DynamoDbDao<DataModel, KeySchema> {
       scanIndexForward,
       keyConditionExpression,
       filterExpression,
-      limit = DEFAULT_QUERY_LIMIT,
+      limit,
       consistentRead,
     } = input;
 
@@ -475,7 +474,7 @@ export default class DynamoDbDao<DataModel, KeySchema> {
       filterExpression,
       segment,
       totalSegments,
-      limit = DEFAULT_QUERY_LIMIT,
+      limit,
       consistentRead,
     } = input;