Commit graph

255 commits

Author SHA1 Message Date
Ray 41b347dfe4 Merge remote-tracking branch 'upstream/master'
Conflicts:
	Logger/ElasticaLogger.php
	README.md
2014-03-18 19:59:27 -04:30
rayrigam de70e78b53 Update Configuration.php
Updated to support any HTTP request header type in the "headers" section.
2014-03-18 18:14:03 -04:30
Tim Nagel 5292a2adad Merge pull request #463 from FriendsOfSymfony/add-hotswapping-aliased-indexes-on-populate
Add support for using aliases to allow hot swapping of indexes.
2014-03-17 09:20:12 +11:00
Tim Nagel 49521e9fc4 Merge branch 'master' into add-hotswapping-aliased-indexes-on-populate
Conflicts:
	Resetter.php
2014-03-17 09:18:57 +11:00
Tim Nagel 857c1c8e48 Merge pull request #415 from nurikabe/master
Refactoring to update ElasticSearch index in postFush
2014-03-17 09:11:43 +11:00
Tim Nagel 6cd69ad131 Merge pull request #361 from xphere-forks/master
Add support for include_in_parent and include_in_root options
2014-03-14 08:53:42 +11:00
Tim Nagel 48edc195cd Merge pull request #484 from bits4breakfast/containeraware-callback
Container is now available in Callback
2014-03-14 08:41:15 +11:00
Ray 0116a6ac4f Add support for clients requiring basic HTTP authentication 2014-03-06 12:38:23 -04:30
Berny Cantos 7f53badad5 Add support for include_in_{parent,root} for nested and objects 2014-03-06 12:31:50 +01:00
tgallice 418b9d72ce Rework configuration validation to fix #461 2014-03-04 17:58:10 +01:00
Matteo Galli eecdd3474a Fixes #459 2014-02-21 16:47:42 +01:00
Tim Nagel cb2eeba318 Merge pull request #461 from tgallice/url_parameter
Force slash at the end of the url parameter
2014-02-19 13:40:18 +11:00
Tim Nagel aa9d74a8a0 Merge remote-tracking branch 'PeerJ/AddServerTimeout'
Conflicts:
	DependencyInjection/Configuration.php
2014-02-19 13:39:03 +11:00
Patrick McAndrew 3065c96a2c Add ability to specify server timeout 2014-02-14 17:32:22 +00:00
Richard Miller 3b1a756e6f Add support for using aliases to allow hot swapping of indexes when populating 2014-02-06 21:11:12 +00:00
tgallice 04390b37d1 Force slash at the end of the url parameter 2014-02-04 10:07:58 +01:00
nurikabe 93c6085fa5 Merge remote-tracking branch 'upstream/master' 2014-02-01 02:15:52 +00:00
Laszlo Horvath 5480e037e3 adding ttl for documents 2014-01-30 12:39:48 +01:00
Tim Nagel ef872dd22d Merge pull request #439 from FriendsOfSymfony/type-timestamp
Adding support for enabling timestamps
2014-01-20 12:57:02 -08:00
Tim Nagel f0f6fc8129 Merge pull request #441 from klmatom/master
Add similarity as a valid field mapping.  http://www.elasticsearch.org/g...
2014-01-20 12:56:47 -08:00
Tom A 4287a91d50 Add similarity as a valid field mapping. http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/mapping-core-types.html#similarity 2014-01-16 23:05:44 -05:00
nurikabe 4a4716a55b Merge remote-tracking branch 'upstream/master' 2014-01-11 16:38:29 +00:00
Vermi 73ee750515 Removing "->performNoDeepMerging()"in indexes configuration, allowing custom Bundle defining new types in an existing index.
Configuration is injected in the new Bundle using prependExtensionConfig()
2014-01-10 16:25:45 +01:00
Lea Haensenberger 274fc00991 Add store and index options to timestamp 2014-01-06 10:19:11 +01:00
Lea Haensenberger 4ee81dc010 Adding support for enabling timestamps 2014-01-06 09:20:44 +01:00
Tim Nagel 5f8b8003d1 Refactor documentation 2013-12-17 21:17:28 +11:00
Tim Nagel 90022b0d0a Move type configuration into independent method 2013-12-15 18:33:45 +11:00
Tim Nagel e2e21b1e0c Allow bundle to be used without clients or indexes defined. 2013-12-15 18:33:31 +11:00
nurikabe 3bd9155f46 Use constants of corresponding events classes rather than making assumption about string values. 2013-12-13 17:51:15 +00:00
Lea Haensenberger a59385af7b Do not set default value to *, might conflict when using e.g. path_match and match_pattern regex together 2013-12-10 15:37:41 +01:00
Lea Haensenberger e55c7e8632 Set match to '*' by default 2013-12-10 15:21:46 +01:00
Lea Haensenberger 09031457cd Allow more matching methods 2013-12-10 15:21:46 +01:00
Lea Haensenberger eaf52fa907 Allow a more dynamic mapping for dynamic templates 2013-12-10 15:21:46 +01:00
Császár Dániel e16ece821d Fix client configuration missing logger 2013-12-10 13:54:50 +01:00
Tim Nagel da44ee65f6 Merge pull request #395 from pierredup/logger
Add option to enable logger and define logger class
2013-12-10 02:17:10 -08:00
Tim Nagel e1ed7bdc67 Merge pull request #420 from FriendsOfSymfony/all-field-config
Add support to disable the _all field for a type
2013-12-10 02:16:23 -08:00
Tim Nagel 8668537740 Merge pull request #400 from cordoval/cleanups
clean ups
2013-12-10 02:15:53 -08:00
Tim Nagel fc64078575 Merge pull request #413 from damienalexandre/serializer-integration
Serializer support in providers and mapping configuration fixes
2013-12-09 12:35:26 -08:00
Lea Haensenberger 8f1b52328f Merge remote-tracking branch 'origin/master' into all-field-config
Conflicts:
	DependencyInjection/FOSElasticaExtension.php
