You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by sa...@apache.org on 2017/05/12 20:25:46 UTC
[11/22] incubator-trafodion git commit: Merge fixes
Merge fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/4d378a6c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/4d378a6c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/4d378a6c
Branch: refs/heads/master
Commit: 4d378a6c365f27415dc06f6cf62904bb3be7b47f
Parents: 19edeb4
Author: Sean Broeder <sb...@edev05.novalocal>
Authored: Mon May 1 19:20:47 2017 +0000
Committer: Sean Broeder <sb...@edev05.novalocal>
Committed: Mon May 1 19:20:47 2017 +0000
----------------------------------------------------------------------
.../NonPendingTransactionException.java | 47 ++++++++++++++
.../transactional/TrxRegionEndpoint.java.tmpl | 2 +-
.../TransactionalRegionScannerHolder.java | 64 --------------------
3 files changed, 48 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4d378a6c/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/NonPendingTransactionException.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/NonPendingTransactionException.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/NonPendingTransactionException.java
new file mode 100644
index 0000000..643f594
--- /dev/null
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/NonPendingTransactionException.java
@@ -0,0 +1,47 @@
+/**
+* @@@ START COPYRIGHT @@@
+*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*
+* @@@ END COPYRIGHT @@@
+**/
+
+package org.apache.hadoop.hbase.client.transactional;
+
+import org.apache.hadoop.hbase.DoNotRetryIOException;
+
+/**
+ * Thrown if a region server receives a commit before a commit request
+ */
+public class NonPendingTransactionException extends DoNotRetryIOException {
+
+ private static final long serialVersionUID = 698575374929591099L;
+
+ /** constructor */
+ public NonPendingTransactionException() {
+ super();
+ }
+
+ /**
+ * Constructor
+ * @param s message
+ */
+ public NonPendingTransactionException(String s) {
+ super(s);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4d378a6c/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java.tmpl
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java.tmpl b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java.tmpl
index 78ed97e..b0f9d24 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java.tmpl
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java.tmpl
@@ -120,7 +120,7 @@ import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
-#ifdef HDP2.3 HDP2.4 CDH5.7 APACHE1.2
+#ifdef HDP2.3 HDP2.4 CDH5.5 CDH5.7 APACHE1.2
import org.apache.hadoop.hbase.ChoreService;
import org.apache.hadoop.hbase.ScheduledChore;
#endif
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4d378a6c/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionalRegionScannerHolder.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionalRegionScannerHolder.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionalRegionScannerHolder.java
deleted file mode 100644
index b4096f0..0000000
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionalRegionScannerHolder.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
-* @@@ START COPYRIGHT @@@
-*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements. See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership. The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied. See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*
-* @@@ END COPYRIGHT @@@
-**/
-
-package org.apache.hadoop.hbase.regionserver.transactional;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hbase.regionserver.Region;
-import org.apache.hadoop.hbase.regionserver.RegionScanner;
-
-/**
- * Holds a RegionScanner
- */
- public class TransactionalRegionScannerHolder {
- public RegionScanner s;
- public Region r;
- public long nextCallSeq;
- public long numberOfRows;
- public long rowsRemaining;
- public long transId;
- public long scannerId;
- public boolean hasMore;
-
-
- public TransactionalRegionScannerHolder(long transId,
- long scannerId,
- RegionScanner s,
- Region r) {
- this.transId = transId;
- this.scannerId = scannerId;
- this.s = s;
- this.r = r;
- this.nextCallSeq = 0L;
- this.numberOfRows = 0L;
- this.rowsRemaining = 0L;
- this.hasMore = false;
- }
-
- public void cleanHolder() {
- this.r = null;
- this.s = null;
- }
- }
-