atlas git commit: ATLAS-2052: updated packaing to exclude junit jar
Repository: atlas Updated Branches: refs/heads/0.8-incubating b285e93c9 -> 0e8d7d508 ATLAS-2052: updated packaing to exclude junit jar (cherry picked from commit 56374ff7e3a6faa3e444db1ba3fa14905f356dc9) Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/0e8d7d50 Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/0e8d7d50 Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/0e8d7d50 Branch: refs/heads/0.8-incubating Commit: 0e8d7d508ef9ad7da333b1664eb09fe1b0a94799 Parents: b285e93 Author: Madhan Neethiraj Authored: Tue Aug 15 15:16:57 2017 -0700 Committer: Madhan Neethiraj Committed: Wed Aug 16 19:23:47 2017 -0700 -- pom.xml| 30 ++ webapp/pom.xml | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/atlas/blob/0e8d7d50/pom.xml -- diff --git a/pom.xml b/pom.xml index 42495cd..1f9f915 100644 --- a/pom.xml +++ b/pom.xml @@ -809,6 +809,10 @@ com.google.guava guava + +junit +junit + @@ -1133,6 +1137,10 @@ * org.mortbay.jetty + +junit +junit + @@ -1141,6 +1149,12 @@ hbase-server ${hbase.version} tests + + +junit +junit + + @@ -1156,6 +1170,10 @@ tomcat * + +junit +junit + @@ -1369,12 +1387,24 @@ org.apache.atlas atlas-hbase-client-shaded ${project.version} + + +junit +junit + + org.apache.atlas atlas-hbase-server-shaded ${project.version} + + +junit +junit + + http://git-wip-us.apache.org/repos/asf/atlas/blob/0e8d7d50/webapp/pom.xml -- diff --git a/webapp/pom.xml b/webapp/pom.xml index fbe25c4..5f59ffa 100755 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -511,7 +511,7 @@ - WEB-INF/lib/titan*.jar,WEB-INF/lib/hbase*.jar,${packages.to.exclude} + WEB-INF/lib/titan*.jar,WEB-INF/lib/hbase*.jar,WEB-INF/lib/junit*.jar,${packages.to.exclude}
atlas git commit: ATLAS-2052: updated packaing to exclude junit jar
Repository: atlas Updated Branches: refs/heads/master fae008252 -> 56374ff7e ATLAS-2052: updated packaing to exclude junit jar Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/56374ff7 Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/56374ff7 Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/56374ff7 Branch: refs/heads/master Commit: 56374ff7e3a6faa3e444db1ba3fa14905f356dc9 Parents: fae0082 Author: Madhan Neethiraj Authored: Tue Aug 15 15:16:57 2017 -0700 Committer: Madhan Neethiraj Committed: Wed Aug 16 18:30:48 2017 -0700 -- pom.xml| 30 ++ webapp/pom.xml | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/atlas/blob/56374ff7/pom.xml -- diff --git a/pom.xml b/pom.xml index 8b9eee6..db71c02 100644 --- a/pom.xml +++ b/pom.xml @@ -834,6 +834,10 @@ com.google.guava guava + +junit +junit + @@ -1152,6 +1156,10 @@ * org.mortbay.jetty + +junit +junit + @@ -1160,6 +1168,12 @@ hbase-server ${hbase.version} tests + + +junit +junit + + @@ -1175,6 +1189,10 @@ tomcat * + +junit +junit + @@ -1388,12 +1406,24 @@ org.apache.atlas atlas-hbase-client-shaded ${project.version} + + +junit +junit + + org.apache.atlas atlas-hbase-server-shaded ${project.version} + + +junit +junit + + http://git-wip-us.apache.org/repos/asf/atlas/blob/56374ff7/webapp/pom.xml -- diff --git a/webapp/pom.xml b/webapp/pom.xml index 42981e0..2a06027 100755 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -511,7 +511,7 @@ - WEB-INF/lib/titan*.jar,WEB-INF/lib/hbase*.jar,${packages.to.exclude} + WEB-INF/lib/titan*.jar,WEB-INF/lib/hbase*.jar,WEB-INF/lib/junit*.jar,${packages.to.exclude}
atlas git commit: ATLAS-2044: In-memory filtering for correctness after index query
Repository: atlas Updated Branches: refs/heads/0.8-incubating 8967f0cf6 -> b285e93c9 ATLAS-2044: In-memory filtering for correctness after index query (cherry picked from commit fae00825291dd79b54867b7b7d0c2a233ce163fd) Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/b285e93c Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/b285e93c Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/b285e93c Branch: refs/heads/0.8-incubating Commit: b285e93c98a1d2d7ca5585f69e621167f53982b3 Parents: 8967f0c Author: apoorvnaik Authored: Sun Aug 13 00:53:38 2017 -0700 Committer: Madhan Neethiraj Committed: Wed Aug 16 18:30:23 2017 -0700 -- .../ClassificationSearchProcessor.java | 19 +- .../atlas/discovery/EntitySearchProcessor.java | 23 +- .../discovery/FullTextSearchProcessor.java | 14 +- .../apache/atlas/discovery/SearchProcessor.java | 171 ++- .../apache/atlas/util/SearchPredicateUtil.java | 1039 ++ 5 files changed, 1218 insertions(+), 48 deletions(-) -- http://git-wip-us.apache.org/repos/asf/atlas/blob/b285e93c/repository/src/main/java/org/apache/atlas/discovery/ClassificationSearchProcessor.java -- diff --git a/repository/src/main/java/org/apache/atlas/discovery/ClassificationSearchProcessor.java b/repository/src/main/java/org/apache/atlas/discovery/ClassificationSearchProcessor.java index 74197ca..29670bc 100644 --- a/repository/src/main/java/org/apache/atlas/discovery/ClassificationSearchProcessor.java +++ b/repository/src/main/java/org/apache/atlas/discovery/ClassificationSearchProcessor.java @@ -87,6 +87,8 @@ public class ClassificationSearchProcessor extends SearchProcessor { indexQueryString = STRAY_ELIPSIS_PATTERN.matcher(indexQueryString).replaceAll(""); this.indexQuery = graph.indexQuery(Constants.VERTEX_INDEX, indexQueryString); + +constructInMemoryPredicate(classificationType, filterCriteria, indexAttributes); } else { indexQuery = null; } @@ -184,6 +186,9 @@ public class ClassificationSearchProcessor extends SearchProcessor { getVertices(queryResult, classificationVertices); } +// Do in-memory filtering before the graph query +CollectionUtils.filter(classificationVertices, inMemoryPredicate); + for (AtlasVertex classificationVertex : classificationVertices) { Iterable edges = classificationVertex.getEdges(AtlasEdgeDirection.IN); @@ -208,19 +213,7 @@ public class ClassificationSearchProcessor extends SearchProcessor { super.filter(entityVertices); -for (AtlasVertex entityVertex : entityVertices) { -resultIdx++; - -if (resultIdx <= startIdx) { -continue; -} - -ret.add(entityVertex); - -if (ret.size() == limit) { -break; -} -} +resultIdx = collectResultVertices(ret, startIdx, limit, resultIdx, entityVertices); } } finally { AtlasPerfTracer.log(perf); http://git-wip-us.apache.org/repos/asf/atlas/blob/b285e93c/repository/src/main/java/org/apache/atlas/discovery/EntitySearchProcessor.java -- diff --git a/repository/src/main/java/org/apache/atlas/discovery/EntitySearchProcessor.java b/repository/src/main/java/org/apache/atlas/discovery/EntitySearchProcessor.java index 9cd83fb..f4ac8ab 100644 --- a/repository/src/main/java/org/apache/atlas/discovery/EntitySearchProcessor.java +++ b/repository/src/main/java/org/apache/atlas/discovery/EntitySearchProcessor.java @@ -71,6 +71,8 @@ public class EntitySearchProcessor extends SearchProcessor { if (attrSearchByIndex) { constructFilterQuery(indexQuery, entityType, filterCriteria, indexAttributes); + +constructInMemoryPredicate(entityType, filterCriteria, indexAttributes); } else { graphAttributes.addAll(indexAttributes); } @@ -165,11 +167,10 @@ public class EntitySearchProcessor extends SearchProcessor { break; } -while (idxQueryResult.hasNext()) { -AtlasVertex vertex = idxQueryResult.next().getVertex(); +getVerticesFromIndexQueryResult(idxQueryResult, entityVertices); -entityVertices.add(vertex); -} +// Do in-memory filtering before the graph query +
atlas git commit: ATLAS-2044: In-memory filtering for correctness after index query
Repository: atlas Updated Branches: refs/heads/master fa11d13a5 -> fae008252 ATLAS-2044: In-memory filtering for correctness after index query Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/fae00825 Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/fae00825 Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/fae00825 Branch: refs/heads/master Commit: fae00825291dd79b54867b7b7d0c2a233ce163fd Parents: fa11d13 Author: apoorvnaik Authored: Sun Aug 13 00:53:38 2017 -0700 Committer: Madhan Neethiraj Committed: Wed Aug 16 17:53:05 2017 -0700 -- .../ClassificationSearchProcessor.java | 19 +- .../atlas/discovery/EntitySearchProcessor.java | 23 +- .../discovery/FullTextSearchProcessor.java | 14 +- .../apache/atlas/discovery/SearchProcessor.java | 171 ++- .../apache/atlas/util/SearchPredicateUtil.java | 1039 ++ 5 files changed, 1218 insertions(+), 48 deletions(-) -- http://git-wip-us.apache.org/repos/asf/atlas/blob/fae00825/repository/src/main/java/org/apache/atlas/discovery/ClassificationSearchProcessor.java -- diff --git a/repository/src/main/java/org/apache/atlas/discovery/ClassificationSearchProcessor.java b/repository/src/main/java/org/apache/atlas/discovery/ClassificationSearchProcessor.java index 74197ca..29670bc 100644 --- a/repository/src/main/java/org/apache/atlas/discovery/ClassificationSearchProcessor.java +++ b/repository/src/main/java/org/apache/atlas/discovery/ClassificationSearchProcessor.java @@ -87,6 +87,8 @@ public class ClassificationSearchProcessor extends SearchProcessor { indexQueryString = STRAY_ELIPSIS_PATTERN.matcher(indexQueryString).replaceAll(""); this.indexQuery = graph.indexQuery(Constants.VERTEX_INDEX, indexQueryString); + +constructInMemoryPredicate(classificationType, filterCriteria, indexAttributes); } else { indexQuery = null; } @@ -184,6 +186,9 @@ public class ClassificationSearchProcessor extends SearchProcessor { getVertices(queryResult, classificationVertices); } +// Do in-memory filtering before the graph query +CollectionUtils.filter(classificationVertices, inMemoryPredicate); + for (AtlasVertex classificationVertex : classificationVertices) { Iterable edges = classificationVertex.getEdges(AtlasEdgeDirection.IN); @@ -208,19 +213,7 @@ public class ClassificationSearchProcessor extends SearchProcessor { super.filter(entityVertices); -for (AtlasVertex entityVertex : entityVertices) { -resultIdx++; - -if (resultIdx <= startIdx) { -continue; -} - -ret.add(entityVertex); - -if (ret.size() == limit) { -break; -} -} +resultIdx = collectResultVertices(ret, startIdx, limit, resultIdx, entityVertices); } } finally { AtlasPerfTracer.log(perf); http://git-wip-us.apache.org/repos/asf/atlas/blob/fae00825/repository/src/main/java/org/apache/atlas/discovery/EntitySearchProcessor.java -- diff --git a/repository/src/main/java/org/apache/atlas/discovery/EntitySearchProcessor.java b/repository/src/main/java/org/apache/atlas/discovery/EntitySearchProcessor.java index 9cd83fb..f4ac8ab 100644 --- a/repository/src/main/java/org/apache/atlas/discovery/EntitySearchProcessor.java +++ b/repository/src/main/java/org/apache/atlas/discovery/EntitySearchProcessor.java @@ -71,6 +71,8 @@ public class EntitySearchProcessor extends SearchProcessor { if (attrSearchByIndex) { constructFilterQuery(indexQuery, entityType, filterCriteria, indexAttributes); + +constructInMemoryPredicate(entityType, filterCriteria, indexAttributes); } else { graphAttributes.addAll(indexAttributes); } @@ -165,11 +167,10 @@ public class EntitySearchProcessor extends SearchProcessor { break; } -while (idxQueryResult.hasNext()) { -AtlasVertex vertex = idxQueryResult.next().getVertex(); +getVerticesFromIndexQueryResult(idxQueryResult, entityVertices); -entityVertices.add(vertex); -} +// Do in-memory filtering before the graph query +CollectionUtils.filter(entityVertices, inMemoryPredicate);
atlas git commit: ATLAS-2048: Fix for Unit test failure on 0.8-incubating branch
Repository: atlas Updated Branches: refs/heads/0.8-incubating 374cc342d -> 8967f0cf6 ATLAS-2048: Fix for Unit test failure on 0.8-incubating branch Signed-off-by: Sarath Subramanian Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/8967f0cf Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/8967f0cf Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/8967f0cf Branch: refs/heads/0.8-incubating Commit: 8967f0cf62cae4c6d6215a7fb4fc0b1d7bac9789 Parents: 374cc34 Author: nixonrodrigues Authored: Wed Aug 16 11:58:10 2017 -0700 Committer: Sarath Subramanian Committed: Wed Aug 16 11:58:10 2017 -0700 -- .../NotificationHookConsumerKafkaTest.java | 26 ++-- 1 file changed, 2 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/atlas/blob/8967f0cf/webapp/src/test/java/org/apache/atlas/notification/NotificationHookConsumerKafkaTest.java -- diff --git a/webapp/src/test/java/org/apache/atlas/notification/NotificationHookConsumerKafkaTest.java b/webapp/src/test/java/org/apache/atlas/notification/NotificationHookConsumerKafkaTest.java index 1a3c413..eb37fa8 100644 --- a/webapp/src/test/java/org/apache/atlas/notification/NotificationHookConsumerKafkaTest.java +++ b/webapp/src/test/java/org/apache/atlas/notification/NotificationHookConsumerKafkaTest.java @@ -100,30 +100,8 @@ public class NotificationHookConsumerKafkaTest { produceMessage(new HookNotification.EntityCreateRequest("test_user1", createEntity())); NotificationConsumer consumer = createNewConsumer(kafkaNotification, false); -NotificationHookConsumer notificationHookConsumer = new NotificationHookConsumer(notificationInterface, atlasEntityStore, serviceState, instanceConverter, typeRegistry); -NotificationHookConsumer.HookConsumer hookConsumer = notificationHookConsumer.new HookConsumer(consumer); - -consumeOneMessage(consumer, hookConsumer); -verify(atlasEntityStore).createOrUpdate(any(EntityStream.class), anyBoolean()); - -// produce another message, and make sure it moves ahead. If commit succeeded, this would work. -produceMessage(new HookNotification.EntityCreateRequest("test_user2", createEntity())); -consumeOneMessage(consumer, hookConsumer); - verify(atlasEntityStore,times(2)).createOrUpdate(any(EntityStream.class), anyBoolean()); -reset(atlasEntityStore); -} -finally { -kafkaNotification.close(); -} -} - -@Test -public void testConsumerConsumesNewMessageWithAutoCommitDisabled1() throws AtlasException, InterruptedException, AtlasBaseException { -try { -produceMessage(new HookNotification.EntityCreateRequest("test_user1", createEntity())); - -NotificationConsumer consumer = createNewConsumer(kafkaNotification, false); -NotificationHookConsumer notificationHookConsumer = new NotificationHookConsumer(notificationInterface, atlasEntityStore, serviceState, instanceConverter, typeRegistry); +NotificationHookConsumer notificationHookConsumer = +new NotificationHookConsumer(notificationInterface, atlasEntityStore, serviceState, instanceConverter, typeRegistry); NotificationHookConsumer.HookConsumer hookConsumer = notificationHookConsumer.new HookConsumer(consumer); consumeOneMessage(consumer, hookConsumer);
[2/3] atlas git commit: ATLAS-2003 Add Javadoc format to class summaries
ATLAS-2003 Add Javadoc format to class summaries Signed-off-by: David Radley (cherry picked from commit 856a0c61b273dd9b4a70c69bd743c51e2425a568) Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/bd5f74b5 Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/bd5f74b5 Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/bd5f74b5 Branch: refs/heads/0.8-incubating Commit: bd5f74b53682914368f8b0fdceb9ac84c618f61e Parents: 0d6f7a4 Author: Richard Ding Authored: Tue Aug 15 13:35:50 2017 +0100 Committer: Madhan Neethiraj Committed: Wed Aug 16 11:15:30 2017 -0700 -- .../security/InMemoryJAASConfiguration.java | 47 +++- .../graphdb/titan/query/TitanGraphQuery.java| 8 ++-- .../notification/NotificationInterface.java | 12 ++--- .../optimizer/ExpandAndsOptimization.java | 31 ++--- .../audit/HBaseBasedAuditRepository.java| 20 + 5 files changed, 63 insertions(+), 55 deletions(-) -- http://git-wip-us.apache.org/repos/asf/atlas/blob/bd5f74b5/common/src/main/java/org/apache/atlas/security/InMemoryJAASConfiguration.java -- diff --git a/common/src/main/java/org/apache/atlas/security/InMemoryJAASConfiguration.java b/common/src/main/java/org/apache/atlas/security/InMemoryJAASConfiguration.java index c65048f..936311b 100644 --- a/common/src/main/java/org/apache/atlas/security/InMemoryJAASConfiguration.java +++ b/common/src/main/java/org/apache/atlas/security/InMemoryJAASConfiguration.java @@ -44,13 +44,14 @@ import java.util.TreeSet; /** * InMemoryJAASConfiguration - * + * * An utility class - which has a static method init to load all JAAS configuration from Application * properties file (eg: atlas.properties) and set it as part of the default lookup configuration for * all JAAS configuration lookup. - * + * * Example settings in jaas-application.properties: * + * * atlas.jaas.KafkaClient.loginModuleName = com.sun.security.auth.module.Krb5LoginModule * atlas.jaas.KafkaClient.loginModuleControlFlag = required * atlas.jaas.KafkaClient.option.useKeyTab = true @@ -72,9 +73,12 @@ import java.util.TreeSet; * atlas.jaas.MyClient.1.option.storeKey = true * atlas.jaas.MyClient.1.option.serviceName = kafka * atlas.jaas.MyClient.1.option.keyTab = /etc/security/keytabs/kafka_client.keytab - * atlas.jaas.MyClient.1.option.principal = kafka-clien...@example.com - + * atlas.jaas.MyClient.1.option.principal = kafka-clien...@example.com + * + * * This will set the JAAS configuration - equivalent to the jaas.conf file entries: + * + * * KafkaClient { * com.sun.security.auth.module.Krb5LoginModule required * useKeyTab=true @@ -97,23 +101,26 @@ import java.util.TreeSet; * serviceName=kafka * keyTab="/etc/security/keytabs/kafka_client.keytab" * principal="kafka-clien...@example.com"; - * }; - * - * Here is the syntax for atlas.properties to add JAAS configuration: - * - * The property name has to begin with 'atlas.jaas.' + clientId (in case of Kafka client, - * it expects the clientId to be KafkaClient). - * The following property must be there to specify the JAAS loginModule name - * 'atlas.jaas.' + clientId + '.loginModuleName' - * The following optional property should be set to specify the loginModuleControlFlag - * 'atlas.jaas.' + clientId + '.loginModuleControlFlag' - * Default value : required , Possible values: required, optional, sufficient, requisite - * Then you can add additional optional parameters as options for the configuration using the following + * }; + * + * Here is the syntax for atlas.properties to add JAAS configuration: + * + * The property name has to begin with 'atlas.jaas.' + clientId (in case of Kafka client, + * it expects the clientId to be KafkaClient). + * + * The following property must be there to specify the JAAS loginModule name + * 'atlas.jaas.' + clientId + '.loginModuleName' + * + * The following optional property should be set to specify the loginModuleControlFlag + * 'atlas.jaas.' + clientId + '.loginModuleControlFlag' + * Default value : required , Possible values: required, optional, sufficient, requisite + * + * Then you can add additional optional parameters as options for the configuration using the following * syntax: - * 'atlas.jaas.' + clientId + '.option.' + = - * - * The current setup will lookup JAAS configration from the atlas-application.properties first, if not available, - * it will delegate to the original configuration + * 'atlas.jaas.' + clientId + '.option.' + = + * + * The current setup will lookup JAAS configration f
[1/3] atlas git commit: ATLAS-2046: UI Regression - Columns Filter not listing all attributes of a datatype
Repository: atlas Updated Branches: refs/heads/0.8-incubating b993f9227 -> 374cc342d ATLAS-2046: UI Regression - Columns Filter not listing all attributes of a datatype Signed-off-by: Madhan Neethiraj (cherry picked from commit fa11d13a5c431fe3c46a7ad2b267bea1f61da3e9) Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/0d6f7a4f Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/0d6f7a4f Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/0d6f7a4f Branch: refs/heads/0.8-incubating Commit: 0d6f7a4faa9c1066196473704bc125ef4bdd50de Parents: b993f92 Author: kevalbhatt Authored: Wed Aug 16 16:02:06 2017 +0530 Committer: Madhan Neethiraj Committed: Wed Aug 16 11:14:31 2017 -0700 -- .../js/views/search/SearchResultLayoutView.js | 76 ++-- 1 file changed, 38 insertions(+), 38 deletions(-) -- http://git-wip-us.apache.org/repos/asf/atlas/blob/0d6f7a4f/dashboardv2/public/js/views/search/SearchResultLayoutView.js -- diff --git a/dashboardv2/public/js/views/search/SearchResultLayoutView.js b/dashboardv2/public/js/views/search/SearchResultLayoutView.js index b9a8895..072295e 100644 --- a/dashboardv2/public/js/views/search/SearchResultLayoutView.js +++ b/dashboardv2/public/js/views/search/SearchResultLayoutView.js @@ -637,48 +637,48 @@ define(['require', } }) }; -if (this.value && this.value.searchType === "basic") { -var def = this.entityDefCollection.fullCollection.find({ name: this.value.type }); -if (def) { -var attrObj = Utils.getNestedSuperTypeObj({ data: def.toJSON(), collection: this.entityDefCollection, attrMerge: true }); -_.each(attrObj, function(obj, key) { -var key = obj.name, -isRenderable = _.contains(columnToShow, key) -if (key == "name" || key == "description" || key == "owner") { -if (columnToShow) { -col[key].renderable = isRenderable; -} -return; +} +if (this.value && this.value.searchType === "basic") { +var def = this.entityDefCollection.fullCollection.find({ name: this.value.type }); +if (def) { +var attrObj = Utils.getNestedSuperTypeObj({ data: def.toJSON(), collection: this.entityDefCollection, attrMerge: true }); +_.each(attrObj, function(obj, key) { +var key = obj.name, +isRenderable = _.contains(columnToShow, key) +if (key == "name" || key == "description" || key == "owner") { +if (columnToShow) { +col[key].renderable = isRenderable; } -col[obj.name] = { -label: obj.name.capitalize(), -cell: "Html", -editable: false, -sortable: false, -resizeable: true, -orderable: true, -renderable: isRenderable, -formatter: _.extend({}, Backgrid.CellFormatter.prototype, { -fromRaw: function(rawValue, model) { -var modelObj = model.toJSON(); - -if (modelObj && modelObj.attributes && !_.isUndefined(modelObj.attributes[key])) { -var tempObj = { -'scope': that, -'attributeDefs': [obj], -'valueObject': {}, -'isTable': false -} +return; +} +col[obj.name] = { +label: obj.name.capitalize(), +cell: "Html", +editable: false, +sortable: false, +resizeable: true, +
[3/3] atlas git commit: ATLAS-1867 ATLASClientV2 correct delete typedefs expected http code
ATLAS-1867 ATLASClientV2 correct delete typedefs expected http code Signed-off-by: David Radley (cherry picked from commit 376298540ceca9315d3726c9dbaab619d33ea4f7) Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/374cc342 Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/374cc342 Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/374cc342 Branch: refs/heads/0.8-incubating Commit: 374cc342daf1982145b3c36788fb972682bc6d35 Parents: bd5f74b Author: Richard Ding Authored: Wed Aug 16 10:36:00 2017 +0100 Committer: Madhan Neethiraj Committed: Wed Aug 16 11:15:59 2017 -0700 -- client/src/main/java/org/apache/atlas/AtlasClientV2.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/atlas/blob/374cc342/client/src/main/java/org/apache/atlas/AtlasClientV2.java -- diff --git a/client/src/main/java/org/apache/atlas/AtlasClientV2.java b/client/src/main/java/org/apache/atlas/AtlasClientV2.java index 1353357..2cb9e84 100644 --- a/client/src/main/java/org/apache/atlas/AtlasClientV2.java +++ b/client/src/main/java/org/apache/atlas/AtlasClientV2.java @@ -67,7 +67,7 @@ public class AtlasClientV2 extends AtlasBaseClient { private static final APIInfo GET_ALL_TYPE_DEFS = new APIInfo(TYPEDEFS_API, HttpMethod.GET, Response.Status.OK); private static final APIInfo CREATE_ALL_TYPE_DEFS = new APIInfo(TYPEDEFS_API, HttpMethod.POST, Response.Status.OK); private static final APIInfo UPDATE_ALL_TYPE_DEFS = new APIInfo(TYPEDEFS_API, HttpMethod.PUT, Response.Status.OK); -private static final APIInfo DELETE_ALL_TYPE_DEFS = new APIInfo(TYPEDEFS_API, HttpMethod.DELETE, Response.Status.OK); +private static final APIInfo DELETE_ALL_TYPE_DEFS = new APIInfo(TYPEDEFS_API, HttpMethod.DELETE, Response.Status.NO_CONTENT); // Entity APIs public static final String ENTITY_API = BASE_URI + "v2/entity/"; @@ -278,7 +278,7 @@ public class AtlasClientV2 extends AtlasBaseClient { * @param typesDef A composite object that captures all types to be deleted */ public void deleteAtlasTypeDefs(final AtlasTypesDef typesDef) throws AtlasServiceException { -callAPI(DELETE_ALL_TYPE_DEFS, AtlasTypesDef.class, AtlasType.toJson(typesDef)); +callAPI(DELETE_ALL_TYPE_DEFS, (Class)null, AtlasType.toJson(typesDef)); } /* Lineage Calls */
atlas git commit: ATLAS-2046: UI Regression - Columns Filter not listing all attributes of a datatype
Repository: atlas Updated Branches: refs/heads/master 376298540 -> fa11d13a5 ATLAS-2046: UI Regression - Columns Filter not listing all attributes of a datatype Signed-off-by: Madhan Neethiraj Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/fa11d13a Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/fa11d13a Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/fa11d13a Branch: refs/heads/master Commit: fa11d13a5c431fe3c46a7ad2b267bea1f61da3e9 Parents: 3762985 Author: kevalbhatt Authored: Wed Aug 16 16:02:06 2017 +0530 Committer: Madhan Neethiraj Committed: Wed Aug 16 10:32:50 2017 -0700 -- .../js/views/search/SearchResultLayoutView.js | 76 ++-- 1 file changed, 38 insertions(+), 38 deletions(-) -- http://git-wip-us.apache.org/repos/asf/atlas/blob/fa11d13a/dashboardv2/public/js/views/search/SearchResultLayoutView.js -- diff --git a/dashboardv2/public/js/views/search/SearchResultLayoutView.js b/dashboardv2/public/js/views/search/SearchResultLayoutView.js index b9a8895..072295e 100644 --- a/dashboardv2/public/js/views/search/SearchResultLayoutView.js +++ b/dashboardv2/public/js/views/search/SearchResultLayoutView.js @@ -637,48 +637,48 @@ define(['require', } }) }; -if (this.value && this.value.searchType === "basic") { -var def = this.entityDefCollection.fullCollection.find({ name: this.value.type }); -if (def) { -var attrObj = Utils.getNestedSuperTypeObj({ data: def.toJSON(), collection: this.entityDefCollection, attrMerge: true }); -_.each(attrObj, function(obj, key) { -var key = obj.name, -isRenderable = _.contains(columnToShow, key) -if (key == "name" || key == "description" || key == "owner") { -if (columnToShow) { -col[key].renderable = isRenderable; -} -return; +} +if (this.value && this.value.searchType === "basic") { +var def = this.entityDefCollection.fullCollection.find({ name: this.value.type }); +if (def) { +var attrObj = Utils.getNestedSuperTypeObj({ data: def.toJSON(), collection: this.entityDefCollection, attrMerge: true }); +_.each(attrObj, function(obj, key) { +var key = obj.name, +isRenderable = _.contains(columnToShow, key) +if (key == "name" || key == "description" || key == "owner") { +if (columnToShow) { +col[key].renderable = isRenderable; } -col[obj.name] = { -label: obj.name.capitalize(), -cell: "Html", -editable: false, -sortable: false, -resizeable: true, -orderable: true, -renderable: isRenderable, -formatter: _.extend({}, Backgrid.CellFormatter.prototype, { -fromRaw: function(rawValue, model) { -var modelObj = model.toJSON(); - -if (modelObj && modelObj.attributes && !_.isUndefined(modelObj.attributes[key])) { -var tempObj = { -'scope': that, -'attributeDefs': [obj], -'valueObject': {}, -'isTable': false -} +return; +} +col[obj.name] = { +label: obj.name.capitalize(), +cell: "Html", +editable: false, +sortable: false, +resizeable: true, +orderable: true, +renderable: isRende
atlas git commit: ATLAS-1867 ATLASClientV2 correct delete typedefs expected http code
Repository: atlas Updated Branches: refs/heads/master 856a0c61b -> 376298540 ATLAS-1867 ATLASClientV2 correct delete typedefs expected http code Signed-off-by: David Radley Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/37629854 Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/37629854 Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/37629854 Branch: refs/heads/master Commit: 376298540ceca9315d3726c9dbaab619d33ea4f7 Parents: 856a0c6 Author: Richard Ding Authored: Wed Aug 16 10:36:00 2017 +0100 Committer: David Radley Committed: Wed Aug 16 10:36:00 2017 +0100 -- client/src/main/java/org/apache/atlas/AtlasClientV2.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/atlas/blob/37629854/client/src/main/java/org/apache/atlas/AtlasClientV2.java -- diff --git a/client/src/main/java/org/apache/atlas/AtlasClientV2.java b/client/src/main/java/org/apache/atlas/AtlasClientV2.java index 1353357..2cb9e84 100644 --- a/client/src/main/java/org/apache/atlas/AtlasClientV2.java +++ b/client/src/main/java/org/apache/atlas/AtlasClientV2.java @@ -67,7 +67,7 @@ public class AtlasClientV2 extends AtlasBaseClient { private static final APIInfo GET_ALL_TYPE_DEFS = new APIInfo(TYPEDEFS_API, HttpMethod.GET, Response.Status.OK); private static final APIInfo CREATE_ALL_TYPE_DEFS = new APIInfo(TYPEDEFS_API, HttpMethod.POST, Response.Status.OK); private static final APIInfo UPDATE_ALL_TYPE_DEFS = new APIInfo(TYPEDEFS_API, HttpMethod.PUT, Response.Status.OK); -private static final APIInfo DELETE_ALL_TYPE_DEFS = new APIInfo(TYPEDEFS_API, HttpMethod.DELETE, Response.Status.OK); +private static final APIInfo DELETE_ALL_TYPE_DEFS = new APIInfo(TYPEDEFS_API, HttpMethod.DELETE, Response.Status.NO_CONTENT); // Entity APIs public static final String ENTITY_API = BASE_URI + "v2/entity/"; @@ -278,7 +278,7 @@ public class AtlasClientV2 extends AtlasBaseClient { * @param typesDef A composite object that captures all types to be deleted */ public void deleteAtlasTypeDefs(final AtlasTypesDef typesDef) throws AtlasServiceException { -callAPI(DELETE_ALL_TYPE_DEFS, AtlasTypesDef.class, AtlasType.toJson(typesDef)); +callAPI(DELETE_ALL_TYPE_DEFS, (Class)null, AtlasType.toJson(typesDef)); } /* Lineage Calls */