You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by vi...@apache.org on 2012/10/29 16:22:31 UTC
svn commit: r1403360 [3/7] - in /accumulo/branches/ACCUMULO-259: ./
assemble/ assemble/platform/debian/ assemble/platform/debian/init.d/ bin/
conf/ conf/examples/1GB/native-standalone/ conf/examples/1GB/standalone/
conf/examples/2GB/native-standalone/ ...
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java?rev=1403360&r1=1403359&r2=1403360&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java Mon Oct 29 15:22:24 2012
@@ -74,13 +74,6 @@ import org.apache.accumulo.core.util.Tex
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.commons.codec.binary.Base64;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.filecache.DistributedCache;
-import org.apache.hadoop.fs.FSDataInputStream;
-import org.apache.hadoop.fs.FSDataOutputStream;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.fs.permission.FsAction;
-import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.mapreduce.InputFormat;
@@ -115,7 +108,7 @@ public abstract class InputFormatBase<K,
private static final String INPUT_INFO_HAS_BEEN_SET = PREFIX + ".configured";
private static final String INSTANCE_HAS_BEEN_SET = PREFIX + ".instanceConfigured";
private static final String USERNAME = PREFIX + ".username";
- private static final String PASSWORD_PATH = PREFIX + ".password";
+ private static final String PASSWORD = PREFIX + ".password";
private static final String TABLE_NAME = PREFIX + ".tablename";
private static final String AUTHORIZATIONS = PREFIX + ".authorizations";
@@ -187,28 +180,10 @@ public abstract class InputFormatBase<K,
ArgumentChecker.notNull(user, passwd, table);
conf.set(USERNAME, user);
+ conf.set(PASSWORD, new String(Base64.encodeBase64(passwd)));
conf.set(TABLE_NAME, table);
if (auths != null && !auths.isEmpty())
conf.set(AUTHORIZATIONS, auths.serialize());
-
- try {
- FileSystem fs = FileSystem.get(conf);
- Path file = new Path(fs.getWorkingDirectory(), conf.get("mapred.job.name") + System.currentTimeMillis() + ".pw");
- conf.set(PASSWORD_PATH, file.toString());
- FSDataOutputStream fos = fs.create(file, false);
- fs.setPermission(file, new FsPermission(FsAction.ALL, FsAction.NONE, FsAction.NONE));
- fs.deleteOnExit(file);
-
- byte[] encodedPw = Base64.encodeBase64(passwd);
- fos.writeInt(encodedPw.length);
- fos.write(encodedPw);
- fos.close();
-
- DistributedCache.addCacheFile(file.toUri(), conf);
- } catch (IOException ioe) {
- throw new RuntimeException(ioe);
- }
-
}
/**
@@ -255,24 +230,17 @@ public abstract class InputFormatBase<K,
*/
public static void setRanges(Configuration conf, Collection<Range> ranges) {
ArgumentChecker.notNull(ranges);
+ ArrayList<String> rangeStrings = new ArrayList<String>(ranges.size());
try {
- FileSystem fs = FileSystem.get(conf);
- Path file = new Path(fs.getWorkingDirectory(), conf.get("mapred.job.name") + System.currentTimeMillis() + ".ranges");
- conf.set(RANGES, file.toString());
- FSDataOutputStream fos = fs.create(file, false);
- fs.setPermission(file, new FsPermission(FsAction.ALL, FsAction.NONE, FsAction.NONE));
- fs.deleteOnExit(file);
-
- fos.writeInt(ranges.size());
for (Range r : ranges) {
- r.write(fos);
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ r.write(new DataOutputStream(baos));
+ rangeStrings.add(new String(Base64.encodeBase64(baos.toByteArray())));
}
- fos.close();
-
- DistributedCache.addCacheFile(file.toUri(), conf);
- } catch (IOException e) {
- throw new RuntimeException("Unable to write ranges to file", e);
+ } catch (IOException ex) {
+ throw new IllegalArgumentException("Unable to encode ranges to Base64", ex);
}
+ conf.setStrings(RANGES, rangeStrings.toArray(new String[0]));
}
/**
@@ -441,26 +409,18 @@ public abstract class InputFormatBase<K,
return conf.get(USERNAME);
}
+
/**
- * Gets the password from the configuration.
+ * Gets the password from the configuration. WARNING: The password is stored in the Configuration and shared with all MapReduce tasks; It is BASE64 encoded to
+ * provide a charset safe conversion to a string, and is not intended to be secure.
*
* @param conf
* the Hadoop configuration object
* @return the BASE64-encoded password
- * @throws IOException
* @see #setInputInfo(Configuration, String, byte[], String, Authorizations)
*/
- protected static byte[] getPassword(Configuration conf) throws IOException {
- FileSystem fs = FileSystem.get(conf);
- Path file = new Path(conf.get(PASSWORD_PATH));
-
- FSDataInputStream fdis = fs.open(file);
- int length = fdis.readInt();
- byte[] encodedPassword = new byte[length];
- fdis.read(encodedPassword);
- fdis.close();
-
- return Base64.decodeBase64(encodedPassword);
+ protected static byte[] getPassword(Configuration conf) {
+ return Base64.decodeBase64(conf.get(PASSWORD, "").getBytes());
}
/**
@@ -511,10 +471,8 @@ public abstract class InputFormatBase<K,
* @return an accumulo tablet locator
* @throws TableNotFoundException
* if the table name set on the configuration doesn't exist
- * @throws IOException
- * if the input format is unable to read the password file from the FileSystem
*/
- protected static TabletLocator getTabletLocator(Configuration conf) throws TableNotFoundException, IOException {
+ protected static TabletLocator getTabletLocator(Configuration conf) throws TableNotFoundException {
if (conf.getBoolean(MOCK, false))
return new MockTabletLocator();
Instance instance = getInstance(conf);
@@ -537,21 +495,12 @@ public abstract class InputFormatBase<K,
*/
protected static List<Range> getRanges(Configuration conf) throws IOException {
ArrayList<Range> ranges = new ArrayList<Range>();
- FileSystem fs = FileSystem.get(conf);
- String rangePath = conf.get(RANGES);
- if (rangePath == null)
- return ranges;
- Path file = new Path(rangePath);
-
- FSDataInputStream fdis = fs.open(file);
- int numRanges = fdis.readInt();
- while (numRanges > 0) {
- Range r = new Range();
- r.readFields(fdis);
- ranges.add(r);
- numRanges--;
+ for (String rangeString : conf.getStringCollection(RANGES)) {
+ ByteArrayInputStream bais = new ByteArrayInputStream(Base64.decodeBase64(rangeString.getBytes()));
+ Range range = new Range();
+ range.readFields(new DataInputStream(bais));
+ ranges.add(range);
}
- fdis.close();
return ranges;
}
@@ -809,7 +758,7 @@ public abstract class InputFormatBase<K,
}
Map<String,Map<KeyExtent,List<Range>>> binOfflineTable(Configuration conf, String tableName, List<Range> ranges) throws TableNotFoundException,
- AccumuloException, AccumuloSecurityException, IOException {
+ AccumuloException, AccumuloSecurityException {
Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<String,Map<KeyExtent,List<Range>>>();
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java?rev=1403360&r1=1403359&r2=1403360&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java Mon Oct 29 15:22:24 2012
@@ -27,7 +27,6 @@ import org.apache.accumulo.core.client.B
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.iterators.Filter;
import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
import org.apache.accumulo.core.iterators.SortedMapIterator;
import org.apache.accumulo.core.security.Authorizations;
@@ -50,24 +49,6 @@ public class MockBatchScanner extends Mo
this.ranges = new ArrayList<Range>(ranges);
}
- static class RangesFilter extends Filter {
- List<Range> ranges;
-
- RangesFilter(SortedKeyValueIterator<Key,Value> iterator, List<Range> ranges) {
- setSource(iterator);
- this.ranges = ranges;
- }
-
- @Override
- public boolean accept(Key k, Value v) {
- for (Range r : ranges) {
- if (r.contains(k))
- return true;
- }
- return false;
- }
- }
-
@SuppressWarnings("unchecked")
@Override
public Iterator<Entry<Key,Value>> iterator() {
@@ -79,7 +60,7 @@ public class MockBatchScanner extends Mo
for (Range range : ranges) {
SortedKeyValueIterator<Key,Value> i = new SortedMapIterator(table.table);
try {
- i = new RangesFilter(createFilter(i), ranges);
+ i = createFilter(i);
i.seek(range, createColumnBSS(fetchedColumns), !fetchedColumns.isEmpty());
chain.addIterator(new IteratorAdapter(i));
} catch (IOException e) {
Propchange: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java?rev=1403360&r1=1403359&r2=1403360&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java Mon Oct 29 15:22:24 2012
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.8.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard
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;
@@ -105,7 +108,7 @@ import org.slf4j.LoggerFactory;
// isset id assignments
private static final int __SCANID_ISSET_ID = 0;
- private BitSet __isset_bit_vector = new BitSet(1);
+ 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);
@@ -134,8 +137,7 @@ import org.slf4j.LoggerFactory;
* Performs a deep copy on <i>other</i>.
*/
public InitialMultiScan(InitialMultiScan other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
this.scanID = other.scanID;
if (other.isSetResult()) {
this.result = new MultiScanResult(other.result);
@@ -164,16 +166,16 @@ import org.slf4j.LoggerFactory;
}
public void unsetScanID() {
- __isset_bit_vector.clear(__SCANID_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SCANID_ISSET_ID);
}
/** Returns true if field scanID is set (has been assigned a value) and false otherwise */
public boolean isSetScanID() {
- return __isset_bit_vector.get(__SCANID_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __SCANID_ISSET_ID);
}
public void setScanIDIsSet(boolean value) {
- __isset_bit_vector.set(__SCANID_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SCANID_ISSET_ID, value);
}
public MultiScanResult getResult() {
@@ -352,6 +354,10 @@ import org.slf4j.LoggerFactory;
public void validate() throws org.apache.thrift.TException {
// check for required fields
+ // check for sub-struct validity
+ if (result != null) {
+ result.validate();
+ }
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -365,7 +371,7 @@ import org.slf4j.LoggerFactory;
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_bit_vector = new BitSet(1);
+ __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);
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialScan.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialScan.java?rev=1403360&r1=1403359&r2=1403360&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialScan.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialScan.java Mon Oct 29 15:22:24 2012
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.8.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard
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;
@@ -105,7 +108,7 @@ import org.slf4j.LoggerFactory;
// isset id assignments
private static final int __SCANID_ISSET_ID = 0;
- private BitSet __isset_bit_vector = new BitSet(1);
+ 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);
@@ -134,8 +137,7 @@ import org.slf4j.LoggerFactory;
* Performs a deep copy on <i>other</i>.
*/
public InitialScan(InitialScan other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
this.scanID = other.scanID;
if (other.isSetResult()) {
this.result = new ScanResult(other.result);
@@ -164,16 +166,16 @@ import org.slf4j.LoggerFactory;
}
public void unsetScanID() {
- __isset_bit_vector.clear(__SCANID_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SCANID_ISSET_ID);
}
/** Returns true if field scanID is set (has been assigned a value) and false otherwise */
public boolean isSetScanID() {
- return __isset_bit_vector.get(__SCANID_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __SCANID_ISSET_ID);
}
public void setScanIDIsSet(boolean value) {
- __isset_bit_vector.set(__SCANID_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SCANID_ISSET_ID, value);
}
public ScanResult getResult() {
@@ -352,6 +354,10 @@ import org.slf4j.LoggerFactory;
public void validate() throws org.apache.thrift.TException {
// check for required fields
+ // check for sub-struct validity
+ if (result != null) {
+ result.validate();
+ }
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -365,7 +371,7 @@ import org.slf4j.LoggerFactory;
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_bit_vector = new BitSet(1);
+ __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);
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/IterInfo.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/IterInfo.java?rev=1403360&r1=1403359&r2=1403360&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/IterInfo.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/IterInfo.java Mon Oct 29 15:22:24 2012
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.8.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard
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;
@@ -110,7 +113,7 @@ import org.slf4j.LoggerFactory;
// isset id assignments
private static final int __PRIORITY_ISSET_ID = 0;
- private BitSet __isset_bit_vector = new BitSet(1);
+ 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);
@@ -143,8 +146,7 @@ import org.slf4j.LoggerFactory;
* Performs a deep copy on <i>other</i>.
*/
public IterInfo(IterInfo other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
this.priority = other.priority;
if (other.isSetClassName()) {
this.className = other.className;
@@ -177,16 +179,16 @@ import org.slf4j.LoggerFactory;
}
public void unsetPriority() {
- __isset_bit_vector.clear(__PRIORITY_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PRIORITY_ISSET_ID);
}
/** Returns true if field priority is set (has been assigned a value) and false otherwise */
public boolean isSetPriority() {
- return __isset_bit_vector.get(__PRIORITY_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __PRIORITY_ISSET_ID);
}
public void setPriorityIsSet(boolean value) {
- __isset_bit_vector.set(__PRIORITY_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PRIORITY_ISSET_ID, value);
}
public String getClassName() {
@@ -429,6 +431,7 @@ import org.slf4j.LoggerFactory;
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 {
@@ -442,7 +445,7 @@ import org.slf4j.LoggerFactory;
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_bit_vector = new BitSet(1);
+ __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);
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/MapFileInfo.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/MapFileInfo.java?rev=1403360&r1=1403359&r2=1403360&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/MapFileInfo.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/MapFileInfo.java Mon Oct 29 15:22:24 2012
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.8.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard
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;
@@ -100,7 +103,7 @@ import org.slf4j.LoggerFactory;
// isset id assignments
private static final int __ESTIMATEDSIZE_ISSET_ID = 0;
- private BitSet __isset_bit_vector = new BitSet(1);
+ 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);
@@ -125,8 +128,7 @@ import org.slf4j.LoggerFactory;
* Performs a deep copy on <i>other</i>.
*/
public MapFileInfo(MapFileInfo other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
this.estimatedSize = other.estimatedSize;
}
@@ -151,16 +153,16 @@ import org.slf4j.LoggerFactory;
}
public void unsetEstimatedSize() {
- __isset_bit_vector.clear(__ESTIMATEDSIZE_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ESTIMATEDSIZE_ISSET_ID);
}
/** Returns true if field estimatedSize is set (has been assigned a value) and false otherwise */
public boolean isSetEstimatedSize() {
- return __isset_bit_vector.get(__ESTIMATEDSIZE_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __ESTIMATEDSIZE_ISSET_ID);
}
public void setEstimatedSizeIsSet(boolean value) {
- __isset_bit_vector.set(__ESTIMATEDSIZE_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ESTIMATEDSIZE_ISSET_ID, value);
}
public void setFieldValue(_Fields field, Object value) {
@@ -275,6 +277,7 @@ import org.slf4j.LoggerFactory;
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 {
@@ -288,7 +291,7 @@ import org.slf4j.LoggerFactory;
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_bit_vector = new BitSet(1);
+ __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);
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java?rev=1403360&r1=1403359&r2=1403360&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java Mon Oct 29 15:22:24 2012
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.8.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard
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;
@@ -131,7 +134,7 @@ import org.slf4j.LoggerFactory;
// isset id assignments
private static final int __PARTNEXTKEYINCLUSIVE_ISSET_ID = 0;
private static final int __MORE_ISSET_ID = 1;
- private BitSet __isset_bit_vector = new BitSet(2);
+ 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);
@@ -183,8 +186,7 @@ import org.slf4j.LoggerFactory;
* Performs a deep copy on <i>other</i>.
*/
public MultiScanResult(MultiScanResult other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
if (other.isSetResults()) {
List<TKeyValue> __this__results = new ArrayList<TKeyValue>();
for (TKeyValue other_element : other.results) {
@@ -401,16 +403,16 @@ import org.slf4j.LoggerFactory;
}
public void unsetPartNextKeyInclusive() {
- __isset_bit_vector.clear(__PARTNEXTKEYINCLUSIVE_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PARTNEXTKEYINCLUSIVE_ISSET_ID);
}
/** Returns true if field partNextKeyInclusive is set (has been assigned a value) and false otherwise */
public boolean isSetPartNextKeyInclusive() {
- return __isset_bit_vector.get(__PARTNEXTKEYINCLUSIVE_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __PARTNEXTKEYINCLUSIVE_ISSET_ID);
}
public void setPartNextKeyInclusiveIsSet(boolean value) {
- __isset_bit_vector.set(__PARTNEXTKEYINCLUSIVE_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PARTNEXTKEYINCLUSIVE_ISSET_ID, value);
}
public boolean isMore() {
@@ -424,16 +426,16 @@ import org.slf4j.LoggerFactory;
}
public void unsetMore() {
- __isset_bit_vector.clear(__MORE_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __MORE_ISSET_ID);
}
/** Returns true if field more is set (has been assigned a value) and false otherwise */
public boolean isSetMore() {
- return __isset_bit_vector.get(__MORE_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __MORE_ISSET_ID);
}
public void setMoreIsSet(boolean value) {
- __isset_bit_vector.set(__MORE_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __MORE_ISSET_ID, value);
}
public void setFieldValue(_Fields field, Object value) {
@@ -784,6 +786,13 @@ import org.slf4j.LoggerFactory;
public void validate() throws org.apache.thrift.TException {
// check for required fields
+ // check for sub-struct validity
+ if (partScan != null) {
+ partScan.validate();
+ }
+ if (partNextKey != null) {
+ partNextKey.validate();
+ }
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -797,7 +806,7 @@ import org.slf4j.LoggerFactory;
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_bit_vector = new BitSet(1);
+ __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);
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java?rev=1403360&r1=1403359&r2=1403360&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java Mon Oct 29 15:22:24 2012
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.8.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard
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;
@@ -105,7 +108,7 @@ import org.slf4j.LoggerFactory;
// isset id assignments
private static final int __MORE_ISSET_ID = 0;
- private BitSet __isset_bit_vector = new BitSet(1);
+ 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);
@@ -135,8 +138,7 @@ import org.slf4j.LoggerFactory;
* Performs a deep copy on <i>other</i>.
*/
public ScanResult(ScanResult other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
if (other.isSetResults()) {
List<TKeyValue> __this__results = new ArrayList<TKeyValue>();
for (TKeyValue other_element : other.results) {
@@ -208,16 +210,16 @@ import org.slf4j.LoggerFactory;
}
public void unsetMore() {
- __isset_bit_vector.clear(__MORE_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __MORE_ISSET_ID);
}
/** Returns true if field more is set (has been assigned a value) and false otherwise */
public boolean isSetMore() {
- return __isset_bit_vector.get(__MORE_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __MORE_ISSET_ID);
}
public void setMoreIsSet(boolean value) {
- __isset_bit_vector.set(__MORE_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __MORE_ISSET_ID, value);
}
public void setFieldValue(_Fields field, Object value) {
@@ -372,6 +374,7 @@ import org.slf4j.LoggerFactory;
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 {
@@ -385,7 +388,7 @@ import org.slf4j.LoggerFactory;
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_bit_vector = new BitSet(1);
+ __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);
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TColumn.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TColumn.java?rev=1403360&r1=1403359&r2=1403360&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TColumn.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TColumn.java Mon Oct 29 15:22:24 2012
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.8.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard
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;
@@ -463,6 +466,7 @@ import org.slf4j.LoggerFactory;
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 {
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TConstraintViolationSummary.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TConstraintViolationSummary.java?rev=1403360&r1=1403359&r2=1403360&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TConstraintViolationSummary.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TConstraintViolationSummary.java Mon Oct 29 15:22:24 2012
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.8.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard
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;
@@ -116,7 +119,7 @@ import org.slf4j.LoggerFactory;
// isset id assignments
private static final int __VIOLATIONCODE_ISSET_ID = 0;
private static final int __NUMBEROFVIOLATINGMUTATIONS_ISSET_ID = 1;
- private BitSet __isset_bit_vector = new BitSet(2);
+ 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);
@@ -154,8 +157,7 @@ import org.slf4j.LoggerFactory;
* Performs a deep copy on <i>other</i>.
*/
public TConstraintViolationSummary(TConstraintViolationSummary other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
if (other.isSetConstrainClass()) {
this.constrainClass = other.constrainClass;
}
@@ -215,16 +217,16 @@ import org.slf4j.LoggerFactory;
}
public void unsetViolationCode() {
- __isset_bit_vector.clear(__VIOLATIONCODE_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __VIOLATIONCODE_ISSET_ID);
}
/** Returns true if field violationCode is set (has been assigned a value) and false otherwise */
public boolean isSetViolationCode() {
- return __isset_bit_vector.get(__VIOLATIONCODE_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __VIOLATIONCODE_ISSET_ID);
}
public void setViolationCodeIsSet(boolean value) {
- __isset_bit_vector.set(__VIOLATIONCODE_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __VIOLATIONCODE_ISSET_ID, value);
}
public String getViolationDescription() {
@@ -262,16 +264,16 @@ import org.slf4j.LoggerFactory;
}
public void unsetNumberOfViolatingMutations() {
- __isset_bit_vector.clear(__NUMBEROFVIOLATINGMUTATIONS_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __NUMBEROFVIOLATINGMUTATIONS_ISSET_ID);
}
/** Returns true if field numberOfViolatingMutations is set (has been assigned a value) and false otherwise */
public boolean isSetNumberOfViolatingMutations() {
- return __isset_bit_vector.get(__NUMBEROFVIOLATINGMUTATIONS_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __NUMBEROFVIOLATINGMUTATIONS_ISSET_ID);
}
public void setNumberOfViolatingMutationsIsSet(boolean value) {
- __isset_bit_vector.set(__NUMBEROFVIOLATINGMUTATIONS_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NUMBEROFVIOLATINGMUTATIONS_ISSET_ID, value);
}
public void setFieldValue(_Fields field, Object value) {
@@ -502,6 +504,7 @@ import org.slf4j.LoggerFactory;
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 {
@@ -515,7 +518,7 @@ import org.slf4j.LoggerFactory;
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_bit_vector = new BitSet(1);
+ __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);
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java?rev=1403360&r1=1403359&r2=1403360&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java Mon Oct 29 15:22:24 2012
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.8.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard
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;
@@ -120,7 +123,7 @@ import org.slf4j.LoggerFactory;
// isset id assignments
private static final int __TIMESTAMP_ISSET_ID = 0;
- private BitSet __isset_bit_vector = new BitSet(1);
+ 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);
@@ -161,8 +164,7 @@ import org.slf4j.LoggerFactory;
* Performs a deep copy on <i>other</i>.
*/
public TKey(TKey other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
if (other.isSetRow()) {
this.row = org.apache.thrift.TBaseHelper.copyBinary(other.row);
;
@@ -343,16 +345,16 @@ import org.slf4j.LoggerFactory;
}
public void unsetTimestamp() {
- __isset_bit_vector.clear(__TIMESTAMP_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TIMESTAMP_ISSET_ID);
}
/** Returns true if field timestamp is set (has been assigned a value) and false otherwise */
public boolean isSetTimestamp() {
- return __isset_bit_vector.get(__TIMESTAMP_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __TIMESTAMP_ISSET_ID);
}
public void setTimestampIsSet(boolean value) {
- __isset_bit_vector.set(__TIMESTAMP_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TIMESTAMP_ISSET_ID, value);
}
public void setFieldValue(_Fields field, Object value) {
@@ -627,6 +629,7 @@ import org.slf4j.LoggerFactory;
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 {
@@ -640,7 +643,7 @@ import org.slf4j.LoggerFactory;
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_bit_vector = new BitSet(1);
+ __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);
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyExtent.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyExtent.java?rev=1403360&r1=1403359&r2=1403360&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyExtent.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyExtent.java Mon Oct 29 15:22:24 2012
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.8.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard
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;
@@ -463,6 +466,7 @@ import org.slf4j.LoggerFactory;
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 {
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyValue.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyValue.java?rev=1403360&r1=1403359&r2=1403360&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyValue.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyValue.java Mon Oct 29 15:22:24 2012
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.8.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard
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;
@@ -364,6 +367,10 @@ import org.slf4j.LoggerFactory;
public void validate() throws org.apache.thrift.TException {
// check for required fields
+ // check for sub-struct validity
+ if (key != null) {
+ key.validate();
+ }
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java?rev=1403360&r1=1403359&r2=1403360&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java Mon Oct 29 15:22:24 2012
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.8.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard
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;
@@ -115,7 +118,7 @@ import org.slf4j.LoggerFactory;
// isset id assignments
private static final int __ENTRIES_ISSET_ID = 0;
- private BitSet __isset_bit_vector = new BitSet(1);
+ 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);
@@ -153,8 +156,7 @@ import org.slf4j.LoggerFactory;
* Performs a deep copy on <i>other</i>.
*/
public TMutation(TMutation other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
if (other.isSetRow()) {
this.row = org.apache.thrift.TBaseHelper.copyBinary(other.row);
;
@@ -306,16 +308,16 @@ import org.slf4j.LoggerFactory;
}
public void unsetEntries() {
- __isset_bit_vector.clear(__ENTRIES_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ENTRIES_ISSET_ID);
}
/** Returns true if field entries is set (has been assigned a value) and false otherwise */
public boolean isSetEntries() {
- return __isset_bit_vector.get(__ENTRIES_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __ENTRIES_ISSET_ID);
}
public void setEntriesIsSet(boolean value) {
- __isset_bit_vector.set(__ENTRIES_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ENTRIES_ISSET_ID, value);
}
public void setFieldValue(_Fields field, Object value) {
@@ -550,6 +552,7 @@ import org.slf4j.LoggerFactory;
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 {
@@ -563,7 +566,7 @@ import org.slf4j.LoggerFactory;
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_bit_vector = new BitSet(1);
+ __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);
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java?rev=1403360&r1=1403359&r2=1403360&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java Mon Oct 29 15:22:24 2012
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.8.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard
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;
@@ -128,7 +131,7 @@ import org.slf4j.LoggerFactory;
private static final int __STOPKEYINCLUSIVE_ISSET_ID = 1;
private static final int __INFINITESTARTKEY_ISSET_ID = 2;
private static final int __INFINITESTOPKEY_ISSET_ID = 3;
- private BitSet __isset_bit_vector = new BitSet(4);
+ 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);
@@ -176,8 +179,7 @@ import org.slf4j.LoggerFactory;
* Performs a deep copy on <i>other</i>.
*/
public TRange(TRange other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
if (other.isSetStart()) {
this.start = new TKey(other.start);
}
@@ -267,16 +269,16 @@ import org.slf4j.LoggerFactory;
}
public void unsetStartKeyInclusive() {
- __isset_bit_vector.clear(__STARTKEYINCLUSIVE_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STARTKEYINCLUSIVE_ISSET_ID);
}
/** Returns true if field startKeyInclusive is set (has been assigned a value) and false otherwise */
public boolean isSetStartKeyInclusive() {
- return __isset_bit_vector.get(__STARTKEYINCLUSIVE_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __STARTKEYINCLUSIVE_ISSET_ID);
}
public void setStartKeyInclusiveIsSet(boolean value) {
- __isset_bit_vector.set(__STARTKEYINCLUSIVE_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STARTKEYINCLUSIVE_ISSET_ID, value);
}
public boolean isStopKeyInclusive() {
@@ -290,16 +292,16 @@ import org.slf4j.LoggerFactory;
}
public void unsetStopKeyInclusive() {
- __isset_bit_vector.clear(__STOPKEYINCLUSIVE_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STOPKEYINCLUSIVE_ISSET_ID);
}
/** Returns true if field stopKeyInclusive is set (has been assigned a value) and false otherwise */
public boolean isSetStopKeyInclusive() {
- return __isset_bit_vector.get(__STOPKEYINCLUSIVE_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __STOPKEYINCLUSIVE_ISSET_ID);
}
public void setStopKeyInclusiveIsSet(boolean value) {
- __isset_bit_vector.set(__STOPKEYINCLUSIVE_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STOPKEYINCLUSIVE_ISSET_ID, value);
}
public boolean isInfiniteStartKey() {
@@ -313,16 +315,16 @@ import org.slf4j.LoggerFactory;
}
public void unsetInfiniteStartKey() {
- __isset_bit_vector.clear(__INFINITESTARTKEY_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __INFINITESTARTKEY_ISSET_ID);
}
/** Returns true if field infiniteStartKey is set (has been assigned a value) and false otherwise */
public boolean isSetInfiniteStartKey() {
- return __isset_bit_vector.get(__INFINITESTARTKEY_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __INFINITESTARTKEY_ISSET_ID);
}
public void setInfiniteStartKeyIsSet(boolean value) {
- __isset_bit_vector.set(__INFINITESTARTKEY_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __INFINITESTARTKEY_ISSET_ID, value);
}
public boolean isInfiniteStopKey() {
@@ -336,16 +338,16 @@ import org.slf4j.LoggerFactory;
}
public void unsetInfiniteStopKey() {
- __isset_bit_vector.clear(__INFINITESTOPKEY_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __INFINITESTOPKEY_ISSET_ID);
}
/** Returns true if field infiniteStopKey is set (has been assigned a value) and false otherwise */
public boolean isSetInfiniteStopKey() {
- return __isset_bit_vector.get(__INFINITESTOPKEY_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __INFINITESTOPKEY_ISSET_ID);
}
public void setInfiniteStopKeyIsSet(boolean value) {
- __isset_bit_vector.set(__INFINITESTOPKEY_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __INFINITESTOPKEY_ISSET_ID, value);
}
public void setFieldValue(_Fields field, Object value) {
@@ -648,6 +650,13 @@ import org.slf4j.LoggerFactory;
public void validate() throws org.apache.thrift.TException {
// check for required fields
+ // check for sub-struct validity
+ if (start != null) {
+ start.validate();
+ }
+ if (stop != null) {
+ stop.validate();
+ }
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -661,7 +670,7 @@ import org.slf4j.LoggerFactory;
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_bit_vector = new BitSet(1);
+ __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);
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java?rev=1403360&r1=1403359&r2=1403360&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java Mon Oct 29 15:22:24 2012
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.8.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard
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;
@@ -495,6 +498,7 @@ import org.slf4j.LoggerFactory;
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 {
Propchange: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/rfile/BlockIndex.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/rfile/RelativeKey.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/rfile/RelativeKey.java?rev=1403360&r1=1403359&r2=1403360&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/rfile/RelativeKey.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/rfile/RelativeKey.java Mon Oct 29 15:22:24 2012
@@ -158,6 +158,8 @@ public class RelativeKey implements Writ
}
static class MByteSequence extends ArrayByteSequence {
+ private static final long serialVersionUID = 1L;
+
MByteSequence(byte[] data, int offset, int length) {
super(data, offset, length);
}
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java?rev=1403360&r1=1403359&r2=1403360&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java Mon Oct 29 15:22:24 2012
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.8.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard
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;
@@ -158,16 +161,20 @@ import org.slf4j.LoggerFactory;
return processMap;
}
- private static class getStatus<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getStatus_args> {
+ public static class getStatus<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getStatus_args> {
public getStatus() {
super("getStatus");
}
- protected getStatus_args getEmptyArgsInstance() {
+ public getStatus_args getEmptyArgsInstance() {
return new getStatus_args();
}
- protected getStatus_result getResult(I iface, getStatus_args args) throws org.apache.thrift.TException {
+ protected boolean isOneway() {
+ return false;
+ }
+
+ public getStatus_result getResult(I iface, getStatus_args args) throws org.apache.thrift.TException {
getStatus_result result = new getStatus_result();
try {
result.success = iface.getStatus(args.tinfo, args.credentials);
@@ -506,6 +513,13 @@ import org.slf4j.LoggerFactory;
public void validate() throws org.apache.thrift.TException {
// check for required fields
+ // check for sub-struct validity
+ if (tinfo != null) {
+ tinfo.validate();
+ }
+ if (credentials != null) {
+ credentials.validate();
+ }
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -963,6 +977,10 @@ import org.slf4j.LoggerFactory;
public void validate() throws org.apache.thrift.TException {
// check for required fields
+ // check for sub-struct validity
+ if (success != null) {
+ success.validate();
+ }
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java?rev=1403360&r1=1403359&r2=1403360&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java Mon Oct 29 15:22:24 2012
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.8.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard
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;
@@ -507,6 +510,19 @@ import org.slf4j.LoggerFactory;
public void validate() throws org.apache.thrift.TException {
// check for required fields
+ // check for sub-struct validity
+ if (last != null) {
+ last.validate();
+ }
+ if (lastLog != null) {
+ lastLog.validate();
+ }
+ if (current != null) {
+ current.validate();
+ }
+ if (currentLog != null) {
+ currentLog.validate();
+ }
}
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java?rev=1403360&r1=1403359&r2=1403360&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java Mon Oct 29 15:22:24 2012
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.8.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard
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;
@@ -130,7 +133,7 @@ import org.slf4j.LoggerFactory;
private static final int __INUSE_ISSET_ID = 3;
private static final int __DELETED_ISSET_ID = 4;
private static final int __ERRORS_ISSET_ID = 5;
- private BitSet __isset_bit_vector = new BitSet(6);
+ 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);
@@ -180,8 +183,7 @@ import org.slf4j.LoggerFactory;
* Performs a deep copy on <i>other</i>.
*/
public GcCycleStats(GcCycleStats other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
this.started = other.started;
this.finished = other.finished;
this.candidates = other.candidates;
@@ -221,16 +223,16 @@ import org.slf4j.LoggerFactory;
}
public void unsetStarted() {
- __isset_bit_vector.clear(__STARTED_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STARTED_ISSET_ID);
}
/** Returns true if field started is set (has been assigned a value) and false otherwise */
public boolean isSetStarted() {
- return __isset_bit_vector.get(__STARTED_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __STARTED_ISSET_ID);
}
public void setStartedIsSet(boolean value) {
- __isset_bit_vector.set(__STARTED_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STARTED_ISSET_ID, value);
}
public long getFinished() {
@@ -244,16 +246,16 @@ import org.slf4j.LoggerFactory;
}
public void unsetFinished() {
- __isset_bit_vector.clear(__FINISHED_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __FINISHED_ISSET_ID);
}
/** Returns true if field finished is set (has been assigned a value) and false otherwise */
public boolean isSetFinished() {
- return __isset_bit_vector.get(__FINISHED_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __FINISHED_ISSET_ID);
}
public void setFinishedIsSet(boolean value) {
- __isset_bit_vector.set(__FINISHED_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __FINISHED_ISSET_ID, value);
}
public long getCandidates() {
@@ -267,16 +269,16 @@ import org.slf4j.LoggerFactory;
}
public void unsetCandidates() {
- __isset_bit_vector.clear(__CANDIDATES_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __CANDIDATES_ISSET_ID);
}
/** Returns true if field candidates is set (has been assigned a value) and false otherwise */
public boolean isSetCandidates() {
- return __isset_bit_vector.get(__CANDIDATES_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __CANDIDATES_ISSET_ID);
}
public void setCandidatesIsSet(boolean value) {
- __isset_bit_vector.set(__CANDIDATES_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __CANDIDATES_ISSET_ID, value);
}
public long getInUse() {
@@ -290,16 +292,16 @@ import org.slf4j.LoggerFactory;
}
public void unsetInUse() {
- __isset_bit_vector.clear(__INUSE_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __INUSE_ISSET_ID);
}
/** Returns true if field inUse is set (has been assigned a value) and false otherwise */
public boolean isSetInUse() {
- return __isset_bit_vector.get(__INUSE_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __INUSE_ISSET_ID);
}
public void setInUseIsSet(boolean value) {
- __isset_bit_vector.set(__INUSE_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __INUSE_ISSET_ID, value);
}
public long getDeleted() {
@@ -313,16 +315,16 @@ import org.slf4j.LoggerFactory;
}
public void unsetDeleted() {
- __isset_bit_vector.clear(__DELETED_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __DELETED_ISSET_ID);
}
/** Returns true if field deleted is set (has been assigned a value) and false otherwise */
public boolean isSetDeleted() {
- return __isset_bit_vector.get(__DELETED_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __DELETED_ISSET_ID);
}
public void setDeletedIsSet(boolean value) {
- __isset_bit_vector.set(__DELETED_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __DELETED_ISSET_ID, value);
}
public long getErrors() {
@@ -336,16 +338,16 @@ import org.slf4j.LoggerFactory;
}
public void unsetErrors() {
- __isset_bit_vector.clear(__ERRORS_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ERRORS_ISSET_ID);
}
/** Returns true if field errors is set (has been assigned a value) and false otherwise */
public boolean isSetErrors() {
- return __isset_bit_vector.get(__ERRORS_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __ERRORS_ISSET_ID);
}
public void setErrorsIsSet(boolean value) {
- __isset_bit_vector.set(__ERRORS_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ERRORS_ISSET_ID, value);
}
public void setFieldValue(_Fields field, Object value) {
@@ -640,6 +642,7 @@ import org.slf4j.LoggerFactory;
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 {
@@ -653,7 +656,7 @@ import org.slf4j.LoggerFactory;
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_bit_vector = new BitSet(1);
+ __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);
Propchange: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/iterators/system/StatsIterator.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/Compacting.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/Compacting.java?rev=1403360&r1=1403359&r2=1403360&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/Compacting.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/Compacting.java Mon Oct 29 15:22:24 2012
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.8.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard
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;
@@ -106,7 +109,7 @@ import org.slf4j.LoggerFactory;
// isset id assignments
private static final int __RUNNING_ISSET_ID = 0;
private static final int __QUEUED_ISSET_ID = 1;
- private BitSet __isset_bit_vector = new BitSet(2);
+ 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);
@@ -136,8 +139,7 @@ import org.slf4j.LoggerFactory;
* Performs a deep copy on <i>other</i>.
*/
public Compacting(Compacting other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
this.running = other.running;
this.queued = other.queued;
}
@@ -165,16 +167,16 @@ import org.slf4j.LoggerFactory;
}
public void unsetRunning() {
- __isset_bit_vector.clear(__RUNNING_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __RUNNING_ISSET_ID);
}
/** Returns true if field running is set (has been assigned a value) and false otherwise */
public boolean isSetRunning() {
- return __isset_bit_vector.get(__RUNNING_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __RUNNING_ISSET_ID);
}
public void setRunningIsSet(boolean value) {
- __isset_bit_vector.set(__RUNNING_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __RUNNING_ISSET_ID, value);
}
public int getQueued() {
@@ -188,16 +190,16 @@ import org.slf4j.LoggerFactory;
}
public void unsetQueued() {
- __isset_bit_vector.clear(__QUEUED_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __QUEUED_ISSET_ID);
}
/** Returns true if field queued is set (has been assigned a value) and false otherwise */
public boolean isSetQueued() {
- return __isset_bit_vector.get(__QUEUED_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __QUEUED_ISSET_ID);
}
public void setQueuedIsSet(boolean value) {
- __isset_bit_vector.set(__QUEUED_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __QUEUED_ISSET_ID, value);
}
public void setFieldValue(_Fields field, Object value) {
@@ -348,6 +350,7 @@ import org.slf4j.LoggerFactory;
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 {
@@ -361,7 +364,7 @@ import org.slf4j.LoggerFactory;
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_bit_vector = new BitSet(1);
+ __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);
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/DeadServer.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/DeadServer.java?rev=1403360&r1=1403359&r2=1403360&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/DeadServer.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/DeadServer.java Mon Oct 29 15:22:24 2012
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift Compiler (0.8.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
* @generated
@@ -12,6 +12,9 @@ import org.apache.thrift.scheme.Standard
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;
@@ -110,7 +113,7 @@ import org.slf4j.LoggerFactory;
// isset id assignments
private static final int __LASTSTATUS_ISSET_ID = 0;
- private BitSet __isset_bit_vector = new BitSet(1);
+ 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);
@@ -143,8 +146,7 @@ import org.slf4j.LoggerFactory;
* Performs a deep copy on <i>other</i>.
*/
public DeadServer(DeadServer other) {
- __isset_bit_vector.clear();
- __isset_bit_vector.or(other.__isset_bit_vector);
+ __isset_bitfield = other.__isset_bitfield;
if (other.isSetServer()) {
this.server = other.server;
}
@@ -201,16 +203,16 @@ import org.slf4j.LoggerFactory;
}
public void unsetLastStatus() {
- __isset_bit_vector.clear(__LASTSTATUS_ISSET_ID);
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __LASTSTATUS_ISSET_ID);
}
/** Returns true if field lastStatus is set (has been assigned a value) and false otherwise */
public boolean isSetLastStatus() {
- return __isset_bit_vector.get(__LASTSTATUS_ISSET_ID);
+ return EncodingUtils.testBit(__isset_bitfield, __LASTSTATUS_ISSET_ID);
}
public void setLastStatusIsSet(boolean value) {
- __isset_bit_vector.set(__LASTSTATUS_ISSET_ID, value);
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __LASTSTATUS_ISSET_ID, value);
}
public String getStatus() {
@@ -429,6 +431,7 @@ import org.slf4j.LoggerFactory;
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 {
@@ -442,7 +445,7 @@ import org.slf4j.LoggerFactory;
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_bit_vector = new BitSet(1);
+ __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);