Skip to content

parser: reduce imports for scan.go#67557

Merged
craig[bot] merged 2 commits intocockroachdb:masterfrom
rafiss:scan-refactor-imports
Jul 14, 2021
Merged

parser: reduce imports for scan.go#67557
craig[bot] merged 2 commits intocockroachdb:masterfrom
rafiss:scan-refactor-imports

Conversation

@rafiss
Copy link
Copy Markdown
Collaborator

@rafiss rafiss commented Jul 13, 2021

See individual commits:

  • move keywords.go and tokens.go to lexbase
  • remove scan.go dependency on tree NewNumVal/NewStrVal

Touches #64710

@rafiss rafiss requested review from knz and otan July 13, 2021 18:14
@rafiss rafiss requested a review from a team as a code owner July 13, 2021 18:14
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@rafiss rafiss force-pushed the scan-refactor-imports branch from 104622e to 376bd07 Compare July 13, 2021 19:15
rafiss added 2 commits July 13, 2021 18:21
This removes the dependency that scan.go has on pkg/sql/lex, and will
make it possible to move scan.go to its own package.

Release note: None
We now inject the NewNumVal and NewPlaceholder functions into scan.go.
This lets us move scan.go into its own package.

Release note: None
@rafiss rafiss force-pushed the scan-refactor-imports branch from 376bd07 to 209c5f0 Compare July 13, 2021 22:21
@rafiss
Copy link
Copy Markdown
Collaborator Author

rafiss commented Jul 13, 2021

tftr!

bors r=otan

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jul 14, 2021

Build failed (retrying...):

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jul 14, 2021

Build succeeded:

@craig craig bot merged commit 5a0b11e into cockroachdb:master Jul 14, 2021
Copy link
Copy Markdown
Contributor

@knz knz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 18 of 18 files at r1, 2 of 2 files at r2.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained

@rafiss rafiss deleted the scan-refactor-imports branch July 19, 2021 16:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants