You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ra...@apache.org on 2010/10/26 00:56:48 UTC
svn commit: r1027293 - in /hbase/trunk: CHANGES.txt
src/main/java/org/apache/hadoop/hbase/client/Result.java
Author: rawson
Date: Mon Oct 25 22:56:47 2010
New Revision: 1027293
URL: http://svn.apache.org/viewvc?rev=1027293&view=rev
Log:
HBASE-2753 Remove sorted() methods from Result now that Gets are Scans
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/Result.java
Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1027293&r1=1027292&r2=1027293&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Mon Oct 25 22:56:47 2010
@@ -612,7 +612,7 @@ Release 0.21.0 - Unreleased
HBASE-3139 Server shutdown processor stuck because meta not online
HBASE-3136 Stale reads from ZK can break the atomic CAS operations we
have in ZKAssign
-
+ HBASE-2753 Remove sorted() methods from Result now that Gets are Scans
IMPROVEMENTS
HBASE-1760 Cleanup TODOs in HTable
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/Result.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/Result.java?rev=1027293&r1=1027292&r2=1027293&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/Result.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/Result.java Mon Oct 25 22:56:47 2010
@@ -159,7 +159,7 @@ public class Result implements Writable
if(this.kvs == null) {
readFields();
}
- return isEmpty()? null: Arrays.asList(sorted());
+ return isEmpty()? null: Arrays.asList(raw());
}
/**
@@ -172,17 +172,8 @@ public class Result implements Writable
* @deprecated
*/
public KeyValue[] sorted() {
- raw(); // side effect of loading this.kvs
- if (!sorted) {
- assert Ordering.from(KeyValue.COMPARATOR).isOrdered(Arrays.asList(kvs));
-
- Arrays.sort(kvs, KeyValue.COMPARATOR);
- sorted = true;
- }
-
- return raw();
+ return raw(); // side effect of loading this.kvs
}
- private boolean sorted = false;
/**
* Return the KeyValues for the specific column. The KeyValues are sorted in