You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by to...@apache.org on 2012/09/05 06:58:05 UTC
svn commit: r1380990 [5/8] - in
/hadoop/common/branches/HDFS-3077/hadoop-common-project:
hadoop-annotations/src/main/java/org/apache/hadoop/classification/tools/
hadoop-common/ hadoop-common/src/ hadoop-common/src/main/conf/
hadoop-common/src/main/docs...
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/CsvRecordOutput.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/CsvRecordOutput.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/CsvRecordOutput.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/CsvRecordOutput.java Wed Sep 5 04:57:47 2012
@@ -61,10 +61,12 @@ public class CsvRecordOutput implements
}
}
+ @Override
public void writeByte(byte b, String tag) throws IOException {
writeLong((long)b, tag);
}
+ @Override
public void writeBool(boolean b, String tag) throws IOException {
printCommaUnlessFirst();
String val = b ? "T" : "F";
@@ -72,32 +74,38 @@ public class CsvRecordOutput implements
throwExceptionOnError(tag);
}
+ @Override
public void writeInt(int i, String tag) throws IOException {
writeLong((long)i, tag);
}
+ @Override
public void writeLong(long l, String tag) throws IOException {
printCommaUnlessFirst();
stream.print(l);
throwExceptionOnError(tag);
}
+ @Override
public void writeFloat(float f, String tag) throws IOException {
writeDouble((double)f, tag);
}
+ @Override
public void writeDouble(double d, String tag) throws IOException {
printCommaUnlessFirst();
stream.print(d);
throwExceptionOnError(tag);
}
+ @Override
public void writeString(String s, String tag) throws IOException {
printCommaUnlessFirst();
stream.print(Utils.toCSVString(s));
throwExceptionOnError(tag);
}
+ @Override
public void writeBuffer(Buffer buf, String tag)
throws IOException {
printCommaUnlessFirst();
@@ -105,6 +113,7 @@ public class CsvRecordOutput implements
throwExceptionOnError(tag);
}
+ @Override
public void startRecord(Record r, String tag) throws IOException {
if (tag != null && !"".equals(tag)) {
printCommaUnlessFirst();
@@ -113,6 +122,7 @@ public class CsvRecordOutput implements
}
}
+ @Override
public void endRecord(Record r, String tag) throws IOException {
if (tag == null || "".equals(tag)) {
stream.print("\n");
@@ -123,23 +133,27 @@ public class CsvRecordOutput implements
}
}
+ @Override
public void startVector(ArrayList v, String tag) throws IOException {
printCommaUnlessFirst();
stream.print("v{");
isFirst = true;
}
+ @Override
public void endVector(ArrayList v, String tag) throws IOException {
stream.print("}");
isFirst = false;
}
+ @Override
public void startMap(TreeMap v, String tag) throws IOException {
printCommaUnlessFirst();
stream.print("m{");
isFirst = true;
}
+ @Override
public void endMap(TreeMap v, String tag) throws IOException {
stream.print("}");
isFirst = false;
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Record.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Record.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Record.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Record.java Wed Sep 5 04:57:47 2012
@@ -54,6 +54,7 @@ public abstract class Record implements
throws IOException;
// inheric javadoc
+ @Override
public abstract int compareTo (final Object peer) throws ClassCastException;
/**
@@ -73,18 +74,21 @@ public abstract class Record implements
}
// inherit javadoc
+ @Override
public void write(final DataOutput out) throws java.io.IOException {
BinaryRecordOutput bout = BinaryRecordOutput.get(out);
this.serialize(bout);
}
// inherit javadoc
+ @Override
public void readFields(final DataInput din) throws java.io.IOException {
BinaryRecordInput rin = BinaryRecordInput.get(din);
this.deserialize(rin);
}
// inherit javadoc
+ @Override
public String toString() {
try {
ByteArrayOutputStream s = new ByteArrayOutputStream();
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/RecordComparator.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/RecordComparator.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/RecordComparator.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/RecordComparator.java Wed Sep 5 04:57:47 2012
@@ -40,6 +40,7 @@ public abstract class RecordComparator e
}
// inheric JavaDoc
+ @Override
public abstract int compare(byte[] b1, int s1, int l1, byte[] b2, int s2, int l2);
/**
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/XmlRecordInput.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/XmlRecordInput.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/XmlRecordInput.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/XmlRecordInput.java Wed Sep 5 04:57:47 2012
@@ -63,10 +63,13 @@ public class XmlRecordInput implements R
valList = vlist;
}
+ @Override
public void startDocument() throws SAXException {}
+ @Override
public void endDocument() throws SAXException {}
+ @Override
public void startElement(String ns,
String sname,
String qname,
@@ -88,6 +91,7 @@ public class XmlRecordInput implements R
}
}
+ @Override
public void endElement(String ns,
String sname,
String qname) throws SAXException {
@@ -98,6 +102,7 @@ public class XmlRecordInput implements R
}
}
+ @Override
public void characters(char buf[], int offset, int len)
throws SAXException {
if (charsValid) {
@@ -109,6 +114,7 @@ public class XmlRecordInput implements R
}
private class XmlIndex implements Index {
+ @Override
public boolean done() {
Value v = valList.get(vIdx);
if ("/array".equals(v.getType())) {
@@ -119,6 +125,7 @@ public class XmlRecordInput implements R
return false;
}
}
+ @Override
public void incr() {}
}
@@ -152,6 +159,7 @@ public class XmlRecordInput implements R
}
}
+ @Override
public byte readByte(String tag) throws IOException {
Value v = next();
if (!"ex:i1".equals(v.getType())) {
@@ -160,6 +168,7 @@ public class XmlRecordInput implements R
return Byte.parseByte(v.getValue());
}
+ @Override
public boolean readBool(String tag) throws IOException {
Value v = next();
if (!"boolean".equals(v.getType())) {
@@ -168,6 +177,7 @@ public class XmlRecordInput implements R
return "1".equals(v.getValue());
}
+ @Override
public int readInt(String tag) throws IOException {
Value v = next();
if (!"i4".equals(v.getType()) &&
@@ -177,6 +187,7 @@ public class XmlRecordInput implements R
return Integer.parseInt(v.getValue());
}
+ @Override
public long readLong(String tag) throws IOException {
Value v = next();
if (!"ex:i8".equals(v.getType())) {
@@ -185,6 +196,7 @@ public class XmlRecordInput implements R
return Long.parseLong(v.getValue());
}
+ @Override
public float readFloat(String tag) throws IOException {
Value v = next();
if (!"ex:float".equals(v.getType())) {
@@ -193,6 +205,7 @@ public class XmlRecordInput implements R
return Float.parseFloat(v.getValue());
}
+ @Override
public double readDouble(String tag) throws IOException {
Value v = next();
if (!"double".equals(v.getType())) {
@@ -201,6 +214,7 @@ public class XmlRecordInput implements R
return Double.parseDouble(v.getValue());
}
+ @Override
public String readString(String tag) throws IOException {
Value v = next();
if (!"string".equals(v.getType())) {
@@ -209,6 +223,7 @@ public class XmlRecordInput implements R
return Utils.fromXMLString(v.getValue());
}
+ @Override
public Buffer readBuffer(String tag) throws IOException {
Value v = next();
if (!"string".equals(v.getType())) {
@@ -217,6 +232,7 @@ public class XmlRecordInput implements R
return Utils.fromXMLBuffer(v.getValue());
}
+ @Override
public void startRecord(String tag) throws IOException {
Value v = next();
if (!"struct".equals(v.getType())) {
@@ -224,6 +240,7 @@ public class XmlRecordInput implements R
}
}
+ @Override
public void endRecord(String tag) throws IOException {
Value v = next();
if (!"/struct".equals(v.getType())) {
@@ -231,6 +248,7 @@ public class XmlRecordInput implements R
}
}
+ @Override
public Index startVector(String tag) throws IOException {
Value v = next();
if (!"array".equals(v.getType())) {
@@ -239,12 +257,15 @@ public class XmlRecordInput implements R
return new XmlIndex();
}
+ @Override
public void endVector(String tag) throws IOException {}
+ @Override
public Index startMap(String tag) throws IOException {
return startVector(tag);
}
+ @Override
public void endMap(String tag) throws IOException { endVector(tag); }
}
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/XmlRecordOutput.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/XmlRecordOutput.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/XmlRecordOutput.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/XmlRecordOutput.java Wed Sep 5 04:57:47 2012
@@ -149,6 +149,7 @@ public class XmlRecordOutput implements
}
}
+ @Override
public void writeByte(byte b, String tag) throws IOException {
printBeginEnvelope(tag);
stream.print("<ex:i1>");
@@ -157,6 +158,7 @@ public class XmlRecordOutput implements
printEndEnvelope(tag);
}
+ @Override
public void writeBool(boolean b, String tag) throws IOException {
printBeginEnvelope(tag);
stream.print("<boolean>");
@@ -165,6 +167,7 @@ public class XmlRecordOutput implements
printEndEnvelope(tag);
}
+ @Override
public void writeInt(int i, String tag) throws IOException {
printBeginEnvelope(tag);
stream.print("<i4>");
@@ -173,6 +176,7 @@ public class XmlRecordOutput implements
printEndEnvelope(tag);
}
+ @Override
public void writeLong(long l, String tag) throws IOException {
printBeginEnvelope(tag);
stream.print("<ex:i8>");
@@ -181,6 +185,7 @@ public class XmlRecordOutput implements
printEndEnvelope(tag);
}
+ @Override
public void writeFloat(float f, String tag) throws IOException {
printBeginEnvelope(tag);
stream.print("<ex:float>");
@@ -189,6 +194,7 @@ public class XmlRecordOutput implements
printEndEnvelope(tag);
}
+ @Override
public void writeDouble(double d, String tag) throws IOException {
printBeginEnvelope(tag);
stream.print("<double>");
@@ -197,6 +203,7 @@ public class XmlRecordOutput implements
printEndEnvelope(tag);
}
+ @Override
public void writeString(String s, String tag) throws IOException {
printBeginEnvelope(tag);
stream.print("<string>");
@@ -205,6 +212,7 @@ public class XmlRecordOutput implements
printEndEnvelope(tag);
}
+ @Override
public void writeBuffer(Buffer buf, String tag)
throws IOException {
printBeginEnvelope(tag);
@@ -214,12 +222,14 @@ public class XmlRecordOutput implements
printEndEnvelope(tag);
}
+ @Override
public void startRecord(Record r, String tag) throws IOException {
insideRecord(tag);
stream.print("<struct>\n");
addIndent();
}
+ @Override
public void endRecord(Record r, String tag) throws IOException {
closeIndent();
putIndent();
@@ -227,12 +237,14 @@ public class XmlRecordOutput implements
outsideRecord(tag);
}
+ @Override
public void startVector(ArrayList v, String tag) throws IOException {
insideVector(tag);
stream.print("<array>\n");
addIndent();
}
+ @Override
public void endVector(ArrayList v, String tag) throws IOException {
closeIndent();
putIndent();
@@ -240,12 +252,14 @@ public class XmlRecordOutput implements
outsideVector(tag);
}
+ @Override
public void startMap(TreeMap v, String tag) throws IOException {
insideMap(tag);
stream.print("<array>\n");
addIndent();
}
+ @Override
public void endMap(TreeMap v, String tag) throws IOException {
closeIndent();
putIndent();
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CGenerator.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CGenerator.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CGenerator.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CGenerator.java Wed Sep 5 04:57:47 2012
@@ -37,6 +37,7 @@ class CGenerator extends CodeGenerator {
* and spits-out file-level elements (such as include statements etc.)
* record-level code is generated by JRecord.
*/
+ @Override
void genCode(String name, ArrayList<JFile> ilist,
ArrayList<JRecord> rlist, String destDir, ArrayList<String> options)
throws IOException {
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CodeBuffer.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CodeBuffer.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CodeBuffer.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CodeBuffer.java Wed Sep 5 04:57:47 2012
@@ -98,6 +98,7 @@ public class CodeBuffer {
sb.append(ch);
}
+ @Override
public String toString() {
return sb.toString();
}
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/Consts.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/Consts.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/Consts.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/Consts.java Wed Sep 5 04:57:47 2012
@@ -18,12 +18,8 @@
package org.apache.hadoop.record.compiler;
-import java.io.IOException;
-import java.util.Iterator;
-
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.record.RecordInput;
/**
* const definitions for Record I/O compiler
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CppGenerator.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CppGenerator.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CppGenerator.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CppGenerator.java Wed Sep 5 04:57:47 2012
@@ -37,6 +37,7 @@ class CppGenerator extends CodeGenerator
* and spits-out file-level elements (such as include statements etc.)
* record-level code is generated by JRecord.
*/
+ @Override
void genCode(String name, ArrayList<JFile> ilist,
ArrayList<JRecord> rlist, String destDir, ArrayList<String> options)
throws IOException {
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JBoolean.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JBoolean.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JBoolean.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JBoolean.java Wed Sep 5 04:57:47 2012
@@ -36,20 +36,24 @@ public class JBoolean extends JType {
super("boolean", "Bool", "Boolean", "TypeID.RIOType.BOOL");
}
+ @Override
void genCompareTo(CodeBuffer cb, String fname, String other) {
cb.append(Consts.RIO_PREFIX + "ret = ("+fname+" == "+other+")? 0 : ("+
fname+"?1:-1);\n");
}
+ @Override
String getTypeIDObjectString() {
return "org.apache.hadoop.record.meta.TypeID.BoolTypeID";
}
+ @Override
void genHashCode(CodeBuffer cb, String fname) {
cb.append(Consts.RIO_PREFIX + "ret = ("+fname+")?0:1;\n");
}
// In Binary format, boolean is written as byte. true = 1, false = 0
+ @Override
void genSlurpBytes(CodeBuffer cb, String b, String s, String l) {
cb.append("{\n");
cb.append("if ("+l+"<1) {\n");
@@ -61,6 +65,7 @@ public class JBoolean extends JType {
}
// In Binary format, boolean is written as byte. true = 1, false = 0
+ @Override
void genCompareBytes(CodeBuffer cb) {
cb.append("{\n");
cb.append("if (l1<1 || l2<1) {\n");
@@ -81,6 +86,7 @@ public class JBoolean extends JType {
super("bool");
}
+ @Override
String getTypeIDObjectString() {
return "new ::hadoop::TypeID(::hadoop::RIOTYPE_BOOL)";
}
@@ -93,6 +99,7 @@ public class JBoolean extends JType {
setCType(new CType());
}
+ @Override
String getSignature() {
return "z";
}
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JBuffer.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JBuffer.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JBuffer.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JBuffer.java Wed Sep 5 04:57:47 2012
@@ -39,22 +39,27 @@ public class JBuffer extends JCompType {
"org.apache.hadoop.record.Buffer", "TypeID.RIOType.BUFFER");
}
+ @Override
String getTypeIDObjectString() {
return "org.apache.hadoop.record.meta.TypeID.BufferTypeID";
}
+ @Override
void genCompareTo(CodeBuffer cb, String fname, String other) {
cb.append(Consts.RIO_PREFIX + "ret = "+fname+".compareTo("+other+");\n");
}
+ @Override
void genEquals(CodeBuffer cb, String fname, String peer) {
cb.append(Consts.RIO_PREFIX + "ret = "+fname+".equals("+peer+");\n");
}
+ @Override
void genHashCode(CodeBuffer cb, String fname) {
cb.append(Consts.RIO_PREFIX + "ret = "+fname+".hashCode();\n");
}
+ @Override
void genSlurpBytes(CodeBuffer cb, String b, String s, String l) {
cb.append("{\n");
cb.append("int i = org.apache.hadoop.record.Utils.readVInt("+
@@ -64,6 +69,7 @@ public class JBuffer extends JCompType {
cb.append("}\n");
}
+ @Override
void genCompareBytes(CodeBuffer cb) {
cb.append("{\n");
cb.append("int i1 = org.apache.hadoop.record.Utils.readVInt(b1, s1);\n");
@@ -84,6 +90,7 @@ public class JBuffer extends JCompType {
super(" ::std::string");
}
+ @Override
void genGetSet(CodeBuffer cb, String fname) {
cb.append("virtual const "+getType()+"& get"+toCamelCase(fname)+"() const {\n");
cb.append("return "+fname+";\n");
@@ -93,6 +100,7 @@ public class JBuffer extends JCompType {
cb.append("}\n");
}
+ @Override
String getTypeIDObjectString() {
return "new ::hadoop::TypeID(::hadoop::RIOTYPE_BUFFER)";
}
@@ -105,6 +113,7 @@ public class JBuffer extends JCompType {
setCType(new CCompType());
}
+ @Override
String getSignature() {
return "B";
}
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JByte.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JByte.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JByte.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JByte.java Wed Sep 5 04:57:47 2012
@@ -37,10 +37,12 @@ public class JByte extends JType {
super("byte", "Byte", "Byte", "TypeID.RIOType.BYTE");
}
+ @Override
String getTypeIDObjectString() {
return "org.apache.hadoop.record.meta.TypeID.ByteTypeID";
}
+ @Override
void genSlurpBytes(CodeBuffer cb, String b, String s, String l) {
cb.append("{\n");
cb.append("if ("+l+"<1) {\n");
@@ -51,6 +53,7 @@ public class JByte extends JType {
cb.append("}\n");
}
+ @Override
void genCompareBytes(CodeBuffer cb) {
cb.append("{\n");
cb.append("if (l1<1 || l2<1) {\n");
@@ -71,6 +74,7 @@ public class JByte extends JType {
super("int8_t");
}
+ @Override
String getTypeIDObjectString() {
return "new ::hadoop::TypeID(::hadoop::RIOTYPE_BYTE)";
}
@@ -82,6 +86,7 @@ public class JByte extends JType {
setCType(new CType());
}
+ @Override
String getSignature() {
return "b";
}
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JCompType.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JCompType.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JCompType.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JCompType.java Wed Sep 5 04:57:47 2012
@@ -35,18 +35,22 @@ abstract class JCompType extends JType {
super(type, suffix, wrapper, typeIDByteString);
}
+ @Override
void genCompareTo(CodeBuffer cb, String fname, String other) {
cb.append(Consts.RIO_PREFIX + "ret = "+fname+".compareTo("+other+");\n");
}
+ @Override
void genEquals(CodeBuffer cb, String fname, String peer) {
cb.append(Consts.RIO_PREFIX + "ret = "+fname+".equals("+peer+");\n");
}
+ @Override
void genHashCode(CodeBuffer cb, String fname) {
cb.append(Consts.RIO_PREFIX + "ret = "+fname+".hashCode();\n");
}
+ @Override
void genClone(CodeBuffer cb, String fname) {
cb.append(Consts.RIO_PREFIX + "other."+fname+" = ("+getType()+") this."+
fname+".clone();\n");
@@ -59,6 +63,7 @@ abstract class JCompType extends JType {
super(type);
}
+ @Override
void genGetSet(CodeBuffer cb, String fname) {
cb.append("virtual const "+getType()+"& get"+toCamelCase(fname)+"() const {\n");
cb.append("return "+fname+";\n");
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JDouble.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JDouble.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JDouble.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JDouble.java Wed Sep 5 04:57:47 2012
@@ -36,15 +36,18 @@ public class JDouble extends JType {
super("double", "Double", "Double", "TypeID.RIOType.DOUBLE");
}
+ @Override
String getTypeIDObjectString() {
return "org.apache.hadoop.record.meta.TypeID.DoubleTypeID";
}
+ @Override
void genHashCode(CodeBuffer cb, String fname) {
String tmp = "Double.doubleToLongBits("+fname+")";
cb.append(Consts.RIO_PREFIX + "ret = (int)("+tmp+"^("+tmp+">>>32));\n");
}
+ @Override
void genSlurpBytes(CodeBuffer cb, String b, String s, String l) {
cb.append("{\n");
cb.append("if ("+l+"<8) {\n");
@@ -55,6 +58,7 @@ public class JDouble extends JType {
cb.append("}\n");
}
+ @Override
void genCompareBytes(CodeBuffer cb) {
cb.append("{\n");
cb.append("if (l1<8 || l2<8) {\n");
@@ -77,6 +81,7 @@ public class JDouble extends JType {
super("double");
}
+ @Override
String getTypeIDObjectString() {
return "new ::hadoop::TypeID(::hadoop::RIOTYPE_DOUBLE)";
}
@@ -90,6 +95,7 @@ public class JDouble extends JType {
setCType(new CType());
}
+ @Override
String getSignature() {
return "d";
}
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JFloat.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JFloat.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JFloat.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JFloat.java Wed Sep 5 04:57:47 2012
@@ -35,14 +35,17 @@ public class JFloat extends JType {
super("float", "Float", "Float", "TypeID.RIOType.FLOAT");
}
+ @Override
String getTypeIDObjectString() {
return "org.apache.hadoop.record.meta.TypeID.FloatTypeID";
}
+ @Override
void genHashCode(CodeBuffer cb, String fname) {
cb.append(Consts.RIO_PREFIX + "ret = Float.floatToIntBits("+fname+");\n");
}
+ @Override
void genSlurpBytes(CodeBuffer cb, String b, String s, String l) {
cb.append("{\n");
cb.append("if ("+l+"<4) {\n");
@@ -53,6 +56,7 @@ public class JFloat extends JType {
cb.append("}\n");
}
+ @Override
void genCompareBytes(CodeBuffer cb) {
cb.append("{\n");
cb.append("if (l1<4 || l2<4) {\n");
@@ -75,6 +79,7 @@ public class JFloat extends JType {
super("float");
}
+ @Override
String getTypeIDObjectString() {
return "new ::hadoop::TypeID(::hadoop::RIOTYPE_FLOAT)";
}
@@ -87,6 +92,7 @@ public class JFloat extends JType {
setCType(new CType());
}
+ @Override
String getSignature() {
return "f";
}
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JInt.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JInt.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JInt.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JInt.java Wed Sep 5 04:57:47 2012
@@ -38,10 +38,12 @@ public class JInt extends JType {
super("int", "Int", "Integer", "TypeID.RIOType.INT");
}
+ @Override
String getTypeIDObjectString() {
return "org.apache.hadoop.record.meta.TypeID.IntTypeID";
}
+ @Override
void genSlurpBytes(CodeBuffer cb, String b, String s, String l) {
cb.append("{\n");
cb.append("int i = org.apache.hadoop.record.Utils.readVInt("+b+", "+s+");\n");
@@ -50,6 +52,7 @@ public class JInt extends JType {
cb.append("}\n");
}
+ @Override
void genCompareBytes(CodeBuffer cb) {
cb.append("{\n");
cb.append("int i1 = org.apache.hadoop.record.Utils.readVInt(b1, s1);\n");
@@ -70,6 +73,7 @@ public class JInt extends JType {
super("int32_t");
}
+ @Override
String getTypeIDObjectString() {
return "new ::hadoop::TypeID(::hadoop::RIOTYPE_INT)";
}
@@ -82,6 +86,7 @@ public class JInt extends JType {
setCType(new CType());
}
+ @Override
String getSignature() {
return "i";
}
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JLong.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JLong.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JLong.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JLong.java Wed Sep 5 04:57:47 2012
@@ -37,15 +37,18 @@ public class JLong extends JType {
super("long", "Long", "Long", "TypeID.RIOType.LONG");
}
+ @Override
String getTypeIDObjectString() {
return "org.apache.hadoop.record.meta.TypeID.LongTypeID";
}
+ @Override
void genHashCode(CodeBuffer cb, String fname) {
cb.append(Consts.RIO_PREFIX + "ret = (int) ("+fname+"^("+
fname+">>>32));\n");
}
+ @Override
void genSlurpBytes(CodeBuffer cb, String b, String s, String l) {
cb.append("{\n");
cb.append("long i = org.apache.hadoop.record.Utils.readVLong("+b+", "+s+");\n");
@@ -54,6 +57,7 @@ public class JLong extends JType {
cb.append("}\n");
}
+ @Override
void genCompareBytes(CodeBuffer cb) {
cb.append("{\n");
cb.append("long i1 = org.apache.hadoop.record.Utils.readVLong(b1, s1);\n");
@@ -74,6 +78,7 @@ public class JLong extends JType {
super("int64_t");
}
+ @Override
String getTypeIDObjectString() {
return "new ::hadoop::TypeID(::hadoop::RIOTYPE_LONG)";
}
@@ -86,6 +91,7 @@ public class JLong extends JType {
setCType(new CType());
}
+ @Override
String getSignature() {
return "l";
}
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JMap.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JMap.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JMap.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JMap.java Wed Sep 5 04:57:47 2012
@@ -59,17 +59,20 @@ public class JMap extends JCompType {
this.value = value;
}
+ @Override
String getTypeIDObjectString() {
return "new org.apache.hadoop.record.meta.MapTypeID(" +
key.getTypeIDObjectString() + ", " +
value.getTypeIDObjectString() + ")";
}
+ @Override
void genSetRTIFilter(CodeBuffer cb, Map<String, Integer> nestedStructMap) {
key.genSetRTIFilter(cb, nestedStructMap);
value.genSetRTIFilter(cb, nestedStructMap);
}
+ @Override
void genCompareTo(CodeBuffer cb, String fname, String other) {
String setType = "java.util.Set<"+key.getWrapperType()+"> ";
String iterType = "java.util.Iterator<"+key.getWrapperType()+"> ";
@@ -98,6 +101,7 @@ public class JMap extends JCompType {
cb.append("}\n");
}
+ @Override
void genReadMethod(CodeBuffer cb, String fname, String tag, boolean decl) {
if (decl) {
cb.append(getType()+" "+fname+";\n");
@@ -122,6 +126,7 @@ public class JMap extends JCompType {
cb.append("}\n");
}
+ @Override
void genWriteMethod(CodeBuffer cb, String fname, String tag) {
String setType = "java.util.Set<java.util.Map.Entry<"+
key.getWrapperType()+","+value.getWrapperType()+">> ";
@@ -153,6 +158,7 @@ public class JMap extends JCompType {
decrLevel();
}
+ @Override
void genSlurpBytes(CodeBuffer cb, String b, String s, String l) {
cb.append("{\n");
incrLevel();
@@ -170,6 +176,7 @@ public class JMap extends JCompType {
cb.append("}\n");
}
+ @Override
void genCompareBytes(CodeBuffer cb) {
cb.append("{\n");
incrLevel();
@@ -208,12 +215,14 @@ public class JMap extends JCompType {
this.value = value;
}
+ @Override
String getTypeIDObjectString() {
return "new ::hadoop::MapTypeID(" +
key.getTypeIDObjectString() + ", " +
value.getTypeIDObjectString() + ")";
}
+ @Override
void genSetRTIFilter(CodeBuffer cb) {
key.genSetRTIFilter(cb);
value.genSetRTIFilter(cb);
@@ -230,6 +239,7 @@ public class JMap extends JCompType {
valueType = t2;
}
+ @Override
String getSignature() {
return "{" + keyType.getSignature() + valueType.getSignature() +"}";
}
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JRecord.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JRecord.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JRecord.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JRecord.java Wed Sep 5 04:57:47 2012
@@ -54,11 +54,13 @@ public class JRecord extends JCompType {
}
}
+ @Override
String getTypeIDObjectString() {
return "new org.apache.hadoop.record.meta.StructTypeID(" +
fullName + ".getTypeInfo())";
}
+ @Override
void genSetRTIFilter(CodeBuffer cb, Map<String, Integer> nestedStructMap) {
// ignore, if we'ev already set the type filter for this record
if (!nestedStructMap.containsKey(fullName)) {
@@ -129,6 +131,7 @@ public class JRecord extends JCompType {
cb.append("}\n");
}
+ @Override
void genReadMethod(CodeBuffer cb, String fname, String tag, boolean decl) {
if (decl) {
cb.append(fullName+" "+fname+";\n");
@@ -137,10 +140,12 @@ public class JRecord extends JCompType {
cb.append(fname+".deserialize(" + Consts.RECORD_INPUT + ",\""+tag+"\");\n");
}
+ @Override
void genWriteMethod(CodeBuffer cb, String fname, String tag) {
cb.append(fname+".serialize(" + Consts.RECORD_OUTPUT + ",\""+tag+"\");\n");
}
+ @Override
void genSlurpBytes(CodeBuffer cb, String b, String s, String l) {
cb.append("{\n");
cb.append("int r = "+fullName+
@@ -149,6 +154,7 @@ public class JRecord extends JCompType {
cb.append("}\n");
}
+ @Override
void genCompareBytes(CodeBuffer cb) {
cb.append("{\n");
cb.append("int r1 = "+fullName+
@@ -492,6 +498,7 @@ public class JRecord extends JCompType {
}
}
+ @Override
String getTypeIDObjectString() {
return "new ::hadoop::StructTypeID(" +
fullName + "::getTypeInfo().getFieldTypeInfos())";
@@ -501,6 +508,7 @@ public class JRecord extends JCompType {
return " "+name+" "+fname+";\n";
}
+ @Override
void genSetRTIFilter(CodeBuffer cb) {
// we set the RTI filter here
cb.append(fullName + "::setTypeFilter(rti.getNestedStructTypeInfo(\""+
@@ -797,6 +805,7 @@ public class JRecord extends JCompType {
signature = sb.toString();
}
+ @Override
String getSignature() {
return signature;
}
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JString.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JString.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JString.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JString.java Wed Sep 5 04:57:47 2012
@@ -36,10 +36,12 @@ public class JString extends JCompType {
super("String", "String", "String", "TypeID.RIOType.STRING");
}
+ @Override
String getTypeIDObjectString() {
return "org.apache.hadoop.record.meta.TypeID.StringTypeID";
}
+ @Override
void genSlurpBytes(CodeBuffer cb, String b, String s, String l) {
cb.append("{\n");
cb.append("int i = org.apache.hadoop.record.Utils.readVInt("+b+", "+s+");\n");
@@ -48,6 +50,7 @@ public class JString extends JCompType {
cb.append("}\n");
}
+ @Override
void genCompareBytes(CodeBuffer cb) {
cb.append("{\n");
cb.append("int i1 = org.apache.hadoop.record.Utils.readVInt(b1, s1);\n");
@@ -61,6 +64,7 @@ public class JString extends JCompType {
cb.append("}\n");
}
+ @Override
void genClone(CodeBuffer cb, String fname) {
cb.append(Consts.RIO_PREFIX + "other."+fname+" = this."+fname+";\n");
}
@@ -72,6 +76,7 @@ public class JString extends JCompType {
super("::std::string");
}
+ @Override
String getTypeIDObjectString() {
return "new ::hadoop::TypeID(::hadoop::RIOTYPE_STRING)";
}
@@ -84,6 +89,7 @@ public class JString extends JCompType {
setCType(new CCompType());
}
+ @Override
String getSignature() {
return "s";
}
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JVector.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JVector.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JVector.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JVector.java Wed Sep 5 04:57:47 2012
@@ -54,15 +54,18 @@ public class JVector extends JCompType {
element = t;
}
+ @Override
String getTypeIDObjectString() {
return "new org.apache.hadoop.record.meta.VectorTypeID(" +
element.getTypeIDObjectString() + ")";
}
+ @Override
void genSetRTIFilter(CodeBuffer cb, Map<String, Integer> nestedStructMap) {
element.genSetRTIFilter(cb, nestedStructMap);
}
+ @Override
void genCompareTo(CodeBuffer cb, String fname, String other) {
cb.append("{\n");
incrLevel();
@@ -92,6 +95,7 @@ public class JVector extends JCompType {
cb.append("}\n");
}
+ @Override
void genReadMethod(CodeBuffer cb, String fname, String tag, boolean decl) {
if (decl) {
cb.append(getType()+" "+fname+";\n");
@@ -113,6 +117,7 @@ public class JVector extends JCompType {
cb.append("}\n");
}
+ @Override
void genWriteMethod(CodeBuffer cb, String fname, String tag) {
cb.append("{\n");
incrLevel();
@@ -131,6 +136,7 @@ public class JVector extends JCompType {
decrLevel();
}
+ @Override
void genSlurpBytes(CodeBuffer cb, String b, String s, String l) {
cb.append("{\n");
incrLevel();
@@ -146,6 +152,7 @@ public class JVector extends JCompType {
cb.append("}\n");
}
+ @Override
void genCompareBytes(CodeBuffer cb) {
cb.append("{\n");
incrLevel();
@@ -179,11 +186,13 @@ public class JVector extends JCompType {
element = t;
}
+ @Override
String getTypeIDObjectString() {
return "new ::hadoop::VectorTypeID(" +
element.getTypeIDObjectString() + ")";
}
+ @Override
void genSetRTIFilter(CodeBuffer cb) {
element.genSetRTIFilter(cb);
}
@@ -198,6 +207,7 @@ public class JVector extends JCompType {
setCType(new CCompType());
}
+ @Override
String getSignature() {
return "[" + type.getSignature() + "]";
}
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JavaGenerator.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JavaGenerator.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JavaGenerator.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JavaGenerator.java Wed Sep 5 04:57:47 2012
@@ -39,6 +39,7 @@ class JavaGenerator extends CodeGenerato
* @param rlist List of records defined within this file
* @param destDir output directory
*/
+ @Override
void genCode(String name, ArrayList<JFile> ilist,
ArrayList<JRecord> rlist, String destDir, ArrayList<String> options)
throws IOException {
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/ant/RccTask.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/ant/RccTask.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/ant/RccTask.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/ant/RccTask.java Wed Sep 5 04:57:47 2012
@@ -110,6 +110,7 @@ public class RccTask extends Task {
/**
* Invoke the Hadoop record compiler on each record definition file
*/
+ @Override
public void execute() throws BuildException {
if (src == null && filesets.size()==0) {
throw new BuildException("There must be a file attribute or a fileset child element");
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/ParseException.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/ParseException.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/ParseException.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/ParseException.java Wed Sep 5 04:57:47 2012
@@ -120,6 +120,7 @@ public class ParseException extends Exce
* of the final stack trace, and hence the correct error message
* gets displayed.
*/
+ @Override
public String getMessage() {
if (!specialConstructor) {
return super.getMessage();
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/Rcc.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/Rcc.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/Rcc.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/Rcc.java Wed Sep 5 04:57:47 2012
@@ -24,7 +24,6 @@ import org.apache.hadoop.classification.
import org.apache.hadoop.record.compiler.*;
import java.util.ArrayList;
import java.util.Hashtable;
-import java.util.Iterator;
import java.io.File;
import java.io.FileReader;
import java.io.FileNotFoundException;
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/RccTokenManager.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/RccTokenManager.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/RccTokenManager.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/RccTokenManager.java Wed Sep 5 04:57:47 2012
@@ -20,14 +20,6 @@
package org.apache.hadoop.record.compiler.generated;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.record.compiler.*;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileNotFoundException;
-import java.io.IOException;
/**
* @deprecated Replaced by <a href="http://hadoop.apache.org/avro/">Avro</a>.
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/Token.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/Token.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/Token.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/Token.java Wed Sep 5 04:57:47 2012
@@ -78,6 +78,7 @@ public class Token {
/**
* Returns the image.
*/
+ @Override
public String toString()
{
return image;
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/TokenMgrError.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/TokenMgrError.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/TokenMgrError.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/generated/TokenMgrError.java Wed Sep 5 04:57:47 2012
@@ -138,6 +138,7 @@ public class TokenMgrError extends Error
*
* from this method for such cases in the release version of your parser.
*/
+ @Override
public String getMessage() {
return super.getMessage();
}
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/FieldTypeInfo.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/FieldTypeInfo.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/FieldTypeInfo.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/FieldTypeInfo.java Wed Sep 5 04:57:47 2012
@@ -69,6 +69,7 @@ public class FieldTypeInfo
/**
* Two FieldTypeInfos are equal if ach of their fields matches
*/
+ @Override
public boolean equals(Object o) {
if (this == o)
return true;
@@ -87,6 +88,7 @@ public class FieldTypeInfo
* We use a basic hashcode implementation, since this class will likely not
* be used as a hashmap key
*/
+ @Override
public int hashCode() {
return 37*17+typeID.hashCode() + 37*17+fieldID.hashCode();
}
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/MapTypeID.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/MapTypeID.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/MapTypeID.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/MapTypeID.java Wed Sep 5 04:57:47 2012
@@ -19,8 +19,6 @@
package org.apache.hadoop.record.meta;
import java.io.IOException;
-import java.util.*;
-
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.record.RecordOutput;
@@ -58,6 +56,7 @@ public class MapTypeID extends TypeID {
return this.typeIDValue;
}
+ @Override
void write(RecordOutput rout, String tag) throws IOException {
rout.writeByte(typeVal, tag);
typeIDKey.write(rout, tag);
@@ -68,6 +67,7 @@ public class MapTypeID extends TypeID {
* Two map typeIDs are equal if their constituent elements have the
* same type
*/
+ @Override
public boolean equals(Object o) {
if (!super.equals(o))
return false;
@@ -82,6 +82,7 @@ public class MapTypeID extends TypeID {
* We use a basic hashcode implementation, since this class will likely not
* be used as a hashmap key
*/
+ @Override
public int hashCode() {
return 37*17+typeIDKey.hashCode() + 37*17+typeIDValue.hashCode();
}
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/RecordTypeInfo.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/RecordTypeInfo.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/RecordTypeInfo.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/RecordTypeInfo.java Wed Sep 5 04:57:47 2012
@@ -122,6 +122,7 @@ public class RecordTypeInfo extends org.
/**
* Serialize the type information for a record
*/
+ @Override
public void serialize(RecordOutput rout, String tag) throws IOException {
// write out any header, version info, here
rout.startRecord(this, tag);
@@ -133,6 +134,7 @@ public class RecordTypeInfo extends org.
/**
* Deserialize the type information for a record
*/
+ @Override
public void deserialize(RecordInput rin, String tag) throws IOException {
// read in any header, version info
rin.startRecord(tag);
@@ -148,6 +150,7 @@ public class RecordTypeInfo extends org.
* So we always throw an exception.
* Not implemented. Always returns 0 if another RecordTypeInfo is passed in.
*/
+ @Override
public int compareTo (final Object peer_) throws ClassCastException {
if (!(peer_ instanceof RecordTypeInfo)) {
throw new ClassCastException("Comparing different types of records.");
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/StructTypeID.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/StructTypeID.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/StructTypeID.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/StructTypeID.java Wed Sep 5 04:57:47 2012
@@ -72,6 +72,7 @@ public class StructTypeID extends TypeID
return null;
}
+ @Override
void write(RecordOutput rout, String tag) throws IOException {
rout.writeByte(typeVal, tag);
writeRest(rout, tag);
@@ -155,9 +156,11 @@ public class StructTypeID extends TypeID
}
}
+ @Override
public boolean equals(Object o) {
return super.equals(o);
}
+ @Override
public int hashCode() { return super.hashCode(); }
}
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/TypeID.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/TypeID.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/TypeID.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/TypeID.java Wed Sep 5 04:57:47 2012
@@ -89,6 +89,7 @@ public class TypeID {
/**
* Two base typeIDs are equal if they refer to the same type
*/
+ @Override
public boolean equals(Object o) {
if (this == o)
return true;
@@ -107,6 +108,7 @@ public class TypeID {
* We use a basic hashcode implementation, since this class will likely not
* be used as a hashmap key
*/
+ @Override
public int hashCode() {
// See 'Effectve Java' by Joshua Bloch
return 37*17+(int)typeVal;
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/VectorTypeID.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/VectorTypeID.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/VectorTypeID.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/meta/VectorTypeID.java Wed Sep 5 04:57:47 2012
@@ -43,6 +43,7 @@ public class VectorTypeID extends TypeID
return this.typeIDElement;
}
+ @Override
void write(RecordOutput rout, String tag) throws IOException {
rout.writeByte(typeVal, tag);
typeIDElement.write(rout, tag);
@@ -52,6 +53,7 @@ public class VectorTypeID extends TypeID
* Two vector typeIDs are equal if their constituent elements have the
* same type
*/
+ @Override
public boolean equals(Object o) {
if (!super.equals (o))
return false;
@@ -64,6 +66,7 @@ public class VectorTypeID extends TypeID
* We use a basic hashcode implementation, since this class will likely not
* be used as a hashmap key
*/
+ @Override
public int hashCode() {
return 37*17+typeIDElement.hashCode();
}
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Credentials.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Credentials.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Credentials.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/Credentials.java Wed Sep 5 04:57:47 2012
@@ -274,10 +274,4 @@ public class Credentials implements Writ
}
}
}
-
- public void addTokensToUGI(UserGroupInformation ugi) {
- for (Map.Entry<Text, Token<?>> token: tokenMap.entrySet()) {
- ugi.addToken(token.getKey(), token.getValue());
- }
- }
}
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/RefreshUserMappingsProtocol.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/RefreshUserMappingsProtocol.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/RefreshUserMappingsProtocol.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/RefreshUserMappingsProtocol.java Wed Sep 5 04:57:47 2012
@@ -22,7 +22,6 @@ import java.io.IOException;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.fs.CommonConfigurationKeys;
-import org.apache.hadoop.ipc.VersionedProtocol;
import org.apache.hadoop.security.KerberosInfo;
/**
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslInputStream.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslInputStream.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslInputStream.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslInputStream.java Wed Sep 5 04:57:47 2012
@@ -189,6 +189,7 @@ public class SaslInputStream extends Inp
* @exception IOException
* if an I/O error occurs.
*/
+ @Override
public int read() throws IOException {
if (!useWrap) {
return inStream.read();
@@ -220,6 +221,7 @@ public class SaslInputStream extends Inp
* @exception IOException
* if an I/O error occurs.
*/
+ @Override
public int read(byte[] b) throws IOException {
return read(b, 0, b.length);
}
@@ -242,6 +244,7 @@ public class SaslInputStream extends Inp
* @exception IOException
* if an I/O error occurs.
*/
+ @Override
public int read(byte[] b, int off, int len) throws IOException {
if (!useWrap) {
return inStream.read(b, off, len);
@@ -286,6 +289,7 @@ public class SaslInputStream extends Inp
* @exception IOException
* if an I/O error occurs.
*/
+ @Override
public long skip(long n) throws IOException {
if (!useWrap) {
return inStream.skip(n);
@@ -312,6 +316,7 @@ public class SaslInputStream extends Inp
* @exception IOException
* if an I/O error occurs.
*/
+ @Override
public int available() throws IOException {
if (!useWrap) {
return inStream.available();
@@ -329,6 +334,7 @@ public class SaslInputStream extends Inp
* @exception IOException
* if an I/O error occurs.
*/
+ @Override
public void close() throws IOException {
disposeSasl();
ostart = 0;
@@ -344,6 +350,7 @@ public class SaslInputStream extends Inp
* @return <code>false</code>, since this class does not support the
* <code>mark</code> and <code>reset</code> methods.
*/
+ @Override
public boolean markSupported() {
return false;
}
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslOutputStream.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslOutputStream.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslOutputStream.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslOutputStream.java Wed Sep 5 04:57:47 2012
@@ -19,9 +19,7 @@
package org.apache.hadoop.security;
import java.io.BufferedOutputStream;
-import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.OutputStream;
@@ -122,6 +120,7 @@ public class SaslOutputStream extends Ou
* @exception IOException
* if an I/O error occurs.
*/
+ @Override
public void write(int b) throws IOException {
if (!useWrap) {
outStream.write(b);
@@ -146,6 +145,7 @@ public class SaslOutputStream extends Ou
* @exception IOException
* if an I/O error occurs.
*/
+ @Override
public void write(byte[] b) throws IOException {
write(b, 0, b.length);
}
@@ -163,6 +163,7 @@ public class SaslOutputStream extends Ou
* @exception IOException
* if an I/O error occurs.
*/
+ @Override
public void write(byte[] inBuf, int off, int len) throws IOException {
if (!useWrap) {
outStream.write(inBuf, off, len);
@@ -197,6 +198,7 @@ public class SaslOutputStream extends Ou
* @exception IOException
* if an I/O error occurs.
*/
+ @Override
public void flush() throws IOException {
outStream.flush();
}
@@ -208,6 +210,7 @@ public class SaslOutputStream extends Ou
* @exception IOException
* if an I/O error occurs.
*/
+ @Override
public void close() throws IOException {
disposeSasl();
outStream.close();
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcClient.java Wed Sep 5 04:57:47 2012
@@ -239,6 +239,7 @@ public class SaslRpcClient {
this.userPassword = SaslRpcServer.encodePassword(token.getPassword());
}
+ @Override
public void handle(Callback[] callbacks)
throws UnsupportedCallbackException {
NameCallback nc = null;
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcServer.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcServer.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcServer.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslRpcServer.java Wed Sep 5 04:57:47 2012
@@ -194,7 +194,6 @@ public class SaslRpcServer {
return encodePassword(secretManager.retrievePassword(tokenid));
}
- /** {@inheritDoc} */
@Override
public void handle(Callback[] callbacks) throws InvalidToken,
UnsupportedCallbackException {
@@ -253,7 +252,6 @@ public class SaslRpcServer {
@InterfaceStability.Evolving
public static class SaslGssCallbackHandler implements CallbackHandler {
- /** {@inheritDoc} */
@Override
public void handle(Callback[] callbacks) throws
UnsupportedCallbackException {
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java Wed Sep 5 04:57:47 2012
@@ -498,6 +498,7 @@ public class SecurityUtil {
* Uses standard java host resolution
*/
static class StandardHostResolver implements HostResolver {
+ @Override
public InetAddress getByName(String host) throws UnknownHostException {
return InetAddress.getByName(host);
}
@@ -542,6 +543,7 @@ public class SecurityUtil {
* @return InetAddress with the fully qualified hostname or ip
* @throws UnknownHostException if host does not exist
*/
+ @Override
public InetAddress getByName(String host) throws UnknownHostException {
InetAddress addr = null;
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedUnixGroupsMapping.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedUnixGroupsMapping.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedUnixGroupsMapping.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedUnixGroupsMapping.java Wed Sep 5 04:57:47 2012
@@ -20,10 +20,7 @@ package org.apache.hadoop.security;
import java.io.IOException;
import java.util.LinkedList;
import java.util.List;
-import java.util.Map;
import java.util.StringTokenizer;
-import java.util.concurrent.ConcurrentHashMap;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience;
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedUnixGroupsNetgroupMapping.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedUnixGroupsNetgroupMapping.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedUnixGroupsNetgroupMapping.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ShellBasedUnixGroupsNetgroupMapping.java Wed Sep 5 04:57:47 2012
@@ -20,12 +20,6 @@ package org.apache.hadoop.security;
import java.io.IOException;
import java.util.LinkedList;
import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.StringTokenizer;
-import java.util.concurrent.ConcurrentHashMap;
-
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/UserGroupInformation.java Wed Sep 5 04:57:47 2012
@@ -19,7 +19,6 @@ package org.apache.hadoop.security;
import static org.apache.hadoop.fs.CommonConfigurationKeys.HADOOP_SECURITY_AUTHENTICATION;
-import java.io.File;
import java.io.IOException;
import java.lang.reflect.UndeclaredThrowableException;
import java.security.AccessControlContext;
@@ -28,12 +27,10 @@ import java.security.Principal;
import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -344,6 +341,7 @@ public class UserGroupInformation {
this.realUser = realUser;
}
+ @Override
public String getName() {
return realUser.getUserName();
}
@@ -647,7 +645,7 @@ public class UserGroupInformation {
// user.
Credentials cred = Credentials.readTokenStorageFile(
new Path("file:///" + fileLocation), conf);
- cred.addTokensToUGI(loginUser);
+ loginUser.addCredentials(cred);
}
loginUser.spawnAutoRenewalThreadForUserCreds();
} catch (LoginException le) {
@@ -700,6 +698,7 @@ public class UserGroupInformation {
!isKeytab) {
Thread t = new Thread(new Runnable() {
+ @Override
public void run() {
String cmd = conf.get("hadoop.kerberos.kinit.command",
"kinit");
@@ -1176,41 +1175,6 @@ public class UserGroupInformation {
public synchronized Set<TokenIdentifier> getTokenIdentifiers() {
return subject.getPublicCredentials(TokenIdentifier.class);
}
-
- // wrapper to retain the creds key for the token
- private class NamedToken {
- Text alias;
- Token<? extends TokenIdentifier> token;
- NamedToken(Text alias, Token<? extends TokenIdentifier> token) {
- this.alias = alias;
- this.token = token;
- }
- @Override
- public boolean equals(Object o) {
- boolean equals;
- if (o == this) {
- equals = true;
- } else if (!(o instanceof NamedToken)) {
- equals = false;
- } else {
- Text otherAlias = ((NamedToken)o).alias;
- if (alias == otherAlias) {
- equals = true;
- } else {
- equals = (otherAlias != null && otherAlias.equals(alias));
- }
- }
- return equals;
- }
- @Override
- public int hashCode() {
- return (alias != null) ? alias.hashCode() : -1;
- }
- @Override
- public String toString() {
- return "NamedToken: alias="+alias+" token="+token;
- }
- }
/**
* Add a token to this UGI
@@ -1219,7 +1183,7 @@ public class UserGroupInformation {
* @return true on successful add of new token
*/
public synchronized boolean addToken(Token<? extends TokenIdentifier> token) {
- return addToken(token.getService(), token);
+ return (token != null) ? addToken(token.getService(), token) : false;
}
/**
@@ -1231,10 +1195,8 @@ public class UserGroupInformation {
*/
public synchronized boolean addToken(Text alias,
Token<? extends TokenIdentifier> token) {
- NamedToken namedToken = new NamedToken(alias, token);
- Collection<Object> ugiCreds = subject.getPrivateCredentials();
- ugiCreds.remove(namedToken); // allow token to be replaced
- return ugiCreds.add(new NamedToken(alias, token));
+ getCredentialsInternal().addToken(alias, token);
+ return true;
}
/**
@@ -1244,8 +1206,8 @@ public class UserGroupInformation {
*/
public synchronized
Collection<Token<? extends TokenIdentifier>> getTokens() {
- return Collections.unmodifiableList(
- new ArrayList<Token<?>>(getCredentials().getAllTokens()));
+ return Collections.unmodifiableCollection(
+ getCredentialsInternal().getAllTokens());
}
/**
@@ -1254,11 +1216,26 @@ public class UserGroupInformation {
* @return Credentials of tokens associated with this user
*/
public synchronized Credentials getCredentials() {
- final Credentials credentials = new Credentials();
- final Set<NamedToken> namedTokens =
- subject.getPrivateCredentials(NamedToken.class);
- for (final NamedToken namedToken : namedTokens) {
- credentials.addToken(namedToken.alias, namedToken.token);
+ return new Credentials(getCredentialsInternal());
+ }
+
+ /**
+ * Add the given Credentials to this user.
+ * @param credentials of tokens and secrets
+ */
+ public synchronized void addCredentials(Credentials credentials) {
+ getCredentialsInternal().addAll(credentials);
+ }
+
+ private synchronized Credentials getCredentialsInternal() {
+ final Credentials credentials;
+ final Set<Credentials> credentialsSet =
+ subject.getPrivateCredentials(Credentials.class);
+ if (!credentialsSet.isEmpty()){
+ credentials = credentialsSet.iterator().next();
+ } else {
+ credentials = new Credentials();
+ subject.getPrivateCredentials().add(credentials);
}
return credentials;
}
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/AccessControlList.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/AccessControlList.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/AccessControlList.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/AccessControlList.java Wed Sep 5 04:57:47 2012
@@ -48,6 +48,7 @@ public class AccessControlList implement
WritableFactories.setFactory
(AccessControlList.class,
new WritableFactory() {
+ @Override
public Writable newInstance() { return new AccessControlList(); }
});
}
@@ -318,6 +319,7 @@ public class AccessControlList implement
/**
* Serializes the AccessControlList object
*/
+ @Override
public void write(DataOutput out) throws IOException {
String aclString = getAclString();
Text.writeString(out, aclString);
@@ -326,6 +328,7 @@ public class AccessControlList implement
/**
* Deserializes the AccessControlList object
*/
+ @Override
public void readFields(DataInput in) throws IOException {
String aclString = Text.readString(in);
buildACL(aclString);
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/PolicyProvider.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/PolicyProvider.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/PolicyProvider.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/PolicyProvider.java Wed Sep 5 04:57:47 2012
@@ -42,6 +42,7 @@ public abstract class PolicyProvider {
*/
public static final PolicyProvider DEFAULT_POLICY_PROVIDER =
new PolicyProvider() {
+ @Override
public Service[] getServices() {
return null;
}
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/RefreshAuthorizationPolicyProtocol.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/RefreshAuthorizationPolicyProtocol.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/RefreshAuthorizationPolicyProtocol.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/RefreshAuthorizationPolicyProtocol.java Wed Sep 5 04:57:47 2012
@@ -22,7 +22,6 @@ import java.io.IOException;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.fs.CommonConfigurationKeys;
-import org.apache.hadoop.ipc.VersionedProtocol;
import org.apache.hadoop.security.KerberosInfo;
/**
Modified: hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/FileBasedKeyStoresFactory.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/FileBasedKeyStoresFactory.java?rev=1380990&r1=1380989&r2=1380990&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/FileBasedKeyStoresFactory.java (original)
+++ hadoop/common/branches/HDFS-3077/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/ssl/FileBasedKeyStoresFactory.java Wed Sep 5 04:57:47 2012
@@ -124,6 +124,7 @@ public class FileBasedKeyStoresFactory i
* @throws GeneralSecurityException thrown if the keystores could not be
* initialized due to a security error.
*/
+ @Override
public void init(SSLFactory.Mode mode)
throws IOException, GeneralSecurityException {