Repository: incubator-usergrid Updated Branches: refs/heads/USERGRID-593 23acdd509 -> 223c4b398
Removed all field mapping Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/223c4b39 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/223c4b39 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/223c4b39 Branch: refs/heads/USERGRID-593 Commit: 223c4b398a3894de319cdfa5a2fe95acb059bcd0 Parents: 23acdd5 Author: Todd Nine <tn...@apigee.com> Authored: Mon Apr 27 11:38:17 2015 -0600 Committer: Todd Nine <tn...@apigee.com> Committed: Mon Apr 27 11:38:17 2015 -0600 ---------------------------------------------------------------------- .../persistence/index/usergrid-mappings.json | 171 ++++++++++--------- .../setup/ConcurrentProcessSingleton.java | 6 +- 2 files changed, 89 insertions(+), 88 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/223c4b39/stack/corepersistence/queryindex/src/main/resources/org/apache/usergrid/persistence/index/usergrid-mappings.json ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/main/resources/org/apache/usergrid/persistence/index/usergrid-mappings.json b/stack/corepersistence/queryindex/src/main/resources/org/apache/usergrid/persistence/index/usergrid-mappings.json index d4c34cd..f12b66b 100644 --- a/stack/corepersistence/queryindex/src/main/resources/org/apache/usergrid/persistence/index/usergrid-mappings.json +++ b/stack/corepersistence/queryindex/src/main/resources/org/apache/usergrid/persistence/index/usergrid-mappings.json @@ -1,93 +1,96 @@ { - "entity": { - "properties": { - "entityId": { - "type": "string", - "index": "not_analyzed", - "doc_values": true - }, - "entityVersion": { - "type": "string", - "index": "not_analyzed", - "doc_values": true - }, - "entityType": { - "type": "string", - "index": "not_analyzed", - "doc_values": true - }, - "applicationId": { - "type": "string", - "index": "not_analyzed", - "doc_values": true - }, - "nodeId": { - "type": "string", - "index": "not_analyzed", - "doc_values": true - }, - "edgeName": { - "type": "string", - "index": "not_analyzed", - "doc_values": true - }, - "entityNodeType": { - "type": "string", - "index": "not_analyzed", - "doc_values": true - }, - "edgeTimestamp": { - "type": "long", - "doc_values": true - }, - "edgeSearch": { - "type": "string", - "index": "not_analyzed", - "doc_values": true - }, - "fields": { - "type": "nested", + "entity": { "properties": { - "name": { - "type": "string", - "index": "not_analyzed", - "doc_values": true - }, - "boolean": { - "type": "boolean", - "doc_values": true - }, - "long": { - "type": "long", - "doc_values": true - }, - "double": { - "type": "double", - "doc_values": true - }, - "location": { - "type": "geo_point", - "lat_lon": true, - "geohash": true, - "doc_values": true - }, - "string": { - "type": "string", - "fields": { - "exact": { + "entityId": { + "type": "string", + "index": "not_analyzed", + "doc_values": true + }, + "entityVersion": { + "type": "string", + "index": "not_analyzed", + "doc_values": true + }, + "entityType": { + "type": "string", + "index": "not_analyzed", + "doc_values": true + }, + "applicationId": { + "type": "string", + "index": "not_analyzed", + "doc_values": true + }, + "nodeId": { + "type": "string", + "index": "not_analyzed", + "doc_values": true + }, + "edgeName": { + "type": "string", + "index": "not_analyzed", + "doc_values": true + }, + "entityNodeType": { + "type": "string", + "index": "not_analyzed", + "doc_values": true + }, + "edgeTimestamp": { + "type": "long", + "doc_values": true + }, + "edgeSearch": { "type": "string", "index": "not_analyzed", "doc_values": true - } + }, + "fields": { + "type": "nested", + "properties": { + "name": { + "type": "string", + "index": "not_analyzed", + "doc_values": true + }, + "boolean": { + "type": "boolean", + "doc_values": true + }, + "long": { + "type": "long", + "doc_values": true + }, + "double": { + "type": "double", + "doc_values": true + }, + "location": { + "type": "geo_point", + "lat_lon": true, + "geohash": true, + "doc_values": true + }, + "string": { + "type": "string", + "fields": { + "exact": { + "type": "string", + "index": "not_analyzed", + "doc_values": true + } + } + }, + "uuid": { + "type": "string", + "index": "not_analyzed", + "doc_values": true + } + } } - }, - "uuid": { - "type": "string", - "index": "not_analyzed", - "doc_values": true - } } - } + }, + "_all": { + "enabled": false } - } } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/223c4b39/stack/test-utils/src/main/java/org/apache/usergrid/setup/ConcurrentProcessSingleton.java ---------------------------------------------------------------------- diff --git a/stack/test-utils/src/main/java/org/apache/usergrid/setup/ConcurrentProcessSingleton.java b/stack/test-utils/src/main/java/org/apache/usergrid/setup/ConcurrentProcessSingleton.java index 214334b..7cb5073 100644 --- a/stack/test-utils/src/main/java/org/apache/usergrid/setup/ConcurrentProcessSingleton.java +++ b/stack/test-utils/src/main/java/org/apache/usergrid/setup/ConcurrentProcessSingleton.java @@ -43,10 +43,8 @@ public class ConcurrentProcessSingleton { public static final int LOCK_PORT = Integer.parseInt( System.getProperty( "test.lock.port", "10101" ) ); -// public static final boolean CLEAN_STORAGE = -// Boolean.parseBoolean( System.getProperty( "test.clean.storage", "false" ) ); - - public static final boolean CLEAN_STORAGE = false; + public static final boolean CLEAN_STORAGE = + Boolean.parseBoolean( System.getProperty( "test.clean.storage", "false" ) ); public static final long ONE_MINUTE = 60000;
