svn commit: r1340721 - in /avro/trunk: CHANGES.txt lang/c/src/datafile.c lang/c/tests/CMakeLists.txt lang/c/tests/test_avro_1084.c

[dc...@apache.org]

Author: dcreager
Date: Sun May 20 13:56:57 2012
New Revision: 1340721

URL: http://svn.apache.org/viewvc?rev=1340721&view=rev
Log:
AVRO-1084. C: Fix reference counting in file_reader and file_writer

Contributed by Pugachev Maxim.

Added:
    avro/trunk/lang/c/tests/test_avro_1084.c
Modified:
    avro/trunk/CHANGES.txt
    avro/trunk/lang/c/src/datafile.c
    avro/trunk/lang/c/tests/CMakeLists.txt

Modified: avro/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1340721&r1=1340720&r2=1340721&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Sun May 20 13:56:57 2012
@@ -90,6 +90,9 @@ Avro 1.7.0 (unreleased)
 
     AVRO-1096. C: Don't set default CMAKE_OSX_ARCHITECTURES. (dcreager)
 
+    AVRO-1084. C: Fix reference counting in file_reader and file_writer.
+    (Pugachev Maxim via dcreager)
+
 Avro 1.6.3 (5 March 2012)
 
     AVRO-1077. Missing 'inline' for union set function. (thiru)

Modified: avro/trunk/lang/c/src/datafile.c
URL: http://svn.apache.org/viewvc/avro/trunk/lang/c/src/datafile.c?rev=1340721&r1=1340720&r2=1340721&view=diff
==============================================================================
--- avro/trunk/lang/c/src/datafile.c (original)
+++ avro/trunk/lang/c/src/datafile.c Sun May 20 13:56:57 2012
@@ -163,7 +163,7 @@ file_writer_create(const char *path, avr
 		return ENOMEM;
 	}
 
-	w->writers_schema = schema;
+	w->writers_schema = avro_schema_incref(schema);
 	return write_header(w);
 }
 
@@ -454,7 +454,7 @@ avro_schema_t
 avro_file_reader_get_writer_schema(avro_file_reader_t r)
 {
 	check_param(NULL, r, "reader");
-	return r->writers_schema;
+	return avro_schema_incref(r->writers_schema);
 }
 
 static int file_write_block(avro_file_writer_t w)
@@ -549,6 +549,7 @@ int avro_file_writer_close(avro_file_wri
 {
 	int rval;
 	check(rval, avro_file_writer_flush(w));
+	avro_schema_decref(w->writers_schema);
 	avro_writer_free(w->datum_writer);
 	avro_writer_free(w->writer);
 	avro_free(w->datum_buffer, w->datum_buffer_size);

Modified: avro/trunk/lang/c/tests/CMakeLists.txt
URL: http://svn.apache.org/viewvc/avro/trunk/lang/c/tests/CMakeLists.txt?rev=1340721&r1=1340720&r2=1340721&view=diff
==============================================================================
--- avro/trunk/lang/c/tests/CMakeLists.txt (original)
+++ avro/trunk/lang/c/tests/CMakeLists.txt Sun May 20 13:56:57 2012
@@ -51,6 +51,7 @@ add_avro_test(test_avro_values)
 add_avro_test(test_avro_968)
 add_avro_test(test_avro_984)
 add_avro_test(test_avro_1034)
+add_avro_test(test_avro_1084)
 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_1084.c
URL: http://svn.apache.org/viewvc/avro/trunk/lang/c/tests/test_avro_1084.c?rev=1340721&view=auto
==============================================================================
--- avro/trunk/lang/c/tests/test_avro_1084.c (added)
+++ avro/trunk/lang/c/tests/test_avro_1084.c Sun May 20 13:56:57 2012
@@ -0,0 +1,73 @@
+/*
+ * 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 <avro.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+const char  PERSON_SCHEMA[] =
+"{\"type\":\"record\",\
+  \"name\":\"Person\",\
+  \"fields\":[\
+     {\"name\": \"ID\", \"type\": \"long\"}]}";
+
+const char *dbname = "test.db";
+avro_schema_t schema;
+
+int main()
+{
+	avro_file_writer_t writer;
+
+	// refcount == 1
+	if (avro_schema_from_json_literal (PERSON_SCHEMA, &schema))
+	{
+		printf ("Unable to parse schema\n");
+		return EXIT_FAILURE;
+	}
+
+	// BUG: refcount == 1
+	if (avro_file_writer_create ("test.db", schema, &writer))
+	{
+		printf ("There was an error creating db: %s\n", avro_strerror());
+		return EXIT_FAILURE;
+	}
+
+	// this is "unusual" behaviour
+	// refcount == 0
+	avro_schema_decref (schema);
+
+	// crash
+	avro_datum_t main_datum = avro_record(schema);		
+	avro_datum_t id_datum = avro_int32(1);
+	
+	if (avro_record_set (main_datum, "ID", id_datum))
+	{
+		printf ("Unable to create datum");
+		return EXIT_FAILURE;
+	}
+
+	avro_file_writer_append (writer, main_datum);
+	avro_file_writer_flush (writer);
+	avro_file_writer_close (writer);
+	remove (dbname);
+
+	avro_datum_decref (id_datum);
+	avro_datum_decref (main_datum);
+
+	return EXIT_SUCCESS;
+}
+