diff options
| author | chrislu <chris.lu@gmail.com> | 2022-10-28 12:53:19 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2022-10-28 12:53:19 -0700 |
| commit | ea2637734a13a08d11d4f26e80c1324664bf7ffc (patch) | |
| tree | 6708b9a0d07a0518a6fdf151d59bf3fc46053430 /other | |
| parent | 1e0d64c04883a8d7b09677e9721f9e189743e2f3 (diff) | |
| download | seaweedfs-ea2637734a13a08d11d4f26e80c1324664bf7ffc.tar.xz seaweedfs-ea2637734a13a08d11d4f26e80c1324664bf7ffc.zip | |
refactor filer proto chunk variable from mtime to modified_ts_ns
Diffstat (limited to 'other')
| -rw-r--r-- | other/java/client/pom.xml | 2 | ||||
| -rw-r--r-- | other/java/client/pom.xml.deploy | 2 | ||||
| -rw-r--r-- | other/java/client/pom_debug.xml | 2 | ||||
| -rw-r--r-- | other/java/client/src/main/java/seaweedfs/client/ReadChunks.java | 4 | ||||
| -rw-r--r-- | other/java/client/src/main/java/seaweedfs/client/SeaweedWrite.java | 2 | ||||
| -rw-r--r-- | other/java/client/src/main/proto/filer.proto | 2 | ||||
| -rw-r--r-- | other/java/client/src/test/java/seaweedfs/client/SeaweedReadTest.java | 16 | ||||
| -rw-r--r-- | other/java/examples/pom.xml | 4 | ||||
| -rw-r--r-- | other/java/hdfs2/dependency-reduced-pom.xml | 2 | ||||
| -rw-r--r-- | other/java/hdfs2/pom.xml | 2 | ||||
| -rw-r--r-- | other/java/hdfs3/dependency-reduced-pom.xml | 2 | ||||
| -rw-r--r-- | other/java/hdfs3/pom.xml | 2 |
12 files changed, 21 insertions, 21 deletions
diff --git a/other/java/client/pom.xml b/other/java/client/pom.xml index 3ed76436d..5abbf705a 100644 --- a/other/java/client/pom.xml +++ b/other/java/client/pom.xml @@ -5,7 +5,7 @@ <groupId>com.github.chrislusf</groupId> <artifactId>seaweedfs-client</artifactId> - <version>3.30</version> + <version>3.33</version> <parent> <groupId>org.sonatype.oss</groupId> diff --git a/other/java/client/pom.xml.deploy b/other/java/client/pom.xml.deploy index 4b661c6cd..10b76ead4 100644 --- a/other/java/client/pom.xml.deploy +++ b/other/java/client/pom.xml.deploy @@ -5,7 +5,7 @@ <groupId>com.github.chrislusf</groupId> <artifactId>seaweedfs-client</artifactId> - <version>3.30</version> + <version>3.33</version> <parent> <groupId>org.sonatype.oss</groupId> diff --git a/other/java/client/pom_debug.xml b/other/java/client/pom_debug.xml index 091271503..1789bc906 100644 --- a/other/java/client/pom_debug.xml +++ b/other/java/client/pom_debug.xml @@ -5,7 +5,7 @@ <groupId>com.github.chrislusf</groupId> <artifactId>seaweedfs-client</artifactId> - <version>3.30</version> + <version>3.33</version> <parent> <groupId>org.sonatype.oss</groupId> diff --git a/other/java/client/src/main/java/seaweedfs/client/ReadChunks.java b/other/java/client/src/main/java/seaweedfs/client/ReadChunks.java index 2eba4f808..e563c0ccc 100644 --- a/other/java/client/src/main/java/seaweedfs/client/ReadChunks.java +++ b/other/java/client/src/main/java/seaweedfs/client/ReadChunks.java @@ -83,7 +83,7 @@ public class ReadChunks { prevX, point.x, chunk.getFileId(), - chunk.getMtime(), + chunk.getModifiedTsNs(), prevX - chunk.getOffset(), chunk.getOffset() == prevX && chunk.getSize() == prevX - startPoint.x, chunk.getCipherKey().toByteArray(), @@ -100,7 +100,7 @@ public class ReadChunks { public Point(long x, FilerProto.FileChunk chunk, boolean isStart) { this.x = x; - this.ts = chunk.getMtime(); + this.ts = chunk.getModifiedTsNs(); this.chunk = chunk; this.isStart = isStart; } diff --git a/other/java/client/src/main/java/seaweedfs/client/SeaweedWrite.java b/other/java/client/src/main/java/seaweedfs/client/SeaweedWrite.java index 48256a3e6..f477303c9 100644 --- a/other/java/client/src/main/java/seaweedfs/client/SeaweedWrite.java +++ b/other/java/client/src/main/java/seaweedfs/client/SeaweedWrite.java @@ -98,7 +98,7 @@ public class SeaweedWrite { .setFileId(fileId) .setOffset(offset) .setSize(bytesLength) - .setMtime(System.currentTimeMillis() / 10000L) + .setModifiedTsNs(System.nanoTime()) .setETag(etag) .setCipherKey(cipherKeyString); } diff --git a/other/java/client/src/main/proto/filer.proto b/other/java/client/src/main/proto/filer.proto index 66c6d2a13..821b6c281 100644 --- a/other/java/client/src/main/proto/filer.proto +++ b/other/java/client/src/main/proto/filer.proto @@ -132,7 +132,7 @@ message FileChunk { string file_id = 1; // to be deprecated int64 offset = 2; uint64 size = 3; - int64 mtime = 4; + int64 modified_ts_ns = 4; string e_tag = 5; string source_file_id = 6; // to be deprecated FileId fid = 7; diff --git a/other/java/client/src/test/java/seaweedfs/client/SeaweedReadTest.java b/other/java/client/src/test/java/seaweedfs/client/SeaweedReadTest.java index 6ad9edb2c..137148425 100644 --- a/other/java/client/src/test/java/seaweedfs/client/SeaweedReadTest.java +++ b/other/java/client/src/test/java/seaweedfs/client/SeaweedReadTest.java @@ -17,13 +17,13 @@ public class SeaweedReadTest { .setFileId("aaa") .setOffset(0) .setSize(100) - .setMtime(1000) + .setModifiedTsNs(1000) .build()); chunks.add(FilerProto.FileChunk.newBuilder() .setFileId("bbb") .setOffset(100) .setSize(133) - .setMtime(2000) + .setModifiedTsNs(2000) .build()); List<SeaweedRead.VisibleInterval> visibleIntervals = SeaweedRead.nonOverlappingVisibleIntervals(null, chunks); @@ -70,31 +70,31 @@ public class SeaweedReadTest { .setFileId("a") .setOffset(0) .setSize(100) - .setMtime(1) + .setModifiedTsNs(1) .build()); chunks.add(FilerProto.FileChunk.newBuilder() .setFileId("b") .setOffset(50) .setSize(100) - .setMtime(2) + .setModifiedTsNs(2) .build()); chunks.add(FilerProto.FileChunk.newBuilder() .setFileId("c") .setOffset(200) .setSize(50) - .setMtime(3) + .setModifiedTsNs(3) .build()); chunks.add(FilerProto.FileChunk.newBuilder() .setFileId("d") .setOffset(250) .setSize(50) - .setMtime(4) + .setModifiedTsNs(4) .build()); chunks.add(FilerProto.FileChunk.newBuilder() .setFileId("e") .setOffset(175) .setSize(100) - .setMtime(5) + .setModifiedTsNs(5) .build()); List<SeaweedRead.VisibleInterval> visibleIntervals = ReadChunks.readResolvedChunks(chunks); @@ -161,7 +161,7 @@ public class SeaweedReadTest { .setFileId("") .setOffset(start) .setSize(size) - .setMtime(ts) + .setModifiedTsNs(ts) .build(); } } diff --git a/other/java/examples/pom.xml b/other/java/examples/pom.xml index 3f5ef1cc3..379396734 100644 --- a/other/java/examples/pom.xml +++ b/other/java/examples/pom.xml @@ -11,13 +11,13 @@ <dependency> <groupId>com.github.chrislusf</groupId> <artifactId>seaweedfs-client</artifactId> - <version>3.30</version> + <version>3.33</version> <scope>compile</scope> </dependency> <dependency> <groupId>com.github.chrislusf</groupId> <artifactId>seaweedfs-hadoop2-client</artifactId> - <version>3.30</version> + <version>3.33</version> <scope>compile</scope> </dependency> <dependency> diff --git a/other/java/hdfs2/dependency-reduced-pom.xml b/other/java/hdfs2/dependency-reduced-pom.xml index 3ee5034d0..866ee4915 100644 --- a/other/java/hdfs2/dependency-reduced-pom.xml +++ b/other/java/hdfs2/dependency-reduced-pom.xml @@ -317,7 +317,7 @@ </snapshotRepository>
</distributionManagement>
<properties>
- <seaweedfs.client.version>3.30</seaweedfs.client.version>
+ <seaweedfs.client.version>3.33</seaweedfs.client.version>
<hadoop.version>3.2.4</hadoop.version>
</properties>
</project>
diff --git a/other/java/hdfs2/pom.xml b/other/java/hdfs2/pom.xml index 8bbd4c99e..3a0927905 100644 --- a/other/java/hdfs2/pom.xml +++ b/other/java/hdfs2/pom.xml @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <properties> - <seaweedfs.client.version>3.30</seaweedfs.client.version> + <seaweedfs.client.version>3.33</seaweedfs.client.version> <hadoop.version>3.2.4</hadoop.version> </properties> diff --git a/other/java/hdfs3/dependency-reduced-pom.xml b/other/java/hdfs3/dependency-reduced-pom.xml index 33d548ac9..13c0f6182 100644 --- a/other/java/hdfs3/dependency-reduced-pom.xml +++ b/other/java/hdfs3/dependency-reduced-pom.xml @@ -317,7 +317,7 @@ </snapshotRepository>
</distributionManagement>
<properties>
- <seaweedfs.client.version>3.30</seaweedfs.client.version>
+ <seaweedfs.client.version>3.33</seaweedfs.client.version>
<hadoop.version>3.2.4</hadoop.version>
</properties>
</project>
diff --git a/other/java/hdfs3/pom.xml b/other/java/hdfs3/pom.xml index 0dd08412f..961af9b2b 100644 --- a/other/java/hdfs3/pom.xml +++ b/other/java/hdfs3/pom.xml @@ -5,7 +5,7 @@ <modelVersion>4.0.0</modelVersion> <properties> - <seaweedfs.client.version>3.30</seaweedfs.client.version> + <seaweedfs.client.version>3.33</seaweedfs.client.version> <hadoop.version>3.2.4</hadoop.version> </properties> |
