Skip to content

Commit

Permalink
Merge pull request #7084 from dolthub/taylor/typo
Browse files Browse the repository at this point in the history
Fix existant typo
  • Loading branch information
tbantle22 authored Dec 1, 2023
2 parents 18f65fb + a0c0fa6 commit 1ca0872
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions go/libraries/doltcore/doltdb/gc_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,10 @@ func testGarbageCollection(t *testing.T, test gcTest) {
// In September 2023, we found a failure to handle the `hasCache` in
// `*NomsBlockStore` appropriately while cleaning up a memtable into which
// dangling references had been written could result in writing chunks to a
// database which referenced non-existant chunks.
// database which referenced non-existent chunks.
//
// The general pattern was to get new chunk addresses into the hasCache, but
// not written to the store, and then to have an incoming chunk add a refenece
// not written to the store, and then to have an incoming chunk add a reference
// to missing chunk. At that time, we would clear the memtable, since it had
// invalid chunks in it, but we wouldn't purge the hasCache. Later writes which
// attempted to reference the chunks which had made it into the hasCache would
Expand Down
2 changes: 1 addition & 1 deletion go/libraries/utils/set/strset_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func TestStrSet(t *testing.T) {
t.Error("Set doesn't match expectation after removes", strSet.AsSlice())
}

strSet.Remove("non-existant string")
strSet.Remove("non-existent string")

if !isAsExpected(strSet, []string{"a", "c", "e"}) {
t.Error("Set doesn't match expectation after noop remove", strSet.AsSlice())
Expand Down
2 changes: 1 addition & 1 deletion go/store/types/apply_map_edits.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ type AppliedEditStats struct {
// Deletions counts the number of items deleted from the map
Deletions int64

// NonexistantDeletes counts the number of items where a deletion was attempted, but the key didn't exist in the map
// NonexistentDeletes counts the number of items where a deletion was attempted, but the key didn't exist in the map
// so there was no impact
NonExistentDeletes int64
}
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/bats/1pk5col-ints.bats
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@ DELIM
[[ "$output" =~ "PRIMARY KEY (\`pk\`)" ]] || false
}

@test "1pk5col-ints: dolt schema show on non existant table" {
@test "1pk5col-ints: dolt schema show on non existent table" {
run dolt schema show foo
[ "$status" -eq 0 ]
[ "$output" = "foo not found" ]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/bats/conflict-detection.bats
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ teardown() {
teardown_common
}

@test "conflict-detection: merge non-existant branch errors" {
@test "conflict-detection: merge non-existent branch errors" {
run dolt merge batmans-parents
[ $status -eq 1 ]
[[ "$output" =~ "branch not found" ]] || false
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/bats/create-views.bats
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ SQL
[[ "${lines[3]}" =~ ' 4 ' ]] || false
}

@test "create-views: cannot create view referencing non-existant table" {
@test "create-views: cannot create view referencing non-existent table" {
run dolt sql <<SQL
create view broken as select id from my_users;
SQL
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/bats/empty-repo.bats
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ teardown() {
[ "$output" = "Already on branch 'main'" ]
}

@test "empty-repo: dolt checkout non-existant branch" {
@test "empty-repo: dolt checkout non-existent branch" {
run dolt checkout foo
[ "$status" -ne 0 ]
[ "$output" = "error: could not find foo" ]
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/bats/import-create-tables.bats
Original file line number Diff line number Diff line change
Expand Up @@ -227,15 +227,15 @@ CSV
[[ "$output" =~ "reserved" ]] || false
}

@test "import-create-tables: try to table import with nonexistant --pk arg" {
@test "import-create-tables: try to table import with nonexistent --pk arg" {
run dolt table import -c -pk="batmansparents" test 1pk5col-ints.csv
[ "$status" -eq 1 ]
[[ "$output" =~ "Error determining the output schema." ]] || false
skip "--pk args is not validated to be an existing column"
[[ "$output" =~ "column 'batmansparents' not found" ]] || false
}

@test "import-create-tables: try to table import with one valid and one nonexistant --pk arg" {
@test "import-create-tables: try to table import with one valid and one nonexistent --pk arg" {
run dolt table import -c -pk="pk,batmansparents" test 1pk5col-ints.csv
[ "$status" -eq 1 ]
[[ "$output" =~ "Error determining the output schema." ]] || false
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/bats/remotes-aws.bats
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ skip_if_no_aws_tests() {
dolt fetch origin
}

@test "remotes-aws: fetch with non-existant dynamo table fails" {
@test "remotes-aws: fetch with non-existent dynamo table fails" {
skip_if_no_aws_tests
dolt remote add origin 'aws://['"this_dynamodb_table_does_not_exist_b612c34f055f4b458"':'"$DOLT_BATS_AWS_BUCKET"']/'"$DOLT_BATS_AWS_EXISTING_REPO"
run dolt fetch origin
[ "$status" -eq 1 ]
}

@test "remotes-aws: fetch with non-existant s3 bucket fails" {
@test "remotes-aws: fetch with non-existent s3 bucket fails" {
skip_if_no_aws_tests
dolt remote add origin 'aws://['"$DOLT_BATS_AWS_TABLE"':'"this_s3_bucket_does_not_exist_5883eaaa20a4797bb"']/'"$DOLT_BATS_AWS_EXISTING_REPO"
run dolt fetch origin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ tests:
args: ["--config", "server.yaml"]
error_matches:
- "require_secure_transport can only be `true` when a tls_key and tls_cert are provided."
- name: tls_key non-existant
- name: tls_key non-existent
repos:
- name: repo1
with_files:
Expand All @@ -28,7 +28,7 @@ tests:
args: ["--config", "server.yaml"]
error_matches:
- "no such file or directory"
- name: tls_cert non-existant
- name: tls_cert non-existent
repos:
- name: repo1
with_files:
Expand Down

0 comments on commit 1ca0872

Please sign in to comment.