Merge branch 'master' into dal
Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/fc190639 Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/fc190639 Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/fc190639 Branch: refs/heads/dal Commit: fc19063959b75c7dca565f84704c5eafda38b702 Parents: 0ed1a1d b10b34e Author: Shwetha GS <[email protected]> Authored: Wed Jun 10 16:57:00 2015 +0530 Committer: Shwetha GS <[email protected]> Committed: Wed Jun 10 16:57:00 2015 +0530 ---------------------------------------------------------------------- .../apache/hadoop/metadata/bridge/ABridge.java | 2 +- .../atlas/GraphTransactionInterceptor.java | 2 +- .../apache/atlas/RepositoryMetadataModule.java | 4 +- .../apache/atlas/discovery/SearchIndexer.java | 8 ++ .../graph/DefaultGraphPersistenceStrategy.java | 1 + .../repository/IndexCreationException.java | 41 ++++++++++ .../apache/atlas/repository/IndexException.java | 45 +++++++++++ .../graph/GraphBackedMetadataRepository.java | 25 ++++--- .../graph/GraphBackedSearchIndexer.java | 67 ++++++++++++----- .../typestore/GraphBackedTypeStore.java | 1 + .../atlas/services/DefaultMetadataService.java | 79 +++++++++++++------- .../graph/GraphRepoMapperScaleTest.java | 74 ++++++++++++++++-- .../typestore/GraphBackedTypeStoreTest.java | 1 - .../org/apache/atlas/TypeNotFoundException.java | 44 +++++++++++ .../atlas/typesystem/types/TypeSystem.java | 27 ++++--- .../apache/atlas/web/filters/AuditFilter.java | 5 +- .../atlas/web/resources/EntityResource.java | 8 +- .../web/resources/EntityJerseyResourceIT.java | 6 +- .../web/resources/TypesJerseyResourceIT.java | 3 + 19 files changed, 354 insertions(+), 89 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/fc190639/repository/src/main/java/org/apache/atlas/services/DefaultMetadataService.java ---------------------------------------------------------------------- diff --cc repository/src/main/java/org/apache/atlas/services/DefaultMetadataService.java index 07ba7f3,57e2d36..ce31412 --- a/repository/src/main/java/org/apache/atlas/services/DefaultMetadataService.java +++ b/repository/src/main/java/org/apache/atlas/services/DefaultMetadataService.java @@@ -424,4 -446,5 +446,5 @@@ public class DefaultMetadataService imp public void unregisterListener(EntityChangeListener listener) { entityChangeListeners.remove(listener); } + -} +}
