mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

Revert "Adding the debug bar logic in the server (#22410)" (#22478)

Просмотр исходного кода 
This reverts commit 280bc7f97e.
Этот коммит содержится в:
Jesse Hallam
2023-03-10 14:30:17 -04:00
коммит произвёл GitHub
родитель 6a9c4ad56b
Коммит ea3ff49b35
34 изменённых файлов: 54 добавлений и 16293 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

127
store/sqlstore/sqlx_wrapper.go
Просмотреть файл

@@ -64,17 +64,15 @@ var namedParamRegex = regexp.MustCompile(`:\w+`)
type sqlxDBWrapper struct {
*sqlx.DB
queryTimeout time.Duration
trace bool
debugbarPublish func(string, float64, ...any)
queryTimeout time.Duration
trace bool
}
func newSqlxDBWrapper(db *sqlx.DB, timeout time.Duration, trace bool, debugbarPublish func(string, float64, ...any)) *sqlxDBWrapper {
func newSqlxDBWrapper(db *sqlx.DB, timeout time.Duration, trace bool) *sqlxDBWrapper {
return &sqlxDBWrapper{
DB: db,
queryTimeout: timeout,
trace: trace,
debugbarPublish: debugbarPublish,
DB: db,
queryTimeout: timeout,
trace: trace,
}
}
@@ -88,7 +86,7 @@ func (w *sqlxDBWrapper) Beginx() (*sqlxTxWrapper, error) {
return nil, err
}
return newSqlxTxWrapper(tx, w.queryTimeout, w.trace, w.debugbarPublish), nil
return newSqlxTxWrapper(tx, w.queryTimeout, w.trace), nil
}
func (w *sqlxDBWrapper) BeginXWithIsolation(opts *sql.TxOptions) (*sqlxTxWrapper, error) {
@@ -97,7 +95,7 @@ func (w *sqlxDBWrapper) BeginXWithIsolation(opts *sql.TxOptions) (*sqlxTxWrapper
return nil, err
}
return newSqlxTxWrapper(tx, w.queryTimeout, w.trace, w.debugbarPublish), nil
return newSqlxTxWrapper(tx, w.queryTimeout, w.trace), nil
}
func (w *sqlxDBWrapper) Get(dest any, query string, args ...any) error {
@@ -110,11 +108,6 @@ func (w *sqlxDBWrapper) Get(dest any, query string, args ...any) error {
printArgs(query, time.Since(then), args)
}(time.Now())
}
if w.debugbarPublish != nil {
defer func(then time.Time) {
w.debugbarPublish(query, float64(time.Since(then))/float64(time.Second), args...)
}(time.Now())
}
return w.DB.GetContext(ctx, dest, query, args...)
}
@@ -141,12 +134,6 @@ func (w *sqlxDBWrapper) NamedExec(query string, arg any) (sql.Result, error) {
}(time.Now())
}
if w.debugbarPublish != nil {
defer func(then time.Time) {
w.debugbarPublish(query, float64(time.Since(then))/float64(time.Second), arg)
}(time.Now())
}
return w.DB.NamedExecContext(ctx, query, arg)
}
@@ -174,12 +161,6 @@ func (w *sqlxDBWrapper) ExecNoTimeout(query string, args ...any) (sql.Result, er
}(time.Now())
}
if w.debugbarPublish != nil {
defer func(then time.Time) {
w.debugbarPublish(query, float64(time.Since(then))/float64(time.Second), args...)
}(time.Now())
}
return w.DB.ExecContext(context.Background(), query, args...)
}
@@ -195,12 +176,6 @@ func (w *sqlxDBWrapper) ExecRaw(query string, args ...any) (sql.Result, error) {
}(time.Now())
}
if w.debugbarPublish != nil {
defer func(then time.Time) {
w.debugbarPublish(query, float64(time.Since(then))/float64(time.Second), args...)
}(time.Now())
}
return w.DB.ExecContext(ctx, query, args...)
}
@@ -217,12 +192,6 @@ func (w *sqlxDBWrapper) NamedQuery(query string, arg any) (*sqlx.Rows, error) {
}(time.Now())
}
if w.debugbarPublish != nil {
defer func(then time.Time) {
w.debugbarPublish(query, float64(time.Since(then))/float64(time.Second), arg)
}(time.Now())
}
return w.DB.NamedQueryContext(ctx, query, arg)
}
@@ -237,12 +206,6 @@ func (w *sqlxDBWrapper) QueryRowX(query string, args ...any) *sqlx.Row {
}(time.Now())
}
if w.debugbarPublish != nil {
defer func(then time.Time) {
w.debugbarPublish(query, float64(time.Since(then))/float64(time.Second), args...)
}(time.Now())
}
return w.DB.QueryRowxContext(ctx, query, args...)
}
@@ -257,12 +220,6 @@ func (w *sqlxDBWrapper) QueryX(query string, args ...any) (*sqlx.Rows, error) {
}(time.Now())
}
if w.debugbarPublish != nil {
defer func(then time.Time) {
w.debugbarPublish(query, float64(time.Since(then))/float64(time.Second), args...)
}(time.Now())
}
return w.DB.QueryxContext(ctx, query, args)
}
@@ -281,12 +238,6 @@ func (w *sqlxDBWrapper) SelectCtx(ctx context.Context, dest any, query string, a
}(time.Now())
}
if w.debugbarPublish != nil {
defer func(then time.Time) {
w.debugbarPublish(query, float64(time.Since(then))/float64(time.Second), args...)
}(time.Now())
}
return w.DB.SelectContext(ctx, dest, query, args...)
}
@@ -301,17 +252,15 @@ func (w *sqlxDBWrapper) SelectBuilder(dest any, builder Builder) error {
type sqlxTxWrapper struct {
*sqlx.Tx
queryTimeout time.Duration
trace bool
debugbarPublish func(string, float64, ...any)
queryTimeout time.Duration
trace bool
}
func newSqlxTxWrapper(tx *sqlx.Tx, timeout time.Duration, trace bool, debugbarPublish func(string, float64, ...any)) *sqlxTxWrapper {
func newSqlxTxWrapper(tx *sqlx.Tx, timeout time.Duration, trace bool) *sqlxTxWrapper {
return &sqlxTxWrapper{
Tx: tx,
queryTimeout: timeout,
trace: trace,
debugbarPublish: debugbarPublish,
Tx: tx,
queryTimeout: timeout,
trace: trace,
}
}
@@ -326,12 +275,6 @@ func (w *sqlxTxWrapper) Get(dest any, query string, args ...any) error {
}(time.Now())
}
if w.debugbarPublish != nil {
defer func(then time.Time) {
w.debugbarPublish(query, float64(time.Since(then))/float64(time.Second), args...)
}(time.Now())
}
return w.Tx.GetContext(ctx, dest, query, args...)
}
@@ -359,12 +302,6 @@ func (w *sqlxTxWrapper) ExecNoTimeout(query string, args ...any) (sql.Result, er
}(time.Now())
}
if w.debugbarPublish != nil {
defer func(then time.Time) {
w.debugbarPublish(query, float64(time.Since(then))/float64(time.Second), args...)
}(time.Now())
}
return w.Tx.ExecContext(context.Background(), query, args...)
}
@@ -389,12 +326,6 @@ func (w *sqlxTxWrapper) ExecRaw(query string, args ...any) (sql.Result, error) {
}(time.Now())
}
if w.debugbarPublish != nil {
defer func(then time.Time) {
w.debugbarPublish(query, float64(time.Since(then))/float64(time.Second), args...)
}(time.Now())
}
return w.Tx.ExecContext(ctx, query, args...)
}
@@ -411,12 +342,6 @@ func (w *sqlxTxWrapper) NamedExec(query string, arg any) (sql.Result, error) {
}(time.Now())
}
if w.debugbarPublish != nil {
defer func(then time.Time) {
w.debugbarPublish(query, float64(time.Since(then))/float64(time.Second), arg)
}(time.Now())
}
return w.Tx.NamedExecContext(ctx, query, arg)
}
@@ -433,12 +358,6 @@ func (w *sqlxTxWrapper) NamedQuery(query string, arg any) (*sqlx.Rows, error) {
}(time.Now())
}
if w.debugbarPublish != nil {
defer func(then time.Time) {
w.debugbarPublish(query, float64(time.Since(then))/float64(time.Second), arg)
}(time.Now())
}
// There is no tx.NamedQueryContext support in the sqlx API. (https://github.com/jmoiron/sqlx/issues/447)
// So we need to implement this ourselves.
type result struct {
@@ -481,12 +400,6 @@ func (w *sqlxTxWrapper) QueryRowX(query string, args ...any) *sqlx.Row {
}(time.Now())
}
if w.debugbarPublish != nil {
defer func(then time.Time) {
w.debugbarPublish(query, float64(time.Since(then))/float64(time.Second), args...)
}(time.Now())
}
return w.Tx.QueryRowxContext(ctx, query, args...)
}
@@ -501,12 +414,6 @@ func (w *sqlxTxWrapper) QueryX(query string, args ...any) (*sqlx.Rows, error) {
}(time.Now())
}
if w.debugbarPublish != nil {
defer func(then time.Time) {
w.debugbarPublish(query, float64(time.Since(then))/float64(time.Second), args...)
}(time.Now())
}
return w.Tx.QueryxContext(ctx, query, args)
}
@@ -521,12 +428,6 @@ func (w *sqlxTxWrapper) Select(dest any, query string, args ...any) error {
}(time.Now())
}
if w.debugbarPublish != nil {
defer func(then time.Time) {
w.debugbarPublish(query, float64(time.Since(then))/float64(time.Second), args...)
}(time.Now())
}
return w.Tx.SelectContext(ctx, dest, query, args...)
}