2013-12-06 08:25:02 +01:00
Lea Haensenberger 08193ec2fd Add support to disable the _all field for a type 2013-12-05 16:35:30 +01:00
Pierre du Plessis 759950aff6 Add option to disable logger or specify different logger service 2013-12-04 22:09:27 +02:00
nurikabe 3a279f8edb Remove debug. 2013-12-04 10:46:05 +00:00
Richard Miller a227a3f076 Merge branch '2.1.x' 2013-12-04 08:03:04 +00:00
Richard Miller 2980ee818a Merge branch '2.0.x' into 2.1.x 2013-12-04 08:02:22 +00:00
Ben Longden 8b6dffbc14 Adds enabled mapping option (default true) 2013-12-04 07:53:08 +00:00
nurikabe 22a5d67d05 pre/postFlush configuration. Update documentation. 2013-12-03 20:41:26 +00:00
nurikabe 5ec652063d Don't need postRemove. 2013-12-01 21:48:41 +00:00
nurikabe f258c9ddc0 Exploratory development for https://github.com/FriendsOfSymfony/FOSElasticaBundle/issues/410 2013-12-01 21:17:55 +00:00
Damien Alexandre 3027c687e2 Ref #341, fix the insertMany method to use Bulk indexing
To make it works, I inject the serializer defined for the Type
into the fos_elastica.object_serializer_persister service.

This is the SAME service injected in the setSerializer of Type.

We deport the handling of serialization outside Elastica,
this is not so good but we need to build our own Documents to
get the ID's correctly.
2013-11-29 15:35:59 +01:00
Damien Alexandre 2862259d8e Allow empty or null or no mappings: key under type configuration
refs #300. This commit allow to define types without having to
set any mapping as Elasticsearch build his own.

The minimal config become:

    indexes:
        toto:
            client: default
            types:
                Article:
                    mappings: ~
                    ...
2013-11-29 14:59:56 +01:00
Damien Alexandre d546b4d3f3 Merge remote-tracking branch 'origin/serializer-transformer' into serializer-integration
Conflicts:
	DependencyInjection/FOSElasticaExtension.php
	Resources/config/config.xml
2013-11-29 10:07:13 +01:00
Luis Cordova cacb40286c clean ups 2013-11-20 08:11:15 -05:00
Tim Nagel 3c26f157aa Merge branch '2.1.x'
Conflicts:
	Tests/ResetterTest.php
