[accumulo] branch main updated (5815bf6 -> a165264)

[mm...@apache.org]

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

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


    from 5815bf6  Make CI build on more branches (#1671)
     add e3a14cd  Modify Combiner init method to honor all options. Fixes #1678 (#1680)
     new a165264  Merge branch '1.9' into main

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/accumulo/core/iterators/Combiner.java     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

[accumulo] 01/01: Merge branch '1.9' into main

[mm...@apache.org]

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

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

commit a165264e714e01329af41954b00d0217e982dfce
Merge: 5815bf6 e3a14cd
Author: Mike Miller <mm...@apache.org>
AuthorDate: Thu Aug 13 08:12:31 2020 -0400

    Merge branch '1.9' into main

 .../org/apache/accumulo/core/iterators/Combiner.java     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --cc core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
index 6581195,7e24f88..c943a8e
--- a/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
@@@ -277,18 -278,18 +277,18 @@@ public abstract class Combiner extends 
      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.isEmpty())
-       throw new IllegalArgumentException("The " + COLUMNS_OPTION + " must not be empty");
+       String encodedColumns = options.get(COLUMNS_OPTION);
 -      if (encodedColumns.length() == 0)
++      if (encodedColumns.isEmpty())
+         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;