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 0301E200BF7 for ; Mon, 9 Jan 2017 23:20:02 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 0181A160B3E; Mon, 9 Jan 2017 22:20:02 +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 4C836160B2F for ; Mon, 9 Jan 2017 23:20:01 +0100 (CET) Received: (qmail 98329 invoked by uid 500); 9 Jan 2017 22:20:00 -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 98318 invoked by uid 99); 9 Jan 2017 22:20:00 -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; Mon, 09 Jan 2017 22:20:00 +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 039B8C028C for ; Mon, 9 Jan 2017 22:20:00 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.219 X-Spam-Level: X-Spam-Status: No, score=-6.219 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] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id Qw5QFib8UHba for ; Mon, 9 Jan 2017 22:19:59 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id CC4DA5FBCF for ; Mon, 9 Jan 2017 22:19:58 +0000 (UTC) Received: (qmail 98304 invoked by uid 99); 9 Jan 2017 22:19:58 -0000 Received: from arcas.apache.org (HELO arcas) (140.211.11.28) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Jan 2017 22:19:58 +0000 Received: from arcas.apache.org (localhost [127.0.0.1]) by arcas (Postfix) with ESMTP id 52B232C022B for ; Mon, 9 Jan 2017 22:19:58 +0000 (UTC) Date: Mon, 9 Jan 2017 22:19:58 +0000 (UTC) From: "Thomas D'Silva (JIRA)" To: dev@tephra.incubator.apache.org Message-ID: In-Reply-To: References: Subject: [jira] [Updated] (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: 7bit X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 archived-at: Mon, 09 Jan 2017 22:20:02 -0000 [ https://issues.apache.org/jira/browse/TEPHRA-208?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Thomas D'Silva updated TEPHRA-208: ---------------------------------- Attachment: TEPHRA-208.patch > Compaction removes rows incorrectly for family deletes with column level conflict detection > -------------------------------------------------------------------------------------------- > > 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. > The attached test fails without the following change > {code} > private static final class DeleteTracker { > private long familyDeleteTs; > + private byte[] rowKey; > > public static boolean isFamilyDelete(Cell cell) { > return !TxUtils.isPreExistingVersion(cell.getTimestamp()) && > @@ -300,14 +301,17 @@ public class TransactionVisibilityFilter extends FilterBase { > > public void addFamilyDelete(Cell delete) { > this.familyDeleteTs = delete.getTimestamp(); > + this.rowKey = Bytes.copy(delete.getRowArray(), delete.getRowOffset(), delete.getRowLength()); > } > > public boolean isDeleted(Cell cell) { > - return cell.getTimestamp() <= familyDeleteTs; > + return rowKey != null && Bytes.compareTo(cell.getRowArray(), cell.getRowOffset(), > + cell.getRowLength(), rowKey, 0, rowKey.length) == 0 && cell.getTimestamp() <= familyDeleteTs; > } > > public void reset() { > this.familyDeleteTs = 0; > + this.rowKey = null; > } > } > } > {code} -- This message was sent by Atlassian JIRA (v6.3.4#6332)