Address darion's comments

vesoft-inc · Dec 13, 2019 · f1a7511 · f1a7511
1 parent 735d908
commit f1a7511
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/src/dataman/RowReader.cpp b/src/dataman/RowReader.cpp
@@ -293,7 +293,7 @@ int64_t RowReader::skipToNext(int64_t index, int64_t offset) const noexcept {
             break;
         }
         case cpp2::SupportedType::FLOAT: {
-            // Eight bytes
+            // Four bytes
             offset += sizeof(float);
             break;
         }

diff --git a/src/jni/java/src/main/java/com/vesoft/nebula/NebulaCodec.java b/src/jni/java/src/main/java/com/vesoft/nebula/NebulaCodec.java
@@ -19,7 +19,13 @@ public class NebulaCodec {
     private static final Logger LOGGER = LoggerFactory.getLogger(NebulaCodec.class.getName());
 
     static {
-        System.loadLibrary("nebula_codec");
+        try {
+            System.loadLibrary("nebula_codec");
+        } catch (Exception e) {
+            LOGGER.error(e.getMessage(), e);
+        } catch (Error e) {
+            LOGGER.error(e.getMessage(), e);
+        }
     }
 
     public static class Pair {

diff --git a/src/jni/src/datamanlite/RowReader.cpp b/src/jni/src/datamanlite/RowReader.cpp
@@ -250,7 +250,7 @@ int64_t RowReader::skipToNext(int64_t index, int64_t offset) const noexcept {
             break;
         }
         case ValueType::FLOAT: {
-            // Eight bytes
+            // Four bytes
             offset += sizeof(float);
             break;
         }

diff --git a/src/jni/src/datamanlite/RowReader.h b/src/jni/src/datamanlite/RowReader.h
@@ -69,7 +69,8 @@ class RowReader {
     public:
         template<typename T>
         typename std::enable_if<std::is_integral<T>::value, ResultType>::type
-            getInt(T& v) const noexcept;
+        getInt(T& v) const noexcept;
+
         ResultType getBool(bool& v) const noexcept;
         ResultType getFloat(float& v) const noexcept;
         ResultType getDouble(double& v) const noexcept;
@@ -199,7 +200,8 @@ class RowReader {
     // A negative number will be returned if an error occurs
     template<typename T>
     typename std::enable_if<std::is_integral<T>::value, int32_t>::type
-        readInteger(int64_t offset, T& v) const noexcept;
+    readInteger(int64_t offset, T& v) const noexcept;
+
     int32_t readFloat(int64_t offset, float& v) const noexcept;
     int32_t readDouble(int64_t offset, double& v) const noexcept;
     int32_t readString(int64_t offset, Slice& v) const noexcept;
@@ -210,7 +212,8 @@ class RowReader {
     // When succeeded, offset will advance
     template<typename T>
     typename std::enable_if<std::is_integral<T>::value, ResultType>::type
-        getInt(int64_t index, int64_t& offset, T& v) const noexcept;
+    getInt(int64_t index, int64_t& offset, T& v) const noexcept;
+
     ResultType getBool(int64_t index, int64_t& offset, bool& v) const noexcept;
     ResultType getFloat(int64_t index, int64_t& offset, float& v) const noexcept;
     ResultType getDouble(int64_t index, int64_t& offset, double& v)