Updated Branches: refs/heads/master ddde450b9 -> c00ac6287
ACCUMULO-1862 implement the desired truncate Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b005a241 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b005a241 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b005a241 Branch: refs/heads/master Commit: b005a24112affb011d15168963a76dac6434f491 Parents: 81861db Author: Eric Newton <eric.new...@gmail.com> Authored: Thu Nov 7 17:28:50 2013 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Thu Nov 7 17:29:08 2013 -0500 ---------------------------------------------------------------------- .../accumulo/server/security/AuditedSecurityOperation.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b005a241/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java b/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java index ee337a5..7148556 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java +++ b/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java @@ -130,7 +130,7 @@ public class AuditedSecurityOperation extends SecurityOperation { List<String> result = new ArrayList<String>(); int i = 0; for (Object obj : list) { - if (i > MAX_ELEMENTS_TO_LOG) { + if (i++ > MAX_ELEMENTS_TO_LOG) { result.add(" and " + (list.size() - MAX_ELEMENTS_TO_LOG) + " more "); break; } @@ -179,11 +179,11 @@ public class AuditedSecurityOperation extends SecurityOperation { try { boolean canScan = super.canScan(credentials, tableId); - audit(credentials, canScan, CAN_SCAN_BATCH_AUDIT_TEMPLATE, tableName, getAuthString(authorizations), convertedBatch, convertedColumns, ssiList, ssio); + audit(credentials, canScan, CAN_SCAN_BATCH_AUDIT_TEMPLATE, tableName, getAuthString(authorizations), truncated, convertedColumns, ssiList, ssio); return canScan; } catch (ThriftSecurityException ex) { - audit(credentials, ex, CAN_SCAN_BATCH_AUDIT_TEMPLATE, getAuthString(authorizations), tableId, convertedBatch, convertedColumns, ssiList, ssio); + audit(credentials, ex, CAN_SCAN_BATCH_AUDIT_TEMPLATE, getAuthString(authorizations), tableId, truncated, convertedColumns, ssiList, ssio); throw ex; } } else {
