Skip to content

chore(insights): Move permissive SQL parser into utils folder #72953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ import {
import {formatBytesBase2} from 'sentry/utils/bytes/formatBytesBase2';
import {generateLinkToEventInTraceView} from 'sentry/utils/discover/urls';
import toRoundedPercent from 'sentry/utils/number/toRoundedPercent';
import {SQLishFormatter} from 'sentry/utils/sqlish/SQLishFormatter';
import {safeURL} from 'sentry/utils/url/safeURL';
import {useLocation} from 'sentry/utils/useLocation';
import useOrganization from 'sentry/utils/useOrganization';
import {transactionSummaryRouteWithQuery} from 'sentry/views/performance/transactionSummary/utils';
import {getPerformanceDuration} from 'sentry/views/performance/utils/getPerformanceDuration';
import {SQLishFormatter} from 'sentry/views/starfish/utils/sqlish/SQLishFormatter';

import KeyValueList from '../keyValueList';
import type {ProcessedSpanType, RawSpanType} from '../spans/types';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {Fragment} from 'react';

import {render} from 'sentry-test/reactTestingLibrary';

import {SQLishFormatter} from 'sentry/views/starfish/utils/sqlish/SQLishFormatter';
import {SQLishFormatter} from 'sentry/utils/sqlish/SQLishFormatter';

describe('SQLishFormatter', function () {
describe('SQLishFormatter.toString()', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import * as Sentry from '@sentry/react';

import {simpleMarkup} from 'sentry/views/starfish/utils/sqlish/formatters/simpleMarkup';
import {string} from 'sentry/views/starfish/utils/sqlish/formatters/string';
import {SQLishParser} from 'sentry/views/starfish/utils/sqlish/SQLishParser';
import {simpleMarkup} from 'sentry/utils/sqlish/formatters/simpleMarkup';
import {string} from 'sentry/utils/sqlish/formatters/string';
import {SQLishParser} from 'sentry/utils/sqlish/SQLishParser';

type StringFormatterOptions = Parameters<typeof string>[1];

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {SQLishParser} from 'sentry/views/starfish/utils/sqlish/SQLishParser';
import {SQLishParser} from 'sentry/utils/sqlish/SQLishParser';

describe('SQLishParser', function () {
describe('SQLishParser()', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type {Token} from 'sentry/views/starfish/utils/sqlish/types';
import type {Token} from 'sentry/utils/sqlish/types';

import grammar from './sqlish.pegjs';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type {Token} from 'sentry/views/starfish/utils/sqlish/types';
import type {Token} from 'sentry/utils/sqlish/types';

export function simpleMarkup(tokens: Token[]): React.ReactElement[] {
const accumulator: React.ReactElement[] = [];
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {StringAccumulator} from 'sentry/views/starfish/utils/sqlish/formatters/stringAccumulator';
import type {Token} from 'sentry/views/starfish/utils/sqlish/types';
import {StringAccumulator} from 'sentry/utils/sqlish/formatters/stringAccumulator';
import type {Token} from 'sentry/utils/sqlish/types';

interface Options {
maxLineLength?: number;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {t} from 'sentry/locale';
import {space} from 'sentry/styles/space';
import type {Organization} from 'sentry/types/organization';
import {trackAnalytics} from 'sentry/utils/analytics';
import {SQLishFormatter} from 'sentry/utils/sqlish/SQLishFormatter';
import type {
TraceTree,
TraceTreeNode,
Expand All @@ -20,7 +21,6 @@ import {
} from 'sentry/views/starfish/components/stackTraceMiniFrame';
import {ModuleName} from 'sentry/views/starfish/types';
import {resolveSpanModule} from 'sentry/views/starfish/utils/resolveSpanModule';
import {SQLishFormatter} from 'sentry/views/starfish/utils/sqlish/SQLishFormatter';

import {TraceDrawerComponents} from '../../styles';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import styled from '@emotion/styled';
import {CodeSnippet} from 'sentry/components/codeSnippet';
import LoadingIndicator from 'sentry/components/loadingIndicator';
import {space} from 'sentry/styles/space';
import {SQLishFormatter} from 'sentry/utils/sqlish/SQLishFormatter';
import {useFullSpanFromTrace} from 'sentry/views/starfish/queries/useFullSpanFromTrace';
import {SQLishFormatter} from 'sentry/views/starfish/utils/sqlish/SQLishFormatter';

const formatter = new SQLishFormatter();

Expand Down
2 changes: 1 addition & 1 deletion static/app/views/starfish/components/spanDescription.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import styled from '@emotion/styled';
import {CodeSnippet} from 'sentry/components/codeSnippet';
import LoadingIndicator from 'sentry/components/loadingIndicator';
import {space} from 'sentry/styles/space';
import {SQLishFormatter} from 'sentry/utils/sqlish/SQLishFormatter';
import {MutableSearch} from 'sentry/utils/tokenizeSearch';
import {
MissingFrame,
Expand All @@ -13,7 +14,6 @@ import {useSpansIndexed} from 'sentry/views/starfish/queries/useDiscover';
import {useFullSpanFromTrace} from 'sentry/views/starfish/queries/useFullSpanFromTrace';
import type {SpanIndexedFieldTypes} from 'sentry/views/starfish/types';
import {SpanIndexedField} from 'sentry/views/starfish/types';
import {SQLishFormatter} from 'sentry/views/starfish/utils/sqlish/SQLishFormatter';

interface Props {
groupId: SpanIndexedFieldTypes[SpanIndexedField.SPAN_GROUP];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import styled from '@emotion/styled';
import {Hovercard} from 'sentry/components/hovercard';
import {t} from 'sentry/locale';
import {space} from 'sentry/styles/space';
import {SQLishFormatter} from 'sentry/utils/sqlish/SQLishFormatter';
import {FullSpanDescription} from 'sentry/views/starfish/components/fullSpanDescription';
import {SpanGroupDetailsLink} from 'sentry/views/starfish/components/spanGroupDetailsLink';
import {ModuleName, SpanMetricsField} from 'sentry/views/starfish/types';
import {SQLishFormatter} from 'sentry/views/starfish/utils/sqlish/SQLishFormatter';

const formatter = new SQLishFormatter();

Expand Down
Loading