You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by se...@apache.org on 2015/12/10 05:28:38 UTC
[1/4] incubator-trafodion git commit: TRAFODION-1643
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 15aa140bb -> 9c1161da5
TRAFODION-1643
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/e2d32a51
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/e2d32a51
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/e2d32a51
Branch: refs/heads/master
Commit: e2d32a510bc29e25962604073d486fc355601a37
Parents: 80d6cff
Author: mashengchen <ma...@gmail.com>
Authored: Tue Dec 1 05:28:25 2015 +0000
Committer: mashengchen <ma...@gmail.com>
Committed: Tue Dec 1 05:28:25 2015 +0000
----------------------------------------------------------------------
.../transactional/TrxTransactionState.java | 49 ++++++++++++++++++--
1 file changed, 45 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e2d32a51/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java
index d8c3d9a..29b21f7 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java
@@ -34,7 +34,6 @@
package org.apache.hadoop.hbase.regionserver.transactional;
import java.io.IOException;
-
import java.lang.Class;
import java.lang.reflect.Constructor;
@@ -65,6 +64,7 @@ import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.KeyValueUtil;
import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.KeyValue.KVComparator;
import org.apache.hadoop.hbase.KeyValue.Type;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.client.Delete;
@@ -80,6 +80,7 @@ import org.apache.hadoop.hbase.regionserver.ScanInfo;
import org.apache.hadoop.hbase.regionserver.wal.WALEdit;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
+import org.apache.hadoop.hbase.util.VersionInfo;
import org.apache.hadoop.io.DataInputBuffer;
/**
@@ -126,9 +127,9 @@ public class TrxTransactionState extends TransactionState{
}
catch (NoSuchMethodException exc_nsm2) {
sb_sqm_98_4 = false;
+ LOG.info("Got info of Class ScanQueryMatcher for HBase version" + VersionInfo.getVersion());
}
}
-
if (sb_sqm_98_1) {
LOG.info("Got info of Class ScanQueryMatcher for HBase 98.1");
}
@@ -659,8 +660,48 @@ public class TrxTransactionState extends TransactionState{
super.setSequenceID(Long.MAX_VALUE);
//Store.ScanInfo scaninfo = new Store.ScanInfo(null, 0, 1, HConstants.FOREVER, false, 0, Cell.COMPARATOR);
- ScanInfo scaninfo = new ScanInfo(null, 0, 1, HConstants.FOREVER, false, 0, KeyValue.COMPARATOR);
-
+ //after hbase 0.98.8, ScanInfo instance need KeepDeletedCells as param instead of boolean
+ ScanInfo scaninfo = null;
+ Class scaninfoClazz = null;
+ try {
+ scaninfoClazz = Class.forName("org.apache.hadoop.hbase.regionserver.ScanInfo");
+ } catch (ClassNotFoundException e) {
+ throw new RuntimeException(e.getMessage());
+ }
+ Class[] types = null;
+ Object[] args = null;
+ try {
+ types = new Class[] { byte[].class, int.class, int.class, long.class, boolean.class, long.class, KVComparator.class };
+ Constructor constructor = scaninfoClazz.getConstructor(types);
+ args = new Object[] { null, 0, 1, HConstants.FOREVER, false, 0, KeyValue.COMPARATOR };
+ scaninfo = (ScanInfo) constructor.newInstance(args);
+
+ if (LOG.isTraceEnabled())
+ LOG.trace("Created ScanInfo instance before HBase 98.8");
+ } catch (Exception e) {
+ Class clazz = null;
+ try {
+ clazz = Class.forName("org.apache.hadoop.hbase.KeepDeletedCells");
+ } catch (ClassNotFoundException e1) {
+ throw new RuntimeException(e1.getMessage());
+ }
+ types = new Class[] { byte[].class, int.class, int.class, long.class, clazz, long.class, KVComparator.class };
+ Constructor constructor = null;
+ try {
+ constructor = scaninfoClazz.getConstructor(types);
+ } catch (Exception e1) {
+ throw new RuntimeException(e1.getMessage());
+ }
+ args = new Object[] { null, 0, 1, HConstants.FOREVER, Enum.valueOf(clazz, "FALSE"), 0, KeyValue.COMPARATOR };
+ try {
+ scaninfo = (ScanInfo) constructor.newInstance(args);
+ } catch (Exception e1) {
+ throw new RuntimeException(e1.getMessage());
+ }
+ if (LOG.isTraceEnabled())
+ LOG.trace("Created ScanInfo instance after HBase 98.8");
+ }
+
try {
if (sb_sqm_98_1) {
try {
[2/4] incubator-trafodion git commit: Update TrxTransactionState.java
Posted by se...@apache.org.
Update TrxTransactionState.java
move scaninfoConstructor to static block
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/fff855f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/fff855f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/fff855f2
Branch: refs/heads/master
Commit: fff855f2d5bf60f6baa87930f74249e2898725b0
Parents: e2d32a5
Author: mashengchen <ma...@gmail.com>
Authored: Mon Dec 7 17:38:45 2015 +0800
Committer: mashengchen <ma...@gmail.com>
Committed: Mon Dec 7 17:38:45 2015 +0800
----------------------------------------------------------------------
.../transactional/TrxTransactionState.java | 75 ++++++++++----------
1 file changed, 39 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fff855f2/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java
index 29b21f7..c53211a 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java
@@ -94,6 +94,9 @@ public class TrxTransactionState extends TransactionState{
static java.lang.reflect.Constructor c98_1 = null;
static java.lang.reflect.Constructor c98_4 = null;
+ static Constructor scaninfoConstructor = null;
+ static Object[] scaninfoArgs = null;
+
static {
sb_sqm_98_1 = true;
try {
@@ -136,6 +139,40 @@ public class TrxTransactionState extends TransactionState{
if (sb_sqm_98_4) {
LOG.info("Got info of Class ScanQueryMatcher for HBase 98.4");
}
+
+
+ Class scaninfoClazz = null;
+ try {
+ scaninfoClazz = Class.forName("org.apache.hadoop.hbase.regionserver.ScanInfo");
+ } catch (ClassNotFoundException e) {
+ throw new RuntimeException(e.getMessage());
+ }
+ Class[] types = null;
+
+ try {
+ types = new Class[] { byte[].class, int.class, int.class, long.class, boolean.class, long.class, KVComparator.class };
+ scaninfoConstructor = scaninfoClazz.getConstructor(types);
+ scaninfoArgs = new Object[] { null, 0, 1, HConstants.FOREVER, false, 0, KeyValue.COMPARATOR };
+ if (LOG.isTraceEnabled())
+ LOG.trace("Created ScanInfo instance before HBase 98.8");
+ } catch (Exception e) {
+ Class clazz = null;
+ try {
+ clazz = Class.forName("org.apache.hadoop.hbase.KeepDeletedCells");
+ } catch (ClassNotFoundException e1) {
+ throw new RuntimeException(e1.getMessage());
+ }
+ types = new Class[] { byte[].class, int.class, int.class, long.class, clazz, long.class, KVComparator.class };
+ try {
+ scaninfoConstructor = scaninfoClazz.getConstructor(types);
+ scaninfoArgs = new Object[] { null, 0, 1, HConstants.FOREVER, Enum.valueOf(clazz, "FALSE"), 0, KeyValue.COMPARATOR };
+ if (LOG.isTraceEnabled())
+ LOG.trace("Created ScanInfo instance after HBase 98.8");
+ } catch (Exception e1) {
+ LOG.error("Created ScanInfo instance ERROR");
+ throw new RuntimeException(e1.getMessage());
+ }
+ }
}
/**
@@ -662,44 +699,10 @@ public class TrxTransactionState extends TransactionState{
//Store.ScanInfo scaninfo = new Store.ScanInfo(null, 0, 1, HConstants.FOREVER, false, 0, Cell.COMPARATOR);
//after hbase 0.98.8, ScanInfo instance need KeepDeletedCells as param instead of boolean
ScanInfo scaninfo = null;
- Class scaninfoClazz = null;
try {
- scaninfoClazz = Class.forName("org.apache.hadoop.hbase.regionserver.ScanInfo");
- } catch (ClassNotFoundException e) {
- throw new RuntimeException(e.getMessage());
- }
- Class[] types = null;
- Object[] args = null;
- try {
- types = new Class[] { byte[].class, int.class, int.class, long.class, boolean.class, long.class, KVComparator.class };
- Constructor constructor = scaninfoClazz.getConstructor(types);
- args = new Object[] { null, 0, 1, HConstants.FOREVER, false, 0, KeyValue.COMPARATOR };
- scaninfo = (ScanInfo) constructor.newInstance(args);
-
- if (LOG.isTraceEnabled())
- LOG.trace("Created ScanInfo instance before HBase 98.8");
+ scaninfo = (ScanInfo) scaninfoConstructor.newInstance(scaninfoArgs);
} catch (Exception e) {
- Class clazz = null;
- try {
- clazz = Class.forName("org.apache.hadoop.hbase.KeepDeletedCells");
- } catch (ClassNotFoundException e1) {
- throw new RuntimeException(e1.getMessage());
- }
- types = new Class[] { byte[].class, int.class, int.class, long.class, clazz, long.class, KVComparator.class };
- Constructor constructor = null;
- try {
- constructor = scaninfoClazz.getConstructor(types);
- } catch (Exception e1) {
- throw new RuntimeException(e1.getMessage());
- }
- args = new Object[] { null, 0, 1, HConstants.FOREVER, Enum.valueOf(clazz, "FALSE"), 0, KeyValue.COMPARATOR };
- try {
- scaninfo = (ScanInfo) constructor.newInstance(args);
- } catch (Exception e1) {
- throw new RuntimeException(e1.getMessage());
- }
- if (LOG.isTraceEnabled())
- LOG.trace("Created ScanInfo instance after HBase 98.8");
+ throw new RuntimeException(e.getMessage());
}
try {
[3/4] incubator-trafodion git commit: Update TrxTransactionState.java
Posted by se...@apache.org.
Update TrxTransactionState.java
change KeepDeletedCells & scanInfoClazz to be static
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/4f79b9d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/4f79b9d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/4f79b9d4
Branch: refs/heads/master
Commit: 4f79b9d4c09e9edc8517273ebf481a521a76a3c3
Parents: fff855f
Author: mashengchen <ma...@gmail.com>
Authored: Wed Dec 9 14:47:32 2015 +0800
Committer: mashengchen <ma...@gmail.com>
Committed: Wed Dec 9 14:47:32 2015 +0800
----------------------------------------------------------------------
.../regionserver/transactional/TrxTransactionState.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4f79b9d4/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java
index c53211a..e9c66c9 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java
@@ -94,6 +94,8 @@ public class TrxTransactionState extends TransactionState{
static java.lang.reflect.Constructor c98_1 = null;
static java.lang.reflect.Constructor c98_4 = null;
+ static Class keepDeletedCellsClazz = null;
+ static Class scaninfoClazz = null;
static Constructor scaninfoConstructor = null;
static Object[] scaninfoArgs = null;
@@ -141,7 +143,6 @@ public class TrxTransactionState extends TransactionState{
}
- Class scaninfoClazz = null;
try {
scaninfoClazz = Class.forName("org.apache.hadoop.hbase.regionserver.ScanInfo");
} catch (ClassNotFoundException e) {
@@ -156,16 +157,16 @@ public class TrxTransactionState extends TransactionState{
if (LOG.isTraceEnabled())
LOG.trace("Created ScanInfo instance before HBase 98.8");
} catch (Exception e) {
- Class clazz = null;
+
try {
- clazz = Class.forName("org.apache.hadoop.hbase.KeepDeletedCells");
+ keepDeletedCellsClazz = Class.forName("org.apache.hadoop.hbase.KeepDeletedCells");
} catch (ClassNotFoundException e1) {
throw new RuntimeException(e1.getMessage());
}
- types = new Class[] { byte[].class, int.class, int.class, long.class, clazz, long.class, KVComparator.class };
+ types = new Class[] { byte[].class, int.class, int.class, long.class, keepDeletedCellsClazz, long.class, KVComparator.class };
try {
scaninfoConstructor = scaninfoClazz.getConstructor(types);
- scaninfoArgs = new Object[] { null, 0, 1, HConstants.FOREVER, Enum.valueOf(clazz, "FALSE"), 0, KeyValue.COMPARATOR };
+ scaninfoArgs = new Object[] { null, 0, 1, HConstants.FOREVER, Enum.valueOf(keepDeletedCellsClazz, "FALSE"), 0, KeyValue.COMPARATOR };
if (LOG.isTraceEnabled())
LOG.trace("Created ScanInfo instance after HBase 98.8");
} catch (Exception e1) {
[4/4] incubator-trafodion git commit: Merge [Trafodion-1643] PR-197
Posted by se...@apache.org.
Merge [Trafodion-1643] PR-197
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/9c1161da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/9c1161da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/9c1161da
Branch: refs/heads/master
Commit: 9c1161da5c4d8ce8b99f01c59a0a71a3eb5b32b6
Parents: 15aa140 4f79b9d
Author: selvaganesang <se...@apache.org>
Authored: Thu Dec 10 04:26:42 2015 +0000
Committer: selvaganesang <se...@apache.org>
Committed: Thu Dec 10 04:26:42 2015 +0000
----------------------------------------------------------------------
.../transactional/TrxTransactionState.java | 53 ++++++++++++++++++--
1 file changed, 49 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/9c1161da/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/regionserver/transactional/TrxTransactionState.java
----------------------------------------------------------------------