Merge branch 'master' into e35_mdbx_v0_13

erigontech · Dec 21, 2024 · 2529582 · 2529582
2 parents 1fde822 + a7f8428
commit 2529582
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/mdbx/env.go b/mdbx/env.go
@@ -114,6 +114,11 @@ var (
 	LoggerDoNotChange = C.MDBX_LOGGER_DONTCHANGE
 )
 
+// Label - will be added to error messages. For better understanding - which DB has problem.
+type Label string
+
+const Default Label = "default"
+
 // DBI is a handle for a database in an Env.
 //
 // See MDBX_dbi
@@ -124,7 +129,8 @@ type DBI C.MDBX_dbi
 //
 // See MDBX_env.
 type Env struct {
-	_env *C.MDBX_env
+	_env  *C.MDBX_env
+	label Label
 
 	// closeLock is used to allow the Txn finalizer to check if the Env has
 	// been closed, so that it may know if it must abort.
@@ -134,8 +140,8 @@ type Env struct {
 // NewEnv allocates and initializes a new Env.
 //
 // See mdbx_env_create.
-func NewEnv() (*Env, error) {
-	env := new(Env)
+func NewEnv(label Label) (*Env, error) {
+	env := &Env{label: label}
 	ret := C.mdbx_env_create(&env._env)
 	if ret != success {
 		return nil, operrno("mdbx_env_create", ret)
@@ -153,6 +159,7 @@ func (env *Env) Open(path string, flags uint, mode os.FileMode) error {
 	ret := C.mdbx_env_open(env._env, cpath, C.MDBX_env_flags_t(NoTLS|flags), C.mdbx_mode_t(mode))
 	return operrno("mdbx_env_open", ret)
 }
+func (env *Env) Label() Label { return env.label }
 
 var errNotOpen = errors.New("enivornment is not open")
 

diff --git a/mdbx/env_test.go b/mdbx/env_test.go
@@ -45,7 +45,7 @@ import (
 //}
 
 func TestEnv_Open_notExist(t *testing.T) {
-	env, err := NewEnv()
+	env, err := NewEnv(Default)
 	if err != nil {
 		t.Fatalf("create: %s", err)
 	}
@@ -59,7 +59,7 @@ func TestEnv_Open_notExist(t *testing.T) {
 }
 
 func TestEnv_Open(t *testing.T) {
-	env, err1 := NewEnv()
+	env, err1 := NewEnv(Default)
 	if err1 != nil {
 		t.Error(err1)
 		return
@@ -179,7 +179,7 @@ func TestEnv_Flags(t *testing.T) {
 func TestEnv_SetMaxReader(t *testing.T) {
 	dir := t.TempDir()
 
-	env, err := NewEnv()
+	env, err := NewEnv(Default)
 	if err != nil {
 		t.Error(err)
 	}
@@ -218,7 +218,7 @@ func TestEnv_SetMaxReader(t *testing.T) {
 }
 
 func TestEnv_SetDebug(t *testing.T) {
-	env, err := NewEnv()
+	env, err := NewEnv(Default)
 	if err != nil {
 		t.Error(err)
 	}
@@ -518,7 +518,7 @@ func setup(t testing.TB) (*Env, string) {
 }
 
 func setupFlags(t testing.TB, flags uint) (env *Env, path string) {
-	env, err := NewEnv()
+	env, err := NewEnv(Default)
 	if err != nil {
 		t.Fatalf("env: %s", err)
 	}

diff --git a/mdbx/mdbx_test.go b/mdbx/mdbx_test.go
@@ -7,7 +7,7 @@ import (
 )
 
 func TestEmptyKeysAndValues(t *testing.T) {
-	env, err1 := NewEnv()
+	env, err1 := NewEnv(Default)
 	if err1 != nil {
 		t.Fatalf("Cannot create environment: %s", err1)
 	}
@@ -104,7 +104,7 @@ func TestEmptyKeysAndValues(t *testing.T) {
 }
 
 func TestTest1(t *testing.T) {
-	env, err1 := NewEnv()
+	env, err1 := NewEnv(Default)
 	if err1 != nil {
 		t.Fatalf("Cannot create environment: %s", err1)
 	}

diff --git a/mdbx/txn_test.go b/mdbx/txn_test.go
@@ -596,7 +596,7 @@ func TestTxn_Flags(t *testing.T) {
 	env.Close()
 
 	// opening the database after it is created inherits the original flags.
-	env, err = NewEnv()
+	env, err = NewEnv(Default)
 	if err != nil {
 		t.Error(err)
 		return