-
Notifications
You must be signed in to change notification settings - Fork 68
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implements aggregation support with Elasticsearch, cursor.getAggregat…
…ions(), cursor.getAggregation(name)
- Loading branch information
Showing
7 changed files
with
160 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| import { Cursor } from 'meteor/easysearch:core'; | ||
|
|
||
| /** | ||
| * A Cursor that extends the regular EasySearch cursor. This cursor is Elasticsearch specific. | ||
| * | ||
| * @type {ESCursor} | ||
| */ | ||
| class ESCursor extends Cursor { | ||
| /** | ||
| * Constructor | ||
| * | ||
| * @param {Mongo.Cursor} hitsCursor Referenced mongo cursor to the regular hits field | ||
| * @param {Number} count Count of all documents found in regular hits field | ||
| * @param {Object} aggs Raw aggragtion data | ||
| * @param {Boolean} isReady Cursor is ready | ||
| * @param {Object} publishHandle Publish handle to stop if on client | ||
| * | ||
| * @constructor | ||
| * | ||
| */ | ||
| constructor(cursor, count, isReady = true, publishHandle = null, aggs = {}) { | ||
| check(cursor.fetch, Function); | ||
| check(count, Number); | ||
| check(aggs, Match.Optional(Object)); | ||
|
|
||
| super(cursor, count, isReady, publishHandle); | ||
|
|
||
| this._aggs = aggs; | ||
| } | ||
|
|
||
| getAggregation(path) { | ||
| return this._aggs[path]; | ||
| } | ||
|
|
||
| getAggregations() { | ||
| return this._aggs; | ||
| } | ||
| } | ||
|
|
||
| export default ESCursor; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
66 changes: 66 additions & 0 deletions
66
packages/easysearch:elasticsearch/lib/search-collection.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| import { SearchCollection } from 'meteor/easysearch:core'; | ||
| import ESCursor from './cursor'; | ||
|
|
||
| /** | ||
| * A search collection represents a reactive collection on the client, | ||
| * which is used by the ReactiveEngine for searching using Elasticsearch. | ||
| * | ||
| * @type {ESSearchCollection} | ||
| */ | ||
| class ESSearchCollection extends SearchCollection { | ||
| /** | ||
| * Constructor | ||
| * | ||
| * @param {Object} indexConfiguration Index configuration | ||
| * @param {ReactiveEngine} engine Reactive Engine | ||
| * | ||
| * @constructor | ||
| */ | ||
| constructor() { | ||
| super(...arguments, false); | ||
| } | ||
|
|
||
| /** | ||
| * Find documents on the client. | ||
| * | ||
| * @param {Object} searchDefinition Search definition | ||
| * @param {Object} options Options | ||
| * | ||
| * @returns {ESCursor} | ||
| */ | ||
| find(searchDefinition, options) { | ||
| if (!Meteor.isClient) { | ||
| throw new Error('find can only be used on client'); | ||
| } | ||
|
|
||
| let publishHandle = Meteor.subscribe(this.name, searchDefinition, options); | ||
|
|
||
| let count = this._getCount(searchDefinition); | ||
| let aggs = this._getAggregation(searchDefinition); | ||
| let mongoCursor = this._getMongoCursor(searchDefinition, options); | ||
|
|
||
| if (!_.isNumber(count)) { | ||
| return new ESCursor(mongoCursor, 0, false, null, aggs); | ||
| } | ||
|
|
||
| return new ESCursor(mongoCursor, count, true, publishHandle, aggs); | ||
| } | ||
|
|
||
| /** | ||
| * Get the aggregations linked to the search | ||
| * | ||
| * @params {Object} searchDefinition Search definition | ||
| * | ||
| * @private | ||
| */ | ||
| _getAggregation(searchDefinition) { | ||
| const aggsDoc = this._collection.findOne('aggs' + JSON.stringify(searchDefinition)); | ||
| if (aggsDoc) { | ||
| return aggsDoc.aggs; | ||
| } | ||
| return {}; | ||
| } | ||
|
|
||
| } | ||
|
|
||
| export default ESSearchCollection; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters