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 747FE200C04 for ; Tue, 10 Jan 2017 03:24:03 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 73240160B49; Tue, 10 Jan 2017 02:24:03 +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 BBD5E160B3E for ; Tue, 10 Jan 2017 03:24:02 +0100 (CET) Received: (qmail 6112 invoked by uid 500); 10 Jan 2017 02:24:02 -0000 Mailing-List: contact dev-help@tephra.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tephra.incubator.apache.org Delivered-To: mailing list dev@tephra.incubator.apache.org Received: (qmail 6101 invoked by uid 99); 10 Jan 2017 02:24:01 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Jan 2017 02:24:01 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 6CAEAC0B7C for ; Tue, 10 Jan 2017 02:24:01 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.218 X-Spam-Level: X-Spam-Status: No, score=-6.218 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id He4ZnNng7jZJ for ; Tue, 10 Jan 2017 02:24:00 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 4E97F5F1BA for ; Tue, 10 Jan 2017 02:23:59 +0000 (UTC) Received: (qmail 5432 invoked by uid 99); 10 Jan 2017 02:23:58 -0000 Received: from arcas.apache.org (HELO arcas) (140.211.11.28) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Jan 2017 02:23:58 +0000 Received: from arcas.apache.org (localhost [127.0.0.1]) by arcas (Postfix) with ESMTP id 6C2522C1F54 for ; Tue, 10 Jan 2017 02:23:58 +0000 (UTC) Date: Tue, 10 Jan 2017 02:23:58 +0000 (UTC) From: "ASF GitHub Bot (JIRA)" To: dev@tephra.incubator.apache.org Message-ID: In-Reply-To: References: Subject: [jira] [Commented] (TEPHRA-208) Compaction removes rows incorrectly for family deletes with column level conflict detection MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 archived-at: Tue, 10 Jan 2017 02:24:03 -0000 [ https://issues.apache.org/jira/browse/TEPHRA-208?page=3Dcom.atlassian= .jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=3D1581= 3586#comment-15813586 ]=20 ASF GitHub Bot commented on TEPHRA-208: --------------------------------------- GitHub user twdsilva opened a pull request: https://github.com/apache/incubator-tephra/pull/26 TEPHRA-208 Compaction removes rows incorrectly for family deletes wit= =E2=80=A6 =E2=80=A6h column level conflict detection =20 @poornachandra @gokulavasan =20 You can merge this pull request into a Git repository by running: $ git pull https://github.com/twdsilva/incubator-tephra TEPHRA-208 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-tephra/pull/26.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #26 =20 ---- commit e6fd62d6d86c8fb9cf89b6f727c53f14dd215465 Author: Thomas D'Silva Date: 2017-01-09T23:02:00Z TEPHRA-208 Compaction removes rows incorrectly for family deletes with = column level conflict detection ---- > Compaction removes rows incorrectly for family deletes with column level = conflict detection=20 > -------------------------------------------------------------------------= ------------------- > > Key: TEPHRA-208 > URL: https://issues.apache.org/jira/browse/TEPHRA-208 > Project: Tephra > Issue Type: Bug > Affects Versions: 0.9.0-incubating > Reporter: Thomas D'Silva > Assignee: Poorna Chandra > Attachments: TEPHRA-208.patch > > > In DeleteTracker we only check the timestamp while removing cells during = compaction. If the previous row had a family delete, cells from subsequent = rows could also be compacted.=20 > The attached test fails without the following change > {code} > private static final class DeleteTracker { > private long familyDeleteTs; > + private byte[] rowKey; > =20 > public static boolean isFamilyDelete(Cell cell) { > return !TxUtils.isPreExistingVersion(cell.getTimestamp()) && > @@ -300,14 +301,17 @@ public class TransactionVisibilityFilter extends Fi= lterBase { > =20 > public void addFamilyDelete(Cell delete) { > this.familyDeleteTs =3D delete.getTimestamp(); > + this.rowKey =3D Bytes.copy(delete.getRowArray(), delete.getRowOffs= et(), delete.getRowLength()); > } > =20 > public boolean isDeleted(Cell cell) { > - return cell.getTimestamp() <=3D familyDeleteTs; > + return rowKey !=3D null && Bytes.compareTo(cell.getRowArray(), cel= l.getRowOffset(),=20 > + cell.getRowLength(), rowKey, 0, rowKey.length) =3D=3D 0 && cell.= getTimestamp() <=3D familyDeleteTs; > } > =20 > public void reset() { > this.familyDeleteTs =3D 0; > + this.rowKey =3D null; > } > } > } > {code} -- This message was sent by Atlassian JIRA (v6.3.4#6332)