Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-11936 IsolationLevel must be attribute of a Query not a Scan (Vladimir Rodionov)

This commit is contained in:
Enis Soztutar 2014-09-11 12:58:04 -07:00
parent c615f22329
commit 4cb76aa929
3 changed files with 41 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java
View File

@ -482,4 +482,10 @@ public class Get extends Query
public Get setReplicaId(int Id) { public Get setReplicaId(int Id) {
return (Get) super.setReplicaId(Id); return (Get) super.setReplicaId(Id);
} }
@Override
public Get setIsolationLevel(IsolationLevel level) {
return (Get) super.setIsolationLevel(level);
}
} }

28
hbase-client/src/main/java/org/apache/hadoop/hbase/client/Query.java
View File

@ -34,6 +34,7 @@ import com.google.common.collect.ListMultimap;
@InterfaceAudience.Public @InterfaceAudience.Public
@InterfaceStability.Evolving @InterfaceStability.Evolving
public abstract class Query extends OperationWithAttributes { public abstract class Query extends OperationWithAttributes {
private static final String ISOLATION_LEVEL = "_isolationlevel_";
protected Filter filter = null; protected Filter filter = null;
protected int targetReplicaId = -1; protected int targetReplicaId = -1;
protected Consistency consistency = Consistency.STRONG; protected Consistency consistency = Consistency.STRONG;
@ -143,4 +144,31 @@ public abstract class Query extends OperationWithAttributes {
public int getReplicaId() { public int getReplicaId() {
return this.targetReplicaId; return this.targetReplicaId;
} }
/*
* Set the isolation level for this query. If the
* isolation level is set to READ_UNCOMMITTED, then
* this query will return data from committed and
* uncommitted transactions. If the isolation level
* is set to READ_COMMITTED, then this query will return
* data from committed transactions only. If a isolation
* level is not explicitly set on a Query, then it
* is assumed to be READ_COMMITTED.
* @param level IsolationLevel for this query
*/
public Query setIsolationLevel(IsolationLevel level) {
setAttribute(ISOLATION_LEVEL, level.toBytes());
return this;
}
/*
* @return The isolation level of this query.
* If no isolation level was set for this query object,
* then it returns READ_COMMITTED.
* @return The IsolationLevel for this query
*/
public IsolationLevel getIsolationLevel() {
byte[] attr = getAttribute(ISOLATION_LEVEL);
return attr == null ? IsolationLevel.READ_COMMITTED :
IsolationLevel.fromBytes(attr);
}
} }

34
hbase-client/src/main/java/org/apache/hadoop/hbase/client/Scan.java
View File

@ -89,7 +89,6 @@ public class Scan extends Query {
private static final Log LOG = LogFactory.getLog(Scan.class); private static final Log LOG = LogFactory.getLog(Scan.class);
private static final String RAW_ATTR = "_raw_"; private static final String RAW_ATTR = "_raw_";
private static final String ISOLATION_LEVEL = "_isolationlevel_";
/** /**
* EXPERT ONLY. * EXPERT ONLY.
@ -751,32 +750,7 @@ public class Scan extends Query {
return attr == null ? false : Bytes.toBoolean(attr); return attr == null ? false : Bytes.toBoolean(attr);
} }
/*
* Set the isolation level for this scan. If the
* isolation level is set to READ_UNCOMMITTED, then
* this scan will return data from committed and
* uncommitted transactions. If the isolation level
* is set to READ_COMMITTED, then this scan will return
* data from committed transactions only. If a isolation
* level is not explicitly set on a Scan, then it
* is assumed to be READ_COMMITTED.
* @param level IsolationLevel for this scan
*/
public Scan setIsolationLevel(IsolationLevel level) {
setAttribute(ISOLATION_LEVEL, level.toBytes());
return this;
}
/*
* @return The isolation level of this scan.
* If no isolation level was set for this scan object,
* then it returns READ_COMMITTED.
* @return The IsolationLevel for this scan
*/
public IsolationLevel getIsolationLevel() {
byte[] attr = getAttribute(ISOLATION_LEVEL);
return attr == null ? IsolationLevel.READ_COMMITTED :
IsolationLevel.fromBytes(attr);
}
/** /**
* Set whether this scan is a small scan * Set whether this scan is a small scan
@ -845,4 +819,10 @@ public class Scan extends Query {
public Scan setReplicaId(int Id) { public Scan setReplicaId(int Id) {
return (Scan) super.setReplicaId(Id); return (Scan) super.setReplicaId(Id);
} }
@Override
public Scan setIsolationLevel(IsolationLevel level) {
return (Scan) super.setIsolationLevel(level);
}
} }