From a999ed94d0abe53ac444c6a12cf0f5f89ea06d33 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Tue, 8 Oct 2019 22:49:10 -0700 Subject: update hdfs client --- other/java/client/pom.xml | 2 +- .../java/client/src/test/java/seaweedfs/client/SeaweedFilerTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'other/java/client') diff --git a/other/java/client/pom.xml b/other/java/client/pom.xml index b5c7af29e..be9470cb9 100644 --- a/other/java/client/pom.xml +++ b/other/java/client/pom.xml @@ -4,7 +4,7 @@ com.github.chrislusf seaweedfs-client - 1.1.6 + 1.1.8 org.sonatype.oss diff --git a/other/java/client/src/test/java/seaweedfs/client/SeaweedFilerTest.java b/other/java/client/src/test/java/seaweedfs/client/SeaweedFilerTest.java index 87165af0c..eaf17e5c6 100644 --- a/other/java/client/src/test/java/seaweedfs/client/SeaweedFilerTest.java +++ b/other/java/client/src/test/java/seaweedfs/client/SeaweedFilerTest.java @@ -16,8 +16,8 @@ public class SeaweedFilerTest { filerClient.mkdirs("/new_folder", 0755); filerClient.touch("/new_folder/new_empty_file", 0755); filerClient.touch("/new_folder/new_empty_file2", 0755); - filerClient.rm("/new_folder/new_empty_file", false); - filerClient.rm("/new_folder", true); + filerClient.rm("/new_folder/new_empty_file", false, true); + filerClient.rm("/new_folder", true, true); } } -- cgit v1.2.3 From 15f968b0546cdf9d5ee6215ff967de0b3ea4b552 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Wed, 9 Oct 2019 18:09:08 -0700 Subject: HCFS: avoid possible jar problem --- other/java/client/pom.xml | 2 +- .../client/src/main/java/seaweedfs/client/SeaweedRead.java | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'other/java/client') diff --git a/other/java/client/pom.xml b/other/java/client/pom.xml index be9470cb9..15921c4dd 100644 --- a/other/java/client/pom.xml +++ b/other/java/client/pom.xml @@ -4,7 +4,7 @@ com.github.chrislusf seaweedfs-client - 1.1.8 + 1.1.9 org.sonatype.oss diff --git a/other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java b/other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java index a307983bb..de8da28d7 100644 --- a/other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java +++ b/other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java @@ -5,16 +5,12 @@ import org.apache.http.HttpHeaders; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; -import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.impl.client.DefaultHttpClient; import java.io.IOException; import java.io.OutputStream; import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; -import java.util.List; -import java.util.Map; +import java.util.*; public class SeaweedRead { @@ -59,7 +55,7 @@ public class SeaweedRead { } private static int readChunkView(long position, byte[] buffer, int startOffset, ChunkView chunkView, FilerProto.Locations locations) { - HttpClient client = HttpClientBuilder.create().build(); + HttpClient client = new DefaultHttpClient(); HttpGet request = new HttpGet( String.format("http://%s/%s", locations.getLocations(0).getUrl(), chunkView.fileId)); -- cgit v1.2.3 From 7057e7a076b109e5d3e9140b27fa4e8beabcbc71 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Fri, 11 Oct 2019 21:44:44 -0700 Subject: HCFS: 1.22 fix put gives java.lang.NoSuchFieldError: INSTANCE related to Cloudera CDH Hadoop https://github.com/chrislusf/seaweedfs/issues/1080 --- other/java/client/pom.xml | 2 +- .../client/src/main/java/seaweedfs/client/SeaweedRead.java | 13 ++++++++----- .../client/src/main/java/seaweedfs/client/SeaweedWrite.java | 12 ++++++++---- 3 files changed, 17 insertions(+), 10 deletions(-) (limited to 'other/java/client') diff --git a/other/java/client/pom.xml b/other/java/client/pom.xml index 15921c4dd..413897238 100644 --- a/other/java/client/pom.xml +++ b/other/java/client/pom.xml @@ -4,7 +4,7 @@ com.github.chrislusf seaweedfs-client - 1.1.9 + 1.2.2 org.sonatype.oss diff --git a/other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java b/other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java index de8da28d7..2efa64580 100644 --- a/other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java +++ b/other/java/client/src/main/java/seaweedfs/client/SeaweedRead.java @@ -7,6 +7,7 @@ import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.DefaultHttpClient; +import java.io.Closeable; import java.io.IOException; import java.io.OutputStream; import java.nio.ByteBuffer; @@ -19,7 +20,7 @@ public class SeaweedRead { // returns bytesRead public static long read(FilerGrpcClient filerGrpcClient, List visibleIntervals, final long position, final byte[] buffer, final int bufferOffset, - final int bufferLength) { + final int bufferLength) throws IOException { List chunkViews = viewFromVisibles(visibleIntervals, position, bufferLength); @@ -54,7 +55,7 @@ public class SeaweedRead { return readCount; } - private static int readChunkView(long position, byte[] buffer, int startOffset, ChunkView chunkView, FilerProto.Locations locations) { + private static int readChunkView(long position, byte[] buffer, int startOffset, ChunkView chunkView, FilerProto.Locations locations) throws IOException { HttpClient client = new DefaultHttpClient(); HttpGet request = new HttpGet( String.format("http://%s/%s", locations.getLocations(0).getUrl(), chunkView.fileId)); @@ -76,10 +77,12 @@ public class SeaweedRead { return len; - } catch (IOException e) { - e.printStackTrace(); + } finally { + if (client instanceof Closeable) { + Closeable t = (Closeable) client; + t.close(); + } } - return 0; } protected static List viewFromVisibles(List visibleIntervals, long offset, long size) { 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 15db87195..0663e8d98 100644 --- a/other/java/client/src/main/java/seaweedfs/client/SeaweedWrite.java +++ b/other/java/client/src/main/java/seaweedfs/client/SeaweedWrite.java @@ -1,13 +1,14 @@ package seaweedfs.client; import org.apache.http.HttpResponse; +import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.mime.HttpMultipartMode; import org.apache.http.entity.mime.MultipartEntityBuilder; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.impl.client.DefaultHttpClient; import java.io.ByteArrayInputStream; +import java.io.Closeable; import java.io.IOException; import java.io.InputStream; @@ -59,7 +60,7 @@ public class SeaweedWrite { final byte[] bytes, final long bytesOffset, final long bytesLength) throws IOException { - CloseableHttpClient client = HttpClientBuilder.create().setUserAgent("hdfs-client").build(); + HttpClient client = new DefaultHttpClient(); InputStream inputStream = new ByteArrayInputStream(bytes, (int) bytesOffset, (int) bytesLength); @@ -84,7 +85,10 @@ public class SeaweedWrite { return etag; } finally { - client.close(); + if (client instanceof Closeable) { + Closeable t = (Closeable) client; + t.close(); + } } } -- cgit v1.2.3 From e9dd5a602a4acf9da21b56e57a510d1f9a24875c Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Fri, 11 Oct 2019 23:56:04 -0700 Subject: HCFS: 1.2.3 shade org.apache.http in https://github.com/chrislusf/seaweedfs/issues/1080 --- other/java/client/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'other/java/client') diff --git a/other/java/client/pom.xml b/other/java/client/pom.xml index 413897238..47742ab8d 100644 --- a/other/java/client/pom.xml +++ b/other/java/client/pom.xml @@ -4,7 +4,7 @@ com.github.chrislusf seaweedfs-client - 1.2.2 + 1.2.3 org.sonatype.oss -- cgit v1.2.3