You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by sy...@apache.org on 2015/10/30 17:54:09 UTC
[10/17] hbase git commit: HBASE-14673 Exorcise deprecated
Delete#delete* api
http://git-wip-us.apache.org/repos/asf/hbase/blob/094d65e6/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java
index 342c7d1..cc8cd29 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java
@@ -1136,9 +1136,9 @@ public class ThriftServerRunner implements Runnable {
addAttributes(delete, attributes);
byte [][] famAndQf = KeyValue.parseColumn(getBytes(column));
if (famAndQf.length == 1) {
- delete.deleteFamily(famAndQf[0], timestamp);
+ delete.addFamily(famAndQf[0], timestamp);
} else {
- delete.deleteColumns(famAndQf[0], famAndQf[1], timestamp);
+ delete.addColumns(famAndQf[0], famAndQf[1], timestamp);
}
table.delete(delete);
@@ -1250,9 +1250,9 @@ public class ThriftServerRunner implements Runnable {
byte[][] famAndQf = KeyValue.parseColumn(getBytes(m.column));
if (m.isDelete) {
if (famAndQf.length == 1) {
- delete.deleteFamily(famAndQf[0], timestamp);
+ delete.addFamily(famAndQf[0], timestamp);
} else {
- delete.deleteColumns(famAndQf[0], famAndQf[1], timestamp);
+ delete.addColumns(famAndQf[0], famAndQf[1], timestamp);
}
delete.setDurability(m.writeToWAL ? Durability.SYNC_WAL
: Durability.SKIP_WAL);
@@ -1310,9 +1310,9 @@ public class ThriftServerRunner implements Runnable {
if (m.isDelete) {
// no qualifier, family only.
if (famAndQf.length == 1) {
- delete.deleteFamily(famAndQf[0], timestamp);
+ delete.addFamily(famAndQf[0], timestamp);
} else {
- delete.deleteColumns(famAndQf[0], famAndQf[1], timestamp);
+ delete.addColumns(famAndQf[0], famAndQf[1], timestamp);
}
delete.setDurability(m.writeToWAL ? Durability.SYNC_WAL
: Durability.SKIP_WAL);
http://git-wip-us.apache.org/repos/asf/hbase/blob/094d65e6/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftUtilities.java
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftUtilities.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftUtilities.java
index bef35f6..8811e6d 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftUtilities.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftUtilities.java
@@ -267,22 +267,22 @@ public class ThriftUtilities {
if (column.isSetTimestamp()) {
if (in.isSetDeleteType() &&
in.getDeleteType().equals(TDeleteType.DELETE_COLUMNS))
- out.deleteColumns(column.getFamily(), column.getQualifier(), column.getTimestamp());
+ out.addColumns(column.getFamily(), column.getQualifier(), column.getTimestamp());
else
- out.deleteColumn(column.getFamily(), column.getQualifier(), column.getTimestamp());
+ out.addColumn(column.getFamily(), column.getQualifier(), column.getTimestamp());
} else {
if (in.isSetDeleteType() &&
in.getDeleteType().equals(TDeleteType.DELETE_COLUMNS))
- out.deleteColumns(column.getFamily(), column.getQualifier());
+ out.addColumns(column.getFamily(), column.getQualifier());
else
- out.deleteColumn(column.getFamily(), column.getQualifier());
+ out.addColumn(column.getFamily(), column.getQualifier());
}
} else {
if (column.isSetTimestamp()) {
- out.deleteFamily(column.getFamily(), column.getTimestamp());
+ out.addFamily(column.getFamily(), column.getTimestamp());
} else {
- out.deleteFamily(column.getFamily());
+ out.addFamily(column.getFamily());
}
}
}