ES 7.x fixes + bonus

* Fix `::Query->add_bool()` for stricter parser in ES 7.x * Add `value_count` as a valid aggregation for sorting
reyjrar · Sep 16, 2021 · ff914b2 · ff914b2
1 parent 963498b
commit ff914b2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/App/ElasticSearch/Utilities/Query.pm b/lib/App/ElasticSearch/Utilities/Query.pm
@@ -629,7 +629,7 @@ sub add_bool {
         ## no critic
         no strict 'refs';
         my $set = $self->$section;
-        push @{ $set }, $bools{$section};
+        push @{ $set }, is_arrayref($bools{$section}) ? @{ $bools{$section} } : $bools{$section};
         my $setter = "set_$section";
         $self->$setter($set);
         ## use critic

diff --git a/scripts/es-search.pl b/scripts/es-search.pl
@@ -209,7 +209,7 @@
     }
 }
 
-my %SUPPORTED_AGGREGATIONS = map {$_=>'simple_value'} qw(cardinality sum min max avg);
+my %SUPPORTED_AGGREGATIONS = map {$_=>'simple_value'} qw(cardinality sum min max avg value_count);
 my $agg_header = '';
 if( exists $OPT{top} ) {
     my @top = split /:/, $OPT{top};