hdf5: Close objects

mattn · kortschak · commit 8c5d23bc6946 · 2021-07-14T09:52:03.000+09:30
diff --git a/h5d_dataset_test.go b/h5d_dataset_test.go
@@ -30,12 +30,14 @@ func createDataset1(t *testing.T) error {
 		t.Fatal(err)
 		return err
 	}
+	defer dspace.Close()
 
 	dset, err := f.CreateDataset("dset", T_NATIVE_USHORT, dspace)
 	if err != nil {
 		t.Fatal(err)
 		return err
 	}
+	defer dset.Close()
 
 	err = dset.Write(&data[0])
 	if err != nil {
@@ -77,9 +79,11 @@ func TestReadSubset(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer dset.Close()
 
 	// get the filespace and select the subset
 	filespace := dset.Space()
+	defer filespace.Close()
 	offset, stride, count, block := [2]uint{5, 1}, [2]uint{1, 1}, [2]uint{5, 2}, [2]uint{1, 1}
 	err = filespace.SelectHyperslab(offset[:], stride[:], count[:], block[:])
 	if err != nil {
@@ -95,6 +99,7 @@ func TestReadSubset(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer memspace.Close()
 
 	expected := [10]uint16{26, 27, 31, 32, 36, 37, 41, 42, 46, 47}
 
@@ -141,11 +146,13 @@ func TestWriteSubset(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer fspace.Close()
 	mdims := []uint{2, 6}
 	mspace, err := CreateSimpleDataspace(mdims, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer mspace.Close()
 
 	f, err := CreateFile(fname, F_ACC_TRUNC)
 	if err != nil {
@@ -157,6 +164,7 @@ func TestWriteSubset(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer dset.Close()
 
 	offset := []uint{6, 0, 0}
 	stride := []uint{3, 1, 1}
@@ -175,12 +183,14 @@ func TestWriteSubset(t *testing.T) {
 func TestSelectHyperslab(t *testing.T) {
 	DisplayErrors(true)
 	defer DisplayErrors(false)
+	defer os.Remove(fname)
 
 	dims := []uint{12, 4}
 	dspace, err := CreateSimpleDataspace(dims, nil)
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer dspace.Close()
 	offset, stride, count, block := []uint{1, 2}, []uint{2, 1}, []uint{4, 2}, []uint{1, 1}
 	if err = dspace.SelectHyperslab(offset, stride, count, block); err != nil {
 		t.Fatal(err)
diff --git a/h5f_file_test.go b/h5f_file_test.go
@@ -41,6 +41,7 @@ func TestFile(t *testing.T) {
 	}
 
 	f2 := f.File()
+	defer f2.Close()
 	fName := f.FileName()
 	f2Name := f2.FileName()
 	if fName != f2Name {
@@ -53,6 +54,7 @@ func TestFile(t *testing.T) {
 	if err != nil {
 		t.Fatalf("CreateGroup() failed: %s", err)
 	}
+	defer g.Close()
 	if name := g.Name(); name != "/"+groupName {
 		t.Fatalf("Group Name() have %v, want /%v", name, groupName)
 	}
@@ -61,6 +63,7 @@ func TestFile(t *testing.T) {
 	if err != nil {
 		t.Fatalf("OpenGroup() failed: %s", err)
 	}
+	defer g2.Close()
 	if name := g2.Name(); name != "/"+groupName {
 		t.Fatalf("Group Name() have %v, want /%v", name, groupName)
 	}
@@ -85,18 +88,21 @@ func TestFile(t *testing.T) {
 	if err != nil {
 		t.Fatalf("CreateDataspace failed: %s", err)
 	}
+	defer ds.Close()
 	dsetName := "test_dataset"
 	dset, err := f.CreateDataset(dsetName, T_NATIVE_INT, ds)
 	if err != nil {
 		t.Fatalf("CreateDataset failed: %s", err)
 	}
+	defer dset.Close()
 	if name := dset.Name(); name != "/"+dsetName {
 		t.Fatalf("Dataset Name() have %v, want /%v", name, dsetName)
 	}
 	dFile := dset.File()
 	if dFile.Name() != f.Name() {
 		t.Fatalf("Dataset File() have %v, want %v", dFile.Name(), f.Name())
 	}
+	defer dFile.Close()
 
 	if n, err := f.NumObjects(); err != nil {
 		t.Fatalf("NumObjects failed: %s", err)
diff --git a/h5g_group_test.go b/h5g_group_test.go
@@ -25,7 +25,9 @@ func TestGroup(t *testing.T) {
 	if err != nil {
 		t.Fatalf("couldn't create group: %s", err)
 	}
-	if *g1.File() != *f {
+	g1f := g1.File()
+	defer g1f.Close()
+	if *g1f != *f {
 		t.Fatal("wrong file for group")
 	}
 	if g1.Name() != "/foo" {
@@ -44,7 +46,9 @@ func TestGroup(t *testing.T) {
 	if err != nil {
 		t.Fatalf("couldn't create group: %s", err)
 	}
-	if *g2.File() != *f {
+	g2f := g2.File()
+	defer g2f.Close()
+	if *g2f != *f {
 		t.Fatal("wrong file for group")
 	}
 	if g2.Name() != "/foo/bar" {
@@ -58,7 +62,9 @@ func TestGroup(t *testing.T) {
 	if err != nil {
 		t.Fatalf("couldn't create group: %s", err)
 	}
-	if *g3.File() != *f {
+	g3f := g3.File()
+	defer g3f.Close()
+	if *g3f != *f {
 		t.Fatal("wrong file for group")
 	}
 	if g3.Name() != "/foo/bar/baz" {
@@ -100,11 +106,13 @@ func TestGroup(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer g2.Close()
 
 	g3, err = g2.OpenGroup("baz")
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer g3.Close()
 
 	_, err = g3.OpenGroup("bs")
 	if err == nil {
@@ -117,22 +125,26 @@ func TestGroup(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer dtype.Close()
 
 	dims := []uint{1}
 	dspace, err := CreateSimpleDataspace(dims, dims)
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer dspace.Close()
 
 	dset, err := g3.CreateDataset("dset", dtype, dspace)
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer dset.Close()
 
 	dset2, err := g3.OpenDataset("dset")
 	if dset.Name() != dset2.Name() {
 		t.Error("expected dataset names to be equal")
 	}
+	defer dset2.Close()
 
 	dset2, err = g3.OpenDataset("bs")
 	if err == nil {
diff --git a/h5p_proplist_test.go b/h5p_proplist_test.go
@@ -184,6 +184,7 @@ func save(fn, dsn string, dims []uint, dcpl *PropList) ([]float64, error) {
 	if err != nil {
 		return nil, err
 	}
+	defer dspace.Close()
 
 	dset, err := f.CreateDatasetWith(dsn, T_NATIVE_DOUBLE, dspace, dcpl)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ func TestFile(t *testing.T) {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`f2 := f.File()`
	`44`	`+ defer f2.Close()`
`44`	`45`	`fName := f.FileName()`
`45`	`46`	`f2Name := f2.FileName()`
`46`	`47`	`if fName != f2Name {`
`@@ -53,6 +54,7 @@ func TestFile(t *testing.T) {`
`53`	`54`	`if err != nil {`
`54`	`55`	`t.Fatalf("CreateGroup() failed: %s", err)`
`55`	`56`	`}`
	`57`	`+ defer g.Close()`
`56`	`58`	`if name := g.Name(); name != "/"+groupName {`
`57`	`59`	`t.Fatalf("Group Name() have %v, want /%v", name, groupName)`
`58`	`60`	`}`
`@@ -61,6 +63,7 @@ func TestFile(t *testing.T) {`
`61`	`63`	`if err != nil {`
`62`	`64`	`t.Fatalf("OpenGroup() failed: %s", err)`
`63`	`65`	`}`
	`66`	`+ defer g2.Close()`
`64`	`67`	`if name := g2.Name(); name != "/"+groupName {`
`65`	`68`	`t.Fatalf("Group Name() have %v, want /%v", name, groupName)`
`66`	`69`	`}`
`@@ -85,18 +88,21 @@ func TestFile(t *testing.T) {`
`85`	`88`	`if err != nil {`
`86`	`89`	`t.Fatalf("CreateDataspace failed: %s", err)`
`87`	`90`	`}`
	`91`	`+ defer ds.Close()`
`88`	`92`	`dsetName := "test_dataset"`
`89`	`93`	`dset, err := f.CreateDataset(dsetName, T_NATIVE_INT, ds)`
`90`	`94`	`if err != nil {`
`91`	`95`	`t.Fatalf("CreateDataset failed: %s", err)`
`92`	`96`	`}`
	`97`	`+ defer dset.Close()`
`93`	`98`	`if name := dset.Name(); name != "/"+dsetName {`
`94`	`99`	`t.Fatalf("Dataset Name() have %v, want /%v", name, dsetName)`
`95`	`100`	`}`
`96`	`101`	`dFile := dset.File()`
`97`	`102`	`if dFile.Name() != f.Name() {`
`98`	`103`	`t.Fatalf("Dataset File() have %v, want %v", dFile.Name(), f.Name())`
`99`	`104`	`}`
	`105`	`+ defer dFile.Close()`
`100`	`106`
`101`	`107`	`if n, err := f.NumObjects(); err != nil {`
`102`	`108`	`t.Fatalf("NumObjects failed: %s", err)`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,9 @@ func TestGroup(t *testing.T) {`
`25`	`25`	`if err != nil {`
`26`	`26`	`t.Fatalf("couldn't create group: %s", err)`
`27`	`27`	`}`
`28`		`- if g1.File() != f {`
	`28`	`+ g1f := g1.File()`
	`29`	`+ defer g1f.Close()`
	`30`	`+ if g1f != f {`
`29`	`31`	`t.Fatal("wrong file for group")`
`30`	`32`	`}`
`31`	`33`	`if g1.Name() != "/foo" {`
`@@ -44,7 +46,9 @@ func TestGroup(t *testing.T) {`
`44`	`46`	`if err != nil {`
`45`	`47`	`t.Fatalf("couldn't create group: %s", err)`
`46`	`48`	`}`
`47`		`- if g2.File() != f {`
	`49`	`+ g2f := g2.File()`
	`50`	`+ defer g2f.Close()`
	`51`	`+ if g2f != f {`
`48`	`52`	`t.Fatal("wrong file for group")`
`49`	`53`	`}`
`50`	`54`	`if g2.Name() != "/foo/bar" {`
`@@ -58,7 +62,9 @@ func TestGroup(t *testing.T) {`
`58`	`62`	`if err != nil {`
`59`	`63`	`t.Fatalf("couldn't create group: %s", err)`
`60`	`64`	`}`
`61`		`- if g3.File() != f {`
	`65`	`+ g3f := g3.File()`
	`66`	`+ defer g3f.Close()`
	`67`	`+ if g3f != f {`
`62`	`68`	`t.Fatal("wrong file for group")`
`63`	`69`	`}`
`64`	`70`	`if g3.Name() != "/foo/bar/baz" {`
`@@ -100,11 +106,13 @@ func TestGroup(t *testing.T) {`
`100`	`106`	`if err != nil {`
`101`	`107`	`t.Fatal(err)`
`102`	`108`	`}`
	`109`	`+ defer g2.Close()`
`103`	`110`
`104`	`111`	`g3, err = g2.OpenGroup("baz")`
`105`	`112`	`if err != nil {`
`106`	`113`	`t.Fatal(err)`
`107`	`114`	`}`
	`115`	`+ defer g3.Close()`
`108`	`116`
`109`	`117`	`_, err = g3.OpenGroup("bs")`
`110`	`118`	`if err == nil {`
`@@ -117,22 +125,26 @@ func TestGroup(t *testing.T) {`
`117`	`125`	`if err != nil {`
`118`	`126`	`t.Fatal(err)`
`119`	`127`	`}`
	`128`	`+ defer dtype.Close()`
`120`	`129`
`121`	`130`	`dims := []uint{1}`
`122`	`131`	`dspace, err := CreateSimpleDataspace(dims, dims)`
`123`	`132`	`if err != nil {`
`124`	`133`	`t.Fatal(err)`
`125`	`134`	`}`
	`135`	`+ defer dspace.Close()`
`126`	`136`
`127`	`137`	`dset, err := g3.CreateDataset("dset", dtype, dspace)`
`128`	`138`	`if err != nil {`
`129`	`139`	`t.Fatal(err)`
`130`	`140`	`}`
	`141`	`+ defer dset.Close()`
`131`	`142`
`132`	`143`	`dset2, err := g3.OpenDataset("dset")`
`133`	`144`	`if dset.Name() != dset2.Name() {`
`134`	`145`	`t.Error("expected dataset names to be equal")`
`135`	`146`	`}`
	`147`	`+ defer dset2.Close()`
`136`	`148`
`137`	`149`	`dset2, err = g3.OpenDataset("bs")`
`138`	`150`	`if err == nil {`
Original file line number	Diff line number	Diff line change
`@@ -184,6 +184,7 @@ func save(fn, dsn string, dims []uint, dcpl *PropList) ([]float64, error) {`
`184`	`184`	`if err != nil {`
`185`	`185`	`return nil, err`
`186`	`186`	`}`
	`187`	`+ defer dspace.Close()`
`187`	`188`
`188`	`189`	`dset, err := f.CreateDatasetWith(dsn, T_NATIVE_DOUBLE, dspace, dcpl)`
`189`	`190`	`if err != nil {`