Author: cutting
Date: Tue Sep 20 22:32:58 2011
New Revision: 1173410
URL: http://svn.apache.org/viewvc?rev=1173410&view=rev
Log:
AVRO-888. Java: Add SeekableByteArrayInput. Contributed by Saleem Shafi.
Added:
avro/trunk/lang/java/avro/src/main/java/org/apache/avro/file/SeekableByteArrayInput.java
avro/trunk/lang/java/avro/src/test/java/org/apache/avro/file/TestSeekableByteArrayInput.java
Modified:
avro/trunk/CHANGES.txt
Modified: avro/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1173410&r1=1173409&r2=1173410&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Tue Sep 20 22:32:58 2011
@@ -60,6 +60,9 @@ Avro 1.6.0 (unreleased)
AVRO-866. Java: Add support in IDL for documentation in protocols
and messages. (George Fletcher via cutting)
+ AVRO-888. Java: Add SeekableByteArrayInput, a utility to permit
+ use of memory-based AvroDataFiles. (Saleem Shafi via cutting)
+
BUG FIXES
AVRO-824. Java: Fix usage message of BinaryFragmentToJsonTool.
Added:
avro/trunk/lang/java/avro/src/main/java/org/apache/avro/file/SeekableByteArrayInput.java
URL:
http://svn.apache.org/viewvc/avro/trunk/lang/java/avro/src/main/java/org/apache/avro/file/SeekableByteArrayInput.java?rev=1173410&view=auto
==============================================================================
---
avro/trunk/lang/java/avro/src/main/java/org/apache/avro/file/SeekableByteArrayInput.java
(added)
+++
avro/trunk/lang/java/avro/src/main/java/org/apache/avro/file/SeekableByteArrayInput.java
Tue Sep 20 22:32:58 2011
@@ -0,0 +1,42 @@
+/**
+ * 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.avro.file;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+
+/** A {@link SeekableInput} backed with data in a byte array. */
+public class SeekableByteArrayInput extends ByteArrayInputStream implements
SeekableInput {
+
+ public SeekableByteArrayInput(byte[] data) {
+ super(data);
+ }
+
+ public long length() throws IOException {
+ return this.count;
+ }
+
+ public void seek(long p) throws IOException {
+ this.reset();
+ this.skip(p);
+ }
+
+ public long tell() throws IOException {
+ return this.pos;
+ }
+}
Added:
avro/trunk/lang/java/avro/src/test/java/org/apache/avro/file/TestSeekableByteArrayInput.java
URL:
http://svn.apache.org/viewvc/avro/trunk/lang/java/avro/src/test/java/org/apache/avro/file/TestSeekableByteArrayInput.java?rev=1173410&view=auto
==============================================================================
---
avro/trunk/lang/java/avro/src/test/java/org/apache/avro/file/TestSeekableByteArrayInput.java
(added)
+++
avro/trunk/lang/java/avro/src/test/java/org/apache/avro/file/TestSeekableByteArrayInput.java
Tue Sep 20 22:32:58 2011
@@ -0,0 +1,86 @@
+/**
+ * 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.avro.file;
+
+import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.avro.Schema;
+import org.apache.avro.Schema.Field;
+import org.apache.avro.Schema.Type;
+import org.apache.avro.generic.GenericData.Record;
+import org.apache.avro.generic.GenericDatumReader;
+import org.apache.avro.generic.GenericRecord;
+import org.apache.avro.generic.IndexedRecord;
+import org.apache.avro.specific.SpecificDatumWriter;
+import org.apache.avro.util.Utf8;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestSeekableByteArrayInput {
+
+ private byte[] getSerializedMessage(IndexedRecord message, Schema schema)
throws Exception {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream(4096);
+ SpecificDatumWriter<IndexedRecord> writer = new
SpecificDatumWriter<IndexedRecord>();
+ DataFileWriter<IndexedRecord> dfw = null;
+ try {
+ dfw = new DataFileWriter<IndexedRecord>(writer).create(schema,
baos);
+ dfw.append(message);
+ } finally {
+ if (dfw != null) {
+ dfw.close();
+ }
+ }
+ return baos.toByteArray();
+ }
+
+ private Schema getTestSchema() throws Exception {
+ Schema schema = Schema.createRecord("TestRecord", "this is a test
record", "org.apache.avro.file", false);
+ List<Field> fields = new ArrayList<Field>();
+ fields.add(new Field("name", Schema.create(Type.STRING), "this is a
test field", null));
+ schema.setFields(fields);
+ return schema;
+ }
+
+ @Test
+ public void testSerialization() throws Exception {
+ Schema testSchema = getTestSchema();
+ GenericRecord message = new Record(testSchema);
+ message.put("name", "testValue");
+
+ byte[] data = getSerializedMessage(message, testSchema);
+
+ GenericDatumReader<IndexedRecord> reader = new
GenericDatumReader<IndexedRecord>(testSchema);
+
+ SeekableInput in = new SeekableByteArrayInput(data);
+ FileReader<IndexedRecord> dfr = null;
+ IndexedRecord result = null;
+ try {
+ dfr = DataFileReader.openReader(in, reader);
+ result = dfr.next();
+ } finally {
+ if (dfr != null) {
+ dfr.close();
+ }
+ }
+ Assert.assertNotNull(result);
+ Assert.assertTrue(result instanceof GenericRecord);
+ Assert.assertEquals(new Utf8("testValue"), ((GenericRecord)
result).get("name"));
+ }
+}