42
store/sqlstore/store.go
Просмотреть файл

@@ -130,7 +130,6 @@ type SqlStore struct {
replicaLagHandles []*dbsql.DB
stores SqlStoreStores
settings *model.SqlSettings
debugbarPublish func(string, float64, ...any)
lockedToMaster bool
context context.Context
license *model.License
@@ -141,13 +140,12 @@ type SqlStore struct {
pgDefaultTextSearchConfig string
}
func New(settings model.SqlSettings, metrics einterfaces.MetricsInterface, debugbarPublish func(string, float64, ...any)) *SqlStore {
func New(settings model.SqlSettings, metrics einterfaces.MetricsInterface) *SqlStore {
store := &SqlStore{
rrCounter: 0,
srCounter: 0,
settings: &settings,
metrics: metrics,
debugbarPublish: debugbarPublish,
rrCounter: 0,
srCounter: 0,
settings: &settings,
metrics: metrics,
}
store.initConnection()
@@ -301,9 +299,7 @@ func (ss *SqlStore) initConnection() {
handle := SetupConnection("master", dataSource, ss.settings)
ss.masterX = newSqlxDBWrapper(sqlx.NewDb(handle, ss.DriverName()),
time.Duration(*ss.settings.QueryTimeout)*time.Second,
*ss.settings.Trace,
ss.debugbarPublish,
)
*ss.settings.Trace)
if ss.DriverName() == model.DatabaseDriverMysql {
ss.masterX.MapperFunc(noOpMapper)
}
@@ -317,9 +313,7 @@ func (ss *SqlStore) initConnection() {
handle := SetupConnection(fmt.Sprintf("replica-%v", i), replica, ss.settings)
ss.ReplicaXs[i] = newSqlxDBWrapper(sqlx.NewDb(handle, ss.DriverName()),
time.Duration(*ss.settings.QueryTimeout)*time.Second,
*ss.settings.Trace,
ss.debugbarPublish,
)
*ss.settings.Trace)
if ss.DriverName() == model.DatabaseDriverMysql {
ss.ReplicaXs[i].MapperFunc(noOpMapper)
}
@@ -335,9 +329,7 @@ func (ss *SqlStore) initConnection() {
handle := SetupConnection(fmt.Sprintf("search-replica-%v", i), replica, ss.settings)
ss.searchReplicaXs[i] = newSqlxDBWrapper(sqlx.NewDb(handle, ss.DriverName()),
time.Duration(*ss.settings.QueryTimeout)*time.Second,
*ss.settings.Trace,
ss.debugbarPublish,
)
*ss.settings.Trace)
if ss.DriverName() == model.DatabaseDriverMysql {
ss.searchReplicaXs[i].MapperFunc(noOpMapper)
}
@@ -442,9 +434,7 @@ func (ss *SqlStore) GetMasterX() *sqlxDBWrapper {
func (ss *SqlStore) SetMasterX(db *sql.DB) {
ss.masterX = newSqlxDBWrapper(sqlx.NewDb(db, ss.DriverName()),
time.Duration(*ss.settings.QueryTimeout)*time.Second,
*ss.settings.Trace,
ss.debugbarPublish,
)
*ss.settings.Trace)
if ss.DriverName() == model.DatabaseDriverMysql {
ss.masterX.MapperFunc(noOpMapper)
}
@@ -1294,17 +1284,3 @@ func (ss *SqlStore) GetAppliedMigrations() ([]model.AppliedMigration, error) {
return migrations, nil
}
func (ss *SqlStore) Explain(query string, args []any) (string, error) {
var explain []string
if strings.HasPrefix(query, "ANALYZE") {
return "", errors.New("not allowed to explain queries with analyze at the beginning")
}
if err := ss.GetMasterX().Select(&explain, "EXPLAIN "+query, args...); err != nil {
return "", errors.Wrap(err, "unable to run the explain query")
}
return strings.Join(explain, "\n"), nil
}

18
store/sqlstore/store_test.go
Просмотреть файл

@@ -132,7 +132,7 @@ func initStores() {
wg.Add(1)
go func() {
defer wg.Done()
st.SqlStore = New(*st.SqlSettings, nil, nil)
st.SqlStore = New(*st.SqlSettings, nil)
st.Store = st.SqlStore
st.Store.DropAllTables()
st.Store.MarkSystemRanUnitTests()
@@ -171,7 +171,7 @@ func tearDownStores() {
// Keeping it here to help avoiding future regressions.
func TestStoreLicenseRace(t *testing.T) {
settings := makeSqlSettings(model.DatabaseDriverPostgres)
store := New(*settings, nil, nil)
store := New(*settings, nil)
defer func() {
store.Close()
storetest.CleanupSqlSettings(settings)
@@ -268,7 +268,7 @@ func TestGetReplica(t *testing.T) {
settings.DataSourceReplicas = dataSourceReplicas
settings.DataSourceSearchReplicas = dataSourceSearchReplicas
store := New(*settings, nil, nil)
store := New(*settings, nil)
defer func() {
store.Close()
storetest.CleanupSqlSettings(settings)
@@ -338,7 +338,7 @@ func TestGetReplica(t *testing.T) {
settings.DataSourceReplicas = dataSourceReplicas
settings.DataSourceSearchReplicas = dataSourceSearchReplicas
store := New(*settings, nil, nil)
store := New(*settings, nil)
defer func() {
store.Close()
storetest.CleanupSqlSettings(settings)
@@ -402,7 +402,7 @@ func TestGetDbVersion(t *testing.T) {
t.Run("Should return db version for "+driver, func(t *testing.T) {
t.Parallel()
settings := makeSqlSettings(driver)
store := New(*settings, nil, nil)
store := New(*settings, nil)
version, err := store.GetDbVersion(false)
require.NoError(t, err)
@@ -546,7 +546,7 @@ func TestUpAndDownMigrations(t *testing.T) {
for _, driver := range testDrivers {
t.Run("Should be reversible for "+driver, func(t *testing.T) {
settings := makeSqlSettings(driver)
store := New(*settings, nil, nil)
store := New(*settings, nil)
defer store.Close()
err := store.migrate(migrationsDirectionDown)
@@ -635,7 +635,7 @@ func TestGetAllConns(t *testing.T) {
settings.DataSourceReplicas = dataSourceReplicas
settings.DataSourceSearchReplicas = dataSourceSearchReplicas
store := New(*settings, nil, nil)
store := New(*settings, nil)
defer func() {
store.Close()
storetest.CleanupSqlSettings(settings)
@@ -819,7 +819,7 @@ func TestGetDBSchemaVersion(t *testing.T) {
t.Run("Should return latest version number of applied migrations for "+driver, func(t *testing.T) {
t.Parallel()
settings := makeSqlSettings(driver)
store := New(*settings, nil, nil)
store := New(*settings, nil)
assetsList, err := assets.ReadDir(filepath.Join("migrations", driver))
require.NoError(t, err)
@@ -853,7 +853,7 @@ func TestGetAppliedMigrations(t *testing.T) {
t.Run("Should return db applied migrations for "+driver, func(t *testing.T) {
t.Parallel()
settings := makeSqlSettings(driver)
store := New(*settings, nil, nil)
store := New(*settings, nil)
assetsList, err := assets.ReadDir(filepath.Join("migrations", driver))
require.NoError(t, err)