Skip to content

Commit faac162

Browse files
committed
feat: 支持文件系统的xAttr
1. 支持文件系统的xAttr; 2. 优化日志输出
1 parent f27e604 commit faac162

9 files changed

+481
-181
lines changed

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.qcloud.cos</groupId>
88
<artifactId>hadoop-cos</artifactId>
9-
<version>3.1.0-5.8.4</version>
9+
<version>3.1.0-5.8.5</version>
1010
<packaging>jar</packaging>
1111

1212
<name>Apache Hadoop Tencent Qcloud COS Support</name>

src/main/java/org/apache/hadoop/fs/CosFileSystem.java

+235-128
Large diffs are not rendered by default.

src/main/java/org/apache/hadoop/fs/CosNConfigKeys.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
@InterfaceStability.Unstable
1111
public class CosNConfigKeys extends CommonConfigurationKeys {
1212
public static final String USER_AGENT = "fs.cosn.user.agent";
13-
public static final String DEFAULT_USER_AGENT = "cos-hadoop-plugin-v5.8.4";
13+
public static final String DEFAULT_USER_AGENT = "cos-hadoop-plugin-v5.8.5";
1414

1515
public static final String TENCENT_EMR_VERSION_KEY = "fs.emr.version";
1616

@@ -43,7 +43,7 @@ public class CosNConfigKeys extends CommonConfigurationKeys {
4343

4444
public static final String COSN_UPLOAD_BUFFER_SIZE_KEY = "fs.cosn.upload.buffer.size";
4545
public static final String COSN_UPLOAD_BUFFER_SIZE_PREV_KEY = "fs.cosn.buffer.size";
46-
public static final int DEFAULT_UPLOAD_BUFFER_SIZE = -1; // default is 128MB
46+
public static final int DEFAULT_UPLOAD_BUFFER_SIZE = -1;
4747

4848
public static final String COSN_BLOCK_SIZE_KEY = "fs.cosn.block.size";
4949
public static final long DEFAULT_BLOCK_SIZE = 128 * Unit.MB;

src/main/java/org/apache/hadoop/fs/CosNCopyFileTask.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
import java.io.IOException;
77

88
public class CosNCopyFileTask implements Runnable {
9-
private static Logger LOG = LoggerFactory.getLogger(CosNCopyFileTask.class);
9+
private static final Logger LOG = LoggerFactory.getLogger(CosNCopyFileTask.class);
1010

11-
private NativeFileSystemStore store;
11+
private final NativeFileSystemStore store;
1212

13-
private String srcKey;
14-
private String dstKey;
15-
private CosNCopyFileContext cosCopyFileContext;
13+
private final String srcKey;
14+
private final String dstKey;
15+
private final CosNCopyFileContext cosCopyFileContext;
1616

1717
public CosNCopyFileTask(NativeFileSystemStore store, String srcKey,
1818
String dstKey,

src/main/java/org/apache/hadoop/fs/CosNDeleteFileTask.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
import java.io.IOException;
77

88
public class CosNDeleteFileTask implements Runnable {
9-
private static Logger LOG = LoggerFactory.getLogger(CosNCopyFileTask.class);
9+
private static final Logger LOG = LoggerFactory.getLogger(CosNCopyFileTask.class);
1010

11-
private NativeFileSystemStore store;
11+
private final NativeFileSystemStore store;
1212

13-
private String srcKey;
14-
private CosNDeleteFileContext cosDeleteFileContext;
13+
private final String srcKey;
14+
private final CosNDeleteFileContext cosDeleteFileContext;
1515

1616
public CosNDeleteFileTask(NativeFileSystemStore store, String srcKey,
1717
CosNDeleteFileContext cosDeleteFileContext) {
@@ -24,10 +24,10 @@ public CosNDeleteFileTask(NativeFileSystemStore store, String srcKey,
2424
public void run() {
2525
boolean fail = false;
2626
try {
27+
LOG.debug("Delete the cos key: {}.", srcKey);
2728
this.store.delete(srcKey);
2829
} catch (IOException e) {
29-
LOG.warn("Exception thrown when delete file{}, exception:{}"
30-
, this.srcKey, e);
30+
LOG.warn("Exception thrown when delete file [{}], exception: ", this.srcKey, e);
3131
fail = true;
3232
cosDeleteFileContext.setIOException(e);
3333
} finally {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package org.apache.hadoop.fs;
2+
3+
import java.io.Serializable;
4+
5+
public class CosNXAttr implements Serializable {
6+
private String name;
7+
private String value;
8+
9+
public String getName() {
10+
return name;
11+
}
12+
13+
public void setName(String name) {
14+
this.name = name;
15+
}
16+
17+
public String getValue() {
18+
return value;
19+
}
20+
21+
public void setValue(String value) {
22+
this.value = value;
23+
}
24+
}

0 commit comments

Comments
 (0)