You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/03/20 19:21:15 UTC
[09/38] git commit: Merge branch 'two-dot-o' of
https://github.com/usergrid/usergrid into binary_serialization
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into binary_serialization
# By Dave Johnson
# Via Dave Johnson
* 'two-dot-o' of https://github.com/usergrid/usergrid: (31 commits)
Correcting document type generation because . , _ # and | are not allowed.
Adding some issues to README.
Still working on debugging IndexIT tests.
Update README.md
Update README.md
Informative README for Query Index module.
Eliminate redundant class.
Add test for deindex() and ignore two problematic tests.
Don't need the ElasticSearchRule
Support for non-embedded ElasticSearch
Ignore ANTLR output.
re-enable ANTLR plugin.
Enable testCollectionOrdering() test, also: use more specific exceptions.
Enable another test, and make tests use different collection names because they were interfering with each other.
Package re-org.
Cursor support complete.
Simple stress tests.
Re-organize test packages.
More GeoIT tests working.
Basic geo queries working as well as part of one of the GeoIT tests.
...
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/3af1805f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3af1805f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3af1805f
Branch: refs/pull/77/head
Commit: 3af1805fd655e07ca1f818c4de0f2650acd1cf9f
Parents: c739fb0 24a8f4d
Author: grey <gr...@apigee.com>
Authored: Fri Mar 7 07:55:33 2014 -0800
Committer: grey <gr...@apigee.com>
Committed: Fri Mar 7 07:55:33 2014 -0800
----------------------------------------------------------------------
.gitignore | 7 +-
.../query/tree/QueryFilterLexer.java | 3106 ------------------
.../query/tree/QueryFilterParser.java | 2484 --------------
.../collection/astyanax/CassandraFig.java | 1 -
.../MvccLogEntrySerializationStrategyImpl.java | 3 +-
.../collection/EntityCollectionManagerST.java | 89 +
.../collection/cassandra/CassandraRule.java | 2 +-
.../collection/guice/TestCollectionModule.java | 31 +-
.../collection/guice/TestModule.java | 26 +-
.../persistence/graph/guice/GraphModule.java | 7 +-
.../graph/guice/TestGraphModule.java | 24 +-
.../persistence/model/field/FloatField.java | 35 +
stack/corepersistence/pom.xml | 7 +-
stack/corepersistence/queryindex/README.md | 64 +
stack/corepersistence/queryindex/pom.xml | 98 +-
.../persistence/query/tree/QueryFilter.g | 4 +-
.../persistence/exceptions/IndexException.java | 41 +
.../persistence/exceptions/QueryException.java | 41 +
.../index/EntityCollectionIndex.java | 9 +
.../index/EntityCollectionIndexFactory.java | 27 +
.../usergrid/persistence/index/IndexFig.java | 71 +
.../persistence/index/guice/IndexModule.java | 47 +
.../index/impl/EsDslQueryVistor.java | 108 -
.../index/impl/EsEntityCollectionIndex.java | 393 ++-
.../persistence/index/impl/EsProvider.java | 97 +
.../persistence/index/impl/EsQueryVistor.java | 165 +
.../persistence/index/impl/IndexModule.java | 32 -
.../usergrid/persistence/query/Query.java | 83 +-
.../usergrid/persistence/query/Results.java | 14 +-
.../query/tree/QueryFilterLexer.java | 2565 ---------------
.../query/tree/QueryFilterParser.java | 2186 ------------
.../persistence/query/tree/QueryVisitor.java | 3 +
.../persistence/query/tree/WithinOperand.java | 8 +-
.../usergrid/persistence/utils/ClassUtils.java | 58 -
.../persistence/utils/ConversionUtils.java | 765 -----
.../usergrid/persistence/utils/JsonUtils.java | 329 --
.../usergrid/persistence/utils/ListUtils.java | 232 --
.../usergrid/persistence/utils/MapUtils.java | 377 ---
.../usergrid/persistence/utils/StringUtils.java | 172 -
.../usergrid/persistence/utils/UUIDUtils.java | 412 ---
.../org/apache/usergrid/utils/ClassUtils.java | 58 +
.../apache/usergrid/utils/ConversionUtils.java | 765 +++++
.../org/apache/usergrid/utils/JsonUtils.java | 329 ++
.../org/apache/usergrid/utils/ListUtils.java | 232 ++
.../org/apache/usergrid/utils/MapUtils.java | 377 +++
.../org/apache/usergrid/utils/StringUtils.java | 172 +
.../org/apache/usergrid/utils/UUIDUtils.java | 412 +++
.../apache/usergrid/persistence/IndexIT.java | 453 ---
.../index/guice/TestIndexModule.java | 30 +
.../persistence/index/impl/CollectionIT.java | 1643 +++++++++
.../index/impl/ElasticSearchRule.java | 61 +
.../index/impl/ElasticSearchTest.java | 25 +-
.../impl/EntityCollectionIndexStressTest.java | 78 +
.../index/impl/EntityCollectionIndexTest.java | 132 +-
.../usergrid/persistence/index/impl/GeoIT.java | 560 ++++
.../persistence/index/impl/IndexIT.java | 488 +++
.../persistence/index/legacy/Application.java | 145 +
.../index/legacy/CoreApplication.java | 155 +
.../persistence/index/legacy/CoreITSetup.java | 31 +
.../index/legacy/CoreITSetupImpl.java | 96 +
.../persistence/index/legacy/EntityBuilder.java | 177 +
.../index/legacy/EntityManagerFacade.java | 167 +
.../persistence/index/legacy/Point.java | 58 +
.../usergrid/persistence/query/QueryTest.java | 6 +-
.../persistence/query/tree/GrammarTreeTest.java | 11 +-
.../persistence/utils/ElasticSearchRule.java | 65 -
.../apache/usergrid/test/AbstractCoreIT.java | 57 -
.../org/apache/usergrid/test/Application.java | 144 -
.../apache/usergrid/test/CassandraService.java | 27 -
.../apache/usergrid/test/CoreApplication.java | 154 -
.../org/apache/usergrid/test/CoreITSetup.java | 31 -
.../apache/usergrid/test/CoreITSetupImpl.java | 97 -
.../usergrid/test/EntityManagerFacade.java | 73 -
.../apache/usergrid/test/EntityMapUtils.java | 178 -
.../src/test/resources/dynamic-test.properties | 4 +
.../src/test/resources/log4j.properties | 12 +-
.../src/test/resources/usergrid-CHOP.properties | 6 +-
.../src/test/resources/usergrid-UNIT.properties | 5 +
78 files changed, 7315 insertions(+), 14422 deletions(-)
----------------------------------------------------------------------