You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by dk...@apache.org on 2020/05/21 13:45:02 UTC
[avro] branch master updated (88538e9 -> 5e8537c)
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/avro.git.
from 88538e9 AVRO-2551:Changed datum API to value API in examples\quickstop
new 833127d [AVRO-2572] Fixup the soname slightly to not have the extra .0 at the end
new 5e8537c [AVRO-2486] Don't ignore fwrite error
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
lang/c++/CMakeLists.txt | 10 ++++++----
lang/c/src/io.c | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
[avro] 02/02: [AVRO-2486] Don't ignore fwrite error
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/avro.git
commit 5e8537c3363a8fe3076295e5c8f3ae229991314f
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Thu May 21 09:42:28 2020 -0400
[AVRO-2486] Don't ignore fwrite error
---
lang/c/src/io.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lang/c/src/io.c b/lang/c/src/io.c
index 00c6857..c1e2f5d 100644
--- a/lang/c/src/io.c
+++ b/lang/c/src/io.c
@@ -345,7 +345,7 @@ avro_write_file(struct _avro_writer_file_t *writer, void *buf, int64_t len)
if (len > 0) {
rval = fwrite(buf, len, 1, writer->fp);
if (rval == 0) {
- return feof(writer->fp) ? EOF : 0;
+ return EIO;
}
}
return 0;
[avro] 01/02: [AVRO-2572] Fixup the soname slightly to not have the
extra .0 at the end
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/avro.git
commit 833127d6ed09618babd1cce10053d5f183740dab
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Thu May 21 09:00:55 2020 -0400
[AVRO-2572] Fixup the soname slightly to not have the extra .0 at the end
---
lang/c++/CMakeLists.txt | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/lang/c++/CMakeLists.txt b/lang/c++/CMakeLists.txt
index 30a5d66..ca03f36 100644
--- a/lang/c++/CMakeLists.txt
+++ b/lang/c++/CMakeLists.txt
@@ -34,8 +34,10 @@ else (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/VERSION.txt)
endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/VERSION.txt)
string(REPLACE "\n" "" AVRO_VERSION ${AVRO_VERSION})
-set (AVRO_VERSION_MAJOR ${AVRO_VERSION})
-set (AVRO_VERSION_MINOR "0")
+string(REPLACE "." ";" AVRO_VERSION ${AVRO_VERSION})
+list(GET AVRO_VERSION 0 AVRO_VERSION_MAJOR)
+list(GET AVRO_VERSION 1 AVRO_VERSION_MINOR)
+list(GET AVRO_VERSION 2 AVRO_VERSION_PATCH)
project (Avro-cpp)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR})
@@ -113,10 +115,10 @@ set_property (TARGET avrocpp avrocpp_s
APPEND PROPERTY COMPILE_DEFINITIONS AVRO_SOURCE)
set_target_properties (avrocpp PROPERTIES
- VERSION ${AVRO_VERSION_MAJOR}.${AVRO_VERSION_MINOR})
+ VERSION ${AVRO_VERSION_MAJOR}.${AVRO_VERSION_MINOR}.${AVRO_VERSION_PATCH})
set_target_properties (avrocpp_s PROPERTIES
- VERSION ${AVRO_VERSION_MAJOR}.${AVRO_VERSION_MINOR})
+ VERSION ${AVRO_VERSION_MAJOR}.${AVRO_VERSION_MINOR}.${AVRO_VERSION_PATCH})
target_link_libraries (avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES})