Fixed Elasticsearch 1.0 backwards compatibility breaks - stemming, optimize mappings

[Mike]

Elasticsearch 1.0 changed the API relating to the mappings and settings endpoints. This means that in the Elasticsearch Setup page in the control panel, mapping optimization and stemming configuration changes do not appear to be applied. However, they are being applied; they are just not being read back correctly.

The fix for this issue (visual appearance only) is attached as a unified diff file. If you don't upgrade to ES 1.0, you will not run into this issue.

 

[rdn]

I'm the one reported this
Thanks Mike !

 

[rdn]

@Mike Could you please upload here the updated library/XenES/Model/Elasticsearch.php file please?
Thanks !

 

[Brent W]

What do I do with that file?

 

[Mike]

Any lines that start with "-" are removed, any that start with "+" are added. Other lines give you the context of how to find it. (You can also apply the changes programmatically with "patch": https://drupal.org/patch/apply)

 

[CTXMedia]

Thanks for the fix Mike - I noticed this after upgrading ES and XFES the other night.

 

[rdn]

@Mike Could you please upload here the updated library/XenES/Model/Elasticsearch.php file please?
Thanks !

Anyone?

 

[Jeremy]

Only Mike and Kier have access. Mike has provided you with a patch file that will allow you to make the changes necessary yourself.

 

[Chris D]

It's really not difficult.

Find:

        if (isset($results->$indexName))

Replace with:

        if (isset($results->$indexName->mappings))
        {
            // elasticsearch 1.0 format
            return $results->$indexName->mappings;
        }
        else if (isset($results->$indexName))

Then find:

            $type = isset($settings->{'index.analysis.analyzer.default.type'})
                ? $settings->{'index.analysis.analyzer.default.type'}
                : 'standard';
            $language = isset($settings->{'index.analysis.analyzer.default.language'})
                ? $settings->{'index.analysis.analyzer.default.language'}
                : 'English';

And replace with:

            if (isset($settings->{'index.analysis.analyzer.default.type'}))
            {
                $type = $settings->{'index.analysis.analyzer.default.type'};
            }
            else if (isset($settings->index->analysis->analyzer->default->type))
            {
                $type = $settings->index->analysis->analyzer->default->type;
            }
            else
            {
                $type = 'standard';
            }

            if (isset($settings->{'index.analysis.analyzer.default.language'}))
            {
                $language = $settings->{'index.analysis.analyzer.default.language'};
            }
            else if (isset($settings->index->analysis->analyzer->default->language))
            {
                $language = $settings->index->analysis->analyzer->default->language;
            }
            else
            {
                $language = 'English';
            }

 

[rdn]

But there are two instances of if (isset($results->$indexName)).

 

[Chris D]

Well the diff file shows you which lines preceed it.

Find:

        $indexName = XenES_Api::getInstance()->getIndex();

        $results = XenES_Api::getMappings($indexName);
        if (isset($results->$indexName))

Replace:

        $indexName = XenES_Api::getInstance()->getIndex();

        $results = XenES_Api::getMappings($indexName);
        if (isset($results->$indexName->mappings))
        {
            // elasticsearch 1.0 format
            return $results->$indexName->mappings;
        }
        else if (isset($results->$indexName))

 

[rdn]

Done, thanks.
Change line #21 and #150.

 

[rdn]

I hope this is correct