[svn-r5273]

Purpose:
    New feature
Description:
    Allow H5Glink and H5Gmove to handle links across different locations.
Solution:
    Added H5Glink2 and H5Gmove2 functions with new parameter of destination
    location.
Platforms tested:
    Linux 2.2(eirene)

2 files changed, 395 insertions, 3 deletions

diff --git a/test/links.c b/test/links.c
index c88b22f..1d99a73 100644
--- a/test/links.c
+++ b/test/links.c
@@ -1,4 +1,4 @@
-/*
+ /*
  * Copyright (C) 1998 NCSA
  *                    All rights reserved.
  *
@@ -10,7 +10,9 @@
 #include "h5test.h"
 
 const char *FILENAME[] = {
-    "links",
+    "links1",
+    "links2",
+    "links3",
     NULL
 };
 
@@ -85,6 +87,132 @@ mklinks(hid_t fapl)
 
 
 /*-------------------------------------------------------------------------
+ * Function:    new_links
+ *
+ * Purpose:     Build a file with assorted links for different locations.
+ *
+ * Return:      Success:        0
+ *
+ *              Failure:        -1
+ *
+ * Programmer:  Raymond Lu 
+ *              Friday, April 19, 2002 
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+new_links(hid_t fapl)
+{
+    hid_t		file_a, file_b;
+    hid_t		grp1_a, grp1_b, grp2_a, grp2_b;
+    hid_t		scalar;
+    hid_t		dset1, dset2;
+    char		filename[1024]; 
+    static hsize_t      size[1] = {1};
+    H5G_stat_t		sb_soft2;
+
+    TESTING("H5Glink2 function");
+
+    /* Create two files */
+    h5_fixname(FILENAME[1], fapl, filename, sizeof filename);
+    if ((file_a=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) {
+        goto error;
+    }
+    h5_fixname(FILENAME[2], fapl, filename, sizeof filename);
+    if ((file_b=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) {
+        goto error;
+    }
+    if ((scalar=H5Screate_simple (1, size, size))<0) goto error;
+
+    /* Create two groups in each file */
+    if ((grp1_a=H5Gcreate (file_a, "grp1", 0))<0) goto error;
+    if ((grp2_a=H5Gcreate (file_a, "grp2", 0))<0) goto error;
+    if ((grp1_b=H5Gcreate (file_b, "grp1", 0))<0) goto error;
+    if ((grp2_b=H5Gcreate (file_b, "grp2", 0))<0) goto error;
+
+    /* Create datasets */
+    if((dset1=H5Dcreate(file_a, "dataset1", H5T_NATIVE_INT, scalar, 
+	H5P_DEFAULT))<0) {
+	goto error;
+    }
+    if((dset2=H5Dcreate(grp1_a, "dataset2", H5T_NATIVE_INT, scalar,
+        H5P_DEFAULT))<0) {
+        goto error;
+    }
+
+    /* Create links within a file.  Both of source and destination use 
+     * H5G_SAME_LOC.  Both hard and soft links should fail. */
+    H5E_BEGIN_TRY {
+        if(H5Glink2(H5G_SAME_LOC, "dataset1", H5G_LINK_HARD , H5G_SAME_LOC, 
+		"hard")!=FAIL) goto error;
+    } H5E_END_TRY;
+    H5E_BEGIN_TRY {
+        if(H5Glink2(H5G_SAME_LOC, "dataset1", H5G_LINK_SOFT , H5G_SAME_LOC, 
+        	"soft")!=FAIL) goto error;
+    } H5E_END_TRY;
+
+    /* Create links across files.  Both hard and soft links should fail. */
+    H5E_BEGIN_TRY {
+        if(H5Glink2(file_a, "dataset1", H5G_LINK_HARD , file_b, 
+        	"hard")!=FAIL) goto error;
+    } H5E_END_TRY;
+    H5E_BEGIN_TRY {
+        if(H5Glink2(file_a, "dataset1", H5G_LINK_SOFT, file_b, "soft")!=FAIL)
+            goto error;
+    } H5E_END_TRY;
+    
+    /* Create links to test H5G_SAME_LOC, H5G_LINK_HARD, H5G_LINK_SOFT. */
+    if(H5Glink2(grp1_a, "dataset2", H5G_LINK_HARD , H5G_SAME_LOC,
+        "hard1")<0) {
+        goto error;
+    }
+    if(H5Glink2(H5G_SAME_LOC, "dataset2", H5G_LINK_SOFT , grp1_a,
+	"soft1")<0) {
+        goto error;
+    }
+
+    /* Create links to test H5G_LINK_HARD, H5G_LINK_SOFT across different 
+     * locations. */
+    if(H5Glink2(grp1_a, "dataset2", H5G_LINK_HARD, grp2_a, "hard2")<0) {
+        goto error;
+    }
+    if(H5Glink2(grp1_a, "/grp1/dataset2", H5G_LINK_SOFT , grp2_a, "soft2")<0) {
+        goto error;
+    }
+
+    /* Close dataspace and files */
+    if (H5Sclose (scalar)<0) goto error;
+    if (H5Dclose(dset1)<0) goto error;
+    if (H5Dclose(dset2)<0) goto error;
+    if (H5Gclose (grp1_a)<0) goto error;
+    if (H5Gclose (grp2_a)<0) goto error;
+    if (H5Gclose (grp1_b)<0) goto error;
+    if (H5Gclose (grp2_b)<0) goto error;
+    if (H5Fclose (file_a)<0) goto error;
+    if (H5Fclose (file_b)<0) goto error;
+
+    PASSED();
+    return 0;
+
+ error:
+    H5E_BEGIN_TRY {
+    	H5Sclose (scalar);
+    	H5Dclose (dset1);
+    	H5Dclose (dset2);
+    	H5Gclose (grp1_a);
+    	H5Gclose (grp2_a);
+    	H5Gclose (grp1_b);
+    	H5Gclose (grp2_b);
+    	H5Fclose (file_a);
+    	H5Fclose (file_b);
+    } H5E_END_TRY;
+    return -1;
+}
+
+
+/*-------------------------------------------------------------------------
  * Function:	cklinks
  *
  * Purpose:	Open the file created in the first step and check that the
@@ -214,6 +342,103 @@ cklinks(hid_t fapl)
 
 
 /*-------------------------------------------------------------------------
+ * Function:    ck_new_links
+ *
+ * Purpose:     Open the file created in the first step and check that the
+ *              links look correct.
+ *
+ * Return:      Success:        0
+ *
+ *              Failure:        -1
+ *
+ * Programmer:  Raymond Lu
+ *              Thursday, April 25, 2002 
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+ck_new_links(hid_t fapl)
+{
+    hid_t 		file, dset, grp2;
+    H5G_stat_t		sb_dset, sb_hard1, sb_hard2, sb_soft1, sb_soft2;
+    char 		filename[1024];
+    char 		linkval[1024];
+
+    TESTING("new link queries");
+
+    /* Open the file */
+    h5_fixname(FILENAME[1], fapl, filename, sizeof filename);
+    if ((file=H5Fopen(filename, H5F_ACC_RDONLY, fapl))<0) {
+        goto error;
+    }
+
+    /* Get hard link info */    
+    if(H5Gget_objinfo(file, "/grp1/dataset2", TRUE, &sb_dset)<0) 
+	goto error;
+    if(H5Gget_objinfo(file, "/grp1/hard1", TRUE, &sb_hard1)<0)
+	goto error;
+    if(H5Gget_objinfo(file, "/grp2/hard2", TRUE, &sb_hard2)<0)
+	goto error;
+
+    /* Check hard links */
+    if(H5G_DATASET!=sb_hard1.type || H5G_DATASET!=sb_hard2.type) {
+	H5_FAILED();
+	puts("    Unexpected object type, should have been a dataset");
+	goto error;
+    }
+    if( sb_dset.objno[0]!=sb_hard1.objno[0] || 
+        sb_dset.objno[1]!=sb_hard1.objno[1] ||
+        sb_dset.objno[0]!=sb_hard2.objno[0] ||
+        sb_dset.objno[1]!=sb_hard2.objno[1] ) {
+	H5_FAILED();
+	puts("    Hard link test failed.  Link seems not to point to the ");
+	puts("    expected file location.");
+	goto error;
+    }
+
+    /* Get soft link info */
+    if(H5Gget_objinfo(file, "/grp1/soft1", TRUE, &sb_soft1)<0) goto error;
+    if(H5Gget_objinfo(file, "/grp2/soft2", TRUE, &sb_soft2)<0) goto error;
+
+    /* Check soft links */
+    if(H5G_DATASET!=sb_soft1.type || H5G_DATASET!=sb_soft2.type) {
+        H5_FAILED();
+        puts("    Unexpected object type, should have been a dataset");
+        goto error;
+    }
+
+    if( sb_dset.objno[0]!=sb_soft1.objno[0] ||
+        sb_dset.objno[1]!=sb_soft1.objno[1] ||
+        sb_dset.objno[0]!=sb_soft2.objno[0] ||
+        sb_dset.objno[1]!=sb_soft2.objno[1] ) {
+        H5_FAILED();
+        puts("    Soft link test failed.  Link seems not to point to the ");
+        puts("    expected file location.");
+        goto error;
+    }
+
+    if (H5Gget_linkval(file, "grp2/soft2", sizeof linkval, linkval)<0) {
+        goto error;
+    }
+    if (strcmp(linkval, "/grp1/dataset2")) {
+        H5_FAILED();
+        puts("    Soft link test failed. Wrong link value");
+        goto error;
+    }
+
+    /* Cleanup */
+    if(H5Fclose(file)<0) goto error;
+    PASSED();
+    return 0;
+
+  error:
+    return -1;
+}
+
+
+/*-------------------------------------------------------------------------
  * Function:	main
  *
  * Purpose:	Test links
@@ -240,7 +465,9 @@ main(void)
 
     /* The tests... */
     nerrors += mklinks(fapl) < 0 ? 1 : 0;
