Merge pull request #16 from pjreed/remove-locks

Remove locks when reading bag files

Author: pjreed

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Java Bag Reader changelog
 
+1.6
+
+- Removed file locking when reading bag files
+
 1.5
 
 - Acquiring shared locks when reading bag files

README.md

@@ -18,7 +18,7 @@ Add the following dependency to your Maven pom.xml:
 <dependency>
     <groupId>com.github.swri-robotics</groupId>
     <artifactId>bag-reader-java</artifactId>
-    <version>1.4</version>
+    <version>1.6</version>
 </dependency>
 ```
 

pom.xml

@@ -9,7 +9,7 @@
     <groupId>com.github.swri-robotics</groupId>
     <artifactId>bag-reader-java</artifactId>
     <packaging>jar</packaging>
-    <version>1.5</version>
+    <version>1.6</version>
     <name>bag-reader-java</name>
     <url>https://github.com/swri-robotics/bag-reader-java</url>
     <properties>

src/main/java/com/github/swrirobotics/bags/reader/BagFile.java

@@ -50,7 +50,6 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.channels.FileChannel;
-import java.nio.channels.FileLock;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.SeekableByteChannel;
 import java.nio.file.FileSystems;
@@ -275,7 +274,6 @@ public Connection findFirstConnectionByMd5Sum(String msgMd5Sum) {
     public void forFirstTopicWithMessagesOfType(String messageType, MessageHandler handler) throws BagReaderException {
         for (Connection conn : myConnectionsByType.get(messageType)) {
             try (FileChannel channel = getChannel()) {
-                FileLock lock = channel.lock(0, Long.MAX_VALUE, true);
                 MsgIterator iter = new MsgIterator(myChunkInfos, conn, channel);
 
                 while (iter.hasNext()) {
@@ -307,7 +305,6 @@ public void forFirstTopicWithMessagesOfType(String messageType, MessageHandler h
     public void forMessagesOfType(String messageType, MessageHandler handler) throws BagReaderException {
         for (Connection conn : myConnectionsByType.get(messageType)) {
             try (FileChannel channel = getChannel()) {
-                FileLock lock = channel.lock(0, Long.MAX_VALUE, true);
                 MsgIterator iter = new MsgIterator(myChunkInfos, conn, channel);
 
                 while (iter.hasNext()) {
@@ -336,7 +333,6 @@ public void forMessagesOfType(String messageType, MessageHandler handler) throws
     public void forMessagesOnTopic(String topic, MessageHandler handler) throws BagReaderException {
         for (Connection conn : myConnectionsByTopic.get(topic)) {
             try (FileChannel channel = getChannel()) {
-                FileLock lock = channel.lock(0, Long.MAX_VALUE, true);
                 MsgIterator iter = new MsgIterator(myChunkInfos, conn, channel);
 
                 while (iter.hasNext()) {
@@ -361,7 +357,6 @@ public void forMessagesOnTopic(String topic, MessageHandler handler) throws BagR
     public MessageType getFirstMessageOfType(String messageType) throws BagReaderException {
         for (Connection conn : myConnectionsByType.get(messageType)) {
             try (FileChannel channel = getChannel()) {
-                FileLock lock = channel.lock(0, Long.MAX_VALUE, true);
                 MsgIterator iter = new MsgIterator(myChunkInfos, conn, channel);
                 if (iter.hasNext()) {
                     return iter.next();
@@ -388,7 +383,6 @@ public MessageType getFirstMessageOfType(String messageType) throws BagReaderExc
     public MessageType getFirstMessageOnTopic(String topic) throws BagReaderException {
         for (Connection conn : myConnectionsByTopic.get(topic)) {
             try (FileChannel channel = getChannel()) {
-                FileLock lock = channel.lock(0, Long.MAX_VALUE, true);
                 MsgIterator iter = new MsgIterator(myChunkInfos, conn, channel);
                 if (iter.hasNext()) {
                     return iter.next();
@@ -507,7 +501,6 @@ else if (compression.equals("lz4")) {
             chunkPositions.add(info.getChunkPos());
         }
         try (FileChannel channel = getChannel()) {
-            FileLock lock = channel.lock(0, Long.MAX_VALUE, true);
             for (Long chunkPos : chunkPositions) {
                 Chunk chunk = new Chunk(recordAt(channel, chunkPos));
                 String compression = chunk.getCompression();
@@ -598,7 +591,6 @@ public MessageType getMessageOnTopicAtIndex(String topic,
         }
 
         try (FileChannel channel = getChannel()) {
-            FileLock lock = channel.lock(0, Long.MAX_VALUE, true);
             MessageIndex msgIndex = indexes.get(index);
             Record record = BagFile.recordAt(channel, msgIndex.fileIndex);
             ByteBufferChannel chunkChannel = new ByteBufferChannel(record.getData());
@@ -626,7 +618,6 @@ public MessageType getMessageOnTopicAtIndex(String topic,
     private void generateIndexesForTopic(String topic) throws BagReaderException {
         List<MessageIndex> msgIndexes = Lists.newArrayList();
         try (FileChannel channel = getChannel()) {
-            FileLock lock = channel.lock(0, Long.MAX_VALUE, true);
             for (Connection conn : myConnectionsByTopic.get(topic)) {
                 for (ChunkInfo chunkInfo : myChunkInfosByConnectionId.get(conn.getConnectionId())) {
                     long chunkPos = chunkInfo.getChunkPos();
@@ -807,7 +798,6 @@ public void read() throws BagReaderException {
         }
 
         try (FileChannel input = getChannel()){
-            FileLock lock = input.lock(0, Long.MAX_VALUE, true);
             verifyBagFile(input);
 
             while (hasNext(input)) {

src/main/java/com/github/swrirobotics/bags/reader/messages/serialization/PrimitiveType.java

@@ -91,6 +91,14 @@ public void setName(String name) {
      */
     abstract public void setValue(String value);
 
+    /**
+     * Sets the value of this field from an object of the same type.
+     * @param value The value to set in this field.
+     */
+    public void setValue(T value) {
+        myValue = value;
+    }
+
     /**
      * Creates a copy of this field.  The new field will have the same type,
      * name, and default value, but if this field had previously been read