Fix cmake format

This commit is contained in:
Yurui Zhou committed 2019-06-06 15:12:01 +08:00
1 parent f2a0c04b88
commit 44505df5db
4 files changed
+21 -23

No files matched your search

+1 -2
View File
@@ -319,8 +319,7 @@ function(ADD_ARROW_LIB LIB_NAME)
endif()
set_target_properties(${LIB_NAME}_static
PROPERTIES LIBRARY_OUTPUT_DIRECTORY
"${OUTPUT_PATH}" OUTPUT_NAME
PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${OUTPUT_PATH}" OUTPUT_NAME
${LIB_NAME_STATIC})
if(ARG_STATIC_INSTALL_INTERFACE_LIBS)
+1 -1
View File
@@ -20,5 +20,5 @@
#
if(ARROW_ORC)
add_subdirectory(orc)
add_subdirectory(orc)
endif()
+18 -18
View File
@@ -33,23 +33,23 @@ add_subdirectory(../../../../java/adapter/orc ./java)
set(ARROW_BUILD_STATIC OFF)
ADD_ARROW_LIB(arrow_orc_jni
BUILD_SHARED
SOURCES
jni_wrapper.cpp
OUTPUTS
ARROW_ORC_JNI_LIBRARIES
SHARED_PRIVATE_LINK_LIBS
arrow_static
EXTRA_INCLUDES
${JNI_HEADERS_DIR}
PRIVATE_INCLUDES
${JNI_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
DEPENDENCIES
arrow_static
arrow_orc_java
OUTPUT_PATH
${CMAKE_CURRENT_BINARY_DIR})
add_arrow_lib(arrow_orc_jni
BUILD_SHARED
SOURCES
jni_wrapper.cpp
OUTPUTS
ARROW_ORC_JNI_LIBRARIES
SHARED_PRIVATE_LINK_LIBS
arrow_static
EXTRA_INCLUDES
${JNI_HEADERS_DIR}
PRIVATE_INCLUDES
${JNI_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR}
DEPENDENCIES
arrow_static
arrow_orc_java
OUTPUT_PATH
${CMAKE_CURRENT_BINARY_DIR})
add_dependencies(arrow_orc_jni ${ARROW_ORC_JNI_LIBRARIES})
@@ -99,6 +99,7 @@ public class OrcStripeReader extends ArrowReader {
new ByteArrayReadableSeekableByteChannel(schemaBytes)), allocator);
MessageResult result = schemaReader.readNext();
schemaReader.close();
if (result == null) {
throw new IOException("Unexpected end of input. Missing schema.");
@@ -108,8 +109,6 @@ public class OrcStripeReader extends ArrowReader {
throw new IOException("Expected schema but header was " + result.getMessage().headerType());
}
schemaReader.close();
return MessageSerializer.deserializeSchema(result.getMessage());
}