From commits-return-23213-archive-asf-public=cust-asf.ponee.io@accumulo.apache.org Thu Jul 25 20:41:37 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id E1CA218066C for ; Thu, 25 Jul 2019 22:41:36 +0200 (CEST) Received: (qmail 40046 invoked by uid 500); 25 Jul 2019 20:41:36 -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 40036 invoked by uid 99); 25 Jul 2019 20:41:36 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Jul 2019 20:41:36 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 280AF85E8D; Thu, 25 Jul 2019 20:41:36 +0000 (UTC) Date: Thu, 25 Jul 2019 20:41:35 +0000 To: "commits@accumulo.apache.org" Subject: [accumulo] branch master updated (75e4255 -> 97c6c06) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <156408729592.9585.3746271750061643680@gitbox.apache.org> From: mmiller@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: accumulo X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 75e42553d1c030816624430c54b815c249225192 X-Git-Newrev: 97c6c06fe4f7c81523d7ec0f5da9128cb6d16f8d X-Git-NotificationType: ref_changed X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. mmiller pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 75e4255 Merge branch '2.0' add 5650335 Fix #1273 Fix Bulk Messages (#1287) add 3a4a4d6 fix #1286 throw exception on empty bulk import (#1292) new 97c6c06 Merge branch '2.0' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../accumulo/core/clientImpl/bulk/BulkImport.java | 26 +++-- .../apache/accumulo/core/file/FileOperations.java | 13 +++ .../bulk/BulkImportFilterInvalidTest.java | 114 +++++++++++++++++++++ server/master/pom.xml | 4 + .../master/tableOps/bulkVer2/PrepBulkImport.java | 34 ++---- .../apache/accumulo/test/functional/BulkNewIT.java | 10 ++ 6 files changed, 164 insertions(+), 37 deletions(-) create mode 100644 core/src/test/java/org/apache/accumulo/core/clientImpl/bulk/BulkImportFilterInvalidTest.java