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 18496200AF5 for ; Thu, 2 Jun 2016 17:16:21 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 16C41160A53; Thu, 2 Jun 2016 15:16:21 +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 6117D160A51 for ; Thu, 2 Jun 2016 17:16:20 +0200 (CEST) Received: (qmail 94812 invoked by uid 500); 2 Jun 2016 15:16:19 -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 94731 invoked by uid 99); 2 Jun 2016 15:16:19 -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; Thu, 02 Jun 2016 15:16:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 644D1DFE65; Thu, 2 Jun 2016 15:16:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kturner@apache.org To: commits@accumulo.apache.org Date: Thu, 02 Jun 2016 15:16:21 -0000 Message-Id: <4db799aa199346bcb595823fa5bdc5f3@git.apache.org> In-Reply-To: <59a4d9a6d858424e8c7daa3ca7ddb6a1@git.apache.org> References: <59a4d9a6d858424e8c7daa3ca7ddb6a1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] accumulo git commit: Merge branch '1.8' archived-at: Thu, 02 Jun 2016 15:16:21 -0000 Merge branch '1.8' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4af23498 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4af23498 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4af23498 Branch: refs/heads/master Commit: 4af23498a7d834665460ce5df79f148f7ad859f1 Parents: 03d71dd 61a7de4 Author: Keith Turner Authored: Thu Jun 2 11:05:07 2016 -0400 Committer: Keith Turner Committed: Thu Jun 2 11:05:07 2016 -0400 ---------------------------------------------------------------------- .../client/admin/NewTableConfiguration.java | 14 +- .../core/client/admin/TableOperations.java | 4 +- .../core/client/impl/OfflineIterator.java | 14 +- .../client/mapred/AccumuloFileOutputFormat.java | 25 +- .../mapreduce/AccumuloFileOutputFormat.java | 27 +- .../accumulo/core/client/rfile/FSConfArgs.java | 47 ++ .../accumulo/core/client/rfile/RFile.java | 275 ++++++++ .../core/client/rfile/RFileScanner.java | 330 ++++++++++ .../core/client/rfile/RFileScannerBuilder.java | 148 +++++ .../accumulo/core/client/rfile/RFileSource.java | 44 ++ .../accumulo/core/client/rfile/RFileWriter.java | 236 +++++++ .../core/client/rfile/RFileWriterBuilder.java | 148 +++++ .../accumulo/core/client/sample/Sampler.java | 1 - .../accumulo/core/file/FileOperations.java | 59 +- .../apache/accumulo/core/file/rfile/RFile.java | 2 +- .../core/file/rfile/RFileOperations.java | 45 +- .../accumulo/core/iterators/IteratorUtil.java | 15 + .../sample/impl/SamplerConfigurationImpl.java | 12 + .../accumulo/core/util/LocalityGroupUtil.java | 2 + .../accumulo/core/client/rfile/RFileTest.java | 647 +++++++++++++++++++ .../accumulo/core/file/rfile/RFileTest.java | 10 +- .../accumulo/tserver/tablet/ScanDataSource.java | 13 +- 22 files changed, 2012 insertions(+), 106 deletions(-) ----------------------------------------------------------------------