mirror of
https://github.com/yiisoft/yii2.git
synced 2025-11-16 14:29:30 +08:00
pull origin
This commit is contained in:
@@ -56,6 +56,7 @@ class ActiveRecord extends BaseActiveRecord
|
||||
private $_version;
|
||||
private $_highlight;
|
||||
|
||||
|
||||
/**
|
||||
* Returns the database connection used by this AR class.
|
||||
* By default, the "elasticsearch" application component is used as the database connection.
|
||||
|
||||
@@ -43,9 +43,9 @@ class Command extends Component
|
||||
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-request-highlighting.html
|
||||
*/
|
||||
public $highlight;
|
||||
|
||||
public $options = [];
|
||||
|
||||
|
||||
/**
|
||||
* @param array $options
|
||||
* @return mixed
|
||||
|
||||
@@ -46,7 +46,6 @@ class Connection extends Component
|
||||
* @var array the active node. key of [[nodes]]. Will be randomly selected on [[open()]].
|
||||
*/
|
||||
public $activeNode;
|
||||
|
||||
// TODO http://www.elasticsearch.org/guide/en/elasticsearch/client/php-api/current/_configuration.html#_example_configuring_http_basic_auth
|
||||
public $auth = [];
|
||||
/**
|
||||
@@ -62,6 +61,7 @@ class Connection extends Component
|
||||
*/
|
||||
public $dataTimeout = null;
|
||||
|
||||
|
||||
public function init()
|
||||
{
|
||||
foreach ($this->nodes as $node) {
|
||||
|
||||
@@ -36,6 +36,7 @@ class DebugAction extends Action
|
||||
*/
|
||||
public $controller;
|
||||
|
||||
|
||||
public function run($logId, $tag)
|
||||
{
|
||||
$this->controller->loadData($tag);
|
||||
|
||||
@@ -24,6 +24,7 @@ class DebugPanel extends Panel
|
||||
{
|
||||
public $db = 'elasticsearch';
|
||||
|
||||
|
||||
public function init()
|
||||
{
|
||||
$this->actions['elasticsearch-query'] = [
|
||||
|
||||
@@ -137,7 +137,6 @@ class Query extends Component implements QueryInterface
|
||||
* on one or more fields.
|
||||
*/
|
||||
public $highlight;
|
||||
|
||||
public $facets = [];
|
||||
|
||||
|
||||
|
||||
@@ -24,6 +24,7 @@ class QueryBuilder extends \yii\base\Object
|
||||
*/
|
||||
public $db;
|
||||
|
||||
|
||||
/**
|
||||
* Constructor.
|
||||
* @param Connection $connection the database connection.
|
||||
|
||||
Reference in New Issue
Block a user