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

Additonal updates to pantheon apachesolr module #13

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Additonal updates to pantheon apachesolr module #13

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
34d9879
Updating Pantheon Apache Solr Service class with changes to Drupal Ap…
Hornswoggles Oct 3, 2012
f608e83
Additional updates
Hornswoggles Oct 3, 2012
8a501e1
Merge in master
Hornswoggles Nov 26, 2012
45eecdf
Issue #761990 by pwolanin, jhedstrom, Nick_vh, jpmckinney | morningti…
Hornswoggles Nov 26, 2012
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
35 changes: 25 additions & 10 deletions modules/pantheon/pantheon_apachesolr/Pantheon_Apache_Solr_Service.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public function ping($timeout = 2) {
* @return
* (array) With all the system info
*/
public function setSystemInfo() {
protected function setSystemInfo() {
$url = $this->_constructUrl(self::SYSTEM_SERVLET, array('wt' => 'json'));
if ($this->env_id) {
$this->system_info_cid = $this->env_id . ":system:" . drupal_hash_base64($url);
Expand Down Expand Up @@ -180,7 +180,12 @@ public function getSystemInfo() {
*/
protected function setLuke($num_terms = 0) {
if (empty($this->luke[$num_terms])) {
$url = $this->_constructUrl(self::LUKE_SERVLET, array('numTerms' => "$num_terms", 'wt' => 'json'));
$params = array(
'numTerms' => "$num_terms",
'wt' => 'json',
'json.nl' => self::NAMED_LIST_FORMAT,
);
$url = $this->_constructUrl(self::LUKE_SERVLET, $params);
if ($this->env_id) {
$cid = $this->env_id . ":luke:" . drupal_hash_base64($url);
$cache = cache_get($cid, 'cache_apachesolr');
Expand Down Expand Up @@ -267,25 +272,28 @@ public function getStatsSummary() {
'@deletes_total' => '',
'@schema_version' => '',
'@core_name' => '',
'@index_size' => '',
);

if (!empty($stats)) {
$docs_pending_xpath = $stats->xpath('//stat[@name="docsPending"]');
$summary['@pending_docs'] = (int) trim($docs_pending_xpath[0]);
$summary['@pending_docs'] = (int) trim(current($docs_pending_xpath));
$max_time_xpath = $stats->xpath('//stat[@name="autocommit maxTime"]');
$max_time = (int) trim(current($max_time_xpath));
// Convert to seconds.
$summary['@autocommit_time_seconds'] = $max_time / 1000;
$summary['@autocommit_time'] = format_interval($max_time / 1000);
$deletes_id_xpath = $stats->xpath('//stat[@name="deletesById"]');
$summary['@deletes_by_id'] = (int) trim($deletes_id_xpath[0]);
$summary['@deletes_by_id'] = (int) trim(current($deletes_id_xpath));
$deletes_query_xpath = $stats->xpath('//stat[@name="deletesByQuery"]');
$summary['@deletes_by_query'] = (int) trim($deletes_query_xpath[0]);
$summary['@deletes_by_query'] = (int) trim(current($deletes_query_xpath));
$summary['@deletes_total'] = $summary['@deletes_by_id'] + $summary['@deletes_by_query'];
$schema = $stats->xpath('/solr/schema[1]');
$summary['@schema_version'] = trim($schema[0]);;
$core = $stats->xpath('/solr/core[1]');
$summary['@core_name'] = trim($core[0]);
$size_xpath = $stats->xpath('//stat[@name="indexSize"]');
$summary['@index_size'] = trim(current($size_xpath));
}

return $summary;
Expand Down Expand Up @@ -398,6 +406,7 @@ public function makeServletRequest($servlet, $params = array(), $options = array
// Add default params.
$params += array(
'wt' => 'json',
'json.nl' => self::NAMED_LIST_FORMAT,
);

$url = $this->_constructUrl($servlet, $params);
Expand Down Expand Up @@ -444,7 +453,7 @@ protected function _sendRawPost($url, $options = array()) {
*
* This is just a wrapper around drupal_http_request().
*/
protected function _makeHttpRequest($url, $options = array()) {
protected function _makeHttpRequest($url, array $options = array()) {
// Hacking starts here.
// $result = drupal_http_request($url, $headers, $method, $content);
static $ch;
Expand Down Expand Up @@ -812,7 +821,7 @@ public function optimize($waitFlush = true, $waitSearcher = true, $timeout = 360
/**
* Like PHP's built in http_build_query(), but uses rawurlencode() and no [] for repeated params.
*/
public function httpBuildQuery(array $query, $parent = '') {
protected function httpBuildQuery(array $query, $parent = '') {
$params = array();

foreach ($query as $key => $value) {
Expand Down Expand Up @@ -869,9 +878,15 @@ public function search($query = '', array $params = array(), $method = 'GET') {
// PHP's built in http_build_query() doesn't give us the format Solr wants.
$queryString = $this->httpBuildQuery($params);
// Check string length of the query string, change method to POST
// if longer than 4000 characters (typical server handles 4096 max).
// @todo - make this a per-server setting.
if (strlen($queryString) > variable_get('apachesolr_search_post_threshold', 4000)) {
$len = strlen($queryString);
// Fetch our threshold to find out when to flip to POST
$max_len = apachesolr_environment_variable_get($this->env_id, 'apachesolr_search_post_threshold', 3600);

// if longer than $max_len (default 3600) characters
// we should switch to POST (a typical server handles 4096 max).
// If this class is used independently (without environments), we switch automatically to POST at an
// limit of 1800 chars.
if (($len > 1800) && (empty($this->env_id) || ($len > $max_len))) {
$method = 'POST';
}

Expand Down