You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/04/30 20:33:09 UTC
svn commit: r1477758 [5/6] - in /accumulo/trunk:
core/src/main/java/org/apache/accumulo/core/client/admin/
core/src/main/java/org/apache/accumulo/core/client/mock/
core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/
core/src/main/java/org/...
Modified: accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java?rev=1477758&r1=1477757&r2=1477758&view=diff
==============================================================================
--- accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java (original)
+++ accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java Tue Apr 30 18:33:06 2013
@@ -1112,13 +1112,13 @@ import org.slf4j.LoggerFactory;
case 3: // INPUT_FILES
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list98 = iprot.readListBegin();
- struct.inputFiles = new ArrayList<String>(_list98.size);
- for (int _i99 = 0; _i99 < _list98.size; ++_i99)
+ org.apache.thrift.protocol.TList _list106 = iprot.readListBegin();
+ struct.inputFiles = new ArrayList<String>(_list106.size);
+ for (int _i107 = 0; _i107 < _list106.size; ++_i107)
{
- String _elem100; // required
- _elem100 = iprot.readString();
- struct.inputFiles.add(_elem100);
+ String _elem108; // required
+ _elem108 = iprot.readString();
+ struct.inputFiles.add(_elem108);
}
iprot.readListEnd();
}
@@ -1178,14 +1178,14 @@ import org.slf4j.LoggerFactory;
case 10: // ITERATORS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list101 = iprot.readListBegin();
- struct.iterators = new ArrayList<IteratorSetting>(_list101.size);
- for (int _i102 = 0; _i102 < _list101.size; ++_i102)
+ org.apache.thrift.protocol.TList _list109 = iprot.readListBegin();
+ struct.iterators = new ArrayList<IteratorSetting>(_list109.size);
+ for (int _i110 = 0; _i110 < _list109.size; ++_i110)
{
- IteratorSetting _elem103; // required
- _elem103 = new IteratorSetting();
- _elem103.read(iprot);
- struct.iterators.add(_elem103);
+ IteratorSetting _elem111; // required
+ _elem111 = new IteratorSetting();
+ _elem111.read(iprot);
+ struct.iterators.add(_elem111);
}
iprot.readListEnd();
}
@@ -1221,9 +1221,9 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(INPUT_FILES_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.inputFiles.size()));
- for (String _iter104 : struct.inputFiles)
+ for (String _iter112 : struct.inputFiles)
{
- oprot.writeString(_iter104);
+ oprot.writeString(_iter112);
}
oprot.writeListEnd();
}
@@ -1259,9 +1259,9 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(ITERATORS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.iterators.size()));
- for (IteratorSetting _iter105 : struct.iterators)
+ for (IteratorSetting _iter113 : struct.iterators)
{
- _iter105.write(oprot);
+ _iter113.write(oprot);
}
oprot.writeListEnd();
}
@@ -1325,9 +1325,9 @@ import org.slf4j.LoggerFactory;
if (struct.isSetInputFiles()) {
{
oprot.writeI32(struct.inputFiles.size());
- for (String _iter106 : struct.inputFiles)
+ for (String _iter114 : struct.inputFiles)
{
- oprot.writeString(_iter106);
+ oprot.writeString(_iter114);
}
}
}
@@ -1352,9 +1352,9 @@ import org.slf4j.LoggerFactory;
if (struct.isSetIterators()) {
{
oprot.writeI32(struct.iterators.size());
- for (IteratorSetting _iter107 : struct.iterators)
+ for (IteratorSetting _iter115 : struct.iterators)
{
- _iter107.write(oprot);
+ _iter115.write(oprot);
}
}
}
@@ -1375,13 +1375,13 @@ import org.slf4j.LoggerFactory;
}
if (incoming.get(2)) {
{
- org.apache.thrift.protocol.TList _list108 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.inputFiles = new ArrayList<String>(_list108.size);
- for (int _i109 = 0; _i109 < _list108.size; ++_i109)
+ org.apache.thrift.protocol.TList _list116 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.inputFiles = new ArrayList<String>(_list116.size);
+ for (int _i117 = 0; _i117 < _list116.size; ++_i117)
{
- String _elem110; // required
- _elem110 = iprot.readString();
- struct.inputFiles.add(_elem110);
+ String _elem118; // required
+ _elem118 = iprot.readString();
+ struct.inputFiles.add(_elem118);
}
}
struct.setInputFilesIsSet(true);
@@ -1412,14 +1412,14 @@ import org.slf4j.LoggerFactory;
}
if (incoming.get(9)) {
{
- org.apache.thrift.protocol.TList _list111 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.iterators = new ArrayList<IteratorSetting>(_list111.size);
- for (int _i112 = 0; _i112 < _list111.size; ++_i112)
+ org.apache.thrift.protocol.TList _list119 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.iterators = new ArrayList<IteratorSetting>(_list119.size);
+ for (int _i120 = 0; _i120 < _list119.size; ++_i120)
{
- IteratorSetting _elem113; // required
- _elem113 = new IteratorSetting();
- _elem113.read(iprot);
- struct.iterators.add(_elem113);
+ IteratorSetting _elem121; // required
+ _elem121 = new IteratorSetting();
+ _elem121.read(iprot);
+ struct.iterators.add(_elem121);
}
}
struct.setIteratorsIsSet(true);
Modified: accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java?rev=1477758&r1=1477757&r2=1477758&view=diff
==============================================================================
--- accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java (original)
+++ accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java Tue Apr 30 18:33:06 2013
@@ -1263,14 +1263,14 @@ import org.slf4j.LoggerFactory;
case 9: // COLUMNS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list74 = iprot.readListBegin();
- struct.columns = new ArrayList<Column>(_list74.size);
- for (int _i75 = 0; _i75 < _list74.size; ++_i75)
+ org.apache.thrift.protocol.TList _list82 = iprot.readListBegin();
+ struct.columns = new ArrayList<Column>(_list82.size);
+ for (int _i83 = 0; _i83 < _list82.size; ++_i83)
{
- Column _elem76; // required
- _elem76 = new Column();
- _elem76.read(iprot);
- struct.columns.add(_elem76);
+ Column _elem84; // required
+ _elem84 = new Column();
+ _elem84.read(iprot);
+ struct.columns.add(_elem84);
}
iprot.readListEnd();
}
@@ -1282,14 +1282,14 @@ import org.slf4j.LoggerFactory;
case 10: // ITERATORS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list77 = iprot.readListBegin();
- struct.iterators = new ArrayList<IteratorSetting>(_list77.size);
- for (int _i78 = 0; _i78 < _list77.size; ++_i78)
+ org.apache.thrift.protocol.TList _list85 = iprot.readListBegin();
+ struct.iterators = new ArrayList<IteratorSetting>(_list85.size);
+ for (int _i86 = 0; _i86 < _list85.size; ++_i86)
{
- IteratorSetting _elem79; // required
- _elem79 = new IteratorSetting();
- _elem79.read(iprot);
- struct.iterators.add(_elem79);
+ IteratorSetting _elem87; // required
+ _elem87 = new IteratorSetting();
+ _elem87.read(iprot);
+ struct.iterators.add(_elem87);
}
iprot.readListEnd();
}
@@ -1301,13 +1301,13 @@ import org.slf4j.LoggerFactory;
case 11: // AUTHORIZATIONS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list80 = iprot.readListBegin();
- struct.authorizations = new ArrayList<ByteBuffer>(_list80.size);
- for (int _i81 = 0; _i81 < _list80.size; ++_i81)
+ org.apache.thrift.protocol.TList _list88 = iprot.readListBegin();
+ struct.authorizations = new ArrayList<ByteBuffer>(_list88.size);
+ for (int _i89 = 0; _i89 < _list88.size; ++_i89)
{
- ByteBuffer _elem82; // required
- _elem82 = iprot.readBinary();
- struct.authorizations.add(_elem82);
+ ByteBuffer _elem90; // required
+ _elem90 = iprot.readBinary();
+ struct.authorizations.add(_elem90);
}
iprot.readListEnd();
}
@@ -1371,9 +1371,9 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(COLUMNS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.columns.size()));
- for (Column _iter83 : struct.columns)
+ for (Column _iter91 : struct.columns)
{
- _iter83.write(oprot);
+ _iter91.write(oprot);
}
oprot.writeListEnd();
}
@@ -1383,9 +1383,9 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(ITERATORS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.iterators.size()));
- for (IteratorSetting _iter84 : struct.iterators)
+ for (IteratorSetting _iter92 : struct.iterators)
{
- _iter84.write(oprot);
+ _iter92.write(oprot);
}
oprot.writeListEnd();
}
@@ -1395,9 +1395,9 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(AUTHORIZATIONS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.authorizations.size()));
- for (ByteBuffer _iter85 : struct.authorizations)
+ for (ByteBuffer _iter93 : struct.authorizations)
{
- oprot.writeBinary(_iter85);
+ oprot.writeBinary(_iter93);
}
oprot.writeListEnd();
}
@@ -1482,27 +1482,27 @@ import org.slf4j.LoggerFactory;
if (struct.isSetColumns()) {
{
oprot.writeI32(struct.columns.size());
- for (Column _iter86 : struct.columns)
+ for (Column _iter94 : struct.columns)
{
- _iter86.write(oprot);
+ _iter94.write(oprot);
}
}
}
if (struct.isSetIterators()) {
{
oprot.writeI32(struct.iterators.size());
- for (IteratorSetting _iter87 : struct.iterators)
+ for (IteratorSetting _iter95 : struct.iterators)
{
- _iter87.write(oprot);
+ _iter95.write(oprot);
}
}
}
if (struct.isSetAuthorizations()) {
{
oprot.writeI32(struct.authorizations.size());
- for (ByteBuffer _iter88 : struct.authorizations)
+ for (ByteBuffer _iter96 : struct.authorizations)
{
- oprot.writeBinary(_iter88);
+ oprot.writeBinary(_iter96);
}
}
}
@@ -1547,41 +1547,41 @@ import org.slf4j.LoggerFactory;
}
if (incoming.get(8)) {
{
- org.apache.thrift.protocol.TList _list89 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.columns = new ArrayList<Column>(_list89.size);
- for (int _i90 = 0; _i90 < _list89.size; ++_i90)
+ org.apache.thrift.protocol.TList _list97 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.columns = new ArrayList<Column>(_list97.size);
+ for (int _i98 = 0; _i98 < _list97.size; ++_i98)
{
- Column _elem91; // required
- _elem91 = new Column();
- _elem91.read(iprot);
- struct.columns.add(_elem91);
+ Column _elem99; // required
+ _elem99 = new Column();
+ _elem99.read(iprot);
+ struct.columns.add(_elem99);
}
}
struct.setColumnsIsSet(true);
}
if (incoming.get(9)) {
{
- org.apache.thrift.protocol.TList _list92 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.iterators = new ArrayList<IteratorSetting>(_list92.size);
- for (int _i93 = 0; _i93 < _list92.size; ++_i93)
+ org.apache.thrift.protocol.TList _list100 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.iterators = new ArrayList<IteratorSetting>(_list100.size);
+ for (int _i101 = 0; _i101 < _list100.size; ++_i101)
{
- IteratorSetting _elem94; // required
- _elem94 = new IteratorSetting();
- _elem94.read(iprot);
- struct.iterators.add(_elem94);
+ IteratorSetting _elem102; // required
+ _elem102 = new IteratorSetting();
+ _elem102.read(iprot);
+ struct.iterators.add(_elem102);
}
}
struct.setIteratorsIsSet(true);
}
if (incoming.get(10)) {
{
- org.apache.thrift.protocol.TList _list95 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.authorizations = new ArrayList<ByteBuffer>(_list95.size);
- for (int _i96 = 0; _i96 < _list95.size; ++_i96)
+ org.apache.thrift.protocol.TList _list103 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.authorizations = new ArrayList<ByteBuffer>(_list103.size);
+ for (int _i104 = 0; _i104 < _list103.size; ++_i104)
{
- ByteBuffer _elem97; // required
- _elem97 = iprot.readBinary();
- struct.authorizations.add(_elem97);
+ ByteBuffer _elem105; // required
+ _elem105 = iprot.readBinary();
+ struct.authorizations.add(_elem105);
}
}
struct.setAuthorizationsIsSet(true);
Modified: accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java?rev=1477758&r1=1477757&r2=1477758&view=diff
==============================================================================
--- accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java (original)
+++ accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java Tue Apr 30 18:33:06 2013
@@ -720,13 +720,13 @@ import org.slf4j.LoggerFactory;
case 1: // AUTHORIZATIONS
if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
{
- org.apache.thrift.protocol.TSet _set42 = iprot.readSetBegin();
- struct.authorizations = new HashSet<ByteBuffer>(2*_set42.size);
- for (int _i43 = 0; _i43 < _set42.size; ++_i43)
+ org.apache.thrift.protocol.TSet _set50 = iprot.readSetBegin();
+ struct.authorizations = new HashSet<ByteBuffer>(2*_set50.size);
+ for (int _i51 = 0; _i51 < _set50.size; ++_i51)
{
- ByteBuffer _elem44; // required
- _elem44 = iprot.readBinary();
- struct.authorizations.add(_elem44);
+ ByteBuffer _elem52; // required
+ _elem52 = iprot.readBinary();
+ struct.authorizations.add(_elem52);
}
iprot.readSetEnd();
}
@@ -738,14 +738,14 @@ import org.slf4j.LoggerFactory;
case 2: // RANGES
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list45 = iprot.readListBegin();
- struct.ranges = new ArrayList<Range>(_list45.size);
- for (int _i46 = 0; _i46 < _list45.size; ++_i46)
+ org.apache.thrift.protocol.TList _list53 = iprot.readListBegin();
+ struct.ranges = new ArrayList<Range>(_list53.size);
+ for (int _i54 = 0; _i54 < _list53.size; ++_i54)
{
- Range _elem47; // required
- _elem47 = new Range();
- _elem47.read(iprot);
- struct.ranges.add(_elem47);
+ Range _elem55; // required
+ _elem55 = new Range();
+ _elem55.read(iprot);
+ struct.ranges.add(_elem55);
}
iprot.readListEnd();
}
@@ -757,14 +757,14 @@ import org.slf4j.LoggerFactory;
case 3: // COLUMNS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list48 = iprot.readListBegin();
- struct.columns = new ArrayList<ScanColumn>(_list48.size);
- for (int _i49 = 0; _i49 < _list48.size; ++_i49)
+ org.apache.thrift.protocol.TList _list56 = iprot.readListBegin();
+ struct.columns = new ArrayList<ScanColumn>(_list56.size);
+ for (int _i57 = 0; _i57 < _list56.size; ++_i57)
{
- ScanColumn _elem50; // required
- _elem50 = new ScanColumn();
- _elem50.read(iprot);
- struct.columns.add(_elem50);
+ ScanColumn _elem58; // required
+ _elem58 = new ScanColumn();
+ _elem58.read(iprot);
+ struct.columns.add(_elem58);
}
iprot.readListEnd();
}
@@ -776,14 +776,14 @@ import org.slf4j.LoggerFactory;
case 4: // ITERATORS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list51 = iprot.readListBegin();
- struct.iterators = new ArrayList<IteratorSetting>(_list51.size);
- for (int _i52 = 0; _i52 < _list51.size; ++_i52)
+ org.apache.thrift.protocol.TList _list59 = iprot.readListBegin();
+ struct.iterators = new ArrayList<IteratorSetting>(_list59.size);
+ for (int _i60 = 0; _i60 < _list59.size; ++_i60)
{
- IteratorSetting _elem53; // required
- _elem53 = new IteratorSetting();
- _elem53.read(iprot);
- struct.iterators.add(_elem53);
+ IteratorSetting _elem61; // required
+ _elem61 = new IteratorSetting();
+ _elem61.read(iprot);
+ struct.iterators.add(_elem61);
}
iprot.readListEnd();
}
@@ -820,9 +820,9 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(AUTHORIZATIONS_FIELD_DESC);
{
oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.authorizations.size()));
- for (ByteBuffer _iter54 : struct.authorizations)
+ for (ByteBuffer _iter62 : struct.authorizations)
{
- oprot.writeBinary(_iter54);
+ oprot.writeBinary(_iter62);
}
oprot.writeSetEnd();
}
@@ -834,9 +834,9 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(RANGES_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.ranges.size()));
- for (Range _iter55 : struct.ranges)
+ for (Range _iter63 : struct.ranges)
{
- _iter55.write(oprot);
+ _iter63.write(oprot);
}
oprot.writeListEnd();
}
@@ -848,9 +848,9 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(COLUMNS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.columns.size()));
- for (ScanColumn _iter56 : struct.columns)
+ for (ScanColumn _iter64 : struct.columns)
{
- _iter56.write(oprot);
+ _iter64.write(oprot);
}
oprot.writeListEnd();
}
@@ -862,9 +862,9 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(ITERATORS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.iterators.size()));
- for (IteratorSetting _iter57 : struct.iterators)
+ for (IteratorSetting _iter65 : struct.iterators)
{
- _iter57.write(oprot);
+ _iter65.write(oprot);
}
oprot.writeListEnd();
}
@@ -913,36 +913,36 @@ import org.slf4j.LoggerFactory;
if (struct.isSetAuthorizations()) {
{
oprot.writeI32(struct.authorizations.size());
- for (ByteBuffer _iter58 : struct.authorizations)
+ for (ByteBuffer _iter66 : struct.authorizations)
{
- oprot.writeBinary(_iter58);
+ oprot.writeBinary(_iter66);
}
}
}
if (struct.isSetRanges()) {
{
oprot.writeI32(struct.ranges.size());
- for (Range _iter59 : struct.ranges)
+ for (Range _iter67 : struct.ranges)
{
- _iter59.write(oprot);
+ _iter67.write(oprot);
}
}
}
if (struct.isSetColumns()) {
{
oprot.writeI32(struct.columns.size());
- for (ScanColumn _iter60 : struct.columns)
+ for (ScanColumn _iter68 : struct.columns)
{
- _iter60.write(oprot);
+ _iter68.write(oprot);
}
}
}
if (struct.isSetIterators()) {
{
oprot.writeI32(struct.iterators.size());
- for (IteratorSetting _iter61 : struct.iterators)
+ for (IteratorSetting _iter69 : struct.iterators)
{
- _iter61.write(oprot);
+ _iter69.write(oprot);
}
}
}
@@ -957,55 +957,55 @@ import org.slf4j.LoggerFactory;
BitSet incoming = iprot.readBitSet(5);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TSet _set62 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.authorizations = new HashSet<ByteBuffer>(2*_set62.size);
- for (int _i63 = 0; _i63 < _set62.size; ++_i63)
- {
- ByteBuffer _elem64; // required
- _elem64 = iprot.readBinary();
- struct.authorizations.add(_elem64);
+ org.apache.thrift.protocol.TSet _set70 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.authorizations = new HashSet<ByteBuffer>(2*_set70.size);
+ for (int _i71 = 0; _i71 < _set70.size; ++_i71)
+ {
+ ByteBuffer _elem72; // required
+ _elem72 = iprot.readBinary();
+ struct.authorizations.add(_elem72);
}
}
struct.setAuthorizationsIsSet(true);
}
if (incoming.get(1)) {
{
- org.apache.thrift.protocol.TList _list65 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.ranges = new ArrayList<Range>(_list65.size);
- for (int _i66 = 0; _i66 < _list65.size; ++_i66)
- {
- Range _elem67; // required
- _elem67 = new Range();
- _elem67.read(iprot);
- struct.ranges.add(_elem67);
+ org.apache.thrift.protocol.TList _list73 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.ranges = new ArrayList<Range>(_list73.size);
+ for (int _i74 = 0; _i74 < _list73.size; ++_i74)
+ {
+ Range _elem75; // required
+ _elem75 = new Range();
+ _elem75.read(iprot);
+ struct.ranges.add(_elem75);
}
}
struct.setRangesIsSet(true);
}
if (incoming.get(2)) {
{
- org.apache.thrift.protocol.TList _list68 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.columns = new ArrayList<ScanColumn>(_list68.size);
- for (int _i69 = 0; _i69 < _list68.size; ++_i69)
- {
- ScanColumn _elem70; // required
- _elem70 = new ScanColumn();
- _elem70.read(iprot);
- struct.columns.add(_elem70);
+ org.apache.thrift.protocol.TList _list76 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.columns = new ArrayList<ScanColumn>(_list76.size);
+ for (int _i77 = 0; _i77 < _list76.size; ++_i77)
+ {
+ ScanColumn _elem78; // required
+ _elem78 = new ScanColumn();
+ _elem78.read(iprot);
+ struct.columns.add(_elem78);
}
}
struct.setColumnsIsSet(true);
}
if (incoming.get(3)) {
{
- org.apache.thrift.protocol.TList _list71 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.iterators = new ArrayList<IteratorSetting>(_list71.size);
- for (int _i72 = 0; _i72 < _list71.size; ++_i72)
- {
- IteratorSetting _elem73; // required
- _elem73 = new IteratorSetting();
- _elem73.read(iprot);
- struct.iterators.add(_elem73);
+ org.apache.thrift.protocol.TList _list79 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.iterators = new ArrayList<IteratorSetting>(_list79.size);
+ for (int _i80 = 0; _i80 < _list79.size; ++_i80)
+ {
+ IteratorSetting _elem81; // required
+ _elem81 = new IteratorSetting();
+ _elem81.read(iprot);
+ struct.iterators.add(_elem81);
}
}
struct.setIteratorsIsSet(true);
Added: accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java?rev=1477758&view=auto
==============================================================================
--- accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java (added)
+++ accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java Tue Apr 30 18:33:06 2013
@@ -0,0 +1,552 @@
+/*
+ * 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.
+ */
+/**
+ * Autogenerated by Thrift Compiler (0.9.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ * @generated
+ */
+package org.apache.accumulo.proxy.thrift;
+
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@SuppressWarnings("all") public class DiskUsage implements org.apache.thrift.TBase<DiskUsage, DiskUsage._Fields>, java.io.Serializable, Cloneable {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DiskUsage");
+
+ private static final org.apache.thrift.protocol.TField TABLES_FIELD_DESC = new org.apache.thrift.protocol.TField("tables", org.apache.thrift.protocol.TType.LIST, (short)1);
+ private static final org.apache.thrift.protocol.TField USAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("usage", org.apache.thrift.protocol.TType.I64, (short)2);
+
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new DiskUsageStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new DiskUsageTupleSchemeFactory());
+ }
+
+ public List<String> tables; // required
+ public long usage; // required
+
+ /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ TABLES((short)1, "tables"),
+ USAGE((short)2, "usage");
+
+ private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+ static {
+ for (_Fields field : EnumSet.allOf(_Fields.class)) {
+ byName.put(field.getFieldName(), field);
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, or null if its not found.
+ */
+ public static _Fields findByThriftId(int fieldId) {
+ switch(fieldId) {
+ case 1: // TABLES
+ return TABLES;
+ case 2: // USAGE
+ return USAGE;
+ default:
+ return null;
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, throwing an exception
+ * if it is not found.
+ */
+ public static _Fields findByThriftIdOrThrow(int fieldId) {
+ _Fields fields = findByThriftId(fieldId);
+ if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+ return fields;
+ }
+
+ /**
+ * Find the _Fields constant that matches name, or null if its not found.
+ */
+ public static _Fields findByName(String name) {
+ return byName.get(name);
+ }
+
+ private final short _thriftId;
+ private final String _fieldName;
+
+ _Fields(short thriftId, String fieldName) {
+ _thriftId = thriftId;
+ _fieldName = fieldName;
+ }
+
+ public short getThriftFieldId() {
+ return _thriftId;
+ }
+
+ public String getFieldName() {
+ return _fieldName;
+ }
+ }
+
+ // isset id assignments
+ private static final int __USAGE_ISSET_ID = 0;
+ private byte __isset_bitfield = 0;
+ public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+ static {
+ Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+ tmpMap.put(_Fields.TABLES, new org.apache.thrift.meta_data.FieldMetaData("tables", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
+ tmpMap.put(_Fields.USAGE, new org.apache.thrift.meta_data.FieldMetaData("usage", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DiskUsage.class, metaDataMap);
+ }
+
+ public DiskUsage() {
+ }
+
+ public DiskUsage(
+ List<String> tables,
+ long usage)
+ {
+ this();
+ this.tables = tables;
+ this.usage = usage;
+ setUsageIsSet(true);
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public DiskUsage(DiskUsage other) {
+ __isset_bitfield = other.__isset_bitfield;
+ if (other.isSetTables()) {
+ List<String> __this__tables = new ArrayList<String>();
+ for (String other_element : other.tables) {
+ __this__tables.add(other_element);
+ }
+ this.tables = __this__tables;
+ }
+ this.usage = other.usage;
+ }
+
+ public DiskUsage deepCopy() {
+ return new DiskUsage(this);
+ }
+
+ @Override
+ public void clear() {
+ this.tables = null;
+ setUsageIsSet(false);
+ this.usage = 0;
+ }
+
+ public int getTablesSize() {
+ return (this.tables == null) ? 0 : this.tables.size();
+ }
+
+ public java.util.Iterator<String> getTablesIterator() {
+ return (this.tables == null) ? null : this.tables.iterator();
+ }
+
+ public void addToTables(String elem) {
+ if (this.tables == null) {
+ this.tables = new ArrayList<String>();
+ }
+ this.tables.add(elem);
+ }
+
+ public List<String> getTables() {
+ return this.tables;
+ }
+
+ public DiskUsage setTables(List<String> tables) {
+ this.tables = tables;
+ return this;
+ }
+
+ public void unsetTables() {
+ this.tables = null;
+ }
+
+ /** Returns true if field tables is set (has been assigned a value) and false otherwise */
+ public boolean isSetTables() {
+ return this.tables != null;
+ }
+
+ public void setTablesIsSet(boolean value) {
+ if (!value) {
+ this.tables = null;
+ }
+ }
+
+ public long getUsage() {
+ return this.usage;
+ }
+
+ public DiskUsage setUsage(long usage) {
+ this.usage = usage;
+ setUsageIsSet(true);
+ return this;
+ }
+
+ public void unsetUsage() {
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __USAGE_ISSET_ID);
+ }
+
+ /** Returns true if field usage is set (has been assigned a value) and false otherwise */
+ public boolean isSetUsage() {
+ return EncodingUtils.testBit(__isset_bitfield, __USAGE_ISSET_ID);
+ }
+
+ public void setUsageIsSet(boolean value) {
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __USAGE_ISSET_ID, value);
+ }
+
+ public void setFieldValue(_Fields field, Object value) {
+ switch (field) {
+ case TABLES:
+ if (value == null) {
+ unsetTables();
+ } else {
+ setTables((List<String>)value);
+ }
+ break;
+
+ case USAGE:
+ if (value == null) {
+ unsetUsage();
+ } else {
+ setUsage((Long)value);
+ }
+ break;
+
+ }
+ }
+
+ public Object getFieldValue(_Fields field) {
+ switch (field) {
+ case TABLES:
+ return getTables();
+
+ case USAGE:
+ return Long.valueOf(getUsage());
+
+ }
+ throw new IllegalStateException();
+ }
+
+ /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+ public boolean isSet(_Fields field) {
+ if (field == null) {
+ throw new IllegalArgumentException();
+ }
+
+ switch (field) {
+ case TABLES:
+ return isSetTables();
+ case USAGE:
+ return isSetUsage();
+ }
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof DiskUsage)
+ return this.equals((DiskUsage)that);
+ return false;
+ }
+
+ public boolean equals(DiskUsage that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_tables = true && this.isSetTables();
+ boolean that_present_tables = true && that.isSetTables();
+ if (this_present_tables || that_present_tables) {
+ if (!(this_present_tables && that_present_tables))
+ return false;
+ if (!this.tables.equals(that.tables))
+ return false;
+ }
+
+ boolean this_present_usage = true;
+ boolean that_present_usage = true;
+ if (this_present_usage || that_present_usage) {
+ if (!(this_present_usage && that_present_usage))
+ return false;
+ if (this.usage != that.usage)
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ return 0;
+ }
+
+ public int compareTo(DiskUsage other) {
+ if (!getClass().equals(other.getClass())) {
+ return getClass().getName().compareTo(other.getClass().getName());
+ }
+
+ int lastComparison = 0;
+ DiskUsage typedOther = (DiskUsage)other;
+
+ lastComparison = Boolean.valueOf(isSetTables()).compareTo(typedOther.isSetTables());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetTables()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tables, typedOther.tables);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetUsage()).compareTo(typedOther.isSetUsage());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetUsage()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.usage, typedOther.usage);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ return 0;
+ }
+
+ public _Fields fieldForId(int fieldId) {
+ return _Fields.findByThriftId(fieldId);
+ }
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder("DiskUsage(");
+ boolean first = true;
+
+ sb.append("tables:");
+ if (this.tables == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.tables);
+ }
+ first = false;
+ if (!first) sb.append(", ");
+ sb.append("usage:");
+ sb.append(this.usage);
+ first = false;
+ sb.append(")");
+ return sb.toString();
+ }
+
+ public void validate() throws org.apache.thrift.TException {
+ // check for required fields
+ // check for sub-struct validity
+ }
+
+ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+ try {
+ write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+ try {
+ // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+ __isset_bitfield = 0;
+ read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private static class DiskUsageStandardSchemeFactory implements SchemeFactory {
+ public DiskUsageStandardScheme getScheme() {
+ return new DiskUsageStandardScheme();
+ }
+ }
+
+ private static class DiskUsageStandardScheme extends StandardScheme<DiskUsage> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, DiskUsage struct) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField schemeField;
+ iprot.readStructBegin();
+ while (true)
+ {
+ schemeField = iprot.readFieldBegin();
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ break;
+ }
+ switch (schemeField.id) {
+ case 1: // TABLES
+ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+ {
+ org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
+ struct.tables = new ArrayList<String>(_list0.size);
+ for (int _i1 = 0; _i1 < _list0.size; ++_i1)
+ {
+ String _elem2; // required
+ _elem2 = iprot.readString();
+ struct.tables.add(_elem2);
+ }
+ iprot.readListEnd();
+ }
+ struct.setTablesIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 2: // USAGE
+ if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+ struct.usage = iprot.readI64();
+ struct.setUsageIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ default:
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+
+ // check for required fields of primitive type, which can't be checked in the validate method
+ struct.validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot, DiskUsage struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.tables != null) {
+ oprot.writeFieldBegin(TABLES_FIELD_DESC);
+ {
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.tables.size()));
+ for (String _iter3 : struct.tables)
+ {
+ oprot.writeString(_iter3);
+ }
+ oprot.writeListEnd();
+ }
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldBegin(USAGE_FIELD_DESC);
+ oprot.writeI64(struct.usage);
+ oprot.writeFieldEnd();
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class DiskUsageTupleSchemeFactory implements SchemeFactory {
+ public DiskUsageTupleScheme getScheme() {
+ return new DiskUsageTupleScheme();
+ }
+ }
+
+ private static class DiskUsageTupleScheme extends TupleScheme<DiskUsage> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, DiskUsage struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.isSetTables()) {
+ optionals.set(0);
+ }
+ if (struct.isSetUsage()) {
+ optionals.set(1);
+ }
+ oprot.writeBitSet(optionals, 2);
+ if (struct.isSetTables()) {
+ {
+ oprot.writeI32(struct.tables.size());
+ for (String _iter4 : struct.tables)
+ {
+ oprot.writeString(_iter4);
+ }
+ }
+ }
+ if (struct.isSetUsage()) {
+ oprot.writeI64(struct.usage);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, DiskUsage struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ BitSet incoming = iprot.readBitSet(2);
+ if (incoming.get(0)) {
+ {
+ org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.tables = new ArrayList<String>(_list5.size);
+ for (int _i6 = 0; _i6 < _list5.size; ++_i6)
+ {
+ String _elem7; // required
+ _elem7 = iprot.readString();
+ struct.tables.add(_elem7);
+ }
+ }
+ struct.setTablesIsSet(true);
+ }
+ if (incoming.get(1)) {
+ struct.usage = iprot.readI64();
+ struct.setUsageIsSet(true);
+ }
+ }
+ }
+
+}
+
Propchange: accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java?rev=1477758&r1=1477757&r2=1477758&view=diff
==============================================================================
--- accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java (original)
+++ accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java Tue Apr 30 18:33:06 2013
@@ -615,15 +615,15 @@ import org.slf4j.LoggerFactory;
case 4: // PROPERTIES
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map8 = iprot.readMapBegin();
- struct.properties = new HashMap<String,String>(2*_map8.size);
- for (int _i9 = 0; _i9 < _map8.size; ++_i9)
+ org.apache.thrift.protocol.TMap _map16 = iprot.readMapBegin();
+ struct.properties = new HashMap<String,String>(2*_map16.size);
+ for (int _i17 = 0; _i17 < _map16.size; ++_i17)
{
- String _key10; // required
- String _val11; // required
- _key10 = iprot.readString();
- _val11 = iprot.readString();
- struct.properties.put(_key10, _val11);
+ String _key18; // required
+ String _val19; // required
+ _key18 = iprot.readString();
+ _val19 = iprot.readString();
+ struct.properties.put(_key18, _val19);
}
iprot.readMapEnd();
}
@@ -664,10 +664,10 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(PROPERTIES_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.properties.size()));
- for (Map.Entry<String, String> _iter12 : struct.properties.entrySet())
+ for (Map.Entry<String, String> _iter20 : struct.properties.entrySet())
{
- oprot.writeString(_iter12.getKey());
- oprot.writeString(_iter12.getValue());
+ oprot.writeString(_iter20.getKey());
+ oprot.writeString(_iter20.getValue());
}
oprot.writeMapEnd();
}
@@ -716,10 +716,10 @@ import org.slf4j.LoggerFactory;
if (struct.isSetProperties()) {
{
oprot.writeI32(struct.properties.size());
- for (Map.Entry<String, String> _iter13 : struct.properties.entrySet())
+ for (Map.Entry<String, String> _iter21 : struct.properties.entrySet())
{
- oprot.writeString(_iter13.getKey());
- oprot.writeString(_iter13.getValue());
+ oprot.writeString(_iter21.getKey());
+ oprot.writeString(_iter21.getValue());
}
}
}
@@ -743,15 +743,15 @@ import org.slf4j.LoggerFactory;
}
if (incoming.get(3)) {
{
- org.apache.thrift.protocol.TMap _map14 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.properties = new HashMap<String,String>(2*_map14.size);
- for (int _i15 = 0; _i15 < _map14.size; ++_i15)
+ org.apache.thrift.protocol.TMap _map22 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.properties = new HashMap<String,String>(2*_map22.size);
+ for (int _i23 = 0; _i23 < _map22.size; ++_i23)
{
- String _key16; // required
- String _val17; // required
- _key16 = iprot.readString();
- _val17 = iprot.readString();
- struct.properties.put(_key16, _val17);
+ String _key24; // required
+ String _val25; // required
+ _key24 = iprot.readString();
+ _val25 = iprot.readString();
+ struct.properties.put(_key24, _val25);
}
}
struct.setPropertiesIsSet(true);
Modified: accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanOptions.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanOptions.java?rev=1477758&r1=1477757&r2=1477758&view=diff
==============================================================================
--- accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanOptions.java (original)
+++ accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanOptions.java Tue Apr 30 18:33:06 2013
@@ -703,13 +703,13 @@ import org.slf4j.LoggerFactory;
case 1: // AUTHORIZATIONS
if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
{
- org.apache.thrift.protocol.TSet _set18 = iprot.readSetBegin();
- struct.authorizations = new HashSet<ByteBuffer>(2*_set18.size);
- for (int _i19 = 0; _i19 < _set18.size; ++_i19)
+ org.apache.thrift.protocol.TSet _set26 = iprot.readSetBegin();
+ struct.authorizations = new HashSet<ByteBuffer>(2*_set26.size);
+ for (int _i27 = 0; _i27 < _set26.size; ++_i27)
{
- ByteBuffer _elem20; // required
- _elem20 = iprot.readBinary();
- struct.authorizations.add(_elem20);
+ ByteBuffer _elem28; // required
+ _elem28 = iprot.readBinary();
+ struct.authorizations.add(_elem28);
}
iprot.readSetEnd();
}
@@ -730,14 +730,14 @@ import org.slf4j.LoggerFactory;
case 3: // COLUMNS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list21 = iprot.readListBegin();
- struct.columns = new ArrayList<ScanColumn>(_list21.size);
- for (int _i22 = 0; _i22 < _list21.size; ++_i22)
+ org.apache.thrift.protocol.TList _list29 = iprot.readListBegin();
+ struct.columns = new ArrayList<ScanColumn>(_list29.size);
+ for (int _i30 = 0; _i30 < _list29.size; ++_i30)
{
- ScanColumn _elem23; // required
- _elem23 = new ScanColumn();
- _elem23.read(iprot);
- struct.columns.add(_elem23);
+ ScanColumn _elem31; // required
+ _elem31 = new ScanColumn();
+ _elem31.read(iprot);
+ struct.columns.add(_elem31);
}
iprot.readListEnd();
}
@@ -749,14 +749,14 @@ import org.slf4j.LoggerFactory;
case 4: // ITERATORS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list24 = iprot.readListBegin();
- struct.iterators = new ArrayList<IteratorSetting>(_list24.size);
- for (int _i25 = 0; _i25 < _list24.size; ++_i25)
+ org.apache.thrift.protocol.TList _list32 = iprot.readListBegin();
+ struct.iterators = new ArrayList<IteratorSetting>(_list32.size);
+ for (int _i33 = 0; _i33 < _list32.size; ++_i33)
{
- IteratorSetting _elem26; // required
- _elem26 = new IteratorSetting();
- _elem26.read(iprot);
- struct.iterators.add(_elem26);
+ IteratorSetting _elem34; // required
+ _elem34 = new IteratorSetting();
+ _elem34.read(iprot);
+ struct.iterators.add(_elem34);
}
iprot.readListEnd();
}
@@ -793,9 +793,9 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(AUTHORIZATIONS_FIELD_DESC);
{
oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.authorizations.size()));
- for (ByteBuffer _iter27 : struct.authorizations)
+ for (ByteBuffer _iter35 : struct.authorizations)
{
- oprot.writeBinary(_iter27);
+ oprot.writeBinary(_iter35);
}
oprot.writeSetEnd();
}
@@ -814,9 +814,9 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(COLUMNS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.columns.size()));
- for (ScanColumn _iter28 : struct.columns)
+ for (ScanColumn _iter36 : struct.columns)
{
- _iter28.write(oprot);
+ _iter36.write(oprot);
}
oprot.writeListEnd();
}
@@ -828,9 +828,9 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(ITERATORS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.iterators.size()));
- for (IteratorSetting _iter29 : struct.iterators)
+ for (IteratorSetting _iter37 : struct.iterators)
{
- _iter29.write(oprot);
+ _iter37.write(oprot);
}
oprot.writeListEnd();
}
@@ -879,9 +879,9 @@ import org.slf4j.LoggerFactory;
if (struct.isSetAuthorizations()) {
{
oprot.writeI32(struct.authorizations.size());
- for (ByteBuffer _iter30 : struct.authorizations)
+ for (ByteBuffer _iter38 : struct.authorizations)
{
- oprot.writeBinary(_iter30);
+ oprot.writeBinary(_iter38);
}
}
}
@@ -891,18 +891,18 @@ import org.slf4j.LoggerFactory;
if (struct.isSetColumns()) {
{
oprot.writeI32(struct.columns.size());
- for (ScanColumn _iter31 : struct.columns)
+ for (ScanColumn _iter39 : struct.columns)
{
- _iter31.write(oprot);
+ _iter39.write(oprot);
}
}
}
if (struct.isSetIterators()) {
{
oprot.writeI32(struct.iterators.size());
- for (IteratorSetting _iter32 : struct.iterators)
+ for (IteratorSetting _iter40 : struct.iterators)
{
- _iter32.write(oprot);
+ _iter40.write(oprot);
}
}
}
@@ -917,13 +917,13 @@ import org.slf4j.LoggerFactory;
BitSet incoming = iprot.readBitSet(5);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TSet _set33 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.authorizations = new HashSet<ByteBuffer>(2*_set33.size);
- for (int _i34 = 0; _i34 < _set33.size; ++_i34)
+ org.apache.thrift.protocol.TSet _set41 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.authorizations = new HashSet<ByteBuffer>(2*_set41.size);
+ for (int _i42 = 0; _i42 < _set41.size; ++_i42)
{
- ByteBuffer _elem35; // required
- _elem35 = iprot.readBinary();
- struct.authorizations.add(_elem35);
+ ByteBuffer _elem43; // required
+ _elem43 = iprot.readBinary();
+ struct.authorizations.add(_elem43);
}
}
struct.setAuthorizationsIsSet(true);
@@ -935,28 +935,28 @@ import org.slf4j.LoggerFactory;
}
if (incoming.get(2)) {
{
- org.apache.thrift.protocol.TList _list36 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.columns = new ArrayList<ScanColumn>(_list36.size);
- for (int _i37 = 0; _i37 < _list36.size; ++_i37)
+ org.apache.thrift.protocol.TList _list44 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.columns = new ArrayList<ScanColumn>(_list44.size);
+ for (int _i45 = 0; _i45 < _list44.size; ++_i45)
{
- ScanColumn _elem38; // required
- _elem38 = new ScanColumn();
- _elem38.read(iprot);
- struct.columns.add(_elem38);
+ ScanColumn _elem46; // required
+ _elem46 = new ScanColumn();
+ _elem46.read(iprot);
+ struct.columns.add(_elem46);
}
}
struct.setColumnsIsSet(true);
}
if (incoming.get(3)) {
{
- org.apache.thrift.protocol.TList _list39 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.iterators = new ArrayList<IteratorSetting>(_list39.size);
- for (int _i40 = 0; _i40 < _list39.size; ++_i40)
+ org.apache.thrift.protocol.TList _list47 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.iterators = new ArrayList<IteratorSetting>(_list47.size);
+ for (int _i48 = 0; _i48 < _list47.size; ++_i48)
{
- IteratorSetting _elem41; // required
- _elem41 = new IteratorSetting();
- _elem41.read(iprot);
- struct.iterators.add(_elem41);
+ IteratorSetting _elem49; // required
+ _elem49 = new IteratorSetting();
+ _elem49.read(iprot);
+ struct.iterators.add(_elem49);
}
}
struct.setIteratorsIsSet(true);
Modified: accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanResult.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanResult.java?rev=1477758&r1=1477757&r2=1477758&view=diff
==============================================================================
--- accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanResult.java (original)
+++ accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanResult.java Tue Apr 30 18:33:06 2013
@@ -432,14 +432,14 @@ import org.slf4j.LoggerFactory;
case 1: // RESULTS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
- struct.results = new ArrayList<KeyValue>(_list0.size);
- for (int _i1 = 0; _i1 < _list0.size; ++_i1)
+ org.apache.thrift.protocol.TList _list8 = iprot.readListBegin();
+ struct.results = new ArrayList<KeyValue>(_list8.size);
+ for (int _i9 = 0; _i9 < _list8.size; ++_i9)
{
- KeyValue _elem2; // required
- _elem2 = new KeyValue();
- _elem2.read(iprot);
- struct.results.add(_elem2);
+ KeyValue _elem10; // required
+ _elem10 = new KeyValue();
+ _elem10.read(iprot);
+ struct.results.add(_elem10);
}
iprot.readListEnd();
}
@@ -475,9 +475,9 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(RESULTS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.results.size()));
- for (KeyValue _iter3 : struct.results)
+ for (KeyValue _iter11 : struct.results)
{
- _iter3.write(oprot);
+ _iter11.write(oprot);
}
oprot.writeListEnd();
}
@@ -514,9 +514,9 @@ import org.slf4j.LoggerFactory;
if (struct.isSetResults()) {
{
oprot.writeI32(struct.results.size());
- for (KeyValue _iter4 : struct.results)
+ for (KeyValue _iter12 : struct.results)
{
- _iter4.write(oprot);
+ _iter12.write(oprot);
}
}
}
@@ -531,14 +531,14 @@ import org.slf4j.LoggerFactory;
BitSet incoming = iprot.readBitSet(2);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.results = new ArrayList<KeyValue>(_list5.size);
- for (int _i6 = 0; _i6 < _list5.size; ++_i6)
+ org.apache.thrift.protocol.TList _list13 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.results = new ArrayList<KeyValue>(_list13.size);
+ for (int _i14 = 0; _i14 < _list13.size; ++_i14)
{
- KeyValue _elem7; // required
- _elem7 = new KeyValue();
- _elem7.read(iprot);
- struct.results.add(_elem7);
+ KeyValue _elem15; // required
+ _elem15 = new KeyValue();
+ _elem15.read(iprot);
+ struct.results.add(_elem15);
}
}
struct.setResultsIsSet(true);
Modified: accumulo/trunk/proxy/src/main/thrift/proxy.thrift
URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/main/thrift/proxy.thrift?rev=1477758&r1=1477757&r2=1477758&view=diff
==============================================================================
--- accumulo/trunk/proxy/src/main/thrift/proxy.thrift (original)
+++ accumulo/trunk/proxy/src/main/thrift/proxy.thrift Tue Apr 30 18:33:06 2013
@@ -43,6 +43,11 @@ struct ColumnUpdate {
6:optional bool deleteCell
}
+struct DiskUsage {
+ 1:list<string> tables,
+ 2:i64 usage
+}
+
struct KeyValue {
1:Key key,
2:binary value
@@ -287,6 +292,7 @@ service AccumuloProxy
set<Range> splitRangeByTablets (1:binary login, 2:string tableName, 3:Range range, 4:i32 maxSplits) throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
bool tableExists (1:binary login, 2:string tableName);
map<string,string> tableIdMap (1:binary login);
+ list<DiskUsage> getDiskUsage(1:binary login, 2:set<string> tables) throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
// instance operations
void pingTabletServer(1:binary login, 2:string tserver) throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
@@ -314,7 +320,6 @@ service AccumuloProxy
void revokeSystemPermission (1:binary login, 2:string user, 3:SystemPermission perm) throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
void revokeTablePermission (1:binary login, 2:string user, 3:string table, 4:TablePermission perm) throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
-
// scanning
string createBatchScanner(1:binary login, 2:string tableName, 3:BatchScanOptions options) throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
string createScanner(1:binary login, 2:string tableName, 3:ScanOptions options) throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
Modified: accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java?rev=1477758&r1=1477757&r2=1477758&view=diff
==============================================================================
--- accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java (original)
+++ accumulo/trunk/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java Tue Apr 30 18:33:06 2013
@@ -60,6 +60,7 @@ import org.apache.accumulo.proxy.thrift.
import org.apache.accumulo.proxy.thrift.ColumnUpdate;
import org.apache.accumulo.proxy.thrift.CompactionReason;
import org.apache.accumulo.proxy.thrift.CompactionType;
+import org.apache.accumulo.proxy.thrift.DiskUsage;
import org.apache.accumulo.proxy.thrift.IteratorScope;
import org.apache.accumulo.proxy.thrift.IteratorSetting;
import org.apache.accumulo.proxy.thrift.Key;
@@ -307,6 +308,10 @@ public class SimpleTest {
client.updateAndFlush(creds, doesNotExist, new HashMap<ByteBuffer,List<ColumnUpdate>>());
fail("exception not thrown");
} catch (TableNotFoundException ex) {}
+ try {
+ client.getDiskUsage(creds, Collections.singleton(doesNotExist));
+ fail("exception not thrown");
+ } catch (TableNotFoundException ex) {}
}
@Test(timeout = 10000)
@@ -721,14 +726,34 @@ public class SimpleTest {
client.closeScanner(scanner);
assertEquals(10, more.getResults().size());
client.deleteTable(creds, "test2");
-
+
// don't know how to test this, call it just for fun
client.clearLocatorCache(creds, TABLE_TEST);
-
+
// compact
client.compactTable(creds, TABLE_TEST, null, null, null, true, true);
assertEquals(1, countFiles(TABLE_TEST));
-
+
+ // get disk usage
+ client.cloneTable(creds, TABLE_TEST, "test2", true, null, null);
+ Set<String> tablesToScan = new HashSet<String>();
+ tablesToScan.add(TABLE_TEST);
+ tablesToScan.add("test2");
+ tablesToScan.add("foo");
+ client.createTable(creds, "foo", true, TimeType.MILLIS);
+ List<DiskUsage> diskUsage = (client.getDiskUsage(creds, tablesToScan));
+ assertEquals(2, diskUsage.size());
+ assertEquals(1, diskUsage.get(0).getTables().size());
+ assertEquals(2, diskUsage.get(1).getTables().size());
+ client.compactTable(creds, "test2", null, null, null, true, true);
+ diskUsage = (client.getDiskUsage(creds, tablesToScan));
+ assertEquals(3, diskUsage.size());
+ assertEquals(1, diskUsage.get(0).getTables().size());
+ assertEquals(1, diskUsage.get(1).getTables().size());
+ assertEquals(1, diskUsage.get(2).getTables().size());
+ client.deleteTable(creds, "foo");
+ client.deleteTable(creds, "test2");
+
// export/import
String dir = folder.getRoot() + "/test";
String destDir = folder.getRoot() + "/test_dest";
Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java?rev=1477758&r1=1477757&r2=1477758&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java Tue Apr 30 18:33:06 2013
@@ -67,12 +67,16 @@ import javax.management.StandardMBean;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.client.impl.ScannerImpl;
import org.apache.accumulo.core.client.impl.TabletType;
import org.apache.accumulo.core.client.impl.Translator;
import org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode;
+import org.apache.accumulo.core.client.impl.thrift.TableOperationExceptionType;
import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException;
+import org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.constraints.Constraint.Environment;
@@ -105,11 +109,14 @@ import org.apache.accumulo.core.master.t
import org.apache.accumulo.core.master.thrift.TabletLoadState;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.core.security.CredentialHelper;
import org.apache.accumulo.core.security.SecurityUtil;
+import org.apache.accumulo.core.security.TablePermission;
import org.apache.accumulo.core.security.thrift.TCredentials;
import org.apache.accumulo.core.tabletserver.thrift.ActiveCompaction;
import org.apache.accumulo.core.tabletserver.thrift.ActiveScan;
import org.apache.accumulo.core.tabletserver.thrift.ConstraintViolationException;
+import org.apache.accumulo.core.tabletserver.thrift.DiskUsage;
import org.apache.accumulo.core.tabletserver.thrift.NoSuchScanIDException;
import org.apache.accumulo.core.tabletserver.thrift.NotServingTabletException;
import org.apache.accumulo.core.tabletserver.thrift.ScanState;
@@ -129,6 +136,7 @@ import org.apache.accumulo.core.util.Ser
import org.apache.accumulo.core.util.ServerServices.Service;
import org.apache.accumulo.core.util.SimpleThreadPool;
import org.apache.accumulo.core.util.Stat;
+import org.apache.accumulo.core.util.TableDiskUsage;
import org.apache.accumulo.core.util.ThriftUtil;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.core.zookeeper.ZooUtil;
@@ -882,7 +890,7 @@ public class TabletServer extends Abstra
@Override
public List<TKeyExtent> bulkImport(TInfo tinfo, TCredentials credentials, long tid, Map<TKeyExtent,Map<String,MapFileInfo>> files, boolean setTime)
throws ThriftSecurityException {
-
+
if (!security.canPerformSystemActions(credentials))
throw new ThriftSecurityException(credentials.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
@@ -1648,7 +1656,7 @@ public class TabletServer extends Abstra
@Override
public void update(TInfo tinfo, TCredentials credentials, TKeyExtent tkeyExtent, TMutation tmutation) throws NotServingTabletException,
ConstraintViolationException, ThriftSecurityException {
-
+
if (!security.canWrite(credentials, new String(tkeyExtent.getTable())))
throw new ThriftSecurityException(credentials.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
KeyExtent keyExtent = new KeyExtent(tkeyExtent);
@@ -1695,8 +1703,8 @@ public class TabletServer extends Abstra
}
@Override
- public void splitTablet(TInfo tinfo, TCredentials credentials, TKeyExtent tkeyExtent, ByteBuffer splitPoint)
- throws NotServingTabletException, ThriftSecurityException {
+ public void splitTablet(TInfo tinfo, TCredentials credentials, TKeyExtent tkeyExtent, ByteBuffer splitPoint) throws NotServingTabletException,
+ ThriftSecurityException {
String tableId = new String(ByteBufferUtil.toBytes(tkeyExtent.table));
if (!security.canSplitTablet(credentials, tableId))
@@ -1753,8 +1761,7 @@ public class TabletServer extends Abstra
private ZooCache masterLockCache = new ZooCache();
- private void checkPermission(TCredentials credentials, String lock, boolean requiresSystemPermission, final String request)
- throws ThriftSecurityException {
+ private void checkPermission(TCredentials credentials, String lock, boolean requiresSystemPermission, final String request) throws ThriftSecurityException {
if (requiresSystemPermission) {
boolean fatal = false;
try {
@@ -1957,7 +1964,7 @@ public class TabletServer extends Abstra
@Override
public void halt(TInfo tinfo, TCredentials credentials, String lock) throws ThriftSecurityException {
- checkPermission(credentials, lock, true, "halt");
+ checkPermission(credentials, lock, true, "halt");
Halt.halt(0, new Runnable() {
@Override
@@ -2018,8 +2025,7 @@ public class TabletServer extends Abstra
}
@Override
- public void compact(TInfo tinfo, TCredentials credentials, String lock, String tableId, ByteBuffer startRow, ByteBuffer endRow)
- throws TException {
+ public void compact(TInfo tinfo, TCredentials credentials, String lock, String tableId, ByteBuffer startRow, ByteBuffer endRow) throws TException {
try {
checkPermission(credentials, lock, true, "compact");
} catch (ThriftSecurityException e) {
@@ -2114,13 +2120,40 @@ public class TabletServer extends Abstra
}
@Override
+ public List<DiskUsage> getDiskUsage(Set<String> tables, TCredentials credentials) throws ThriftTableOperationException, ThriftSecurityException, TException {
+ try {
+ Connector conn = instance.getConnector(credentials.getPrincipal(), CredentialHelper.extractToken(credentials));
+
+ for (String table : tables) {
+ if (conn.tableOperations().exists(table) && !conn.securityOperations().hasTablePermission(credentials.getPrincipal(), table, TablePermission.READ))
+ throw new AccumuloSecurityException(credentials.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
+ }
+
+ Map<TreeSet<String>,Long> diskUsage = TableDiskUsage.getDiskUsage(getServerConfig().getConfiguration(), tables, fs, conn);
+ List<DiskUsage> retUsages = new ArrayList<DiskUsage>();
+ for (Map.Entry<TreeSet<String>,Long> usageItem : diskUsage.entrySet()) {
+ retUsages.add(new DiskUsage(new ArrayList<String>(usageItem.getKey()), usageItem.getValue()));
+ }
+ return retUsages;
+
+ } catch (AccumuloSecurityException e) {
+ // *.security.thrift.SecurityErrorCode is deprecated- let's assume the two stay in sync...
+ throw new ThriftSecurityException(credentials.getPrincipal(), SecurityErrorCode.valueOf(e.getSecurityErrorCode().name()));
+ } catch (TableNotFoundException e) {
+ throw new ThriftTableOperationException(null, e.getTableName(), null, TableOperationExceptionType.NOTFOUND, "Table was not found");
+ } catch (Exception e) {
+ throw new TException(e);
+ }
+ }
+
+ @Override
public List<ActiveCompaction> getActiveCompactions(TInfo tinfo, TCredentials credentials) throws ThriftSecurityException, TException {
try {
checkPermission(credentials, null, true, "getActiveCompactions");
} catch (ThriftSecurityException e) {
log.error(e, e);
throw new RuntimeException(e);
- }
+ }
List<CompactionInfo> compactions = Compactor.getRunningCompactions();
List<ActiveCompaction> ret = new ArrayList<ActiveCompaction>(compactions.size());
@@ -2181,7 +2214,7 @@ public class TabletServer extends Abstra
Iterator<Entry<KeyExtent,Tablet>> iter = copyOnlineTablets.entrySet().iterator();
// bail early now if we're shutting down
- while (iter.hasNext() && !majorCompactorDisabled) {
+ while (iter.hasNext() && !majorCompactorDisabled) {
Entry<KeyExtent,Tablet> entry = iter.next();
@@ -2472,7 +2505,7 @@ public class TabletServer extends Abstra
enqueueMasterMessage(new TabletStatusMessage(TabletLoadState.LOAD_FAILURE, extent));
throw new RuntimeException(e);
}
-
+
if (locationToOpen == null) {
log.debug("Reporting tablet " + extent + " assignment failure: unable to verify Tablet Information");
synchronized (openingTablets) {
@@ -2482,7 +2515,7 @@ public class TabletServer extends Abstra
enqueueMasterMessage(new TabletStatusMessage(TabletLoadState.LOAD_FAILURE, extent));
return;
}
-
+
Tablet tablet = null;
boolean successful = false;
@@ -2505,7 +2538,7 @@ public class TabletServer extends Abstra
if (tablet.getNumEntriesInMemory() > 0 && !tablet.minorCompactNow(MinorCompactionReason.SYSTEM)) {
throw new RuntimeException("Minor compaction after recovery fails for " + extent);
}
-
+
Assignment assignment = new Assignment(extent, getTabletSession());
TabletStateStore.setLocation(assignment);
@@ -2886,8 +2919,7 @@ public class TabletServer extends Abstra
}
public static Pair<Text,KeyExtent> verifyTabletInformation(KeyExtent extent, TServerInstance instance, SortedMap<Key,Value> tabletsKeyValues,
- String clientAddress,
- ZooLock lock) throws AccumuloSecurityException, DistributedStoreException, AccumuloException {
+ String clientAddress, ZooLock lock) throws AccumuloSecurityException, DistributedStoreException, AccumuloException {
log.debug("verifying extent " + extent);
if (extent.isRootTablet()) {
@@ -2900,11 +2932,11 @@ public class TabletServer extends Abstra
ScannerImpl scanner = new ScannerImpl(HdfsZooInstance.getInstance(), SecurityConstants.getSystemCredentials(), Constants.METADATA_TABLE_ID,
Constants.NO_AUTHS);
scanner.setRange(extent.toMetadataRange());
-
+
TreeMap<Key,Value> tkv = new TreeMap<Key,Value>();
for (Entry<Key,Value> entry : scanner)
tkv.put(entry.getKey(), entry.getValue());
-
+
// only populate map after success
if (tabletsKeyValues == null) {
tabletsKeyValues = tkv;
@@ -2984,20 +3016,20 @@ public class TabletServer extends Abstra
return null;
}
}
-
+
if (dir == null) {
throw new AccumuloException("Metadata entry does not have directory (" + metadataEntry + ")");
}
-
+
if (time == null) {
throw new AccumuloException("Metadata entry does not have time (" + metadataEntry + ")");
}
-
+
if (future == null) {
log.info("The master has not assigned " + extent + " to " + instance);
return null;
}
-
+
if (!instance.equals(future)) {
log.info("Table " + extent + " has been assigned to " + future + " which is not " + instance);
return null;
Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java?rev=1477758&r1=1477757&r2=1477758&view=diff
==============================================================================
--- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java (original)
+++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/performance/thrift/NullTserver.java Tue Apr 30 18:33:06 2013
@@ -23,7 +23,10 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
+import org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException;
+import org.apache.accumulo.core.tabletserver.thrift.DiskUsage;
import org.apache.accumulo.trace.thrift.TInfo;
import org.apache.accumulo.core.cli.Help;
import org.apache.accumulo.core.client.Instance;
@@ -208,6 +211,11 @@ public class NullTserver {
public List<ActiveCompaction> getActiveCompactions(TInfo tinfo, TCredentials credentials) throws ThriftSecurityException, TException {
return new ArrayList<ActiveCompaction>();
}
+
+ @Override
+ public List<DiskUsage> getDiskUsage(Set<String> tables, TCredentials credentials) throws ThriftSecurityException, ThriftTableOperationException, TException {
+ return null;
+ }
}
static class Opts extends Help {
Added: accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TableOperationsIT.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TableOperationsIT.java?rev=1477758&view=auto
==============================================================================
--- accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TableOperationsIT.java (added)
+++ accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TableOperationsIT.java Tue Apr 30 18:33:06 2013
@@ -0,0 +1,95 @@
+/*
+ * 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.
+ */
+package org.apache.accumulo.test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.accumulo.core.client.AccumuloException;
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.TableExistsException;
+import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.client.ZooKeeperInstance;
+import org.apache.accumulo.core.client.admin.DiskUsage;
+import org.apache.accumulo.core.client.security.tokens.PasswordToken;
+import org.apache.accumulo.core.security.CredentialHelper;
+import org.apache.accumulo.core.security.TablePermission;
+import org.apache.accumulo.core.security.thrift.TCredentials;
+import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
+import org.apache.thrift.TException;
+import org.apache.thrift.transport.TTransportException;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+public class TableOperationsIT {
+
+ static TemporaryFolder tempFolder = new TemporaryFolder();
+ static final String ROOT_PASS = "password";
+
+ static MiniAccumuloCluster accumuloCluster;
+
+ static Connector connector;
+ static TabletClientService.Client client;
+
+ static TCredentials creds;
+
+ @BeforeClass
+ public static void startUp() throws IOException, AccumuloException, AccumuloSecurityException, TTransportException, InterruptedException {
+ tempFolder.create();
+ accumuloCluster = new MiniAccumuloCluster(tempFolder.getRoot(), ROOT_PASS);
+
+ accumuloCluster.start();
+
+ ZooKeeperInstance instance = new ZooKeeperInstance(accumuloCluster.getInstanceName(), accumuloCluster.getZooKeepers());
+ connector = instance.getConnector("root", ROOT_PASS.getBytes());
+ creds = CredentialHelper.create("root", new PasswordToken("password"), connector.getInstance().getInstanceID());
+ }
+
+ @Test
+ public void getDiskUsage() throws TableExistsException, AccumuloException, AccumuloSecurityException, TableNotFoundException, TException {
+ connector.tableOperations().create("table1");
+ List<DiskUsage> diskUsage = connector.tableOperations().getDiskUsage(Collections.singleton("table1"));
+ assertEquals(1, diskUsage.size());
+ assertEquals(0, (long) diskUsage.get(0).getUsage());
+ assertEquals("table1", diskUsage.get(0).getTables().iterator().next());
+
+ connector.securityOperations().revokeTablePermission(creds.getPrincipal(), "table1", TablePermission.READ);
+ try {
+ connector.tableOperations().getDiskUsage(Collections.singleton("table1"));
+ fail("Should throw securityexception");
+ } catch(AccumuloSecurityException e) {}
+
+ connector.tableOperations().delete("table1");
+ try {
+ connector.tableOperations().getDiskUsage(Collections.singleton("table1"));
+ fail("Should throw tablenotfound");
+ } catch (TableNotFoundException e) {}
+ }
+
+ @AfterClass
+ public static void shutDown() throws IOException, InterruptedException {
+ accumuloCluster.stop();
+ tempFolder.delete();
+ }
+}
Propchange: accumulo/trunk/test/src/test/java/org/apache/accumulo/test/TableOperationsIT.java
------------------------------------------------------------------------------
svn:eol-style = native