diff --git a/.gitignore b/.gitignore index 65fdb113b..2e6cf78f8 100644 --- a/.gitignore +++ b/.gitignore @@ -48,4 +48,4 @@ simulator-output/ bisected.sql *.log -*.db-lg +*.db-log diff --git a/core/lib.rs b/core/lib.rs index f7d8c1cc5..7150fc156 100644 --- a/core/lib.rs +++ b/core/lib.rs @@ -410,7 +410,7 @@ impl Database { let shared_wal = WalFileShared::open_shared_if_exists(&io, wal_path)?; let mv_store = if opts.enable_mvcc { - let file = io.open_file(&format!("{path}-lg"), OpenFlags::default(), false)?; + let file = io.open_file(&format!("{path}-log"), OpenFlags::default(), false)?; let storage = mvcc::persistent_storage::Storage::new(file); let mv_store = MvStore::new(mvcc::LocalClock::new(), storage); Some(Arc::new(mv_store)) diff --git a/core/mvcc/database/tests.rs b/core/mvcc/database/tests.rs index 608a9f366..1781a5c1d 100644 --- a/core/mvcc/database/tests.rs +++ b/core/mvcc/database/tests.rs @@ -58,7 +58,7 @@ impl MvccTestDbNoConn { let log_path_filename = log_path .file_name() .and_then(|name| name.to_str()) - .map(|s| format!("{s}-lg")) + .map(|s| format!("{s}-log")) .unwrap(); log_path.set_file_name(log_path_filename); Self { diff --git a/tests/integration/query_processing/test_transactions.rs b/tests/integration/query_processing/test_transactions.rs index 6743e88a9..53ab7f00e 100644 --- a/tests/integration/query_processing/test_transactions.rs +++ b/tests/integration/query_processing/test_transactions.rs @@ -480,7 +480,7 @@ fn test_mvcc_checkpoint_works() { conn.execute("COMMIT").unwrap(); } - // Before checkpoint: assert that the DB file size is exactly 4096, .db-wal size is exactly 32, and there is a nonzero size .db-lg file + // Before checkpoint: assert that the DB file size is exactly 4096, .db-wal size is exactly 32, and there is a nonzero size .db-log file let db_file_size = std::fs::metadata(&tmp_db.path).unwrap().len(); assert!(db_file_size == 4096); let wal_file_size = std::fs::metadata(tmp_db.path.with_extension("db-wal")) @@ -490,7 +490,7 @@ fn test_mvcc_checkpoint_works() { wal_file_size == 0, "wal file size should be 0 bytes, but is {wal_file_size} bytes" ); - let lg_file_size = std::fs::metadata(tmp_db.path.with_extension("db-lg")) + let lg_file_size = std::fs::metadata(tmp_db.path.with_extension("db-log")) .unwrap() .len(); assert!(lg_file_size > 0); @@ -521,7 +521,7 @@ fn test_mvcc_checkpoint_works() { assert_eq!(rows, expected); - // Assert that the db file size is larger than 4096, assert .db-wal size is 32 bytes, assert there is no .db-lg file + // Assert that the db file size is larger than 4096, assert .db-wal size is 32 bytes, assert there is no .db-log file let db_file_size = std::fs::metadata(&tmp_db.path).unwrap().len(); assert!(db_file_size > 4096); assert!(db_file_size % 4096 == 0); @@ -532,7 +532,7 @@ fn test_mvcc_checkpoint_works() { wal_size == 0, "wal size should be 0 bytes, but is {wal_size} bytes" ); - let log_size = std::fs::metadata(tmp_db.path.with_extension("db-lg")) + let log_size = std::fs::metadata(tmp_db.path.with_extension("db-log")) .unwrap() .len(); assert!(