2013-11-11 13:30:29 +11:00
Tim Nagel 9b6b0b0148 Add query_builder_method option to the transformers 2013-11-11 13:14:02 +11:00
Tim Nagel d5c606c64a Merge pull request #388 from XWB/dynamic_template_support
Add support for dynamic templates
2013-11-04 13:49:48 -08:00
Tim Nagel 28641427d5 Merge tag 'v2.1.3-PL1' 2013-11-01 09:17:17 +11:00
Tim Nagel 7f8a8e95e6 Merge tag 'v2.0.3-PL1' into 2.1.x 2013-11-01 09:16:27 +11:00
Tim Nagel 21ce3cf6ff Fix definition decorators (closes #393) 2013-11-01 09:15:38 +11:00
Jeremy Mikola 467ccbf753 Tag client services in DI extension class
These tags were originally introduced in 16ecd7cca3. #339 removed the fos_elastica.client definition from config.xml, so this tag needs to be added via the DI extension class now.
2013-10-30 17:15:09 -04:00
Jeremy Mikola 68092eb4db Merge branch '2.1.x'
Conflicts:
	Resources/config/config.xml
2013-10-30 17:14:20 -04:00
Jeremy Mikola 11d0dd8f91 Merge branch '2.0.x' into 2.1.x 2013-10-30 17:10:04 -04:00
Jeremy Mikola 74d993b642 Do not clobber existing client definitions (closes #336 and #324)
While we could have used an abstract definition, its ID would likely conflict with the alias we set for the default client. Remove the abstract definition altogether and simply construct new definitions for each client. This resolves the previous issue where multiple clients would overwrite the constructor arguments of the previous definition.
2013-10-30 15:15:26 -04:00
Jeremy Mikola 604193396f Remove "prototype" from abstract definition IDs; note possible conflicts
Due to the naming of transformer, listener, and finder services, it's possible for index/type services to clobber the ID of another concrete or abstract service. This cannot be helped without breaking BC, but we should note it within the extension class.
2013-10-30 15:15:25 -04:00
Karel Souffriau c68bb411ac Add support for dynamic templates 2013-10-30 13:39:43 +01:00
Tim Nagel 85c4dc92f9 Merge tag 'v2.1.3'
Conflicts:
	DependencyInjection/Configuration.php
	README.md
2013-10-30 09:06:48 +11:00
Karel Souffriau 9d1201099d Add date format field 2013-10-29 12:20:32 +01:00
Lea Haensenberger 37cfdb0df7 refactoring some code 2013-07-18 10:56:25 +02:00
Lea Haensenberger 300d189a9d renaming services to avoid potential conflicts 2013-07-18 10:51:51 +02:00
Lea Haensenberger 5b6a1f7bd6 Adding new persister and new transformer to make use of the serializer support of elastica when persisting doctrine objects 2013-07-17 08:58:15 +02:00
Antonio J. García Lagar 7f3cfa49fb Make the property param optional 2013-06-19 13:57:15 +02:00
Antonio J. García Lagar a386ffefe3 Fix parent mapping 2013-06-17 21:19:11 +02:00
Lukas Kahwe Smith 43d1531cd4 cs fix 2013-05-23 00:25:38 +03:00
Lukas Kahwe Smith 50730cca3d added path support, see http://www.elasticsearch.org/guide/reference/mapping/id-field/ 2013-05-17 00:22:46 +02:00
Jeremy Mikola 814460dbf2 Merge branch '2.1.x' 2013-05-15 10:58:47 -05:00
Tim Nagel 00b67fd8a4 Ignore missing index hits 2013-05-15 09:59:43 -05:00
Lukas Kahwe Smith 800e38f8aa tweaked the callback handling 2013-04-26 14:10:06 +02:00
Lukas Kahwe Smith 8a9a9686ba various tweaks 2013-04-26 14:10:05 +02:00
Lukas Kahwe Smith aafb6e53fb made the bundle compatible with Elastica 0.20.x 2013-04-26 14:10:05 +02:00
Lea Haensenberger 1abe1f48dd Having a parameter name defining a class for the serializer callback, because directly putting service id or parameter doesn't work because these values are not available at bundle configuration time 2013-04-26 14:10:05 +02:00
Lea Haensenberger a139d18b22 Adding default callback for serialization if serialization is turned on 2013-04-26 14:09:42 +02:00
Lea Haensenberger 73fd4fe6b0 Creating a serializer callable for every type in an index and passing it to elastica 2013-04-26 14:06:49 +02:00
Lea Haensenberger c5ee26099b Adding support to pass a serializer to elastica 2013-04-26 14:06:48 +02:00
Thomas Tourlourat 4b4a56db1e Check for "indexes" key in Configuration::getNestings() 2013-04-17 11:23:30 -04:00
Jeremy Mikola 440c36f537 Merge remote-tracking branch 'cevou/master' into pr/245
Conflicts:
	Command/PopulateCommand.php
	Command/SearchCommand.php
	DependencyInjection/Configuration.php
	Doctrine/AbstractElasticaToModelTransformer.php
	Doctrine/AbstractListener.php
	Doctrine/MongoDB/ElasticaToModelTransformer.php
	Doctrine/ORM/ElasticaToModelTransformer.php
	Doctrine/RepositoryManager.php
	Finder/TransformedFinder.php
	Paginator/PaginatorAdapterInterface.php
	Paginator/RawPaginatorAdapter.php
	Persister/ObjectPersister.php
	Propel/ElasticaToModelTransformer.php
	Subscriber/PaginateElasticaQuerySubscriber.php
	Tests/DataCollector/ElasticaDataCollectorTest.php
	Tests/Doctrine/AbstractProviderTest.php
	Tests/Doctrine/RepositoryManagerTest.php
	Tests/Manager/RepositoryManagerTest.php
	Tests/RepositoryTest.php
	Transformer/ElasticaToModelTransformerCollection.php
	composer.json
2013-03-27 14:58:34 -04:00
Jeremy Mikola 744f05814a Merge branch '1.0.x' 2013-03-27 13:58:57 -04:00
Jeremy Mikola 4aa8fefe2d Rename FOQ filenames to FOS 2013-03-27 13:58:32 -04:00
Jeremy Mikola 49de4d361d Rename FOQ namespaces and services to FOS 2013-03-27 13:44:44 -04:00
Jeremy Mikola 3fb9aaa56a Rename FOQ namespaces and services to FOS 2013-03-27 13:44:06 -04:00
Stanislav Petrov 3f93f93a45 Changed configuration to implement ConfigurationInterface 2013-03-15 14:54:48 -04:00
skuro 904a664dfe Allow processing of null mappings in configuration 2013-03-15 14:35:01 -04:00
Konstantin Tjuterev 5e835f5b2c Added missing string field attributes, according to http://www.elasticsearch.org/guide/reference/mapping/core-types.html 2013-03-05 15:06:11 +02:00
Jeremy Mikola 8d11082a02 Skip config processing of indexes without types (fixes #246) 2013-03-04 14:59:04 -05:00
Jeremy Mikola eff52c2c9b Revert "fix search command"
This reverts commit f874e1d34f from PR #243.
2013-03-04 14:57:08 -05:00
cevou cbe6071969 Code cleanup
- updated deprecated calls
- cleaned up PHPDoc comments
2013-03-02 12:23:44 +01:00
Uyi Ehondor f874e1d34f fix search command
The bug:
The Search command throws an invalid argument exception when the index
alias and the index_name are different (see pull request 207 for a
background about the issue).

Fix:
The first argument of the index manager should be an array of index
objects having index names as keys, and should only fall back to using index aliases
if the index_name config param is not set.

See: pull request 207
(https://github.com/Exercise/FOQElasticaBundle/pull/207) for a background
on the issue.
2013-02-26 10:50:33 +00:00
Lea Haensenberger 7e85f79f8e Merge remote-tracking branch 'origin/master' into recursive_field_config
Conflicts:
	DependencyInjection/Configuration.php
2013-02-22 10:46:43 +01:00
Richard Miller 48d665e2ea Merge pull request #211 from liip-forks/fields_in_properties
Adding the fields configuration to the properties so multi_field fields ...
2013-02-03 11:49:51 -08:00
Richard Miller c82999fd8e Merge pull request #204 from micjohnson/patch-4
Add access to compression and disabling of _source from configuration
2013-02-03 11:45:37 -08:00
Richard Miller bfb0f823c1 Merge pull request #203 from micjohnson/patch-3
Adding _routing to type configuration
2013-02-03 11:44:51 -08:00
Richard Miller 94d89159bd Merge pull request #207 from Exercise/index-aliasing
Adding configuring index name separately from service name
2013-02-03 11:32:37 -08:00