This is an automated email from the ASF dual-hosted git repository. oleewere pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ambari-logsearch.git
The following commit(s) were added to refs/heads/master by this push: new c6e0cfa AMBARI-24939. ADDENDUM - use username in delete query c6e0cfa is described below commit c6e0cfa57510bb5327ef0fa351df40c1679d283d Author: Oliver Szabo <oleew...@gmail.com> AuthorDate: Wed Nov 28 12:29:55 2018 +0100 AMBARI-24939. ADDENDUM - use username in delete query --- .../java/org/apache/ambari/logsearch/dao/MetadataSolrDao.java | 8 ++++---- .../java/org/apache/ambari/logsearch/manager/MetadataManager.java | 8 +++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/MetadataSolrDao.java b/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/MetadataSolrDao.java index 61f18b3..f6c3b1e 100644 --- a/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/MetadataSolrDao.java +++ b/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/MetadataSolrDao.java @@ -89,15 +89,15 @@ public class MetadataSolrDao extends SolrDaoBase { } } - public UpdateResponse deleteMetadata(String name, String type) { - return removeDoc(String.format("name:%s AND type:%s", name, type)); + public UpdateResponse deleteMetadata(String name, String type, String userName) { + return removeDoc(String.format("name:%s AND type:%s AND username:%s", name, type, userName)); } private UpdateResponse removeDoc(String query) { try { UpdateResponse updateResoponse = getSolrClient().deleteByQuery(query); getSolrClient().commit(); - LOG_PERFORMANCE.info("\n Username :- " + LogSearchContext.getCurrentUsername() + + LOG_PERFORMANCE.info("Username :- " + LogSearchContext.getCurrentUsername() + " Remove Time Execution :- " + updateResoponse.getQTime() + " Total Time Elapsed is :- " + updateResoponse.getElapsedTime()); return updateResoponse; } catch (SolrServerException e) { @@ -110,7 +110,7 @@ public class MetadataSolrDao extends SolrDaoBase { public UpdateResponse addDocs(SolrInputDocument doc) { try { UpdateResponse updateResoponse = getSolrClient().add(doc); - LOG_PERFORMANCE.info("\n Username :- " + LogSearchContext.getCurrentUsername() + + LOG_PERFORMANCE.info("Username :- " + LogSearchContext.getCurrentUsername() + " Update Time Execution :- " + updateResoponse.getQTime() + " Total Time Elapsed is :- " + updateResoponse.getElapsedTime()); getSolrClient().commit(); return updateResoponse; diff --git a/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/manager/MetadataManager.java b/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/manager/MetadataManager.java index 95d2fd7..3211b45 100644 --- a/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/manager/MetadataManager.java +++ b/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/manager/MetadataManager.java @@ -77,7 +77,13 @@ public class MetadataManager extends JsonManagerBase { if (!isValid(metaData, true)) { throw new MalformedInputException("Name and type should be specified"); } - metadataSolrDao.deleteMetadata(metaData.getName(), metaData.getType()); + final String userName; + if (StringUtils.isNotBlank(metaData.getUserName())) { + userName = metaData.getUserName(); + } else { + userName = LogSearchContext.getCurrentUsername(); + } + metadataSolrDao.deleteMetadata(metaData.getName(), metaData.getType(), userName); } @SuppressWarnings("unchecked")