Merge pull request #57 from cxy1461274124/master

elasticsearch: fix bug and add methods

Author: stelin

src/elasticsearch/src/Autoloader.php renamed to src/elasticsearch/src/AutoLoader.php

@@ -2,12 +2,14 @@
 
 namespace Swoft\Elasticsearch;
 
+use Swoft\Elasticsearch\Connection\ConnectionManager;
 use Swoft\Helper\ComposerJSON;
 use Swoft\SwoftComponent;
 use function dirname;
 
 /**
  * class AutoLoader
+ *
  * @since 2.0
  */
 final class AutoLoader extends SwoftComponent
@@ -39,7 +41,7 @@ public function getPrefixDirs(): array
  */
  public function metadata(): array
  {
- $jsonFile = dirname(__DIR__) . '/composer.json';
+ $jsonFile = dirname(__DIR__).'/composer.json';
 
  return ComposerJSON::open($jsonFile)->getMetadata();
  }

src/elasticsearch/src/Connection/Connection.php

@@ -19,7 +19,7 @@
  * @since 2.0
  * @Bean(scope=Bean::PROTOTYPE)
  *
- * @package Jcsp\Elasticsearch\Connection
+ * @package Swoft\Elasticsearch\Connection
  */
 class Connection extends AbstractConnection
 {

src/elasticsearch/src/Connection/ConnectionInstance.php

@@ -149,7 +149,7 @@
  * @method callable|array tasksTasksList(array $params = [])
  * @method callable|array tasksCancel(array $params = [])
  *
- * @package Jcsp\Elasticsearch\Connection
+ * @package Swoft\Elasticsearch\Connection
  */
 class ConnectionInstance
 {

src/elasticsearch/src/Elasticsearch.php

@@ -166,10 +166,10 @@ public static function connection(string $pool = Pool::DEFAULT_POOL): Connection
  {
  try {
  /** @var ConnectionManager $manager */
- $manager = BeanFactory::getBean(ConnectionManager::class);
+ $manager = bean(ConnectionManager::class);
 
  /** @var Pool $elasticsearchPool */
- $elasticsearchPool = BeanFactory::getBean($pool);
+ $elasticsearchPool = bean($pool);
  /** @var Connection $connection */
  $connection = $elasticsearchPool->getConnection();
 
@@ -200,5 +200,4 @@ public static function __callStatic($name, $arguments)
 
  return $instance->$name(...$arguments);
  }
-
-}
+}

src/elasticsearch/src/Eloquent/Builder.php

@@ -4,19 +4,27 @@
 
 use Closure;
 use Exception;
+use Jcsp\Core\Pagination\LengthAwarePaginator;
 use Swoft\Elasticsearch\Elasticsearch;
 use Swoft\Elasticsearch\Exception\ElasticsearchException;
+use Swoft\Elasticsearch\Pool;
+use Swoft\Stdlib\Helper\Arr;
 
 /**
  * Class Builder
  *
  * @since 2.0
  *
- * @package Jcsp\Elasticsearch\Eloquent
+ * @package Swoft\Elasticsearch\Eloquent
  */
 class Builder
 {
 
+ /**
+ * @var string
+ */
+ protected $pool = '';
+
  /**
  * @var string
  */
@@ -32,6 +40,11 @@ class Builder
  */
  protected $model;
 
+ /**
+ * @var array
+ */
+ protected $select = [];
+
  /**
  * @var array
  */
@@ -42,6 +55,19 @@ class Builder
  */
  private $queryIndices = [0, 0];
 
+ /**
+ * @var array
+ */
+ private $sort = [];
+
+ /**
+ * @var array
+ */
+ private $limit = [
+ 'from' => 0,
+ 'size' => 0,
+ ];
+
  /**
  * @var array
  */
@@ -81,15 +107,39 @@ public function __construct(string $modelName)
  $this->type = $model->getType();
  $this->createTimeField = $model->getCreateTimeField();
  $this->updateTimeField = $model->getUpdateTimeField();
+ $this->pool = $model->getPool();
+ $this->pool = !empty($this->pool) ? $this->pool : Pool::DEFAULT_POOL;
+
  unset($model);
  }
 
- //public function select(array $fields): Builder
- //{
- // $this->fields = $fields;
- //
- // return $this;
- //}
+ /**
+ * select
+ *
+ * @param array $fields
+ *
+ * @return Builder
+ */
+ public function select(array $fields): Builder
+ {
+ $this->fields = $fields;
+
+ return $this;
+ }
+
+ /**
+ * setPool
+ *
+ * @param string $pool
+ *
+ * @return Builder
+ */
+ public function setPool(string $pool = Pool::DEFAULT_POOL): Builder
+ {
+ $this->pool = $pool;
+
+ return $this;
+ }
 
  /**
  * index
@@ -325,17 +375,23 @@ public function whereRegex(string $field, string $value): Builder
  /**
  * get
  *
- * @return \Jcsp\Elasticsearch\Eloquent\Collection
+ * @return \Swoft\Elasticsearch\Eloquent\Collection
+ * @throws ElasticsearchException
  */
  public function get(): Collection
  {
- $data = Elasticsearch::search([
+ $this->limit['size'] = $this->limit['size'] > 0 ? $this->limit['size'] : $this->count();
+
+ $data = Elasticsearch::connection($this->pool)->search([
  'index' => $this->index,
  'type' => $this->type,
  'body' => [
- 'query' => $this->parseJson($this->query),
- 'sort' => [$this->createTimeField => ['order' => 'asc']],
+ '_source' => $this->fields,
+ 'query' => $this->parseJson($this->query),
+ 'sort' => $this->sort,
  ],
+ 'from' => $this->limit['from'],
+ 'size' => $this->limit['size'],
  ]);
 
  $result = [];
@@ -357,15 +413,17 @@ public function get(): Collection
  * first
  *
  * @return Model|null
+ * @throws ElasticsearchException
  */
  public function first(): ?Model
  {
- $data = Elasticsearch::search([
+ $data = Elasticsearch::connection($this->pool)->search([
  'index' => $this->index,
  'type' => $this->type,
  'body' => [
- 'query' => $this->parseJson($this->query),
- 'sort' => [$this->createTimeField => ['order' => 'asc']],
+ '_source' => $this->fields,
+ 'query' => $this->parseJson($this->query),
+ 'sort' => $this->sort,
  ],
  'from' => 0,
  'size' => 1,
@@ -391,19 +449,21 @@ public function first(): ?Model
  * @param int $page
  * @param int $size
  *
- * @return Pagination
+ * @return LengthAwarePaginator
+ * @throws ElasticsearchException
  */
- public function paginate(int $page = 1, int $size = 10): Pagination
+ public function paginate(int $page = 1, int $size = 10): LengthAwarePaginator
  {
  $page = $page < 1 ? 1 : intval($page);
  $size = $size < 1 ? 1 : intval($size);
  $from = ($page - 1) * $size;
- $data = Elasticsearch::search([
+ $data = Elasticsearch::connection($this->pool)->search([
  'index' => $this->index,
  'type' => $this->type,
  'body' => [
- 'query' => $this->parseJson($this->query),
- 'sort' => [$this->createTimeField => ['order' => 'asc']],
+ '_source' => $this->fields,
+ 'query' => $this->parseJson($this->query),
+ 'sort' => $this->sort,
  ],
  'from' => $from,
  'size' => $size,
@@ -421,7 +481,7 @@ public function paginate(int $page = 1, int $size = 10): Pagination
  array_push($list, $model);
  }
 
- return Pagination::create($list, $total, $size, $page);
+ return LengthAwarePaginator::create($list, $total, $size, $page);
  }
 
  /**
@@ -432,7 +492,7 @@ public function paginate(int $page = 1, int $size = 10): Pagination
  public function count(): int
  {
  try {
- $data = Elasticsearch::count([
+ $data = Elasticsearch::connection($this->pool)->count([
  'index' => $this->index,
  'type' => $this->type,
  'body' => [
@@ -447,18 +507,51 @@ public function count(): int
  return $count;
  }
 
+ /**
+ * orderBy
+ *
+ * @param string $field
+ * @param string $sort
+ *
+ * @return Builder
+ */
+ public function orderBy(string $field, string $sort = 'asc'): Builder
+ {
+ $sort = in_array(strtolower($sort), ['asc', 'desc']) ? strtolower($sort) : 'asc';
+ array_push($this->sort, [$field => ['order' => $sort]]);
+
+ return $this;
+ }
+
+ /**
+ * limit
+ *
+ * @param int $from
+ * @param int $size
+ *
+ * @return Builder
+ */
+ public function limit(int $from = 0, int $size = 10): Builder
+ {
+ $this->limit['from'] = $from > 0 ? $from : 0;
+ $this->limit['size'] = $size > 0 ? $size : 10;
+
+ return $this;
+ }
+
  /**
  * create
  *
  * @param array $value
  *
  * @return Model
+ * @throws ElasticsearchException
  */
  public function create(array $value): Model
  {
- $value[$this->createTimeField] = $value[$this->updateTimeField] = time();
+ $value[$this->createTimeField] = $value[$this->updateTimeField] = date('Y-m-d H:i:s');
 
- $data = Elasticsearch::index([
+ $data = Elasticsearch::connection($this->pool)->index([
  'index' => $this->index,
  'type' => $this->type,
  'body' => $value,
@@ -491,12 +584,12 @@ public function insert(array $values): Collection
  {
  $body = [];
  foreach ($values as $value) {
- $value[$this->createTimeField] = $value[$this->updateTimeField] = time();
+ $value[$this->createTimeField] = $value[$this->updateTimeField] = date('Y-m-d H:i:s');
  array_push($body, ['index' => ['_index' => $this->index, '_type' => $this->type]]);
  array_push($body, $value);
  }
 
- $data = Elasticsearch::bulk(['body' => $body]);
+ $data = Elasticsearch::connection($this->pool)->bulk(['body' => $body]);
  if (!isset($data['errors']) || $data['errors'] !== false) {
  throw new ElasticsearchException('elasticsearch builder error: insert failed.');
  }
@@ -527,9 +620,9 @@ public function insert(array $values): Collection
  public function update(string $id, array $value): bool
  {
  try {
- $value[$this->updateTimeField] = time();
+ $value[$this->updateTimeField] = date('Y-m-d H:i:s');
 
- $data = Elasticsearch::update([
+ $data = Elasticsearch::connection($this->pool)->update([
  'index' => $this->index,
  'type' => $this->type,
  'id' => $id,
@@ -558,7 +651,7 @@ public function update(string $id, array $value): bool
  public function delete(string $id): bool
  {
  try {
- $data = Elasticsearch::delete([
+ $data = Elasticsearch::connection($this->pool)->delete([
  'index' => $this->index,
  'type' => $this->type,
  'id' => $id,

src/elasticsearch/src/Eloquent/Collection.php

@@ -7,7 +7,7 @@
 /**
  * Class Collection
  *
- * @package Jcsp\Elasticsearch\Eloquent
+ * @package Swoft\Elasticsearch\Eloquent
  */
 class Collection extends SwoftCollection
 {