Merge branch 'fb/spatial.queries' of https://github.com/ramtej/qi4j-sdk into
fb/spatial.queries
Conflicts:
extensions/indexing-elasticsearch/src/main/java/org/qi4j/index/elasticsearch/ElasticSearchConfiguration.java
Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/b4e474da
Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/b4e474da
Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/b4e474da
Branch: refs/heads/ramtej-fb/spatial.queries
Commit: b4e474da37bdf4fb17a76a26c833547dc2692f57
Parents: 9a62448 c990fe4
Author: jj <[email protected]>
Authored: Tue Jan 6 17:15:46 2015 +0100
Committer: jj <[email protected]>
Committed: Tue Jan 6 17:15:46 2015 +0100
----------------------------------------------------------------------
.../api/configuration/ConfigurationTest.java | 1 -
extensions/indexing-elasticsearch/build.gradle | 4 +
.../ElasticSearchClusterConfiguration.java | 1 +
.../ElasticSearchConfiguration.java | 4 +-
.../elasticsearch/ElasticSearchFinder.java | 58 +--
.../elasticsearch/ElasticSearchIndexer.java | 14 +-
.../elasticsearch/ElasticSearchSupport.java | 3 +
.../assembly/ESClusterIndexQueryAssembler.java | 9 +
.../ESFilesystemIndexQueryAssembler.java | 9 +
.../assembly/ESMemoryIndexQueryAssembler.java | 7 +
.../elasticsearch/cluster/ESClusterSupport.java | 2 +
.../spatial/ElasticSearchSpatialIndexer.java | 20 +-
.../configuration/SpatialConfiguration.java | 98 +++++
.../SpatialConfigurationValues.java | 9 -
.../SpatialFunctionsSupportMatrix.java | 70 ++-
.../functions/predicates/ST_Disjoint.java | 14 +-
.../AbstractElasticSearchSpatialFunction.java | 23 +-
.../spatial/mappings/SpatialIndexMapper.java | 22 +-
.../mappings/builders/GeoShapeBuilder.java | 3 +-
.../old/ElasticSearchMappingsCache.java | 90 ----
.../old/ElasticSearchMappingsHelper.java | 121 -----
.../ElasticSearchSpatialIndexerMappings.java | 314 -------------
.../filesystem/ESFilesystemSupport.java | 18 +-
.../internal/AbstractElasticSearchSupport.java | 18 +-
.../elasticsearch/memory/ESMemorySupport.java | 6 +-
.../spatial/ElasticSearchSpatialBench.java | 247 +++++++++++
...earchSpatialRegressionQueryVariant1Test.java | 31 +-
...earchSpatialRegressionQueryVariant2Test.java | 40 +-
.../extension/spatial/utils/RandomPoint.java | 148 +++++++
.../extension/spatial/utils/RandomUtils.java | 438 +++++++++++++++++++
...lasticSearchConfigurationVariant1.properties | 28 ++
...lasticSearchConfigurationVariant2.properties | 28 ++
.../openstreetmap/model/test/TestOSMModel.java | 54 +--
33 files changed, 1241 insertions(+), 711 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/b4e474da/extensions/indexing-elasticsearch/src/main/java/org/qi4j/index/elasticsearch/ElasticSearchConfiguration.java
----------------------------------------------------------------------
diff --cc
extensions/indexing-elasticsearch/src/main/java/org/qi4j/index/elasticsearch/ElasticSearchConfiguration.java
index 223d579,23f8b33..795fc6b
---
a/extensions/indexing-elasticsearch/src/main/java/org/qi4j/index/elasticsearch/ElasticSearchConfiguration.java
+++
b/extensions/indexing-elasticsearch/src/main/java/org/qi4j/index/elasticsearch/ElasticSearchConfiguration.java
@@@ -22,7 -21,7 +22,8 @@@ import org.qi4j.api.common.Optional
import org.qi4j.api.common.UseDefaults;
import org.qi4j.api.configuration.ConfigurationComposite;
import org.qi4j.api.property.Property;
+import
org.qi4j.index.elasticsearch.extensions.spatial.configuration.SpatialExceptionConfiguration;
+ import
org.qi4j.index.elasticsearch.extensions.spatial.configuration.SpatialConfiguration;
// START SNIPPET: config
public interface ElasticSearchConfiguration
@@@ -54,8 -53,13 +55,9 @@@
@Optional Property<INDEX_MAPPING_POINT_METHOD> indexPointMappingMethod();
-
-
@Optional
- Association<SpatialExceptionConfiguration> spatial();
+ Property<SpatialConfiguration.Configuration> spatial();
+
- // @Optional
- // Property<String> spatial();
}
// END SNIPPET: config
