add scan and scroll queries

Author: basemkhirat

readme.md

@@ -40,7 +40,11 @@
 
     ES::index("my_index")->create(function($index){
             
+<<<<<<< HEAD
         $index->shards(5)->replicas(1)->mappping([
+=======
+        $index->shards(5)->replicas(1)->mapping([
+>>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
             'my_type' => [
                 'properties' => [
                     'first_name' => [
@@ -59,7 +63,11 @@
 
     ES::create("my_index", function($index){
       
+<<<<<<< HEAD
           $index->shards(5)->replicas(1)->mappping([
+=======
+          $index->shards(5)->replicas(1)->mapping([
+>>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
               'my_type' => [
                   'properties' => [
                       'first_name' => [
@@ -182,7 +190,11 @@ Index and type names setted in query will override values the configuration file
 
 ##### Where not field exists
 
+<<<<<<< HEAD
     ES::whereNot("hobbies", "exists", true)->get(); or ES::whereExists("hobbies", true)->get();
+=======
+    ES::whereNot("hobbies", "exists", true)->get(); or ES::whereExists("hobbies", false)->get();
+>>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
     
 ##### Where not in clause
 
@@ -216,6 +228,7 @@ Index and type names setted in query will override values the configuration file
 
     ES::search("bar")->count();
 
+<<<<<<< HEAD
 
 ##### Scan-and-Scroll queries
 
@@ -245,6 +258,8 @@ Index and type names setted in query will override values the configuration file
     ES::scrollID("DnF1ZXJ5VGhlbkZldGNoBQAAAAAAAAFMFlJQOEtTdnJIUklhcU1FX2VqS0EwZncAAAAAAAABSxZSUDhLU3ZySFJJYXFNRV9laktBMGZ3AAAAAAAAAU4WUlA4S1N2ckhSSWFxTUVfZWpLQTBmdwAAAAAAAAFPFlJQOEtTdnJIUklhcU1FX2VqS0EwZncAAAAAAAABTRZSUDhLU3ZySFJJYXFNRV9laktBMGZ3")
         ->clear();
 
+=======
+>>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
   >
     
 ##### Paginate results with per_page = 5
@@ -258,13 +273,16 @@ Index and type names setted in query will override values the configuration file
 
   >
   
+<<<<<<< HEAD
 ##### Ignoring bad HTTP response
       
     $documents = ES::ignore(404, 500)->_id(5)->first();
 
 
   >
   
+=======
+>>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
 ##### Executing elasticsearch raw queries
 
     ES::raw()->search([
@@ -395,4 +413,8 @@ Index and type names setted in query will override values the configuration file
 
 `Good luck`
 
-`Dont forget to send a feedback..`
+<<<<<<< HEAD
+`Dont forget to send a feedback..`
+=======
+`Dont forget to send a feedback..`
+>>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44

src/Index.php

@@ -94,6 +94,7 @@ public function replicas($replicas)
     }
 
     /**
+<<<<<<< HEAD
      * Ignore bad HTTP requests
      * @param array|int $code
      * @return $this
@@ -120,6 +121,8 @@ public function ignore($code)
     }
 
     /**
+=======
+>>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
      * Create a new index
      * @return mixed
      */

src/Query.php

@@ -2,8 +2,13 @@
 
 namespace Basemkhirat\Elasticsearch;
 
+<<<<<<< HEAD
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
+=======
+use Illuminate\Support\Collection;
+use Illuminate\Pagination\LengthAwarePaginator;
+>>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
 use Illuminate\Support\Facades\Request;
 
 /**
@@ -101,6 +106,7 @@ class Query
     protected $sort = [];
 
     /**
+<<<<<<< HEAD
      * Query scroll time
      * @var string
      */
@@ -119,6 +125,8 @@ class Query
     protected $search_type;
 
     /**
+=======
+>>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
      * Query limit
      * @var int
      */
@@ -181,6 +189,7 @@ public function type($type)
      */
     protected function getType()
     {
+<<<<<<< HEAD
 
         return $this->type;
 
@@ -245,6 +254,9 @@ public function getScroll()
 
         return $this->scroll;
 
+=======
+        return $this->type;
+>>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
     }
 
     /**
@@ -261,6 +273,7 @@ public function take($take = 10)
     }
 
     /**
+<<<<<<< HEAD
      * Ignore bad HTTP response
      * @param array|int $code
      * @return $this
@@ -288,6 +301,9 @@ public function ignore($code)
 
     /**
      * Get the query limit
+=======
+     * get the query limit
+>>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
      * @return int
      */
     protected function getTake()
@@ -426,7 +442,11 @@ public function _id($_id = false)
     }
 
     /**
+<<<<<<< HEAD
      * Set the query where clause
+=======
+     * set the query where clause
+>>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
      * @param $name
      * @param string $operator
      * @param null $value
@@ -483,7 +503,11 @@ public function where($name, $operator = "=", $value = NULL)
     }
 
     /**
+<<<<<<< HEAD
      * Set the query inverse where clause
+=======
+     * set the query inverse where clause
+>>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
      * @param $name
      * @param string $operator
      * @param null $value
@@ -535,7 +559,11 @@ public function whereNot($name, $operator = "=", $value = NULL)
     }
 
     /**
+<<<<<<< HEAD
      * Set the query where between clause
+=======
+     * set the query where between clause
+>>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
      * @param $name
      * @param $first_value
      * @param $last_value
@@ -551,7 +579,11 @@ public function whereBetween($name, $first_value, $last_value)
     }
 
     /**
+<<<<<<< HEAD
      * Set the query where not between clause
+=======
+     * set the query where not between clause
+>>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
      * @param $name
      * @param $first_value
      * @param $last_value
@@ -567,7 +599,11 @@ public function whereNotBetween($name, $first_value, $last_value)
     }
 
     /**
+<<<<<<< HEAD
      * Set the query where in clause
+=======
+     * set the query where in clause
+>>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
      * @param $name
      * @param array $value
      * @return $this
@@ -587,7 +623,11 @@ public function whereIn($name, $value = [])
     }
 
     /**
+<<<<<<< HEAD
      * Set the query where not in clause
+=======
+     * set the query where not in clause
+>>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
      * @param $name
      * @param array $value
      * @return $this
@@ -608,7 +648,11 @@ public function whereNotIn($name, $value = [])
 
 
     /**
+<<<<<<< HEAD
      * Set the query where exists clause
+=======
+     * set the query where exists clause
+>>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
      * @param $name
      * @param bool $exists
      * @return $this
@@ -673,6 +717,7 @@ public function query()
 
         ];
 
+<<<<<<< HEAD
         $search_type = $this->getSearchType();
 
         if($search_type){
@@ -686,6 +731,8 @@ public function query()
         }
 
 
+=======
+>>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
         return $query;
 
     }
@@ -707,6 +754,7 @@ protected function validate($query)
     }
 
 
+<<<<<<< HEAD
 
     /**
      * Clear scroll query id
@@ -750,6 +798,20 @@ public function get($scroll_id = NULL)
 
             $result = $this->connection->search($query);
         }
+=======
+    /**
+     * Get the collection of results
+     * @return array|Collection
+     */
+    public function get()
+    {
+
+        $query = $this->query();
+
+        $this->validate($query);
+
+        $result = $this->connection->search($query);
+>>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
 
         return $this->getAll($result);
 
@@ -810,8 +872,12 @@ protected function getAll($result = [])
         $new->max_score = $result["hits"]["max_score"];
         $new->took = $result["took"];
         $new->timed_out = $result["timed_out"];
+<<<<<<< HEAD
         $new->scroll_id = isset($result["_scroll_id"]) ? $result["_scroll_id"] : NULL;
         $new->shards = (object)$result["_shards"];
+=======
+        $new->_shards = (object)$result["_shards"];
+>>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
 
         return $new;
     }
@@ -1038,8 +1104,12 @@ public function raw()
      * @param bool $callback
      * @return mixed
      */
+<<<<<<< HEAD
     function createIndex($name, $callback = false)
     {
+=======
+    function createIndex($name, $callback = false){
+>>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
 
         $index = new Index($name, $callback);
 
@@ -1055,8 +1125,12 @@ function createIndex($name, $callback = false)
      * @param $name
      * @return mixed
      */
+<<<<<<< HEAD
     function dropIndex($name)
     {
+=======
+    function dropIndex($name){
+>>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
 
         $index = new Index($name);
 
@@ -1072,8 +1146,12 @@ function dropIndex($name)
      * @param bool $callback
      * @return mixed
      */
+<<<<<<< HEAD
     function create($callback = false)
     {
+=======
+    function create($callback = false){
+>>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
 
         $index = new Index($this->index, $callback);
 
@@ -1087,8 +1165,12 @@ function create($callback = false)
      * Drop index [alias to dropIndex method]
      * @return mixed
      */
+<<<<<<< HEAD
     function drop()
     {
+=======
+    function drop(){
+>>>>>>> 6fdc2f25787d06ee7bcbcfcd82f36e727c753e44
 
         $index = new Index($this->index);