Author: cutting
Date: Wed Jan 3 10:56:54 2007
New Revision: 492251
URL: http://svn.apache.org/viewvc?view=rev&rev=492251
Log:
HADOOP-850. Add Writable implementations for variable-length integers.
Contributed by Andrzej.
Added:
lucene/hadoop/trunk/src/java/org/apache/hadoop/io/VIntWritable.java
lucene/hadoop/trunk/src/java/org/apache/hadoop/io/VLongWritable.java
Modified:
lucene/hadoop/trunk/CHANGES.txt
Modified: lucene/hadoop/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=492251&r1=492250&r2=492251
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Wed Jan 3 10:56:54 2007
@@ -162,6 +162,9 @@
45. HADOOP-745. Fix a synchronization bug in the HDFS namenode.
(Dhruba Borthakur via cutting)
+46. HADOOP-850. Add Writable implementations for variable-length
+ integers. (ab via cutting)
+
Release 0.9.2 - 2006-12-15
Added: lucene/hadoop/trunk/src/java/org/apache/hadoop/io/VIntWritable.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/io/VIntWritable.java?view=auto&rev=492251
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/io/VIntWritable.java (added)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/io/VIntWritable.java Wed Jan
3 10:56:54 2007
@@ -0,0 +1,74 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.io;
+
+import java.io.*;
+
+/** A WritableComparable for integer values stored in variable-length format.
+ * Such values take between one and five bytes. Smaller values take fewer
bytes.
+ *
+ * @author Andrzej Bialecki
+ * @see org.apache.hadoop.io.WritableUtils#readVInt(DataInput)
+ */
+public class VIntWritable implements WritableComparable {
+ private int value;
+
+ public VIntWritable() {}
+
+ public VIntWritable(int value) { set(value); }
+
+ /** Set the value of this VIntWritable. */
+ public void set(int value) { this.value = value; }
+
+ /** Return the value of this VIntWritable. */
+ public int get() { return value; }
+
+ public void readFields(DataInput in) throws IOException {
+ value = WritableUtils.readVInt(in);
+ }
+
+ public void write(DataOutput out) throws IOException {
+ WritableUtils.writeVInt(out, value);
+ }
+
+ /** Returns true iff <code>o</code> is a VIntWritable with the same value. */
+ public boolean equals(Object o) {
+ if (!(o instanceof VIntWritable))
+ return false;
+ VIntWritable other = (VIntWritable)o;
+ return this.value == other.value;
+ }
+
+ public int hashCode() {
+ return (int)value;
+ }
+
+ /** Compares two VIntWritables. */
+ public int compareTo(Object o) {
+ int thisValue = this.value;
+ int thatValue = ((VIntWritable)o).value;
+ return (thisValue < thatValue ? -1 : (thisValue == thatValue ? 0 : 1));
+ }
+
+ public String toString() {
+ return Integer.toString(value);
+ }
+
+}
+
Added: lucene/hadoop/trunk/src/java/org/apache/hadoop/io/VLongWritable.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/io/VLongWritable.java?view=auto&rev=492251
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/io/VLongWritable.java (added)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/io/VLongWritable.java Wed
Jan 3 10:56:54 2007
@@ -0,0 +1,74 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.io;
+
+import java.io.*;
+
+/** A WritableComparable for longs in a variable-length format. Such values
take
+ * between one and five bytes. Smaller values take fewer bytes.
+ *
+ * @author Andrzej Bialecki
+ * @see org.apache.hadoop.io.WritableUtils#readVLong(DataInput)
+ */
+public class VLongWritable implements WritableComparable {
+ private long value;
+
+ public VLongWritable() {}
+
+ public VLongWritable(long value) { set(value); }
+
+ /** Set the value of this LongWritable. */
+ public void set(long value) { this.value = value; }
+
+ /** Return the value of this LongWritable. */
+ public long get() { return value; }
+
+ public void readFields(DataInput in) throws IOException {
+ value = WritableUtils.readVLong(in);
+ }
+
+ public void write(DataOutput out) throws IOException {
+ WritableUtils.writeVLong(out, value);
+ }
+
+ /** Returns true iff <code>o</code> is a VLongWritable with the same value.
*/
+ public boolean equals(Object o) {
+ if (!(o instanceof VLongWritable))
+ return false;
+ VLongWritable other = (VLongWritable)o;
+ return this.value == other.value;
+ }
+
+ public int hashCode() {
+ return (int)value;
+ }
+
+ /** Compares two VLongWritables. */
+ public int compareTo(Object o) {
+ long thisValue = this.value;
+ long thatValue = ((VLongWritable)o).value;
+ return (thisValue < thatValue ? -1 : (thisValue == thatValue ? 0 : 1));
+ }
+
+ public String toString() {
+ return Long.toString(value);
+ }
+
+}
+
