You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/06/13 04:36:23 UTC
[1/9] git commit: ACCUMULO-2832 fixed object creation in
Defaultformatter. Uses single Text object.
Repository: accumulo
Updated Branches:
refs/heads/1.5.2-SNAPSHOT a3a86412b -> 3d469eb85
refs/heads/1.6.1-SNAPSHOT b65035a31 -> ab4ecfc25
refs/heads/master 7d639d8b8 -> 5e4478057
ACCUMULO-2832 fixed object creation in Defaultformatter. Uses single Text object.
Signed-off-by: Josh Elser <el...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/59591273
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/59591273
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/59591273
Branch: refs/heads/1.5.2-SNAPSHOT
Commit: 59591273317147600a4299e215114fcf1fc1c341
Parents: a3a8641
Author: meislerj <ja...@gmail.com>
Authored: Thu Jun 12 19:26:16 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jun 12 21:34:55 2014 -0400
----------------------------------------------------------------------
.../accumulo/core/util/format/DefaultFormatter.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/59591273/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java b/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
index 78abed9..2b8a88c 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
@@ -60,22 +60,24 @@ public class DefaultFormatter implements Formatter {
// this should be replaced with something like Record.toString();
public static String formatEntry(Entry<Key,Value> entry, boolean showTimestamps) {
StringBuilder sb = new StringBuilder();
+ Key key = entry.getKey();
+ Text buffer = new Text();
// append row
- appendText(sb, entry.getKey().getRow()).append(" ");
+ appendText(sb, key.getRow(buffer)).append(" ");
// append column family
- appendText(sb, entry.getKey().getColumnFamily()).append(":");
+ appendText(sb, key.getColumnFamily(buffer)).append(":");
// append column qualifier
- appendText(sb, entry.getKey().getColumnQualifier()).append(" ");
+ appendText(sb, key.getColumnQualifier(buffer)).append(" ");
// append visibility expression
- sb.append(new ColumnVisibility(entry.getKey().getColumnVisibility()));
+ sb.append(new ColumnVisibility(key.getColumnVisibility(buffer)));
// append timestamp
if (showTimestamps)
- sb.append(" ").append(entry.getKey().getTimestamp());
+ sb.append(" ").append(key.getTimestamp());
// append value
if (entry.getValue() != null && entry.getValue().getSize() > 0) {
[3/9] git commit: ACCUMULO-2832 fixed object creation in
Defaultformatter. Uses single Text object.
Posted by el...@apache.org.
ACCUMULO-2832 fixed object creation in Defaultformatter. Uses single Text object.
Signed-off-by: Josh Elser <el...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/59591273
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/59591273
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/59591273
Branch: refs/heads/master
Commit: 59591273317147600a4299e215114fcf1fc1c341
Parents: a3a8641
Author: meislerj <ja...@gmail.com>
Authored: Thu Jun 12 19:26:16 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jun 12 21:34:55 2014 -0400
----------------------------------------------------------------------
.../accumulo/core/util/format/DefaultFormatter.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/59591273/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java b/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
index 78abed9..2b8a88c 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
@@ -60,22 +60,24 @@ public class DefaultFormatter implements Formatter {
// this should be replaced with something like Record.toString();
public static String formatEntry(Entry<Key,Value> entry, boolean showTimestamps) {
StringBuilder sb = new StringBuilder();
+ Key key = entry.getKey();
+ Text buffer = new Text();
// append row
- appendText(sb, entry.getKey().getRow()).append(" ");
+ appendText(sb, key.getRow(buffer)).append(" ");
// append column family
- appendText(sb, entry.getKey().getColumnFamily()).append(":");
+ appendText(sb, key.getColumnFamily(buffer)).append(":");
// append column qualifier
- appendText(sb, entry.getKey().getColumnQualifier()).append(" ");
+ appendText(sb, key.getColumnQualifier(buffer)).append(" ");
// append visibility expression
- sb.append(new ColumnVisibility(entry.getKey().getColumnVisibility()));
+ sb.append(new ColumnVisibility(key.getColumnVisibility(buffer)));
// append timestamp
if (showTimestamps)
- sb.append(" ").append(entry.getKey().getTimestamp());
+ sb.append(" ").append(key.getTimestamp());
// append value
if (entry.getValue() != null && entry.getValue().getSize() > 0) {
[7/9] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Posted by el...@apache.org.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Conflicts:
core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ab4ecfc2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ab4ecfc2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ab4ecfc2
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: ab4ecfc252d3a634f4e266819c4226a6fc30212c
Parents: b65035a 3d469eb
Author: Josh Elser <el...@apache.org>
Authored: Thu Jun 12 22:35:09 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jun 12 22:35:09 2014 -0400
----------------------------------------------------------------------
.../apache/accumulo/core/iterators/Combiner.java | 10 +++++-----
.../accumulo/core/util/format/DefaultFormatter.java | 16 ++++++++--------
2 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab4ecfc2/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab4ecfc2/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
index acd4ba1,2b8a88c..931b59f
--- a/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
@@@ -92,55 -56,33 +92,55 @@@ public class DefaultFormatter implement
if (!expectInitialized && si != null)
throw new IllegalStateException("Already initialized");
}
-
+
// this should be replaced with something like Record.toString();
public static String formatEntry(Entry<Key,Value> entry, boolean showTimestamps) {
+ DateFormat timestampFormat = null;
+
+ if(showTimestamps) {
+ timestampFormat = formatter.get();
+ }
+
+ return formatEntry(entry, timestampFormat);
+ }
+
+ /* so a new date object doesn't get created for every record in the scan result */
+ private static ThreadLocal<Date> tmpDate = new ThreadLocal<Date>() {
+ @Override
+ protected Date initialValue() {
+ return new Date();
+ }
+ };
+
+ public static String formatEntry(Entry<Key,Value> entry, DateFormat timestampFormat) {
StringBuilder sb = new StringBuilder();
-
Key key = entry.getKey();
+ Text buffer = new Text();
-
+
// append row
- appendText(sb, key.getRow()).append(" ");
-
+ appendText(sb, key.getRow(buffer)).append(" ");
+
// append column family
- appendText(sb, key.getColumnFamily()).append(":");
-
+ appendText(sb, key.getColumnFamily(buffer)).append(":");
+
// append column qualifier
- appendText(sb, key.getColumnQualifier()).append(" ");
-
+ appendText(sb, key.getColumnQualifier(buffer)).append(" ");
+
// append visibility expression
- sb.append(new ColumnVisibility(key.getColumnVisibility()));
+ sb.append(new ColumnVisibility(key.getColumnVisibility(buffer)));
// append timestamp
- if (showTimestamps)
- sb.append(" ").append(key.getTimestamp());
-
+ if (timestampFormat != null) {
+ tmpDate.get().setTime(entry.getKey().getTimestamp());
+ sb.append(" ").append(timestampFormat.format(tmpDate.get()));
+ }
+
+ Value value = entry.getValue();
+
// append value
- if (entry.getValue() != null && entry.getValue().getSize() > 0) {
+ if (value != null && value.getSize() > 0) {
sb.append("\t");
- appendValue(sb, entry.getValue());
+ appendValue(sb, value);
}
return sb.toString();
[5/9] git commit: ACCUMULO-2663 Fix some compilation issues from
guava deps
Posted by el...@apache.org.
ACCUMULO-2663 Fix some compilation issues from guava deps
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3d469eb8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3d469eb8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3d469eb8
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: 3d469eb853a56ea5e1d0e15c049eb0284d2046c3
Parents: 5959127
Author: Josh Elser <el...@apache.org>
Authored: Thu Jun 12 22:28:56 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jun 12 22:28:56 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/core/iterators/Combiner.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3d469eb8/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
index dd215cc..8ec22fe 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
@@ -16,15 +16,12 @@
*/
package org.apache.accumulo.core.iterators;
-import com.google.common.base.Splitter;
import java.io.IOException;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
-import java.util.StringTokenizer;
import org.apache.accumulo.core.client.IteratorSetting;
import org.apache.accumulo.core.client.IteratorSetting.Column;
@@ -38,6 +35,9 @@ import org.apache.accumulo.core.iterators.conf.ColumnSet;
import org.apache.hadoop.io.Text;
import org.apache.log4j.Logger;
+import com.google.common.base.Splitter;
+import com.google.common.collect.Lists;
+
/**
* A SortedKeyValueIterator that combines the Values for different versions (timestamp) of a Key within a row into a single Value. Combiner will replace one or
* more versions of a Key and their Values with the most recent Key and a Value which is the result of the reduce method. An {@link Column}
@@ -235,7 +235,7 @@ public abstract class Combiner extends WrappingIterator implements OptionDescrib
if (encodedColumns.length() == 0)
throw new IllegalArgumentException("The " + COLUMNS_OPTION + " must not be empty");
- combiners = new ColumnSet(Splitter.on(",").splitToList(encodedColumns));
+ combiners = new ColumnSet(Lists.newArrayList(Splitter.on(",").split(encodedColumns)));
}
@Override
@@ -279,7 +279,7 @@ public abstract class Combiner extends WrappingIterator implements OptionDescrib
if (encodedColumns.length() == 0)
throw new IllegalArgumentException("empty columns specified in option " + COLUMNS_OPTION);
- for (String columns : Splitter.on(",").splitToList(encodedColumns)) {
+ for (String columns : Splitter.on(",").split(encodedColumns)) {
if (!ColumnSet.isValidEncoding(columns))
throw new IllegalArgumentException("invalid column encoding " + encodedColumns);
}
[9/9] git commit: Merge branch '1.6.1-SNAPSHOT'
Posted by el...@apache.org.
Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5e447805
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5e447805
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5e447805
Branch: refs/heads/master
Commit: 5e4478057533d349be9c53312fd2a1d9787b9834
Parents: 7d639d8 ab4ecfc
Author: Josh Elser <el...@apache.org>
Authored: Thu Jun 12 22:35:17 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jun 12 22:35:17 2014 -0400
----------------------------------------------------------------------
.../apache/accumulo/core/iterators/Combiner.java | 10 +++++-----
.../accumulo/core/util/format/DefaultFormatter.java | 16 ++++++++--------
2 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
[8/9] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Posted by el...@apache.org.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Conflicts:
core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ab4ecfc2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ab4ecfc2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ab4ecfc2
Branch: refs/heads/master
Commit: ab4ecfc252d3a634f4e266819c4226a6fc30212c
Parents: b65035a 3d469eb
Author: Josh Elser <el...@apache.org>
Authored: Thu Jun 12 22:35:09 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jun 12 22:35:09 2014 -0400
----------------------------------------------------------------------
.../apache/accumulo/core/iterators/Combiner.java | 10 +++++-----
.../accumulo/core/util/format/DefaultFormatter.java | 16 ++++++++--------
2 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab4ecfc2/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab4ecfc2/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
index acd4ba1,2b8a88c..931b59f
--- a/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
@@@ -92,55 -56,33 +92,55 @@@ public class DefaultFormatter implement
if (!expectInitialized && si != null)
throw new IllegalStateException("Already initialized");
}
-
+
// this should be replaced with something like Record.toString();
public static String formatEntry(Entry<Key,Value> entry, boolean showTimestamps) {
+ DateFormat timestampFormat = null;
+
+ if(showTimestamps) {
+ timestampFormat = formatter.get();
+ }
+
+ return formatEntry(entry, timestampFormat);
+ }
+
+ /* so a new date object doesn't get created for every record in the scan result */
+ private static ThreadLocal<Date> tmpDate = new ThreadLocal<Date>() {
+ @Override
+ protected Date initialValue() {
+ return new Date();
+ }
+ };
+
+ public static String formatEntry(Entry<Key,Value> entry, DateFormat timestampFormat) {
StringBuilder sb = new StringBuilder();
-
Key key = entry.getKey();
+ Text buffer = new Text();
-
+
// append row
- appendText(sb, key.getRow()).append(" ");
-
+ appendText(sb, key.getRow(buffer)).append(" ");
+
// append column family
- appendText(sb, key.getColumnFamily()).append(":");
-
+ appendText(sb, key.getColumnFamily(buffer)).append(":");
+
// append column qualifier
- appendText(sb, key.getColumnQualifier()).append(" ");
-
+ appendText(sb, key.getColumnQualifier(buffer)).append(" ");
+
// append visibility expression
- sb.append(new ColumnVisibility(key.getColumnVisibility()));
+ sb.append(new ColumnVisibility(key.getColumnVisibility(buffer)));
// append timestamp
- if (showTimestamps)
- sb.append(" ").append(key.getTimestamp());
-
+ if (timestampFormat != null) {
+ tmpDate.get().setTime(entry.getKey().getTimestamp());
+ sb.append(" ").append(timestampFormat.format(tmpDate.get()));
+ }
+
+ Value value = entry.getValue();
+
// append value
- if (entry.getValue() != null && entry.getValue().getSize() > 0) {
+ if (value != null && value.getSize() > 0) {
sb.append("\t");
- appendValue(sb, entry.getValue());
+ appendValue(sb, value);
}
return sb.toString();
[6/9] git commit: ACCUMULO-2663 Fix some compilation issues from
guava deps
Posted by el...@apache.org.
ACCUMULO-2663 Fix some compilation issues from guava deps
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3d469eb8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3d469eb8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3d469eb8
Branch: refs/heads/master
Commit: 3d469eb853a56ea5e1d0e15c049eb0284d2046c3
Parents: 5959127
Author: Josh Elser <el...@apache.org>
Authored: Thu Jun 12 22:28:56 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jun 12 22:28:56 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/core/iterators/Combiner.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3d469eb8/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
index dd215cc..8ec22fe 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
@@ -16,15 +16,12 @@
*/
package org.apache.accumulo.core.iterators;
-import com.google.common.base.Splitter;
import java.io.IOException;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
-import java.util.StringTokenizer;
import org.apache.accumulo.core.client.IteratorSetting;
import org.apache.accumulo.core.client.IteratorSetting.Column;
@@ -38,6 +35,9 @@ import org.apache.accumulo.core.iterators.conf.ColumnSet;
import org.apache.hadoop.io.Text;
import org.apache.log4j.Logger;
+import com.google.common.base.Splitter;
+import com.google.common.collect.Lists;
+
/**
* A SortedKeyValueIterator that combines the Values for different versions (timestamp) of a Key within a row into a single Value. Combiner will replace one or
* more versions of a Key and their Values with the most recent Key and a Value which is the result of the reduce method. An {@link Column}
@@ -235,7 +235,7 @@ public abstract class Combiner extends WrappingIterator implements OptionDescrib
if (encodedColumns.length() == 0)
throw new IllegalArgumentException("The " + COLUMNS_OPTION + " must not be empty");
- combiners = new ColumnSet(Splitter.on(",").splitToList(encodedColumns));
+ combiners = new ColumnSet(Lists.newArrayList(Splitter.on(",").split(encodedColumns)));
}
@Override
@@ -279,7 +279,7 @@ public abstract class Combiner extends WrappingIterator implements OptionDescrib
if (encodedColumns.length() == 0)
throw new IllegalArgumentException("empty columns specified in option " + COLUMNS_OPTION);
- for (String columns : Splitter.on(",").splitToList(encodedColumns)) {
+ for (String columns : Splitter.on(",").split(encodedColumns)) {
if (!ColumnSet.isValidEncoding(columns))
throw new IllegalArgumentException("invalid column encoding " + encodedColumns);
}
[4/9] git commit: ACCUMULO-2663 Fix some compilation issues from
guava deps
Posted by el...@apache.org.
ACCUMULO-2663 Fix some compilation issues from guava deps
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3d469eb8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3d469eb8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3d469eb8
Branch: refs/heads/1.5.2-SNAPSHOT
Commit: 3d469eb853a56ea5e1d0e15c049eb0284d2046c3
Parents: 5959127
Author: Josh Elser <el...@apache.org>
Authored: Thu Jun 12 22:28:56 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jun 12 22:28:56 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/core/iterators/Combiner.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3d469eb8/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
index dd215cc..8ec22fe 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
@@ -16,15 +16,12 @@
*/
package org.apache.accumulo.core.iterators;
-import com.google.common.base.Splitter;
import java.io.IOException;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
-import java.util.StringTokenizer;
import org.apache.accumulo.core.client.IteratorSetting;
import org.apache.accumulo.core.client.IteratorSetting.Column;
@@ -38,6 +35,9 @@ import org.apache.accumulo.core.iterators.conf.ColumnSet;
import org.apache.hadoop.io.Text;
import org.apache.log4j.Logger;
+import com.google.common.base.Splitter;
+import com.google.common.collect.Lists;
+
/**
* A SortedKeyValueIterator that combines the Values for different versions (timestamp) of a Key within a row into a single Value. Combiner will replace one or
* more versions of a Key and their Values with the most recent Key and a Value which is the result of the reduce method. An {@link Column}
@@ -235,7 +235,7 @@ public abstract class Combiner extends WrappingIterator implements OptionDescrib
if (encodedColumns.length() == 0)
throw new IllegalArgumentException("The " + COLUMNS_OPTION + " must not be empty");
- combiners = new ColumnSet(Splitter.on(",").splitToList(encodedColumns));
+ combiners = new ColumnSet(Lists.newArrayList(Splitter.on(",").split(encodedColumns)));
}
@Override
@@ -279,7 +279,7 @@ public abstract class Combiner extends WrappingIterator implements OptionDescrib
if (encodedColumns.length() == 0)
throw new IllegalArgumentException("empty columns specified in option " + COLUMNS_OPTION);
- for (String columns : Splitter.on(",").splitToList(encodedColumns)) {
+ for (String columns : Splitter.on(",").split(encodedColumns)) {
if (!ColumnSet.isValidEncoding(columns))
throw new IllegalArgumentException("invalid column encoding " + encodedColumns);
}
[2/9] git commit: ACCUMULO-2832 fixed object creation in
Defaultformatter. Uses single Text object.
Posted by el...@apache.org.
ACCUMULO-2832 fixed object creation in Defaultformatter. Uses single Text object.
Signed-off-by: Josh Elser <el...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/59591273
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/59591273
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/59591273
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: 59591273317147600a4299e215114fcf1fc1c341
Parents: a3a8641
Author: meislerj <ja...@gmail.com>
Authored: Thu Jun 12 19:26:16 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Jun 12 21:34:55 2014 -0400
----------------------------------------------------------------------
.../accumulo/core/util/format/DefaultFormatter.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/59591273/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java b/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
index 78abed9..2b8a88c 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
@@ -60,22 +60,24 @@ public class DefaultFormatter implements Formatter {
// this should be replaced with something like Record.toString();
public static String formatEntry(Entry<Key,Value> entry, boolean showTimestamps) {
StringBuilder sb = new StringBuilder();
+ Key key = entry.getKey();
+ Text buffer = new Text();
// append row
- appendText(sb, entry.getKey().getRow()).append(" ");
+ appendText(sb, key.getRow(buffer)).append(" ");
// append column family
- appendText(sb, entry.getKey().getColumnFamily()).append(":");
+ appendText(sb, key.getColumnFamily(buffer)).append(":");
// append column qualifier
- appendText(sb, entry.getKey().getColumnQualifier()).append(" ");
+ appendText(sb, key.getColumnQualifier(buffer)).append(" ");
// append visibility expression
- sb.append(new ColumnVisibility(entry.getKey().getColumnVisibility()));
+ sb.append(new ColumnVisibility(key.getColumnVisibility(buffer)));
// append timestamp
if (showTimestamps)
- sb.append(" ").append(entry.getKey().getTimestamp());
+ sb.append(" ").append(key.getTimestamp());
// append value
if (entry.getValue() != null && entry.getValue().getSize() > 0) {