trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ansha...@apache.org
Subject [09/14] incubator-trafodion git commit: Adding expected file for test116 for JIRA [TRAFODION-1435]
Date Sun, 25 Sep 2016 01:57:46 GMT
Adding expected file for test116 for JIRA [TRAFODION-1435]


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/90539bf8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/90539bf8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/90539bf8

Branch: refs/heads/master
Commit: 90539bf81152a934ba35e8fde60be8bc05e02a9c
Parents: 508b8cf
Author: Sean Broeder <sbroeder@edev06.esgyn.local>
Authored: Thu Sep 22 03:30:10 2016 +0000
Committer: Sean Broeder <sbroeder@edev06.esgyn.local>
Committed: Thu Sep 22 21:47:52 2016 +0000

----------------------------------------------------------------------
 .../transactional/SsccTransactionalTable.java   |  3 +-
 .../transactional/SsccRegionEndpoint.java.tmpl  | 12 ------
 core/sql/regress/core/EXPECTED116               | 41 +++++++++++---------
 .../java/org/trafodion/sql/HTableClient.java    |  4 +-
 4 files changed, 26 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/90539bf8/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/SsccTransactionalTable.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/SsccTransactionalTable.java
b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/SsccTransactionalTable.java
index 94a43f1..12e3208 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/SsccTransactionalTable.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/SsccTransactionalTable.java
@@ -429,7 +429,7 @@ public class SsccTransactionalTable extends HTable implements TransactionalTable
       ServerRpcController controller = new ServerRpcController();
       BlockingRpcCallback<SsccPutRegionTxResponse> rpcCallback =
           new BlockingRpcCallback<SsccPutRegionTxResponse>();
