Author: dcreager
Date: Thu Dec 19 22:23:30 2013
New Revision: 1552444
URL: http://svn.apache.org/r1552444
Log:
AVRO-1405. C: Check for end-of-file correctly.
Contributed by Miki Ristimaki.
Added:
avro/trunk/lang/c/tests/test_avro_1405.c
Modified:
avro/trunk/CHANGES.txt
avro/trunk/lang/c/src/io.c
avro/trunk/lang/c/tests/CMakeLists.txt
Modified: avro/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1552444&r1=1552443&r2=1552444&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Thu Dec 19 22:23:30 2013
@@ -97,6 +97,9 @@ Trunk (not yet released)
AVRO-1369. C: Use correct byte-swapping functions on Mac OS X.
(thinker0 via dcreager)
+ AVRO-1405. C: Check for end-of-file correctly.
+ (Mika Ristimaki via dcreager)
+
Avro 1.7.5 (12 August 2013)
NEW FEATURES
Modified: avro/trunk/lang/c/src/io.c
URL:
http://svn.apache.org/viewvc/avro/trunk/lang/c/src/io.c?rev=1552444&r1=1552443&r2=1552444&view=diff
==============================================================================
--- avro/trunk/lang/c/src/io.c (original)
+++ avro/trunk/lang/c/src/io.c Thu Dec 19 22:23:30 2013
@@ -438,7 +438,10 @@ void avro_writer_free(avro_writer_t writ
int avro_reader_is_eof(avro_reader_t reader)
{
if (is_file_io(reader)) {
- return feof(avro_reader_to_file(reader)->fp);
+ struct _avro_reader_file_t *file = avro_reader_to_file(reader);
+ if (feof(file->fp)) {
+ return file->cur == file->end;
+ }
}
return 0;
}
Modified: avro/trunk/lang/c/tests/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/avro/trunk/lang/c/tests/CMakeLists.txt?rev=1552444&r1=1552443&r2=1552444&view=diff
==============================================================================
--- avro/trunk/lang/c/tests/CMakeLists.txt (original)
+++ avro/trunk/lang/c/tests/CMakeLists.txt Thu Dec 19 22:23:30 2013
@@ -57,6 +57,7 @@ add_avro_test(test_avro_1165)
add_avro_test(test_avro_1237)
add_avro_test(test_avro_1238)
add_avro_test(test_avro_1279)
+add_avro_test(test_avro_1405)
add_avro_test(test_avro_data)
add_avro_test(test_refcount)
add_avro_test(test_cpp test_cpp.cpp)
Added: avro/trunk/lang/c/tests/test_avro_1405.c
URL:
http://svn.apache.org/viewvc/avro/trunk/lang/c/tests/test_avro_1405.c?rev=1552444&view=auto
==============================================================================
--- avro/trunk/lang/c/tests/test_avro_1405.c (added)
+++ avro/trunk/lang/c/tests/test_avro_1405.c Thu Dec 19 22:23:30 2013
@@ -0,0 +1,160 @@
+/*
+ * 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.
+ */
+
+#include <stdio.h>
+#include "avro.h"
+
+#define NUM_RECORDS 10
+
+const char PERSON_SCHEMA[] =
+ "{"
+ " \"type\":\"record\","
+ " \"name\":\"Person\","
+ " \"fields\": ["
+ " {\"name\": \"ID\", \"type\": \"long\"},"
+ " {\"name\": \"First\", \"type\": \"string\"},"
+ " {\"name\": \"Last\", \"type\": \"string\"},"
+ " {\"name\": \"Phone\", \"type\": \"string\"},"
+ " {\"name\": \"Age\", \"type\": \"int\"}"
+ " ]"
+ "}";
+
+const char *file = "avro_file.dat";
+
+void print_avro_value(avro_value_t *value) {
+ char *json;
+ if (!avro_value_to_json(value, 1, &json)) {
+ printf("%s\n", json);
+ free(json);
+ }
+}
+
+int read_data() {
+ int rval;
+ int records_read = 0;
+
+ avro_file_reader_t reader;
+ avro_value_iface_t *iface;
+ avro_value_t value;
+
+ avro_file_reader(file, &reader);
+ avro_schema_t schema = avro_file_reader_get_writer_schema(reader);
+
+ iface = avro_generic_class_from_schema(schema);
+ avro_generic_value_new(iface, &value);
+
+ printf("\nReading...\n");
+ while ((rval = avro_file_reader_read_value(reader, &value)) == 0) {
+ char *json;
+
+ if (avro_value_to_json(&value, 1, &json)) {
+ printf("Error converting value to JSON:
%s\n",avro_strerror());
+ } else {
+ printf("%s\n", json);
+ free(json);
+ records_read++;
+ }
+
+ avro_value_reset(&value);
+ }
+
+ avro_value_decref(&value);
+ avro_value_iface_decref(iface);
+ avro_schema_decref(schema);
+ avro_file_reader_close(reader);
+
+ if (rval != EOF || records_read != NUM_RECORDS) {
+ fprintf(stderr, "Error: %s\n", avro_strerror());
+ return EXIT_FAILURE;
+ }
+
+ return EXIT_SUCCESS;
+}
+
+int write_data() {
+ int i;
+ avro_schema_t schema;
+ avro_schema_error_t error;
+ avro_file_writer_t writer;
+ avro_value_iface_t *iface;
+ avro_value_t value;
+
+ if (avro_schema_from_json(PERSON_SCHEMA, 0, &schema, &error)) {
+ printf ("Unable to parse schema\n");
+ return EXIT_FAILURE;
+ }
+
+ iface = avro_generic_class_from_schema(schema);
+ avro_generic_value_new(iface, &value);
+
+ if (avro_file_writer_create(file, schema, &writer)) {
+ printf ("There was an error creating file: %s\n",
avro_strerror());
+ return EXIT_FAILURE;
+ }
+
+ printf("\nWriting...\n");
+ for (i = 0; i < NUM_RECORDS; i++) {
+ avro_value_t field;
+ avro_value_get_by_name(&value, "ID", &field, NULL);
+ avro_value_set_long(&field, (int64_t) i);
+
+ avro_value_get_by_name(&value, "Age", &field, NULL);
+ avro_value_set_int(&field, i);
+
+ avro_value_get_by_name(&value, "First", &field, NULL);
+ avro_value_set_string(&field, "Firstname");
+
+ avro_value_get_by_name(&value, "Last", &field, NULL);
+ avro_value_set_string(&field, "Lastname");
+
+
+ avro_value_get_by_name(&value, "Phone", &field, NULL);
+ avro_value_set_string(&field, "1234567");
+
+ print_avro_value(&value);
+
+ avro_file_writer_append_value(writer, &value);
+
+ // Writing multiple blocks
+ avro_file_writer_close(writer);
+ avro_file_writer_open(file, &writer);
+
+ avro_value_reset(&value);
+ }
+
+ avro_file_writer_close(writer);
+ avro_value_iface_decref(iface);
+ avro_value_decref(&value);
+ avro_schema_decref(schema);
+
+ return EXIT_SUCCESS;
+}
+
+
+int main()
+{
+ int read_data_result;
+
+ if (write_data()) {
+ return EXIT_FAILURE;
+ }
+
+ read_data_result = read_data();
+ remove(file);
+
+ return read_data_result;
+}
