Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id F0734200C7E for ; Tue, 9 May 2017 07:46:46 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id EF094160BCA; Tue, 9 May 2017 05:46:46 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1C3F1160BA5 for ; Tue, 9 May 2017 07:46:45 +0200 (CEST) Received: (qmail 71048 invoked by uid 500); 9 May 2017 05:46:45 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 71021 invoked by uid 99); 9 May 2017 05:46:44 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 May 2017 05:46:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C4ED4DFEF3; Tue, 9 May 2017 05:46:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aengineer@apache.org To: common-commits@hadoop.apache.org Date: Tue, 09 May 2017 05:46:45 -0000 Message-Id: In-Reply-To: <7375f12120ad40c79395df70c4459abe@git.apache.org> References: <7375f12120ad40c79395df70c4459abe@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [02/50] [abbrv] hadoop git commit: YARN-6518. Fix warnings from Spotbugs in hadoop-yarn-server-timelineservice. Contributed by Weiwei Yang. archived-at: Tue, 09 May 2017 05:46:47 -0000 YARN-6518. Fix warnings from Spotbugs in hadoop-yarn-server-timelineservice. Contributed by Weiwei Yang. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0f1af317 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0f1af317 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0f1af317 Branch: refs/heads/HDFS-7240 Commit: 0f1af3178eb2a38aaaa1e1a27edd409cda19a198 Parents: 4b5bd73 Author: Naganarasimha Authored: Mon May 1 16:49:30 2017 +0530 Committer: Naganarasimha Committed: Mon May 1 16:49:30 2017 +0530 ---------------------------------------------------------------------- .../storage/FileSystemTimelineReaderImpl.java | 129 ++++++++++--------- 1 file changed, 67 insertions(+), 62 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0f1af317/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/FileSystemTimelineReaderImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/FileSystemTimelineReaderImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/FileSystemTimelineReaderImpl.java index cfd5bd4..967702b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/FileSystemTimelineReaderImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/main/java/org/apache/hadoop/yarn/server/timelineservice/storage/FileSystemTimelineReaderImpl.java @@ -278,69 +278,74 @@ public class FileSystemTimelineReaderImpl extends AbstractService } } ); - for (File entityFile : dir.listFiles()) { - if (!entityFile.getName().contains(TIMELINE_SERVICE_STORAGE_EXTENSION)) { - continue; - } - try (BufferedReader reader = - new BufferedReader( - new InputStreamReader( - new FileInputStream( - entityFile), Charset.forName("UTF-8")))) { - TimelineEntity entity = readEntityFromFile(reader); - if (!entity.getType().equals(entityType)) { - continue; - } - if (!isTimeInRange(entity.getCreatedTime(), - filters.getCreatedTimeBegin(), filters.getCreatedTimeEnd())) { - continue; - } - if (filters.getRelatesTo() != null && - !filters.getRelatesTo().getFilterList().isEmpty() && - !TimelineStorageUtils.matchRelatesTo(entity, - filters.getRelatesTo())) { - continue; - } - if (filters.getIsRelatedTo() != null && - !filters.getIsRelatedTo().getFilterList().isEmpty() && - !TimelineStorageUtils.matchIsRelatedTo(entity, - filters.getIsRelatedTo())) { - continue; - } - if (filters.getInfoFilters() != null && - !filters.getInfoFilters().getFilterList().isEmpty() && - !TimelineStorageUtils.matchInfoFilters(entity, - filters.getInfoFilters())) { - continue; - } - if (filters.getConfigFilters() != null && - !filters.getConfigFilters().getFilterList().isEmpty() && - !TimelineStorageUtils.matchConfigFilters(entity, - filters.getConfigFilters())) { - continue; - } - if (filters.getMetricFilters() != null && - !filters.getMetricFilters().getFilterList().isEmpty() && - !TimelineStorageUtils.matchMetricFilters(entity, - filters.getMetricFilters())) { - continue; - } - if (filters.getEventFilters() != null && - !filters.getEventFilters().getFilterList().isEmpty() && - !TimelineStorageUtils.matchEventFilters(entity, - filters.getEventFilters())) { - continue; - } - TimelineEntity entityToBeReturned = createEntityToBeReturned( - entity, dataToRetrieve.getFieldsToRetrieve()); - Set entitiesCreatedAtSameTime = - sortedEntities.get(entityToBeReturned.getCreatedTime()); - if (entitiesCreatedAtSameTime == null) { - entitiesCreatedAtSameTime = new HashSet(); + if (dir != null) { + File[] files = dir.listFiles(); + if (files != null) { + for (File entityFile : files) { + if (!entityFile.getName() + .contains(TIMELINE_SERVICE_STORAGE_EXTENSION)) { + continue; + } + try (BufferedReader reader = new BufferedReader( + new InputStreamReader(new FileInputStream(entityFile), + Charset.forName("UTF-8")))) { + TimelineEntity entity = readEntityFromFile(reader); + if (!entity.getType().equals(entityType)) { + continue; + } + if (!isTimeInRange(entity.getCreatedTime(), + filters.getCreatedTimeBegin(), + filters.getCreatedTimeEnd())) { + continue; + } + if (filters.getRelatesTo() != null && + !filters.getRelatesTo().getFilterList().isEmpty() && + !TimelineStorageUtils.matchRelatesTo(entity, + filters.getRelatesTo())) { + continue; + } + if (filters.getIsRelatedTo() != null && + !filters.getIsRelatedTo().getFilterList().isEmpty() && + !TimelineStorageUtils.matchIsRelatedTo(entity, + filters.getIsRelatedTo())) { + continue; + } + if (filters.getInfoFilters() != null && + !filters.getInfoFilters().getFilterList().isEmpty() && + !TimelineStorageUtils.matchInfoFilters(entity, + filters.getInfoFilters())) { + continue; + } + if (filters.getConfigFilters() != null && + !filters.getConfigFilters().getFilterList().isEmpty() && + !TimelineStorageUtils.matchConfigFilters(entity, + filters.getConfigFilters())) { + continue; + } + if (filters.getMetricFilters() != null && + !filters.getMetricFilters().getFilterList().isEmpty() && + !TimelineStorageUtils.matchMetricFilters(entity, + filters.getMetricFilters())) { + continue; + } + if (filters.getEventFilters() != null && + !filters.getEventFilters().getFilterList().isEmpty() && + !TimelineStorageUtils.matchEventFilters(entity, + filters.getEventFilters())) { + continue; + } + TimelineEntity entityToBeReturned = createEntityToBeReturned( + entity, dataToRetrieve.getFieldsToRetrieve()); + Set entitiesCreatedAtSameTime = + sortedEntities.get(entityToBeReturned.getCreatedTime()); + if (entitiesCreatedAtSameTime == null) { + entitiesCreatedAtSameTime = new HashSet(); + } + entitiesCreatedAtSameTime.add(entityToBeReturned); + sortedEntities.put(entityToBeReturned.getCreatedTime(), + entitiesCreatedAtSameTime); + } } - entitiesCreatedAtSameTime.add(entityToBeReturned); - sortedEntities.put( - entityToBeReturned.getCreatedTime(), entitiesCreatedAtSameTime); } } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org