java: remove deprecated libcephfs

Removes ceph_set_default_*

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>

diff --git a/src/java/java/com/ceph/fs/CephMount.java b/src/java/java/com/ceph/fs/CephMount.java
index 41b38f5aa09f30e22be060c574c5bdf716fa8520..752b69907038a24bf682da59ddd25dc5542a9596 100644 (file)
--- a/src/java/java/com/ceph/fs/CephMount.java
+++ b/src/java/java/com/ceph/fs/CephMount.java
@@ -654,39 +654,6 @@ public class CephMount {
 
   private static synchronized native int native_ceph_get_file_replication(long mountp, int fd);
 
-  /**
-   * Set the default file stripe unit.
-   *
-   * @param stripe_unit The stripe unit.
-   */
-  public void set_default_file_stripe_unit(int stripe_unit) {
-    native_ceph_set_default_file_stripe_unit(instance_ptr, stripe_unit);
-  }
-
-  private static synchronized native int native_ceph_set_default_file_stripe_unit(long mountp, int stripe_unit);
-
-  /**
-   * Set the default file stripe count.
-   *
-   * @param stripe_count The stripe count.
-   */
-  public void set_default_file_stripe_count(int stripe_count) {
-    native_ceph_set_default_file_stripe_count(instance_ptr, stripe_count);
-  }
-
-  private static synchronized native int native_ceph_set_default_file_stripe_count(long mountp, int stripe_count);
-
-  /**
-   * Set the default object size.
-   *
-   * @param object_size The object size.
-   */
-  public void set_default_object_size(int object_size) {
-    native_ceph_set_default_object_size(instance_ptr, object_size);
-  }
-
-  private static synchronized native int native_ceph_set_default_object_size(long mountp, int object_size);
-
   /**
    * Favor reading from local replicas when possible.
    *

diff --git a/src/java/native/libcephfs_jni.cc b/src/java/native/libcephfs_jni.cc
index 09448b75ec4c2c2f235522a726d96376d31b97ed..f0313c8febdf6bc3950d30f14bb8452d38041f49 100644 (file)
--- a/src/java/native/libcephfs_jni.cc
+++ b/src/java/native/libcephfs_jni.cc
@@ -2383,84 +2383,6 @@ JNIEXPORT jint JNICALL Java_com_ceph_fs_CephMount_native_1ceph_1get_1file_1repli
        return ret;
 }
 
-/*
- * Class:     com_ceph_fs_CephMount
- * Method:    native_ceph_set_default_file_stripe_unit
- * Signature: (JI)I
- */
-JNIEXPORT jint JNICALL Java_com_ceph_fs_CephMount_native_1ceph_1set_1default_1file_1stripe_1unit
-       (JNIEnv *env, jclass clz, jlong j_mntp, jint j_stripe_unit)
-{
-       struct ceph_mount_info *cmount = get_ceph_mount(j_mntp);
-       CephContext *cct = ceph_get_mount_context(cmount);
-       int ret;
-
-       CHECK_MOUNTED(cmount, -1);
-
-       ldout(cct, 10) << "jni: set_default_file_stripe_unit: " << (int)j_stripe_unit << dendl;
-
-       ret = ceph_set_default_file_stripe_unit(cmount, (int)j_stripe_unit);
-
-       ldout(cct, 10) << "jni: set_default_file_stripe_unit: exit ret " << ret << dendl;
-
-  if (ret)
-    handle_error(env, ret);
-
-       return ret;
-}
-
-/*
- * Class:     com_ceph_fs_CephMount
- * Method:    native_ceph_set_default_file_stripe_count
- * Signature: (JI)I
- */
-JNIEXPORT jint JNICALL Java_com_ceph_fs_CephMount_native_1ceph_1set_1default_1file_1stripe_1count
-       (JNIEnv *env, jclass clz, jlong j_mntp, jint j_stripe_count)
-{
-       struct ceph_mount_info *cmount = get_ceph_mount(j_mntp);
-       CephContext *cct = ceph_get_mount_context(cmount);
-       int ret;
-
-       CHECK_MOUNTED(cmount, -1);
-
-       ldout(cct, 10) << "jni: set_default_file_stripe_count: " << (int)j_stripe_count << dendl;
-
-       ret = ceph_set_default_file_stripe_count(cmount, (int)j_stripe_count);
-
-       ldout(cct, 10) << "jni: set_default_file_stripe_count: exit ret " << ret << dendl;
-
-  if (ret)
-    handle_error(env, ret);
-
-       return ret;
-}
-
-/*
- * Class:     com_ceph_fs_CephMount
- * Method:    native_ceph_set_default_object_size
- * Signature: (JI)I
- */
-JNIEXPORT jint JNICALL Java_com_ceph_fs_CephMount_native_1ceph_1set_1default_1object_1size
-       (JNIEnv *env, jclass clz, jlong j_mntp, jint j_object_size)
-{
-       struct ceph_mount_info *cmount = get_ceph_mount(j_mntp);
-       CephContext *cct = ceph_get_mount_context(cmount);
-       int ret;
-
-       CHECK_MOUNTED(cmount, -1);
-
-       ldout(cct, 10) << "jni: set_default_object_size: " << (int)j_object_size << dendl;
-
-       ret = ceph_set_default_object_size(cmount, (int)j_object_size);
-
-       ldout(cct, 10) << "jni: set_default_object_size: exit ret " << ret << dendl;
-
-  if (ret)
-    handle_error(env, ret);
-
-       return ret;
-}
-
 /*
  * Class:     com_ceph_fs_CephMount
  * Method:    native_ceph_localize_reads

diff --git a/src/java/test/com/ceph/fs/CephMountTest.java b/src/java/test/com/ceph/fs/CephMountTest.java
index c48b06ff41956deaa0d43de5c6a5572715879667..87d54b2f4eabc812946e9dc551c77e231624888a 100644 (file)
--- a/src/java/test/com/ceph/fs/CephMountTest.java
+++ b/src/java/test/com/ceph/fs/CephMountTest.java
@@ -826,19 +826,4 @@ public class CephMountTest {
     mount.unlink(path);
   }
 
-  @Test
-  public void test_set_def_obj_size() throws Exception {
-    mount.set_default_object_size(1 << 21);
-  }
-
-  @Test
-  public void test_set_def_file_stripe_count() throws Exception {
-    mount.set_default_file_stripe_count(2);
-  }
-
-  @Test
-  public void test_set_def_file_stripe_unit() throws Exception {
-    mount.set_default_file_stripe_unit(1 << 10);
-  }
-
 }

diff --git a/src/java/test/com/ceph/fs/CephUnmountedTest.java b/src/java/test/com/ceph/fs/CephUnmountedTest.java
index 7074168ee101a59af5c343dc0537713769354376..d4466530e7774094de5fc9a7432a92eac6a7dde3 100644 (file)
--- a/src/java/test/com/ceph/fs/CephUnmountedTest.java
+++ b/src/java/test/com/ceph/fs/CephUnmountedTest.java
@@ -130,19 +130,4 @@ public class CephUnmountedTest {
   public void test_get_repl() throws Exception {
     mount.get_file_replication(0);
   }
-
-  @Test(expected=CephNotMountedException.class)
-  public void test_set_def_stripe_unit() throws Exception {
-    mount.set_default_file_stripe_unit(1);
-  }
-
-  @Test(expected=CephNotMountedException.class)
-  public void test_set_def_stripe_count() throws Exception {
-    mount.set_default_file_stripe_count(1);
-  }
-
-  @Test(expected=CephNotMountedException.class)
-  public void test_set_def_obj_size() throws Exception {
-    mount.set_default_object_size(1);
-  }
 }