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 5285E200BB0 for ; Sun, 25 Sep 2016 03:57:45 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 51304160AD1; Sun, 25 Sep 2016 01:57:45 +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 6B850160ADF for ; Sun, 25 Sep 2016 03:57:44 +0200 (CEST) Received: (qmail 91390 invoked by uid 500); 25 Sep 2016 01:57:43 -0000 Mailing-List: contact commits-help@trafodion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: commits@trafodion.apache.org Delivered-To: mailing list commits@trafodion.apache.org Received: (qmail 91377 invoked by uid 99); 25 Sep 2016 01:57:43 -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; Sun, 25 Sep 2016 01:57:43 +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 2F20DC0405 for ; Sun, 25 Sep 2016 01:57:43 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 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=-1.426] 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 YC5-2efbdWor for ; Sun, 25 Sep 2016 01:57:41 +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 8B24160D3A for ; Sun, 25 Sep 2016 01:57:39 +0000 (UTC) Received: (qmail 90920 invoked by uid 99); 25 Sep 2016 01:57:38 -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; Sun, 25 Sep 2016 01:57:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1BFD6E0A3F; Sun, 25 Sep 2016 01:57:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ansharma@apache.org To: commits@trafodion.incubator.apache.org Date: Sun, 25 Sep 2016 01:57:38 -0000 Message-Id: <09d54c567dd74afd96a237472715158e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [01/14] incubator-trafodion git commit: Second set of changes for JIRA [TRAFODION-1435] Region operations performed transactionally for delete, chackAndDelete Improved endpoint coprocessor exception logging archived-at: Sun, 25 Sep 2016 01:57:45 -0000 Repository: incubator-trafodion Updated Branches: refs/heads/master 3ad30f51e -> b37c1a170 http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1e4a88d3/core/sqf/src/seatrans/hbase-trx/src/main/protobuf/SsccRegion.proto ---------------------------------------------------------------------- diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/protobuf/SsccRegion.proto b/core/sqf/src/seatrans/hbase-trx/src/main/protobuf/SsccRegion.proto index 14eb31c..87d765a 100644 --- a/core/sqf/src/seatrans/hbase-trx/src/main/protobuf/SsccRegion.proto +++ b/core/sqf/src/seatrans/hbase-trx/src/main/protobuf/SsccRegion.proto @@ -106,7 +106,7 @@ message SsccCheckAndDeleteResponse { } message SsccCheckAndDeleteRegionTxRequest { - required int64 transactionId = 1; + required int64 tid = 1; required int64 startId = 2; required bytes regionName = 3; required bytes row = 4; @@ -183,6 +183,21 @@ message SsccDeleteMultipleTransactionalResponse { optional int32 status = 4; } +message SsccDeleteRegionTxRequest { + required int64 tid = 1; + required int64 startId = 2; + required bytes regionName = 3; + required MutationProto delete = 4; + required bool autoCommit = 5; +} + +message SsccDeleteRegionTxResponse { + optional Result result = 1; + optional string exception = 2; + optional bool hasException = 3; + optional int32 status = 4; +} + message SsccDeleteTransactionalRequest { required int64 transactionId = 1; required int64 startId = 2; @@ -337,8 +352,8 @@ service SsccRegionService { returns(SsccBeginTransactionResponse); rpc checkAndDelete(SsccCheckAndDeleteRequest) returns(SsccCheckAndDeleteResponse); -// rpc checkAndDeleteRegionTx(SsccCheckAndDeleteRegionTxRequest) -// returns(SsccCheckAndDeleteRegionTxResponse); + rpc checkAndDeleteRegionTx(SsccCheckAndDeleteRegionTxRequest) + returns(SsccCheckAndDeleteRegionTxResponse); rpc checkAndPut(SsccCheckAndPutRequest) returns(SsccCheckAndPutResponse); rpc checkAndPutRegionTx(SsccCheckAndPutRegionTxRequest) @@ -351,6 +366,8 @@ service SsccRegionService { returns(SsccCommitIfPossibleResponse); rpc commitRequest(SsccCommitRequestRequest) returns(SsccCommitRequestResponse); + rpc deleteRegionTx(SsccDeleteRegionTxRequest) + returns(SsccDeleteRegionTxResponse); rpc delete(SsccDeleteTransactionalRequest) returns(SsccDeleteTransactionalResponse); rpc deleteMultiple(SsccDeleteMultipleTransactionalRequest) http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1e4a88d3/core/sqf/src/seatrans/hbase-trx/src/main/protobuf/TrxRegion.proto ---------------------------------------------------------------------- diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/protobuf/TrxRegion.proto b/core/sqf/src/seatrans/hbase-trx/src/main/protobuf/TrxRegion.proto index 5327cf1..a0a1385 100755 --- a/core/sqf/src/seatrans/hbase-trx/src/main/protobuf/TrxRegion.proto +++ b/core/sqf/src/seatrans/hbase-trx/src/main/protobuf/TrxRegion.proto @@ -145,7 +145,7 @@ message CheckAndDeleteResponse { } message CheckAndDeleteRegionTxRequest { - required int64 transactionId = 1; + required int64 tid = 1; required bytes regionName = 2; required bytes row = 3; required bytes family = 4; @@ -217,6 +217,19 @@ message DeleteMultipleTransactionalResponse { optional bool hasException = 3; } +message DeleteRegionTxRequest { + required int64 tid = 1; + required bytes regionName = 2; + required MutationProto delete = 3; + required bool autoCommit = 4; +} + +message DeleteRegionTxResponse { + optional Result result = 1; + optional string exception = 2; + optional bool hasException = 3; +} + message DeleteTransactionalRequest { required int64 transactionId = 1; required bytes regionName = 2; @@ -442,8 +455,8 @@ service TrxRegionService { returns(BeginTransactionResponse); rpc checkAndDelete(CheckAndDeleteRequest) returns(CheckAndDeleteResponse); -// rpc checkAndDeleteRegionTx(CheckAndDeleteRegionTxRequest) -// returns(CheckAndDeleteRegionTxResponse); + rpc checkAndDeleteRegionTx(CheckAndDeleteRegionTxRequest) + returns(CheckAndDeleteRegionTxResponse); rpc checkAndPut(CheckAndPutRequest) returns(CheckAndPutResponse); rpc checkAndPutRegionTx(CheckAndPutRegionTxRequest) @@ -460,6 +473,8 @@ service TrxRegionService { returns(CommitMultipleResponse); rpc commitRequest(CommitRequestRequest) returns(CommitRequestResponse); + rpc deleteRegionTx(DeleteRegionTxRequest) + returns(DeleteRegionTxResponse); rpc delete(DeleteTransactionalRequest) returns(DeleteTransactionalResponse); rpc deleteMultiple(DeleteMultipleTransactionalRequest) http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/1e4a88d3/core/sql/src/main/java/org/trafodion/sql/HTableClient.java ---------------------------------------------------------------------- diff --git a/core/sql/src/main/java/org/trafodion/sql/HTableClient.java b/core/sql/src/main/java/org/trafodion/sql/HTableClient.java index 3573e90..4c99290 100644 --- a/core/sql/src/main/java/org/trafodion/sql/HTableClient.java +++ b/core/sql/src/main/java/org/trafodion/sql/HTableClient.java @@ -1388,12 +1388,10 @@ public class HTableClient { if (useTRex && (transID != 0)) { table.delete(transID, del); } -// else if (useRegionTransaction){ -// logger.info("deleteRow using region TX"); -// table.deleteRegionTx(del, /* auto-commit */ true); -// } + else if (useRegionTransaction){ + table.deleteRegionTx(del, /* auto-commit */ true); + } else { -// logger.info("deleteRow without transID "); table.delete(del); } return true; @@ -1404,10 +1402,9 @@ public class HTableClient { if (useTRex && (transID != 0)) { table.delete(transID, del); } -// else if (useRegionTransaction){ -// logger.info("deleteRow using region TX"); -// table.deleteRegionTx(del, /* auto-commit */ true); -// } + else if (useRegionTransaction){ + table.deleteRegionTx(del, /* auto-commit */ true); + } else { table.delete(del); } @@ -1502,11 +1499,10 @@ public class HTableClient { if (useTRex && (transID != 0)) { res = table.checkAndDelete(transID, rowID, family, qualifier, colValToCheck, del); } -// else if (useRegionTransaction){ -// logger.info("checkAndDeleteRow using region TX"); -// res = table.checkAndDeleteRegionTx(rowID, family, qualifier, colValToCheck, -// del, /* autoCommit */ true); -// } + else if (useRegionTransaction){ + res = table.checkAndDeleteRegionTx(rowID, family, qualifier, colValToCheck, + del, /* autoCommit */ true); + } else { res = table.checkAndDelete(rowID, family, qualifier, colValToCheck, del); } @@ -1566,10 +1562,8 @@ public class HTableClient { family1, qualifier1, colValToCheck, put); } else if (useRegionTransaction){ - if (logger.isTraceEnabled()) logger.trace("checkAndPutRegionTx with regionTX "); - res = table.checkAndPutRegionTx(rowID, + res = table.checkAndPutRegionTx(rowID, family1, qualifier1, colValToCheck, put, /* auto-commit */ true); - } else { res = table.checkAndPut(rowID, @@ -1581,9 +1575,8 @@ public class HTableClient { table.put(transID, put); } else if (useRegionTransaction){ - if (logger.isTraceEnabled()) logger.trace("putRow using putRegionTx"); table.putRegionTx(put, /* auto-commit */ true); - }else{ + }else{ table.put(put); } } @@ -1599,8 +1592,7 @@ public class HTableClient { family1, qualifier1, colValToCheck, put); } else if (useRegionTransaction){ - if (logger.isTraceEnabled()) logger.trace("checkAndPutRegionTx using regionTX "); - result = table.checkAndPutRegionTx(rowID, family1, qualifier1, + result = table.checkAndPutRegionTx(rowID, family1, qualifier1, colValToCheck, put, /* auto-commit */ true); } else { @@ -1613,8 +1605,7 @@ public class HTableClient { table.put(transID, put); } else if (useRegionTransaction){ - if (logger.isTraceEnabled()) logger.trace("putRow using putRegionTx"); - table.putRegionTx(put, true /* also commit */); + table.putRegionTx(put, /* auto commit */ true); }else{ table.put(put); }