ACCUMULO-3283 Create ColumnFQ only once MetadataTableUtil.getTabletEntries creates ColumnFQ twice This change removes the redundant second creation.
Signed-off-by: Christopher Tubbs <ctubb...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/bf7bbb5b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/bf7bbb5b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/bf7bbb5b Branch: refs/heads/master Commit: bf7bbb5b0bee73079cef260c4e6da6a7749e01a5 Parents: 7619532 Author: D Hwang <d-hw...@users.noreply.github.com> Authored: Tue Aug 1 10:40:28 2017 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Tue Aug 1 20:12:09 2017 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/server/util/MetadataTableUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/bf7bbb5b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java index f7fd31f..ebba5a6 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java +++ b/server/base/src/main/java/org/apache/accumulo/server/util/MetadataTableUtil.java @@ -1052,8 +1052,8 @@ public class MetadataTableUtil { } for (Entry<Key,Value> entry : tabletKeyValues.entrySet()) { - - if (columns != null && !colSet.contains(new ColumnFQ(entry.getKey()))) { + ColumnFQ currentKey = new ColumnFQ(entry.getKey()); + if (columns != null && !colSet.contains(currentKey)) { continue; } @@ -1065,7 +1065,7 @@ public class MetadataTableUtil { tabletEntries.put(row, colVals); } - colVals.put(new ColumnFQ(entry.getKey()), entry.getValue()); + colVals.put(currentKey, entry.getValue()); } return tabletEntries;