-      @Override
+
       public SsccPutRegionTxResponse call(SsccRegionService instance) throws IOException
{
         org.apache.hadoop.hbase.coprocessor.transactional.generated.SsccRegionProtos.SsccPutRegionTxRequest.Builder
builder = SsccPutRegionTxRequest.newBuilder();
         builder.setTid(tsId);
@@ -705,7 +705,6 @@ if (LOG.isTraceEnabled()) LOG.trace("checkAndPut, seting request startid:
" + tr
       BlockingRpcCallback<SsccCheckAndPutRegionTxResponse> rpcCallback =
         new BlockingRpcCallback<SsccCheckAndPutRegionTxResponse>();
 
-      @Override
       public SsccCheckAndPutRegionTxResponse call(SsccRegionService instance) throws IOException
{
         org.apache.hadoop.hbase.coprocessor.transactional.generated.SsccRegionProtos.SsccCheckAndPutRegionTxRequest.Builder
builder = SsccCheckAndPutRegionTxRequest.newBuilder();
         builder.setTid(tsId);

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/90539bf8/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SsccRegionEndpoint.java.tmpl
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SsccRegionEndpoint.java.tmpl
b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SsccRegionEndpoint.java.tmpl
index cd06ef5..29813ea 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SsccRegionEndpoint.java.tmpl
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/SsccRegionEndpoint.java.tmpl
@@ -2618,24 +2618,12 @@ CoprocessorService, Coprocessor {
       // Process in local memory
       if (delete != null && t == null)
       {
-        if (request.hasRow()) {
-          row = request.getRow();
-
           if (!Bytes.equals(rowArray, request.getRow().toByteArray()))
             t = new org.apache.hadoop.hbase.DoNotRetryIOException("Action's " +
                  "Delete row must match the passed row");
         }
 
         if (t == null) {
-          if (request.hasRow())
-            row = request.getRow();
-          if (request.hasFamily())
-            family = request.getFamily();
-          if (request.hasQualifier())
-            qualifier = request.getQualifier();
-          if (request.hasValue())
-            value = request.getValue();
-
           try {
            result = checkAndDeleteRegionTx(tid, startId,
                request.getRow().toByteArray(),

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/90539bf8/core/sql/regress/core/EXPECTED116
----------------------------------------------------------------------
diff --git a/core/sql/regress/core/EXPECTED116 b/core/sql/regress/core/EXPECTED116
index 2c85b49..cfab051 100644
--- a/core/sql/regress/core/EXPECTED116
+++ b/core/sql/regress/core/EXPECTED116
@@ -341,7 +341,7 @@ A1           C1           B1
 >>invoke t116t1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T116T1
--- Definition current  Wed Sep 21 03:01:46 2016
+-- Definition current  Thu Sep 22 05:38:39 2016
 
   (
     SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -359,7 +359,7 @@ A1           C1           B1
 >>invoke t116t1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T116T1
--- Definition current  Wed Sep 21 03:01:46 2016
+-- Definition current  Thu Sep 22 05:38:39 2016
 
   (
     SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -374,7 +374,7 @@ A1           C1           B1
 >>invoke t116v1;
 
 -- Definition of Trafodion view TRAFODION.SCH.T116V1
--- Definition current  Wed Sep 21 03:01:47 2016
+-- Definition current  Thu Sep 22 05:38:40 2016
 
   (
     A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -391,7 +391,7 @@ A1           C1           B1
 >>invoke t116t1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T116T1
--- Definition current  Wed Sep 21 03:01:55 2016
+-- Definition current  Thu Sep 22 05:38:42 2016
 
   (
     SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -406,7 +406,7 @@ A1           C1           B1
 >>invoke t116v1;
 
 -- Definition of Trafodion view TRAFODION.SCH.T116V1
--- Definition current  Wed Sep 21 03:01:56 2016
+-- Definition current  Thu Sep 22 05:38:42 2016
 
   (
     A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -423,7 +423,7 @@ A1           C1           B1
 >>invoke t116t1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T116T1
--- Definition current  Wed Sep 21 03:01:59 2016
+-- Definition current  Thu Sep 22 05:38:45 2016
 
   (
     SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -438,7 +438,7 @@ A1           C1           B1
 >>invoke t116v1;
 
 -- Definition of Trafodion view TRAFODION.SCH.T116V1
--- Definition current  Wed Sep 21 03:02:00 2016
+-- Definition current  Thu Sep 22 05:38:46 2016
 
   (
     A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -456,7 +456,7 @@ A1           C1           B1
 >>invoke t116t1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T116T1
--- Definition current  Wed Sep 21 03:02:00 2016
+-- Definition current  Thu Sep 22 05:38:46 2016
 
   (
     SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -471,7 +471,7 @@ A1           C1           B1
 >>invoke t116v1;
 
 -- Definition of Trafodion view TRAFODION.SCH.T116V1
--- Definition current  Wed Sep 21 03:02:00 2016
+-- Definition current  Thu Sep 22 05:38:46 2016
 
   (
     A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -488,7 +488,7 @@ A1           C1           B1
 >>invoke t116t1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T116T1
--- Definition current  Wed Sep 21 03:02:10 2016
+-- Definition current  Thu Sep 22 05:38:51 2016
 
   (
     SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -503,7 +503,7 @@ A1           C1           B1
 >>invoke t116v1;
 
 -- Definition of Trafodion view TRAFODION.SCH.T116V1
--- Definition current  Wed Sep 21 03:02:10 2016
+-- Definition current  Thu Sep 22 05:38:51 2016
 
   (
     A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -521,7 +521,7 @@ A1           C1           B1
 >>invoke t116t1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T116T1
--- Definition current  Wed Sep 21 03:02:15 2016
+-- Definition current  Thu Sep 22 05:38:55 2016
 
   (
     SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -536,7 +536,7 @@ A1           C1           B1
 >>invoke t116v1;
 
 -- Definition of Trafodion view TRAFODION.SCH.T116V1
--- Definition current  Wed Sep 21 03:02:15 2016
+-- Definition current  Thu Sep 22 05:38:56 2016
 
   (
     A                                INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -595,7 +595,7 @@ End of MXCI Session
 >>invoke t116t1;
 
 -- Definition of Trafodion table TRAFODION.SCH.T116T1
--- Definition current  Wed Sep 21 03:02:38 2016
+-- Definition current  Thu Sep 22 05:39:13 2016
 
   (
     SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -717,7 +717,7 @@ T116T1
 >>invoke t116t2;
 
 -- Definition of Trafodion table TRAFODION.SCH.T116T2
--- Definition current  Wed Sep 21 03:03:44 2016
+-- Definition current  Thu Sep 22 05:40:00 2016
 
   (
     SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -742,7 +742,7 @@ T116T1
 >>invoke t116t2;
 
 -- Definition of Trafodion table TRAFODION.SCH.T116T2
--- Definition current  Wed Sep 21 03:03:50 2016
+-- Definition current  Thu Sep 22 05:40:11 2016
 
   (
     SYSKEY                           LARGEINT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -1170,7 +1170,9 @@ End of MXCI Session
 >>-- should show conflict
 >>commit work;
 
---- SQL operation complete.
+*** ERROR[8616] A conflict was detected during commit processing. Transaction has been aborted.
+
+--- SQL operation failed with errors.
 >>select * from t116t6;
 
 --- 0 row(s) selected.
@@ -1272,7 +1274,9 @@ End of MXCI Session
 >>-- should show conflict
 >>commit work;
 
---- SQL operation complete.
+*** ERROR[8616] A conflict was detected during commit processing. Transaction has been aborted.
+
+--- SQL operation failed with errors.
 >>select * from t116t6;
 
 --- 0 row(s) selected.
@@ -1417,3 +1421,4 @@ A            B
 --- SQL operation complete.
 >>
 >>log;
+

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/90539bf8/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 30cf770..5fbd4f9 100644
--- a/core/sql/src/main/java/org/trafodion/sql/HTableClient.java
+++ b/core/sql/src/main/java/org/trafodion/sql/HTableClient.java
@@ -1363,7 +1363,7 @@ public class HTableClient {
 				 Object[] columns,
 				 long timestamp,
                                  boolean asyncOperation,
-                                 boolean useRegionXn) throws IOException {
+                                 final boolean useRegionXn) throws IOException {
 
             if (logger.isTraceEnabled()) logger.trace("Enter deleteRow(" + new String(rowID)
+ ", "
                                                       + timestamp + ") " + tableName);
@@ -1475,7 +1475,7 @@ public class HTableClient {
     
 	public boolean checkAndDeleteRow(long transID, byte[] rowID, 
 					 byte[] columnToCheck, byte[] colValToCheck,
-					 long timestamp, boolean useRegionXn) throws IOException {
+					 long timestamp, final boolean useRegionXn) throws IOException {
 
             if (logger.isTraceEnabled()) logger.trace("Enter checkAndDeleteRow(" + new String(rowID)
+ ", "
                                                       + new String(columnToCheck) + ", "
+ new String(colValToCheck) + ", " + timestamp + ") " + tableName);


Mime
View raw message