forked from cockroachdb/cockroach
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
99168: randgen: disable generation of REGNAMESPACE type expressions r=msirek a=msirek Casting an OID to REGNAMESPACE runs this SQL using the internal executor: ``` SELECT pg_namespace.oid, nspname FROM pg_catalog.pg_namespace WHERE oid = $1 ``` When the `GenerateConstrainedScans` rule is disabled, this returns no rows and so doesn't apply the cast. The same SQL, not run via an internal executor, but also with `GenerateConstrainedScans` disabled, behaves correctly. Disabling `GenerateConstrainedScans` all the time prevents the cluster from starting. The reason a full scan of pg_namespace doesn't find the OID is because it only checks for schemas in the current database: https://github.com/cockroachdb/cockroach/blob/7b341ffa678e4a22416e2274351fd56f415f5421/pkg/sql/virtual_schema.go#L602 https://github.com/cockroachdb/cockroach/blob/d10c3dd42c3dc40cad82792a30ae47fd2a663f43/pkg/sql/pg_catalog.go#L2099-L2106 https://github.com/cockroachdb/cockroach/blob/a7e9c4a68b81436d1f9382518d4267f74cbdac94/pkg/sql/information_schema.go#L2295-L2296 Whereas with a constrained scan, all descriptors are searched: https://github.com/cockroachdb/cockroach/blob/af6a72a622ae05f3733b5db637403b3eaa9455f1/pkg/sql/catalog/descs/descriptor.go#L168-L175 The correct result is from the constrained scan, because we currently allow cross-database references. Once cockroachdb#55791 is fixed, both results should match. The fix alternatives are: 1. disallow disabling of the `GenerateConstrainedScans` rule for internal SQL 2. turn off generation of REGNAMESPACE expressions in randgen to avoid hitting this problem in tests. The 2nd fix alternative is implemented to avoid losing any of the rule-disabling test coverage provided by the `testing_optimizer_disable_rule_probability` setting. Fixes cockroachdb#98322 100652: cluster-ui: fix cached data invalidation on timescale change r=xinhaoz a=xinhaoz In a prior change, we moved the invalidation of cached data depending on the timescale to the local storage saga for CC. This was so invaldiation would occur after updating the cache. The local storage saga created for the time scale action was not hooked up to fire after the action, thus the data would not have been invalidated. This commit properly subscribes the saga to the update time scale action in CC. Epic: none Release note: None 100760: build: make sure toolchain has correct arguments for linking shared lib r=rail a=rickystewart `geos` has been failing to build without this change since cockroachdb#100313. This fixes it. Epic: none Release note: None Co-authored-by: Mark Sirek <[email protected]> Co-authored-by: Xin Hao Zhang <[email protected]> Co-authored-by: Ricky Stewart <[email protected]>
- Loading branch information
Showing
10 changed files
with
79 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
51 changes: 51 additions & 0 deletions
51
pkg/ui/workspaces/cluster-ui/src/store/localStorage/localStorage.saga.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
// Copyright 2023 The Cockroach Authors. | ||
// | ||
// Use of this software is governed by the Business Source License | ||
// included in the file licenses/BSL.txt. | ||
// | ||
// As of the Change Date specified in that file, in accordance with | ||
// the Business Source License, use of this software will be governed | ||
// by the Apache License, Version 2.0, included in the file | ||
// licenses/APL.txt. | ||
|
||
import { expectSaga, testSaga } from "redux-saga-test-plan"; | ||
import { actions } from "./localStorage.reducer"; | ||
import { actions as stmtInsightActions } from "src/store/insights/statementInsights/statementInsights.reducer"; | ||
import { actions as txnInsightActions } from "src/store/insights/transactionInsights/transactionInsights.reducer"; | ||
import { actions as sqlStatsActions } from "src/store/sqlStats/sqlStats.reducer"; | ||
import { actions as txnStatsActions } from "src/store/transactionStats"; | ||
import { | ||
localStorageSaga, | ||
updateLocalStorageItemSaga, | ||
updateTimeScale, | ||
} from "./localStorage.saga"; | ||
import { defaultTimeScaleSelected } from "../../timeScaleDropdown"; | ||
import { takeEvery, takeLatest } from "redux-saga/effects"; | ||
|
||
const ts = defaultTimeScaleSelected; | ||
|
||
describe("local storage sagas", () => { | ||
describe("localStorageSaga", () => { | ||
it("should fork relevant sagas on actions", () => { | ||
testSaga(localStorageSaga) | ||
.next() | ||
.all([ | ||
takeEvery(actions.update, updateLocalStorageItemSaga), | ||
takeLatest(actions.updateTimeScale, updateTimeScale), | ||
]) | ||
.finish() | ||
.isDone(); | ||
}); | ||
}); | ||
|
||
describe("updateTimeScale", () => { | ||
it("invalidates data depending on timescale ", () => { | ||
return expectSaga(updateTimeScale, actions.updateTimeScale({ value: ts })) | ||
.put(sqlStatsActions.invalidated()) | ||
.put(stmtInsightActions.invalidated()) | ||
.put(txnInsightActions.invalidated()) | ||
.put(txnStatsActions.invalidated()) | ||
.run(); | ||
}); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters