Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B3C88116AA for ; Tue, 22 Apr 2014 21:08:59 +0000 (UTC) Received: (qmail 82202 invoked by uid 500); 22 Apr 2014 21:08:43 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 82018 invoked by uid 500); 22 Apr 2014 21:08:39 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 81855 invoked by uid 99); 22 Apr 2014 21:08:37 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Apr 2014 21:08:37 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 945B68C2D33; Tue, 22 Apr 2014 21:08:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: busbey@apache.org To: commits@accumulo.apache.org Date: Tue, 22 Apr 2014 21:08:46 -0000 Message-Id: <2d693b5a1b2c491aa4364296642335dc@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [11/15] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Conflicts: core/src/main/java/org/apache/accumulo/core/file/rfile/RFileOperations.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1ed463ea Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1ed463ea Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1ed463ea Branch: refs/heads/master Commit: 1ed463ea285a70cc0ec5ebdfcc7f92c75acf4f32 Parents: 0b79ee8 a65565b Author: Sean Busbey Authored: Wed Apr 16 12:56:54 2014 -0500 Committer: Sean Busbey Committed: Tue Apr 22 15:11:28 2014 -0500 ---------------------------------------------------------------------- .../accumulo/core/file/rfile/CreateEmpty.java | 81 ++++++++++++++++++++ .../core/file/rfile/RFileOperations.java | 6 +- 2 files changed, 85 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/1ed463ea/core/src/main/java/org/apache/accumulo/core/file/rfile/RFileOperations.java ---------------------------------------------------------------------- diff --cc core/src/main/java/org/apache/accumulo/core/file/rfile/RFileOperations.java index b361413,c906522..9fabe42 --- a/core/src/main/java/org/apache/accumulo/core/file/rfile/RFileOperations.java +++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/RFileOperations.java @@@ -119,9 -123,7 +123,7 @@@ public class RFileOperations extends Fi long blockSize = acuconf.getMemoryInBytes(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE); long indexBlockSize = acuconf.getMemoryInBytes(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE_INDEX); - String compression = acuconf.get(Property.TABLE_FILE_COMPRESSION_TYPE); - - CachableBlockFile.Writer _cbw = new CachableBlockFile.Writer(fs.create(new Path(file), false, bufferSize, (short) rep, block), compression, conf); + CachableBlockFile.Writer _cbw = new CachableBlockFile.Writer(fs.create(new Path(file), false, bufferSize, (short) rep, block), compression, conf, acuconf); Writer writer = new RFile.Writer(_cbw, (int) blockSize, (int) indexBlockSize); return writer; }