t

Signed-off-by: Wine93 <[email protected]>
opencurve · Nov 2, 2023 · 7282e25 · 7282e25
1 parent 7fab03d
commit 7282e25
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 18 deletions.
diff --git a/curvefs/sdk/java/pom.xml b/curvefs/sdk/java/pom.xml
@@ -34,9 +34,30 @@
                 <directory>src/main/resources</directory>
             </resource>
         </resources>
+
+        <plugins>
+            <!-- any other plugins -->
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 
     <dependencies>
+
         <dependency>
             <groupId>net.java.dev.jna</groupId>
             <artifactId>jna-platform</artifactId>

diff --git a/curvefs/sdk/java/src/main/java/io/opencurve/curve/fs/common/StackLogger.java b/curvefs/sdk/java/src/main/java/io/opencurve/curve/fs/common/StackLogger.java
@@ -19,9 +19,9 @@ private String now() {
         return formatter.format(new Date());
     }
 
-    private int getIndex() {
-        long id = Thread.currentThread().getId();
-    }
+    //private int getIndex() {
+    //    long id = Thread.currentThread().getId();
+    //}
 
     public void log(String fn, Object... args) {
         String value = System.getenv(CURVEFS_DEBUG_ENV_VAR);

diff --git a/curvefs/sdk/java/src/main/java/io/opencurve/curve/fs/flink/CurveFileSystemFactory.java b/curvefs/sdk/java/src/main/java/io/opencurve/curve/fs/flink/CurveFileSystemFactory.java
@@ -1,5 +1,6 @@
 package io.opencurve.curve.fs.flink;
 
+import io.opencurve.curve.fs.common.StackLogger;
 import io.opencurve.curve.fs.hadoop.CurveFileSystem;
 import org.apache.flink.core.fs.FileSystem;
 import org.apache.flink.core.fs.FileSystemFactory;
@@ -11,32 +12,25 @@
 
 public class CurveFileSystemFactory implements FileSystemFactory {
     private org.apache.hadoop.conf.Configuration conf;
-
     private static final String CURVE_FS_CONFIG_PREFIXES = "curvefs.";
     private static final String FLINK_CONFIG_PREFIXES = "fs.";
     public static String SCHEME = "curvefs";
+    private static final StackLogger logger =
+        new StackLogger("CurveFileSystemFactory", 0);
 
     @Override
     public void configure(org.apache.flink.configuration.Configuration config) {
         conf = new Configuration();
-        if (config != null) {
-            for (String key : config.keySet()) {
-                if (key.startsWith(CURVE_FS_CONFIG_PREFIXES) || key.startsWith(FLINK_CONFIG_PREFIXES)) {
-                    String value = config.getString(key, null);
-                    if (value != null) {
-                        if (CurveFileSystem.class.getCanonicalName().equals(value.trim())) {
-                            SCHEME = key.split("\\.")[1];
-                        }
-                        conf.set(key, value);
-                    }
-                }
-            }
-        }
+        config.keySet()
+                .stream()
+                .filter(key -> key.startsWith(CURVE_FS_CONFIG_PREFIXES) || key.startsWith(FLINK_CONFIG_PREFIXES))
+                .forEach(key -> conf.set(key, config.getString(key, "")));
     }
 
     @Override
     public String getScheme() {
-        return SCHEME;
+        logger.log("getScheme");
+        return "hdfs";
     }
 
     @Override

diff --git a/curvefs/sdk/java/src/main/java/io/opencurve/curve/fs/hadoop/permission/Helper.java b/curvefs/sdk/java/src/main/java/io/opencurve/curve/fs/hadoop/permission/Helper.java
@@ -90,6 +90,9 @@ public static List<Entry> getAllUsers() {
         }
         lib.endpwent();
         return users;
+
+        //List<Entry> users = new ArrayList<Entry>();
+        //return users;
     }
 
     public static List<Entry> getAllGroups() {
@@ -101,5 +104,8 @@ public static List<Entry> getAllGroups() {
         }
         lib.endgrent();
         return groups;
+
+        //List<Entry> groups = new ArrayList<Entry>();
+        //return groups;
     }
 }