This is an automated email from the ASF dual-hosted git repository.

jiangtian pushed a commit to branch dev/1.1
in repository https://gitbox.apache.org/repos/asf/tsfile.git


The following commit(s) were added to refs/heads/dev/1.1 by this push:
     new 2ee995d7 [to dev/1.1] Add final for readData methods (#347)
2ee995d7 is described below

commit 2ee995d73a54384e4dcae1d4796d8cc5a43bb879
Author: shuwenwei <[email protected]>
AuthorDate: Fri Dec 27 12:35:11 2024 +0800

    [to dev/1.1] Add final for readData methods (#347)
    
    * add final for readData methods
    
    * update pom.xml
---
 .../java/org/apache/tsfile/read/TsFileSequenceReader.java     |  6 +++---
 pom.xml                                                       | 11 +++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git 
a/java/tsfile/src/main/java/org/apache/tsfile/read/TsFileSequenceReader.java 
b/java/tsfile/src/main/java/org/apache/tsfile/read/TsFileSequenceReader.java
index 376fc9b9..ff7c5006 100644
--- a/java/tsfile/src/main/java/org/apache/tsfile/read/TsFileSequenceReader.java
+++ b/java/tsfile/src/main/java/org/apache/tsfile/read/TsFileSequenceReader.java
@@ -1828,7 +1828,7 @@ public class TsFileSequenceReader implements 
AutoCloseable {
    * @param totalSize the size of data that want to read
    * @return data that been read.
    */
-  protected ByteBuffer readData(long position, int totalSize) throws 
IOException {
+  protected final ByteBuffer readData(long position, int totalSize) throws 
IOException {
     return readData(position, totalSize, null);
   }
 
@@ -1889,7 +1889,7 @@ public class TsFileSequenceReader implements 
AutoCloseable {
    * @param end the end position of data that want to read
    * @return data that been read.
    */
-  protected ByteBuffer readData(long start, long end) throws IOException {
+  protected final ByteBuffer readData(long start, long end) throws IOException 
{
     return readData(start, end, null);
   }
 
@@ -1903,7 +1903,7 @@ public class TsFileSequenceReader implements 
AutoCloseable {
    * @param ioSizeRecorder can be null
    * @return data that been read.
    */
-  protected ByteBuffer readData(long start, long end, LongConsumer 
ioSizeRecorder)
+  protected final ByteBuffer readData(long start, long end, LongConsumer 
ioSizeRecorder)
       throws IOException {
     try {
       return readData(start, (int) (end - start), ioSizeRecorder);
diff --git a/pom.xml b/pom.xml
index 5360c1e7..687fce2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -359,6 +359,17 @@
                                             
<artifactId>atomix-raft</artifactId>
                                             <version>3.1.12</version>
                                         </exclude>
+                                        <exclude>
+                                            <groupId>ch.netty</groupId>
+                                            
<artifactId>netty-handler</artifactId>
+                                            <version>4.1.97.Final</version>
+                                        </exclude>
+                                        <dependency>
+                                            <groupId>ch.qos.logback</groupId>
+                                            
<artifactId>logback-core</artifactId>
+                                            <!-- This was the last version to 
support Java 8 -->
+                                            <version>1.3.14</version>
+                                        </dependency>
                                     </excludeCoordinates>
                                 </banVulnerable>
                             </rules>

Reply via email to