hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r686568 [3/3] - in /hadoop/hbase/trunk: ./ lib/ src/java/org/apache/hadoop/hbase/thrift/ src/java/org/apache/hadoop/hbase/thrift/generated/
Date Sat, 16 Aug 2008 22:04:17 GMT
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/IOError.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/IOError.java?rev=686568&r1=686567&r2=686568&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/IOError.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/IOError.java Sat
Aug 16 15:04:16 2008
@@ -23,9 +23,11 @@
  */
 package org.apache.hadoop.hbase.thrift.generated;
 
+import java.util.List;
 import java.util.ArrayList;
-import java.util.AbstractMap;
+import java.util.Map;
 import java.util.HashMap;
+import java.util.Set;
 import java.util.HashSet;
 import com.facebook.thrift.*;
 
@@ -41,7 +43,7 @@
   public String message;
 
   public final Isset __isset = new Isset();
-  public static final class Isset {
+  public static final class Isset implements java.io.Serializable {
     public boolean message = false;
   }
 
@@ -56,6 +58,34 @@
     this.__isset.message = true;
   }
 
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof IOError)
+      return this.equals((IOError)that);
+    return false;
+  }
+
+  public boolean equals(IOError that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_message = true && (this.message != null);
+    boolean that_present_message = true && (that.message != null);
+    if (this_present_message || that_present_message) {
+      if (!(this_present_message && that_present_message))
+        return false;
+      if (!this.message.equals(that.message))
+        return false;
+    }
+
+    return true;
+  }
+
+  public int hashCode() {
+    return 0;
+  }
+
   public void read(TProtocol iprot) throws TException {
     TField field;
     iprot.readStructBegin();

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/IllegalArgument.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/IllegalArgument.java?rev=686568&r1=686567&r2=686568&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/IllegalArgument.java
(original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/IllegalArgument.java
Sat Aug 16 15:04:16 2008
@@ -23,9 +23,11 @@
  */
 package org.apache.hadoop.hbase.thrift.generated;
 
+import java.util.List;
 import java.util.ArrayList;
-import java.util.AbstractMap;
+import java.util.Map;
 import java.util.HashMap;
+import java.util.Set;
 import java.util.HashSet;
 import com.facebook.thrift.*;
 
@@ -40,7 +42,7 @@
   public String message;
 
   public final Isset __isset = new Isset();
-  public static final class Isset {
+  public static final class Isset implements java.io.Serializable {
     public boolean message = false;
   }
 
@@ -55,6 +57,34 @@
     this.__isset.message = true;
   }
 
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof IllegalArgument)
+      return this.equals((IllegalArgument)that);
+    return false;
+  }
+
+  public boolean equals(IllegalArgument that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_message = true && (this.message != null);
+    boolean that_present_message = true && (that.message != null);
+    if (this_present_message || that_present_message) {
+      if (!(this_present_message && that_present_message))
+        return false;
+      if (!this.message.equals(that.message))
+        return false;
+    }
+
+    return true;
+  }
+
+  public int hashCode() {
+    return 0;
+  }
+
   public void read(TProtocol iprot) throws TException {
     TField field;
     iprot.readStructBegin();

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/Mutation.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/Mutation.java?rev=686568&r1=686567&r2=686568&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/Mutation.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/Mutation.java Sat
Aug 16 15:04:16 2008
@@ -23,9 +23,11 @@
  */
 package org.apache.hadoop.hbase.thrift.generated;
 
+import java.util.List;
 import java.util.ArrayList;
-import java.util.AbstractMap;
+import java.util.Map;
 import java.util.HashMap;
+import java.util.Set;
 import java.util.HashSet;
 import com.facebook.thrift.*;
 
@@ -41,7 +43,7 @@
   public byte[] value;
 
   public final Isset __isset = new Isset();
-  public static final class Isset {
+  public static final class Isset implements java.io.Serializable {
     public boolean isDelete = false;
     public boolean column = false;
     public boolean value = false;
@@ -66,6 +68,52 @@
     this.__isset.value = true;
   }
 
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof Mutation)
+      return this.equals((Mutation)that);
+    return false;
+  }
+
+  public boolean equals(Mutation that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_isDelete = true;
+    boolean that_present_isDelete = true;
+    if (this_present_isDelete || that_present_isDelete) {
+      if (!(this_present_isDelete && that_present_isDelete))
+        return false;
+      if (this.isDelete != that.isDelete)
+        return false;
+    }
+
+    boolean this_present_column = true && (this.column != null);
+    boolean that_present_column = true && (that.column != null);
+    if (this_present_column || that_present_column) {
+      if (!(this_present_column && that_present_column))
+        return false;
+      if (!java.util.Arrays.equals(this.column, that.column))
+        return false;
+    }
+
+    boolean this_present_value = true && (this.value != null);
+    boolean that_present_value = true && (that.value != null);
+    if (this_present_value || that_present_value) {
+      if (!(this_present_value && that_present_value))
+        return false;
+      if (!java.util.Arrays.equals(this.value, that.value))
+        return false;
+    }
+
+    return true;
+  }
+
+  public int hashCode() {
+    return 0;
+  }
+
   public void read(TProtocol iprot) throws TException {
     TField field;
     iprot.readStructBegin();

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/NotFound.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/NotFound.java?rev=686568&r1=686567&r2=686568&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/NotFound.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/NotFound.java Sat
Aug 16 15:04:16 2008
@@ -23,9 +23,11 @@
  */
 package org.apache.hadoop.hbase.thrift.generated;
 
+import java.util.List;
 import java.util.ArrayList;
-import java.util.AbstractMap;
+import java.util.Map;
 import java.util.HashMap;
+import java.util.Set;
 import java.util.HashSet;
 import com.facebook.thrift.*;
 
@@ -40,7 +42,7 @@
   public String message;
 
   public final Isset __isset = new Isset();
-  public static final class Isset {
+  public static final class Isset implements java.io.Serializable {
     public boolean message = false;
   }
 
@@ -55,6 +57,34 @@
     this.__isset.message = true;
   }
 
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof NotFound)
+      return this.equals((NotFound)that);
+    return false;
+  }
+
+  public boolean equals(NotFound that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_message = true && (this.message != null);
+    boolean that_present_message = true && (that.message != null);
+    if (this_present_message || that_present_message) {
+      if (!(this_present_message && that_present_message))
+        return false;
+      if (!this.message.equals(that.message))
+        return false;
+    }
+
+    return true;
+  }
+
+  public int hashCode() {
+    return 0;
+  }
+
   public void read(TProtocol iprot) throws TException {
     TField field;
     iprot.readStructBegin();

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/RegionDescriptor.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/RegionDescriptor.java?rev=686568&r1=686567&r2=686568&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/RegionDescriptor.java
(original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/RegionDescriptor.java
Sat Aug 16 15:04:16 2008
@@ -1,111 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Autogenerated by Thrift
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- */
-package org.apache.hadoop.hbase.thrift.generated;
-
-import java.util.ArrayList;
-import java.util.AbstractMap;
-import java.util.HashMap;
-import java.util.HashSet;
-import com.facebook.thrift.*;
-
-import com.facebook.thrift.protocol.*;
-import com.facebook.thrift.transport.*;
-
-/**
- * A RegionDescriptor contains informationa about an HTable region.
- * Currently, this is just the startKey of the region.
- */
-public class RegionDescriptor implements TBase, java.io.Serializable {
-  public byte[] startKey;
-
-  public final Isset __isset = new Isset();
-  public static final class Isset {
-    public boolean startKey = false;
-  }
-
-  public RegionDescriptor() {
-  }
-
-  public RegionDescriptor(
-    byte[] startKey)
-  {
-    this();
-    this.startKey = startKey;
-    this.__isset.startKey = true;
-  }
-
-  public void read(TProtocol iprot) throws TException {
-    TField field;
-    iprot.readStructBegin();
-    while (true)
-    {
-      field = iprot.readFieldBegin();
-      if (field.type == TType.STOP) { 
-        break;
-      }
-      switch (field.id)
-      {
-        case 1:
-          if (field.type == TType.STRING) {
-            this.startKey = iprot.readBinary();
-            this.__isset.startKey = true;
-          } else { 
-            TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        default:
-          TProtocolUtil.skip(iprot, field.type);
-          break;
-      }
-      iprot.readFieldEnd();
-    }
-    iprot.readStructEnd();
-  }
-
-  public void write(TProtocol oprot) throws TException {
-    TStruct struct = new TStruct("RegionDescriptor");
-    oprot.writeStructBegin(struct);
-    TField field = new TField();
-    if (this.startKey != null) {
-      field.name = "startKey";
-      field.type = TType.STRING;
-      field.id = 1;
-      oprot.writeFieldBegin(field);
-      oprot.writeBinary(this.startKey);
-      oprot.writeFieldEnd();
-    }
-    oprot.writeFieldStop();
-    oprot.writeStructEnd();
-  }
-
-  public String toString() {
-    StringBuilder sb = new StringBuilder("RegionDescriptor(");
-    sb.append("startKey:");
-    sb.append(this.startKey);
-    sb.append(")");
-    return sb.toString();
-  }
-
-}
-

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/ScanEntry.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/ScanEntry.java?rev=686568&r1=686567&r2=686568&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/ScanEntry.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/generated/ScanEntry.java Sat
Aug 16 15:04:16 2008
@@ -1,153 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Autogenerated by Thrift
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- */
-package org.apache.hadoop.hbase.thrift.generated;
-
-import java.util.ArrayList;
-import java.util.AbstractMap;
-import java.util.HashMap;
-import java.util.HashSet;
-import com.facebook.thrift.*;
-
-import com.facebook.thrift.protocol.*;
-import com.facebook.thrift.transport.*;
-
-/**
- * A ScanEntry contains the row, column, and value information for a scanner's
- * current location.
- */
-public class ScanEntry implements TBase, java.io.Serializable {
-  public byte[] row;
-  public AbstractMap<byte[],byte[]> columns;
-
-  public final Isset __isset = new Isset();
-  public static final class Isset {
-    public boolean row = false;
-    public boolean columns = false;
-  }
-
-  public ScanEntry() {
-  }
-
-  public ScanEntry(
-    byte[] row,
-    AbstractMap<byte[],byte[]> columns)
-  {
-    this();
-    this.row = row;
-    this.__isset.row = true;
-    this.columns = columns;
-    this.__isset.columns = true;
-  }
-
-  public void read(TProtocol iprot) throws TException {
-    TField field;
-    iprot.readStructBegin();
-    while (true)
-    {
-      field = iprot.readFieldBegin();
-      if (field.type == TType.STOP) { 
-        break;
-      }
-      switch (field.id)
-      {
-        case 1:
-          if (field.type == TType.STRING) {
-            this.row = iprot.readBinary();
-            this.__isset.row = true;
-          } else { 
-            TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 2:
-          if (field.type == TType.MAP) {
-            {
-              TMap _map0 = iprot.readMapBegin();
-              this.columns = new HashMap<byte[],byte[]>(2*_map0.size);
-              for (int _i1 = 0; _i1 < _map0.size; ++_i1)
-              {
-                byte[] _key2;
-                byte[] _val3;
-                _key2 = iprot.readBinary();
-                _val3 = iprot.readBinary();
-                this.columns.put(_key2, _val3);
-              }
-              iprot.readMapEnd();
-            }
-            this.__isset.columns = true;
-          } else { 
-            TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        default:
-          TProtocolUtil.skip(iprot, field.type);
-          break;
-      }
-      iprot.readFieldEnd();
-    }
-    iprot.readStructEnd();
-  }
-
-  public void write(TProtocol oprot) throws TException {
-    TStruct struct = new TStruct("ScanEntry");
-    oprot.writeStructBegin(struct);
-    TField field = new TField();
-    if (this.row != null) {
-      field.name = "row";
-      field.type = TType.STRING;
-      field.id = 1;
-      oprot.writeFieldBegin(field);
-      oprot.writeBinary(this.row);
-      oprot.writeFieldEnd();
-    }
-    if (this.columns != null) {
-      field.name = "columns";
-      field.type = TType.MAP;
-      field.id = 2;
-      oprot.writeFieldBegin(field);
-      {
-        oprot.writeMapBegin(new TMap(TType.STRING, TType.STRING, this.columns.size()));
-        for (byte[] _iter4 : this.columns.keySet())        {
-          oprot.writeBinary(_iter4);
-          oprot.writeBinary(this.columns.get(_iter4));
-        }
-        oprot.writeMapEnd();
-      }
-      oprot.writeFieldEnd();
-    }
-    oprot.writeFieldStop();
-    oprot.writeStructEnd();
-  }
-
-  public String toString() {
-    StringBuilder sb = new StringBuilder("ScanEntry(");
-    sb.append("row:");
-    sb.append(this.row);
-    sb.append(",columns:");
-    sb.append(this.columns);
-    sb.append(")");
-    return sb.toString();
-  }
-
-}
-

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/package.html
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/package.html?rev=686568&r1=686567&r2=686568&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/package.html (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/package.html Sat Aug 16 15:04:16
2008
@@ -49,7 +49,7 @@
 
 <p>The files were generated by running the commands:
 <pre>
-  thrift -strict -java Hbase.thrift
+  thrift -strict --gen java Hbase.thrift
   mv gen-java/org/apache/hadoop/hbase/thrift/generated .
   rm -rf gen-java
 </pre>
@@ -62,8 +62,8 @@
 under the hbase/lib directory.
 </p>
 
-<p>The version of Thrift used to generate the Java files is revision 746 from
-the <a href="http://svn.facebook.com/svnroot/thrift/">SVN repository</a>.</p>
+<p>The version of Thrift used to generate the Java files is release 20080411p1 from
+the <a href="http://developers.facebook.com/thrift/">thrift homepage</a>.</p>
 
 <p>The ThriftServer is run like:
 <pre>



Mime
View raw message