Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enhanced mapper logging #51

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

enhanced mapper logging #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions src/main/scala/dynamodb/mapper.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ trait AmazonDynamoDBScalaMapper {

client.deleteItem(request) map { result =>
if (logger.isDebugEnabled)
logger.debug(s"deleteByKey() ConsumedCapacity = ${result.getConsumedCapacity()}")
logger.debug(s"table $tableName deleteByKey() ConsumedCapacity = ${result.getConsumedCapacity()}")

Option { result.getAttributes } map { item =>
serializer.fromAttributeMap(item.asScala)
Expand Down Expand Up @@ -377,7 +377,7 @@ trait AmazonDynamoDBScalaMapper {

client.deleteItem(request) map { result =>
if (logger.isDebugEnabled)
logger.debug(s"deleteByKey() ConsumedCapacity = ${result.getConsumedCapacity()}")
logger.debug(s"table $tableName deleteByKey() ConsumedCapacity = ${result.getConsumedCapacity()}")

Option { result.getAttributes } map { item =>
serializer.fromAttributeMap(item.asScala)
Expand Down Expand Up @@ -422,7 +422,7 @@ trait AmazonDynamoDBScalaMapper {

client.deleteItem(request) map { result =>
if (logger.isDebugEnabled)
logger.debug(s"delete() ConsumedCapacity = ${result.getConsumedCapacity()}")
logger.debug(s"table $tableName delete() ConsumedCapacity = ${result.getConsumedCapacity()}")
}
}

Expand Down Expand Up @@ -453,7 +453,7 @@ trait AmazonDynamoDBScalaMapper {

client.putItem(request) map { result =>
if (logger.isDebugEnabled)
logger.debug(s"dump() ConsumedCapacity = ${result.getConsumedCapacity()}")
logger.debug(s"table $tableName dump() ConsumedCapacity = ${result.getConsumedCapacity()}")
}
}

Expand Down Expand Up @@ -506,7 +506,7 @@ trait AmazonDynamoDBScalaMapper {

client.getItem(request) map { result =>
if (logger.isDebugEnabled)
logger.debug(s"loadByKey() ConsumedCapacity = ${result.getConsumedCapacity()}")
logger.debug(s"table $tableName loadByKey() ConsumedCapacity = ${result.getConsumedCapacity()}")

Option { result.getItem } map { item =>
serializer.fromAttributeMap(item.asScala)
Expand Down Expand Up @@ -551,7 +551,7 @@ trait AmazonDynamoDBScalaMapper {

client.getItem(request) map { result =>
if (logger.isDebugEnabled)
logger.debug(s"loadByKey() ConsumedCapacity = ${result.getConsumedCapacity()}")
logger.debug(s"table $tableName loadByKey() ConsumedCapacity = ${result.getConsumedCapacity()}")

Option { result.getItem } map { item =>
serializer.fromAttributeMap(item.asScala)
Expand Down Expand Up @@ -660,7 +660,7 @@ trait AmazonDynamoDBScalaMapper {
scanRequest.withExclusiveStartKey(lastEvaluatedKey.orNull)
) map { result =>
if (logger.isDebugEnabled)
logger.debug(s"scanOnce() ConsumedCapacity = ${result.getConsumedCapacity()}")
logger.debug(s"table $tableName scanOnce() ConsumedCapacity = ${result.getConsumedCapacity()}")

val r = result.getItems.asScala map { item =>
serializer.fromAttributeMap(item.asScala)
Expand Down Expand Up @@ -700,7 +700,7 @@ trait AmazonDynamoDBScalaMapper {
scanRequest.withExclusiveStartKey(lastKey.orNull)
) flatMap { result =>
if (logger.isDebugEnabled)
logger.debug(s"countScan() ConsumedCapacity = ${result.getConsumedCapacity()}")
logger.debug(s"table $tableName countScan() ConsumedCapacity = ${result.getConsumedCapacity()}")

val newCount = count + result.getCount
Option { result.getLastEvaluatedKey } match {
Expand Down Expand Up @@ -799,7 +799,7 @@ trait AmazonDynamoDBScalaMapper {
queryRequest.withExclusiveStartKey(lastKey.orNull)
) flatMap { result =>
if (logger.isDebugEnabled)
logger.debug(s"query() ConsumedCapacity = ${result.getConsumedCapacity}")
logger.debug(s"table $tableName query() ConsumedCapacity = ${result.getConsumedCapacity}")

val queryResult = result.getItems.asScala map { item =>
serializer.fromAttributeMap(item.asScala)
Expand Down Expand Up @@ -1372,7 +1372,7 @@ trait AmazonDynamoDBScalaMapper {
queryRequest
) map { result =>
if (logger.isDebugEnabled)
logger.debug(s"queryOnce() ConsumedCapacity = ${result.getConsumedCapacity()}")
logger.debug(s"table $tableName queryOnce() ConsumedCapacity = ${result.getConsumedCapacity()}")

result.getItems.asScala.view map { item =>
serializer.fromAttributeMap(item.asScala)
Expand Down Expand Up @@ -1747,7 +1747,7 @@ trait AmazonDynamoDBScalaMapper {
queryRequest.withExclusiveStartKey(lastKey.orNull)
) flatMap { result =>
if (logger.isDebugEnabled)
logger.debug(s"countQuery() ConsumedCapacity = ${result.getConsumedCapacity()}")
logger.debug(s"table $tableName countQuery() ConsumedCapacity = ${result.getConsumedCapacity()}")

val newCount = count + result.getCount

Expand Down Expand Up @@ -2022,7 +2022,7 @@ trait AmazonDynamoDBScalaMapper {

client.batchGetItem(request) flatMap { result =>
if (logger.isDebugEnabled)
logger.debug(s"batchLoadByKeys() ConsumedCapacity = ${result.getConsumedCapacity()}")
logger.debug(s"table $tableName batchLoadByKeys() ConsumedCapacity = ${result.getConsumedCapacity()}")

builder ++= result.getResponses.get(tableName).asScala.view map { item =>
serializer.fromAttributeMap(item.asScala)
Expand Down Expand Up @@ -2118,7 +2118,7 @@ trait AmazonDynamoDBScalaMapper {

client.batchWriteItem(request) flatMap { result =>
if (logger.isDebugEnabled)
logger.debug(s"batchDump() ConsumedCapacity = ${result.getConsumedCapacity()}")
logger.debug(s"table $tableName batchDump() ConsumedCapacity = ${result.getConsumedCapacity()}")

checkRetryBatchWrite(result) flatMap { _ =>
if (objsPair._2.isEmpty)
Expand Down Expand Up @@ -2168,7 +2168,7 @@ trait AmazonDynamoDBScalaMapper {

client.batchWriteItem(request) flatMap { result =>
if (logger.isDebugEnabled)
logger.debug(s"batchDelete() ConsumedCapacity = ${result.getConsumedCapacity()}")
logger.debug(s"table $tableName batchDelete() ConsumedCapacity = ${result.getConsumedCapacity()}")

checkRetryBatchWrite(result) flatMap { _ =>
if (objsPair._2.isEmpty)
Expand Down Expand Up @@ -2276,7 +2276,7 @@ trait AmazonDynamoDBScalaMapper {

client.batchWriteItem(request) flatMap { result =>
if (logger.isDebugEnabled)
logger.debug(s"batchDeleteByKeys() ConsumedCapacity = ${result.getConsumedCapacity()}")
logger.debug(s"table $tableName batchDeleteByKeys() ConsumedCapacity = ${result.getConsumedCapacity()}")

checkRetryBatchWrite(result) flatMap { _ =>
if (keysPair._2.isEmpty)
Expand Down
2 changes: 1 addition & 1 deletion version.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := "0.8.0"
version in ThisBuild := "0.8.1"