Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix incomplete LastEvaluatedKey when using Global Secondary Index (#4488)

Browse Source
This commit is contained in:
Vincent Barbaresi 2021-10-28 12:10:11 +02:00 committed by GitHub
parent b7560c9ad2
commit 6f5cae98ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 62 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
moto/dynamodb2/models/__init__.py
View File

@ -825,7 +825,7 @@ class Table(CloudFormationModel):
result.filter(projection_expression)
results, last_evaluated_key = self._trim_results(
results, limit, exclusive_start_key
results, limit, exclusive_start_key, scanned_index=index_name
)
return results, scanned_count, last_evaluated_key
@ -917,7 +917,7 @@ class Table(CloudFormationModel):
result.filter(projection_expression)
results, last_evaluated_key = self._trim_results(
results, limit, exclusive_start_key, index_name
results, limit, exclusive_start_key, scanned_index=index_name
)
return results, scanned_count, last_evaluated_key

60
tests/test_dynamodb2/test_dynamodb.py
View File

@ -5965,3 +5965,63 @@ def test_batch_write_item():
table = conn.Table(f"table-{idx}")
scan = table.scan()
assert scan["Count"].should.equal(0)
@mock_dynamodb2
def test_gsi_lastevaluatedkey():
# github.com/spulec/moto/issues/3968
conn = boto3.resource("dynamodb", region_name="us-west-2")
name = "test-table"
table = conn.Table(name)
conn.create_table(
TableName=name,
KeySchema=[{"AttributeName": "main_key", "KeyType": "HASH"}],
AttributeDefinitions=[
{"AttributeName": "main_key", "AttributeType": "S"},
{"AttributeName": "index_key", "AttributeType": "S"},
],
ProvisionedThroughput={"ReadCapacityUnits": 5, "WriteCapacityUnits": 5},
GlobalSecondaryIndexes=[
{
"IndexName": "test_index",
"KeySchema": [{"AttributeName": "index_key", "KeyType": "HASH"}],
"Projection": {"ProjectionType": "ALL",},
"ProvisionedThroughput": {
"ReadCapacityUnits": 1,
"WriteCapacityUnits": 1,
},
}
],
)
table.put_item(
Item={
"main_key": "testkey1",
"extra_data": "testdata",
"index_key": "indexkey",
},
)
table.put_item(
Item={
"main_key": "testkey2",
"extra_data": "testdata",
"index_key": "indexkey",
},
)
response = table.query(
Limit=1,
KeyConditionExpression=Key("index_key").eq("indexkey"),
IndexName="test_index",
)
items = response["Items"]
items.should.have.length_of(1)
items[0].should.equal(
{"main_key": "testkey1", "extra_data": "testdata", "index_key": "indexkey"}
)
last_evaluated_key = response["LastEvaluatedKey"]
last_evaluated_key.should.have.length_of(2)
last_evaluated_key.should.equal({"main_key": "testkey1", "index_key": "indexkey"})