[accumulo] branch 1.9 updated: Modify Combiner init method to honor all options. Fixes #1678 (#1680)

[mmiller]

This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch 1.9
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/1.9 by this push:
     new e3a14cd  Modify Combiner init method to honor all options. Fixes #1678 
(#1680)
e3a14cd is described below

commit e3a14cd083848917b1f3f739eb79e6ea65a3e704
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Thu Aug 13 08:06:47 2020 -0400

    Modify Combiner init method to honor all options. Fixes #1678 (#1680)
---
 .../org/apache/accumulo/core/iterators/Combiner.java     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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 9a94216..7e24f88 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
@@ -278,18 +278,18 @@ public abstract class Combiner extends WrappingIterator 
implements OptionDescrib
     combineAllColumns = false;
     if (options.containsKey(ALL_OPTION)) {
       combineAllColumns = Boolean.parseBoolean(options.get(ALL_OPTION));
-      if (combineAllColumns)
-        return;
     }
 
-    if (!options.containsKey(COLUMNS_OPTION))
-      throw new IllegalArgumentException("Must specify " + COLUMNS_OPTION + " 
option");
+    if (!combineAllColumns) {
+      if (!options.containsKey(COLUMNS_OPTION))
+        throw new IllegalArgumentException("Must specify " + COLUMNS_OPTION + 
" option");
 
-    String encodedColumns = options.get(COLUMNS_OPTION);
-    if (encodedColumns.length() == 0)
-      throw new IllegalArgumentException("The " + COLUMNS_OPTION + " must not 
be empty");
+      String encodedColumns = options.get(COLUMNS_OPTION);
+      if (encodedColumns.length() == 0)
+        throw new IllegalArgumentException("The " + COLUMNS_OPTION + " must 
not be empty");
 
-    combiners = new 
ColumnSet(Lists.newArrayList(Splitter.on(",").split(encodedColumns)));
+      combiners = new 
ColumnSet(Lists.newArrayList(Splitter.on(",").split(encodedColumns)));
+    }
 
     isMajorCompaction = env.getIteratorScope() == IteratorScope.majc;