Merge pull request #424 from ongr-io/master

saimaz · saimaz · commit 14ab67d81c1d · 2015-09-16T14:40:46.000+02:00
v0.10.2 release
diff --git a/Annotation/Document.php b/Annotation/Document.php
@@ -56,6 +56,11 @@ final class Document implements DumperInterface
      */
     public $dynamic;
 
+    /**
+     * @var array
+     */
+    public $dynamicTemplates;
+    
     /**
      * @var array
      */
@@ -77,6 +82,7 @@ public function dump(array $exclude = [])
                 '_all' => $this->all,
                 'enabled' => $this->enabled,
                 'dynamic' => $this->dynamic,
+                'dynamic_templates' => $this->dynamicTemplates,
                 'transform' => $this->transform,
                 'dynamic_date_formats' => $this->dynamicDateFormats,
             ],
diff --git a/Annotation/Suggester/AbstractSuggesterProperty.php b/Annotation/Suggester/AbstractSuggesterProperty.php
@@ -35,7 +35,7 @@ abstract class AbstractSuggesterProperty extends AbstractProperty
      *
      * @Required
      */
-     public $objectName;
+    public $objectName;
 
     /**
      * @var string
diff --git a/DSL/Aggregation/AbstractAggregation.php b/DSL/Aggregation/AbstractAggregation.php
@@ -13,12 +13,15 @@
 
 use ONGR\ElasticsearchBundle\DSL\NamedBuilderBag;
 use ONGR\ElasticsearchBundle\DSL\NamedBuilderInterface;
+use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
 
 /**
  * AbstractAggregation class.
  */
 abstract class AbstractAggregation implements NamedBuilderInterface
 {
+    use ParametersTrait;
+
     const PREFIX = 'agg_';
 
     /**
@@ -113,7 +116,12 @@ public function getAggregations()
      */
     public function toArray()
     {
-        $result = [$this->getName() => [$this->getType() => $this->getArray()]];
+        $array = $this->getArray();
+        $result = [
+            $this->getName() => [
+                $this->getType() => is_array($array) ? $this->processArray($array) : $array,
+            ],
+        ];
 
         if ($this->supportsNesting()) {
             $nestedResult = $this->collectNestedAggregations();
diff --git a/DSL/Aggregation/TermsAggregation.php b/DSL/Aggregation/TermsAggregation.php
@@ -12,162 +12,15 @@
 namespace ONGR\ElasticsearchBundle\DSL\Aggregation;
 
 use ONGR\ElasticsearchBundle\DSL\Aggregation\Type\BucketingTrait;
+use ONGR\ElasticsearchBundle\DSL\ScriptAwareTrait;
 
 /**
  * Class representing TermsAggregation.
  */
 class TermsAggregation extends AbstractAggregation
 {
     use BucketingTrait;
-
-    const MODE_COUNT = '_count';
-    const MODE_TERM = '_term';
-    const DIRECTION_ASC = 'asc';
-    const DIRECTION_DESC = 'desc';
-
-    /**
-     * @var int
-     */
-    private $size;
-
-    /**
-     * @var string
-     */
-    private $orderMode;
-
-    /**
-     * @var string
-     */
-    private $orderDirection;
-
-    /**
-     * @var int
-     */
-    private $minDocumentCount;
-
-    /**
-     * @var string
-     */
-    private $include;
-
-    /**
-     * @var string
-     */
-    private $includeFlags;
-
-    /**
-     * @var string
-     */
-    private $exclude;
-
-    /**
-     * @var string
-     */
-    private $excludeFlags;
-
-    /**
-     * Sets buckets max count.
-     *
-     * @param int $size
-     */
-    public function setSize($size)
-    {
-        $this->size = $size;
-    }
-
-    /**
-     * Sets buckets ordering.
-     *
-     * @param string $mode
-     * @param string $direction
-     */
-    public function setOrder($mode, $direction = self::DIRECTION_ASC)
-    {
-        $this->orderMode = $mode;
-        $this->orderDirection = $direction;
-    }
-
-    /**
-     * Sets minimum hits to consider as term.
-     *
-     * @param int $count
-     */
-    public function setMinDocumentCount($count)
-    {
-        $this->minDocumentCount = $count;
-    }
-
-    /**
-     * Sets include field.
-     *
-     * @param string $include Include field.
-     * @param string $flags   Possible flags:
-     *                        - CANON_EQ
-     *                        - CASE_INSENSITIVE
-     *                        - COMMENTS
-     *                        - DOTALL
-     *                        - LITERAL
-     *                        - MULTILINE
-     *                        - UNICODE
-     *                        - UNICODE_CASE
-     *                        - UNICODE_CHARACTER_CLASS
-     *                        - UNIX_LINES
-     *                        Usage example:
-     *                        'CASE_INSENSITIVE|MULTILINE'.
-     */
-    public function setInclude($include, $flags = '')
-    {
-        $this->include = $include;
-        $this->includeFlags = $flags;
-    }
-
-    /**
-     * Sets include field.
-     *
-     * @param string $exclude
-     * @param string $flags
-     *
-     * @see Terms::setInclude()
-     */
-    public function setExclude($exclude, $flags = '')
-    {
-        $this->exclude = $exclude;
-        $this->excludeFlags = $flags;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getArray()
-    {
-        $data = ['field' => $this->getField()];
-
-        if ($this->orderMode && $this->orderDirection) {
-            $data['order'] = [
-                $this->orderMode => $this->orderDirection,
-            ];
-        }
-
-        if ($this->size !== null) {
-            $data['size'] = $this->size;
-        }
-
-        if ($this->minDocumentCount !== null) {
-            $data['min_doc_count'] = $this->minDocumentCount;
-        }
-
-        $includeResult = $this->getIncludeExclude($this->include, $this->includeFlags);
-        if ($includeResult) {
-            $data['include'] = $includeResult;
-        }
-
-        $excludeResult = $this->getIncludeExclude($this->exclude, $this->excludeFlags);
-        if ($excludeResult) {
-            $data['exclude'] = $excludeResult;
-        }
-
-        return $data;
-    }
+    use ScriptAwareTrait;
 
     /**
      * {@inheritdoc}
@@ -178,26 +31,17 @@ public function getType()
     }
 
     /**
-     * Constructs include/exclude search values.
-     *
-     * @param string $pattern
-     * @param string $flags
-     *
-     * @return string|array|null
+     * {@inheritdoc}
      */
-    protected function getIncludeExclude($pattern, $flags)
+    public function getArray()
     {
-        if ($pattern) {
-            if (empty($flags)) {
-                return $pattern;
-            } else {
-                return [
-                    'pattern' => $pattern,
-                    'flags' => $flags,
-                ];
-            }
-        }
+        $data = array_filter(
+            [
+                'field' => $this->getField(),
+                'script' => $this->getScript(),
+            ]
+        );
 
-        return null;
+        return $data;
     }
 }
diff --git a/Tests/Functional/Annotation/DocumentTest.php b/Tests/Functional/Annotation/DocumentTest.php
@@ -32,6 +32,7 @@ public function testDocumentMappingWithAllFieldSetToFalse()
             'dynamic' => null,
             'transform' => null,
             'dynamic_date_formats' => null,
+            'dynamic_templates' => null,
         ];
         $this->assertEquals($expectedResult, $result);
     }
diff --git a/Tests/Functional/DSL/Aggregation/TermsAggregationTest.php b/Tests/Functional/DSL/Aggregation/TermsAggregationTest.php
@@ -14,9 +14,9 @@
 use ONGR\ElasticsearchBundle\DSL\Aggregation\TermsAggregation;
 use ONGR\ElasticsearchBundle\DSL\Query\RangeQuery;
 use ONGR\ElasticsearchBundle\ORM\Repository;
-use ONGR\ElasticsearchBundle\Test\ElasticsearchTestCase;
+use ONGR\ElasticsearchBundle\Test\AbstractElasticsearchTestCase;
 
-class TermsAggregationTest extends ElasticsearchTestCase
+class TermsAggregationTest extends AbstractElasticsearchTestCase
 {
     /**
      * {@inheritdoc}
@@ -107,7 +107,7 @@ public function getTermsAggregationData()
         $aggregation = [
             'name' => 'test_agg',
             'field' => 'surface',
-            'order' => [TermsAggregation::MODE_TERM, TermsAggregation::DIRECTION_ASC],
+            'order' => ['_term', 'asc'],
         ];
 
         $result = [
@@ -134,7 +134,7 @@ public function getTermsAggregationData()
         $aggregation = [
             'name' => 'test_agg',
             'field' => 'surface',
-            'min_document_cound' => 2,
+            'min_document_count' => 2,
         ];
 
         $result = [
@@ -284,6 +284,30 @@ public function testTermsAggregationWithRangeQuery($aggregation, $parameters, $e
         $this->assertArraySubset($expectedResult, $results['aggregations']);
     }
 
+    /**
+     * Test for terms aggregation with shard_size, collect_mode, shard_min_doc_count.
+     */
+    public function testTermsAggregationWithCollectMode()
+    {
+        /** @var Repository $repo */
+        $repo = $this->getManager()->getRepository('AcmeTestBundle:Product');
+        $aggregationFoo = new TermsAggregation('test_foo');
+        $aggregationFoo->setField('title');
+        $aggregationFoo->addParameter('size', 5);
+        $aggregationFoo->addParameter('shard_size', 5);
+        $aggregationFoo->addParameter('execution_hint', 'map');
+        $aggregationFoo->addParameter('collect_mode', 'breadth_first');
+
+        $aggregationBar = new TermsAggregation('test_bar');
+        $aggregationBar->setField('title');
+        $aggregationBar->addParameter('shard_min_doc_count', 5);
+        $aggregationFoo->addAggregation($aggregationBar);
+
+        $search = $repo->createSearch()->addAggregation($aggregationFoo);
+        $results = $repo->execute($search, Repository::RESULTS_RAW);
+        $this->assertEquals(3, count($results['aggregations'][$aggregationFoo->getName()]['buckets']));
+    }
+
     /**
      * Builds term aggregation.
      *
@@ -297,23 +321,23 @@ private function getAggregation($options)
         $term->setField($options['field']);
 
         if (array_key_exists('exclude', $options)) {
-            $term->setExclude($options['exclude']);
+            $term->addParameter('exclude', $options['exclude']);
         }
 
         if (array_key_exists('include', $options)) {
-            $term->setInclude($options['include']);
+            $term->addParameter('include', $options['include']);
         }
 
         if (array_key_exists('min_document_count', $options)) {
-            $term->setMinDocumentCount($options['min_document_count']);
+            $term->addParameter('min_doc_count', $options['min_document_count']);
         }
 
         if (array_key_exists('order', $options)) {
-            call_user_func_array([$term, 'setOrder'], $options['order']);
+            $term->addParameter('order', [$options['order'][0] => $options['order'][1]]);
         }
 
         if (array_key_exists('size', $options)) {
-            $term->setSize($options['size']);
+            $term->addParameter('size', $options['size']);
         }
 
         return $term;
diff --git a/Tests/Functional/DSL/Complex/PostFilterAndAggregationTest.php b/Tests/Functional/DSL/Complex/PostFilterAndAggregationTest.php
@@ -82,7 +82,7 @@ public function testBoolWithFuzzyQueryAndSortFilter()
         $name = 'foo';
         $TermsAgg = new TermsAggregation($name);
         $TermsAgg->setField('title');
-        $TermsAgg->setInclude($name);
+        $TermsAgg->addParameter('include', $name);
 
         $filterAgg = new FilterAggregation($name . '-filter');
 
diff --git a/Tests/Functional/Result/AggregationIteratorFindTest.php b/Tests/Functional/Result/AggregationIteratorFindTest.php
diff --git a/Tests/Unit/DSL/Aggregation/TermsAggregationTest.php b/Tests/Unit/DSL/Aggregation/TermsAggregationTest.php

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ abstract class AbstractSuggesterProperty extends AbstractProperty`
`35`	`35`	`*`
`36`	`36`	`* @Required`
`37`	`37`	`*/`
`38`		`- public $objectName;`
	`38`	`+ public $objectName;`
`39`	`39`
`40`	`40`	`/**`
`41`	`41`	`* @var string`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ public function testDocumentMappingWithAllFieldSetToFalse()`
`32`	`32`	`'dynamic' => null,`
`33`	`33`	`'transform' => null,`
`34`	`34`	`'dynamic_date_formats' => null,`
	`35`	`+ 'dynamic_templates' => null,`
`35`	`36`	`];`
`36`	`37`	`$this->assertEquals($expectedResult, $result);`
`37`	`38`	`}`