Return-Path: X-Original-To: apmail-apex-commits-archive@minotaur.apache.org Delivered-To: apmail-apex-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C87471877E for ; Mon, 30 Nov 2015 21:06:37 +0000 (UTC) Received: (qmail 65149 invoked by uid 500); 30 Nov 2015 21:06:32 -0000 Delivered-To: apmail-apex-commits-archive@apex.apache.org Received: (qmail 65109 invoked by uid 500); 30 Nov 2015 21:06:32 -0000 Mailing-List: contact commits-help@apex.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@apex.incubator.apache.org Delivered-To: mailing list commits@apex.incubator.apache.org Received: (qmail 65091 invoked by uid 99); 30 Nov 2015 21:06:32 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Nov 2015 21:06:32 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 62398C57AD for ; Mon, 30 Nov 2015 21:06:32 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id NwEPn-Xk3gzb for ; Mon, 30 Nov 2015 21:06:27 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 2F966234C6 for ; Mon, 30 Nov 2015 21:06:10 +0000 (UTC) Received: (qmail 63195 invoked by uid 99); 30 Nov 2015 21:06:09 -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; Mon, 30 Nov 2015 21:06:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9ACA0E2C3B; Mon, 30 Nov 2015 21:06:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davidyan@apache.org To: commits@apex.incubator.apache.org Date: Mon, 30 Nov 2015 21:07:15 -0000 Message-Id: <03db72c1288b4a909a9db1176777cdda@git.apache.org> In-Reply-To: <5b5b1b1327d6412ca3f00c1f8b0781a9@git.apache.org> References: <5b5b1b1327d6412ca3f00c1f8b0781a9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [69/98] [abbrv] incubator-apex-malhar git commit: - MLHR-1880 #resolve fixed default value documentation for setMaxLength method. - MLHR-1880 #resolve fixed default value documentation for setMaxLength method. Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/8cf1a2bb Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/8cf1a2bb Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/8cf1a2bb Branch: refs/heads/master Commit: 8cf1a2bb0ff7a192bbfe9a654997cb710a21a9dc Parents: 6b43059 Author: Timothy Farkas Authored: Fri Oct 23 14:56:23 2015 -0700 Committer: Chandni Singh Committed: Thu Nov 5 16:55:17 2015 -0800 ---------------------------------------------------------------------- .../lib/io/fs/AbstractFileOutputOperator.java | 32 ++++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/8cf1a2bb/library/src/main/java/com/datatorrent/lib/io/fs/AbstractFileOutputOperator.java ---------------------------------------------------------------------- diff --git a/library/src/main/java/com/datatorrent/lib/io/fs/AbstractFileOutputOperator.java b/library/src/main/java/com/datatorrent/lib/io/fs/AbstractFileOutputOperator.java index 58062a1..3819a33 100644 --- a/library/src/main/java/com/datatorrent/lib/io/fs/AbstractFileOutputOperator.java +++ b/library/src/main/java/com/datatorrent/lib/io/fs/AbstractFileOutputOperator.java @@ -210,8 +210,8 @@ public abstract class AbstractFileOutputOperator extends BaseOperator imp private int rotationCount; /** - * If a filter stream provider is set it is used to obtain the filter that will be applied to data before it is - * stored in the file. If it null no filter is applied and data is written as is. Multiple filters can be chained + * If a filter stream provider is set it is used to obtain the filter that will be applied to data before it is + * stored in the file. If it null no filter is applied and data is written as is. Multiple filters can be chained * together by using a filter stream chain provider. */ protected FilterStreamProvider filterStreamProvider; @@ -329,7 +329,7 @@ public abstract class AbstractFileOutputOperator extends BaseOperator imp { FSFilterStreamContext streamContext = notification.getValue(); if (streamContext != null) { - + //FilterOutputStream filterStream = streamContext.getFilterStream(); try { String filename = notification.getKey(); @@ -938,8 +938,8 @@ public abstract class AbstractFileOutputOperator extends BaseOperator imp } /** - * Sets the maximum length of a an output file in bytes. By default this is null, - * if this is not null then the output operator is in rolling mode. + * Sets the maximum length of a an output file in bytes. By default this is Long.MAX_VALUE, + * if this is not Long.MAX_VALUE then the output operator is in rolling mode. * @param maxLength The maximum length of an output file in bytes, when in rolling mode. */ public void setMaxLength(long maxLength) @@ -1014,7 +1014,7 @@ public abstract class AbstractFileOutputOperator extends BaseOperator imp } /** - * Get the filter stream provider + * Get the filter stream provider * @return The filter stream provider. */ public FilterStreamProvider getFilterStreamProvider() @@ -1023,7 +1023,7 @@ public abstract class AbstractFileOutputOperator extends BaseOperator imp } /** - * Set the filter stream provider. When a non-null provider is specified it will be used to supply the filter that + * Set the filter stream provider. When a non-null provider is specified it will be used to supply the filter that * will be applied to data before it is stored in the file. * @param filterStreamProvider The filter stream provider */ @@ -1049,15 +1049,15 @@ public abstract class AbstractFileOutputOperator extends BaseOperator imp private class FSFilterStreamContext implements FilterStreamContext { - + private FSDataOutputStream outputStream; - + private FilterStreamContext filterContext; private NonCloseableFilterOutputStream outputWrapper; - + public FSFilterStreamContext(FSDataOutputStream outputStream) throws IOException { - this.outputStream = outputStream; + this.outputStream = outputStream; outputWrapper = new NonCloseableFilterOutputStream(outputStream); //resetFilter(); initializeContext(); @@ -1085,7 +1085,7 @@ public abstract class AbstractFileOutputOperator extends BaseOperator imp filterStreamProvider.reclaimFilterStreamContext(filterContext); } } - + @SuppressWarnings("unchecked") public void initializeContext() throws IOException { @@ -1093,7 +1093,7 @@ public abstract class AbstractFileOutputOperator extends BaseOperator imp filterContext = filterStreamProvider.getFilterStreamContext(outputWrapper); } } - + public void close() throws IOException { //finalizeContext(); @@ -1102,10 +1102,10 @@ public abstract class AbstractFileOutputOperator extends BaseOperator imp } outputStream.close(); } - + } - - private static class NonCloseableFilterOutputStream extends FilterOutputStream + + private static class NonCloseableFilterOutputStream extends FilterOutputStream { public NonCloseableFilterOutputStream(OutputStream out) {