Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added support for MongoDB aggregation framework to the datasource #74

Open
wants to merge 2 commits into
base: cake2.2
Choose a base branch
from
Open

Added support for MongoDB aggregation framework to the datasource #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a3433b
Added support for MongoDB aggregation framework to the datasource
codingthoughts Apr 30, 2013
0303bac
Added some error checking to data source and added test cases to test…
codingthoughts May 1, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 104 additions & 18 deletions Model/Datasource/MongodbSource.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -987,6 +987,7 @@ public function delete(Model $Model, $conditions = null) {
* @access public
*/
public function read(Model $Model, $query = array(), $recursive = null) {
$isAggregateQuery = false;
if (!$this->isConnected()) {
return false;
}
Expand Down Expand Up @@ -1039,14 +1040,28 @@ public function read(Model $Model, $query = array(), $recursive = null) {
$offset = ($page - 1) * $limit;
}

// Set flag if the query is an aggregate query.
if( count($conditions) == 1 && array_key_exists('aggregate', $conditions))
{
$isAggregateQuery = true;
}

$return = array();

$this->_prepareLogQuery($Model); // just sets a timer
if (empty($modify)) {
if ($Model->findQueryType === 'count' && $fields == array('count' => true)) {
$count = $this->_db
->selectCollection($Model->table)
->count($conditions);
if($isAggregateQuery) {
$count = $this->getResultCountForAggregateQuery($Model, $conditions);
}
else
{
$count = $this->_db
->selectCollection($Model->table)
->count($conditions);
}


if ($this->fullDebug) {
$this->logQuery("db.{$Model->useTable}.count( :conditions )",
compact('conditions', 'count')
Expand All @@ -1055,18 +1070,56 @@ public function read(Model $Model, $query = array(), $recursive = null) {
return array(array($Model->alias => array('count' => $count)));
}

$return = $this->_db
->selectCollection($Model->table)
->find($conditions, $fields)
->sort($order)
->limit($limit)
->skip($offset);
if ($this->fullDebug) {
$count = $return->count(true);
$this->logQuery("db.{$Model->useTable}.find( :conditions, :fields ).sort( :order ).limit( :limit ).skip( :offset )",
compact('conditions', 'fields', 'order', 'limit', 'offset', 'count')
);
}
if($isAggregateQuery)
{
//We are dealing with aggregate query here.
if(!empty($order)) {
$conditions['aggregate'][] = array('$sort' => $order);
}
if (!empty($offset)) {
$conditions['aggregate'][] = array('$skip' => $offset);
}
if(!empty($limit))
{
$conditions['aggregate'][] = array('$limit' => $limit);
}

$return = $this->_db
->selectCollection($Model->table)
->aggregate($conditions['aggregate']);

//Format $return in a format that cake expects
$_return = array();
foreach($return['result'] as $result)
{
$_return[][$Model->alias] = $result;
}
$return = $_return;
}
else
{
$return = $this->_db
->selectCollection($Model->table)
->find($conditions, $fields)
->sort($order)
->limit($limit)
->skip($offset);
}


if ($this->fullDebug) {
if($isAggregateQuery)
{
$count = $this->getResultCountForAggregateQuery($Model,$conditions);
}
else
{
$count = $return->count(true);
}
$this->logQuery("db.{$Model->useTable}.find( :conditions, :fields ).sort( :order ).limit( :limit ).skip( :offset )",
compact('conditions', 'fields', 'order', 'limit', 'offset', 'count')
);
}
} else {
$options = array_filter(array(
'findandmodify' => $Model->table,
Expand Down Expand Up @@ -1096,9 +1149,16 @@ public function read(Model $Model, $query = array(), $recursive = null) {
}
}

if ($Model->findQueryType === 'count') {
return array(array($Model->alias => array('count' => $return->count())));
}
if ($Model->findQueryType === 'count') {
if($isAggregateQuery) {
$count = $this->getResultCountForAggregateQuery($Model,$conditions);
}
else
{
$count = $return->count();
}
return array(array($Model->alias => array('count' => $count)));
}

if (is_object($return)) {
$_return = array();
Expand All @@ -1119,6 +1179,32 @@ public function read(Model $Model, $query = array(), $recursive = null) {
return $return;
}

/**
* @param $Model
* @param $conditions
* @return int
*/
protected function getResultCountForAggregateQuery(&$Model, $conditions)
{
$countConditions = $conditions['aggregate'];
$countConditions[] = array(
'$group' => array(
'_id' => null,
'count' => array('$sum' => 1)
));
$countOfAggregatedResults = $this->_db
->selectCollection($Model->table)
->aggregate($countConditions);

if (!empty($countOfAggregatedResults['result'])) {
$countOfAggregatedResults = $countOfAggregatedResults['result'][0]['count'];
} else {
$countOfAggregatedResults = 0;
}
$count = $countOfAggregatedResults;
return $count;
}

/**
* rollback method
*
Expand Down
153 changes: 150 additions & 3 deletions Test/Case/Datasource/MongodbSourceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ class Post extends AppModel {
),
);

public $mongoSchema = array(
'title' => array('type' => 'string'),
'body' => array('type' => 'string'),
public $mongoSchema = array(
'title' => array('type' => 'string'),
'body' => array('type' => 'string'),
'text' => array('type' => 'text'),
'uniquefield1' => array('type' => 'text'),
'uniquefield2' => array('type' => 'text'),
Expand Down Expand Up @@ -228,6 +228,153 @@ public function dropData() {
}
}

/**
* Tests aggregation case
*
* @return void
* @access public
*/
public function testAggregation()
{
for ($i = 0; $i < 30; $i++) {
$saveData[$i]['Post'] = array(
'title' => 'test' . $i,
'body' => 'aaaa' . $i,
'text' => 'bbbb',
'count' => $i,
);
}

$saveData[30]['Post'] = array(
'title' => 'test1',
'body' => 'aaaa1',
'text' => 'bbbb1',
'count' => 1,
);
$saveData[31]['Post'] = array(
'title' => 'test2',
'body' => 'aaaa2',
'text' => 'bbbb2',
'count' => 2,
);

$this->Post->create();
$saveResult = $this->Post->saveAll($saveData);

$conditions = array(
'aggregate' => array(
array(
'$match' => array(
'text' => 'bbbb'
)
),
array(
'$group' => array(
'_id' => '$text',
'count' => array(
'$sum' => '$count'
)
)
),
array(
'$project' => array(
'text' => '$_id',
'count' => 1
)
)
)
);

$result = $this->Post->find('all', array('conditions' => $conditions));

$expected = array(
'Post' => array(
'_id' => 'bbbb',
'count' => (29 * 30) / 2,
'text' => 'bbbb'
)
);

$this->assertEquals($expected, $result[0]);
}

/**
* Tests another aggregation case
*
* @return void
* @access public
*/
public function testAggregationCase1()
{
for ($i = 0; $i < 30; $i++) {
$saveData[$i]['Post'] = array(
'title' => 'test' . $i,
'body' => 'aaaa' . $i,
'text' => 'bbbb' . $i,
'count' => $i,
);
}

$saveData[30]['Post'] = array(
'title' => 'test1',
'body' => 'aaaa1',
'text' => 'bbbb1',
'count' => 1,
);
$saveData[31]['Post'] = array(
'title' => 'test2',
'body' => 'aaaa2',
'text' => 'bbbb2',
'count' => 2,
);

$this->Post->create();
$saveResult = $this->Post->saveAll($saveData);

$conditions = array(
'aggregate' => array(
array(
'$group' => array(
'_id' => '$title',
'count' => array(
'$sum' => 1
)
)
),
array(
'$project' => array(
'title' => '$_id',
'count' => 1,
'_id' => 0
)
),
array(
'$match' => array(
'title' => array('$in' => array('test1', 'test2'))
)
)
)
);

$result = $this->Post->find('all', array('conditions' => $conditions));

$expected = array(
array(
'Post' => array(
'count' => 2,
'title' => 'test1'
)
),
array(
'Post' => array(
'count' => 2,
'title' => 'test2'
)
)
);

$this->assertEquals($expected, $result);
}

/**
* testCreateConnectionName
Expand Down