+    nerrors += new_links(fapl) < 0 ? 1 : 0;
     nerrors += cklinks(fapl) < 0 ? 1 : 0;
+    nerrors += ck_new_links(fapl) < 0 ? 1 : 0;
 
     /* Results */
     if (nerrors) {
diff --git a/test/unlink.c b/test/unlink.c
index 66c2b82..c31643f 100644
--- a/test/unlink.c
+++ b/test/unlink.c
@@ -11,6 +11,8 @@
 
 const char *FILENAME[] = {
     "unlink",
+    "new_move_a",
+    "new_move_b",
     NULL
 };
 
@@ -275,7 +277,168 @@ test_rename(hid_t file)
     } H5E_END_TRY;
     return 1;
 }
+
+    
+/*-------------------------------------------------------------------------
+ * Function:    test_new_move
+ *
+ * Purpose:     Tests H5Gmove2()
+ *
+ * Return:      Success:        0
+ *
+ *              Failure:        number of errors
+ *
+ * Programmer:  Raymond Lu 
+ *              Thursday, April 25, 2002 
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+test_new_move(void)
+{
+    hid_t 	fapl, file_a, file_b;
+    hid_t	grp1, grp2, grp_move, moved_grp;
+    char 	filename[1024];
+
+    TESTING("new move");
+   
+    /* Create a second file */ 
+    fapl = h5_fileaccess();
+    h5_fixname(FILENAME[1], fapl, filename, sizeof filename);
+    if ((file_a=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0)
+        goto error;
+    h5_fixname(FILENAME[2], fapl, filename, sizeof filename);
+    if ((file_b=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0)
+        goto error;
+
+    /* Create groups in first file */
+    if((grp1=H5Gcreate(file_a, "group1", 0))<0) goto error;
+    if((grp2=H5Gcreate(file_a, "group2", 0))<0) goto error;
+    if((grp_move=H5Gcreate(grp1, "group_move", 0))<0) goto error;
+
+    /* Create hard and soft links. */
+    if(H5Glink2(grp1, "group_move", H5G_LINK_HARD, H5G_SAME_LOC, "hard")<0) 
+	goto error;
+    if(H5Glink2(grp1, "/group1/group_move", H5G_LINK_SOFT, grp2, "soft")<0)
+	goto error;
+
+    /* Move a group within the file.  Both of source and destination use
+     * H5G_SAME_LOC.  Should fail. */
+    H5E_BEGIN_TRY {
+        if(H5Gmove2(H5G_SAME_LOC, "group_move", H5G_SAME_LOC, "group_new_name")
+		!=FAIL) goto error;
+    } H5E_END_TRY;
+
+    /* Move a group across files.  Should fail. */
+    H5E_BEGIN_TRY {
+        if(H5Gmove2(grp1, "group_move", file_b, "group_new_name")!=FAIL)
+	    goto error;
+    } H5E_END_TRY;
     
+    /* Move a group across groups in the same file. */
+    if(H5Gmove2(grp1, "group_move", grp2, "group_new_name")<0)
+	goto error;
+
+    /* Open the group just moved to the new location. */
+    if((moved_grp = H5Gopen(grp2, "group_new_name"))<0) 
+	goto error;
+
+    H5Gclose(grp1);
+    H5Gclose(grp2);
+    H5Gclose(grp_move);
+    H5Gclose(moved_grp);
+    H5Fclose(file_a);
+    H5Fclose(file_b);
+
+    PASSED();
+    return 0;
+
+  error:
+    H5E_BEGIN_TRY {
+ 	H5Gclose(grp1);
+	H5Gclose(grp2);
+	H5Gclose(grp_move);
+        H5Gclose(moved_grp);
+	H5Fclose(file_a);
+	H5Fclose(file_b);
+    } H5E_END_TRY;
+    return 1;
+}
+
+
+/*-------------------------------------------------------------------------
+ * Function:    check_new_move
+ *
+ * Purpose:     Checks result of H5Gmove2()
+ *
+ * Return:      Success:        0
+ *
+ *              Failure:        number of errors
+ *
+ * Programmer:  Raymond Lu
+ *              Thursday, April 25, 2002
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static int
+check_new_move(void)
+{
+    hid_t 	fapl, file;
+    H5G_stat_t	sb_hard1, sb_hard2, sb_soft;
+    char 	filename[1024];
+    char 	linkval[1024];
+
+    TESTING("check new move function");
+
+    /* Open file */
+    fapl = h5_fileaccess();
+    h5_fixname(FILENAME[1], fapl, filename, sizeof filename);
+    if ((file=H5Fopen(filename, H5F_ACC_RDONLY, fapl))<0) {
+        goto error;
+    }
+
+    /* Get hard link info */
+    if(H5Gget_objinfo(file, "/group2/group_new_name", TRUE, &sb_hard1)<0)
+	goto error;
+    if(H5Gget_objinfo(file, "/group1/hard", TRUE, &sb_hard2)<0)
+	goto error;
+
+    /* Check hard links */
+    if(H5G_GROUP!=sb_hard1.type || H5G_GROUP!=sb_hard2.type) {
+        H5_FAILED();
+        puts("    Unexpected object type, should have been a group");
+        goto error;
+    }
+    if( sb_hard1.objno[0]!=sb_hard2.objno[0] || 
+        sb_hard1.objno[1]!=sb_hard2.objno[1] ) { 
+        H5_FAILED();
+        puts("    Hard link test failed.  Link seems not to point to the ");
+        puts("    expected file location.");
+        goto error;
+    }
+
+    /* Check soft links */
+    if (H5Gget_linkval(file, "group2/soft", sizeof linkval, linkval)<0) {
+        goto error;
+    }
+    if (strcmp(linkval, "/group1/group_move")) {
+        H5_FAILED();
+        puts("    Soft link test failed. Wrong link value");
+        goto error;
+    }
+
+    /* Cleanup */
+    if(H5Fclose(file)<0) goto error;
+    PASSED();
+    return 0;
+
+  error:
+    return -1;
+}
 
 
 /*-------------------------------------------------------------------------
@@ -313,7 +476,9 @@ main(void)
     nerrors += test_many(file);
     nerrors += test_symlink(file);
     nerrors += test_rename(file);
-    
+    nerrors += test_new_move();
+    nerrors += check_new_move();
+ 
     /* Close */
     if (H5Fclose(file)<0) goto error;
     if (nerrors) {