Skip to content

parser/parser.y: S/R conflicts 10->9.#104

Merged
qiuyesuifeng merged 1 commit intopingcap:masterfrom
cznic:master
Sep 11, 2015
Merged

parser/parser.y: S/R conflicts 10->9.#104
qiuyesuifeng merged 1 commit intopingcap:masterfrom
cznic:master

Conversation

@cznic
Copy link

@cznic cznic commented Sep 10, 2015 

state 510 // deleteKwd from after join after

  365 JoinTable: TableRef . CrossOpt TableRef  // assoc %left, prec 4
  365 JoinTable: TableRef CrossOpt TableRef .  [$end, ')', ',', ';', '}', cross, forKwd, full, group, having, inner, join, left, limit, lock, on, order, right, union, where]  // assoc %left, prec 4
  366 JoinTable: TableRef . CrossOpt TableRef on Expression
  366 JoinTable: TableRef CrossOpt TableRef . on Expression
  367 JoinTable: TableRef . JoinType OuterOpt join TableRef on Expression

    $end    reduce using rule 365 (JoinTable)
    ')'     reduce using rule 365 (JoinTable)
    ','     reduce using rule 365 (JoinTable)
    ';'     reduce using rule 365 (JoinTable)
    '}'     reduce using rule 365 (JoinTable)
    cross   reduce using rule 365 (JoinTable)
    forKwd  reduce using rule 365 (JoinTable)
    full    reduce using rule 365 (JoinTable)
    group   reduce using rule 365 (JoinTable)
    having  reduce using rule 365 (JoinTable)
    inner   reduce using rule 365 (JoinTable)
    join    reduce using rule 365 (JoinTable)
    left    reduce using rule 365 (JoinTable)
    limit   reduce using rule 365 (JoinTable)
    lock    reduce using rule 365 (JoinTable)
    on      shift, and goto state 511
    order   reduce using rule 365 (JoinTable)
    right   reduce using rule 365 (JoinTable)
    union   reduce using rule 365 (JoinTable)
    where   reduce using rule 365 (JoinTable)

    CrossOpt  goto state 494
    JoinType  goto state 495

    conflict on on, shift, and goto state 511, reduce using rule 365

jnml@4670:~/src/github.com/cznic/tidb/parser$ goyacc -cr -o /dev/null parser.y
Parse table entries: 124004 of 377154, x 16 bits == 248008 bytes
conflicts: 9 shift/reduce
jnml@4670:~/src/github.com/cznic/tidb/parser$

@coocood
Copy link
Member

coocood commented Sep 11, 2015

LGTM

@shenli
Copy link
Member

shenli commented Sep 11, 2015

LGTM
Many thanks! @cznic

qiuyesuifeng added a commit that referenced this pull request Sep 11, 2015
@qiuyesuifeng
Merge pull request #104 from cznic/master
15eaba8 
parser/parser.y: S/R conflicts 10->9.
@qiuyesuifeng qiuyesuifeng merged commit 15eaba8 into pingcap:master Sep 11, 2015
@sre-bot sre-bot added the contribution This PR is from a community contributor. label Dec 18, 2019
YuJuncen pushed a commit to YuJuncen/tidb that referenced this pull request Apr 23, 2021
@kennytm
Cleanup the repository to prepare for open-sourcing (pingcap#104)
61fdee3 
* *: remove unused code (in particular the PrepareStmtMode in SQL2KV)

* docs: removed docs, link to the official docs instead

* tests: fix coverage result being overridden in some tests

* *: cover tidb-lightning-ctl as well

* file_checkpoints: generate less methods

* pull_request_template: remove irrelevant section "Code changes"

Lightning is not a library, so we don't need to care about API stability

* config: change the documented ports to use the consensual port numbers

* *: added MAINTAINERS.md, CONTRIBUTING.md, CHANGELOG.md

Also updated several README.md to fix typo or point to some new files.

* pull_request_template: fix typo

* cmd: move source of bin/tidb-lightning into cmd/tidb-lightning

This provides better symmetry with tidb-lightning-ctl.

* *: fix gometalint report
YuJuncen pushed a commit to YuJuncen/tidb that referenced this pull request Apr 23, 2021
@MyonKeminta @3pointer
@overvenus @sre-bot
Implement Raw Restore (pingcap#104)
c3d26d9 
* Update kvproto

* Implement raw restore

* fix build

* Set range for file importer

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>

* Remove unnecessary comments

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>

* check cf and support multi ranges in BackupMeta

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>

* Check files' cf; address comments

* adjust structure to keep consistent with master

* Fix build

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>

* Fix build and make check, avoid accessing TiDB in rawkv mode

* Fix test

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>

* Fix tests

Signed-off-by: MyonKeminta <MyonKeminta@users.noreply.github.com>

* Fix broken logic after merging master

* Update pkg/task/restore_raw.go

Co-Authored-By: Neil Shen <overvenus@gmail.com>

* Address comments

* Address comments

* Mark raw restore as experimental

* Fix build

* Address comments

* test: Add check for deleting data and partial backup

* Fix build

* Add license header

* fix ci

* fix ci

Co-authored-by: MyonKeminta <MyonKeminta@users.noreply.github.com>
Co-authored-by: 3pointer <luancheng@pingcap.com>
Co-authored-by: Neil Shen <overvenus@gmail.com>
Co-authored-by: pingcap-github-bot <sre-bot@pingcap.com>
xhebox pushed a commit to xhebox/tidb that referenced this pull request Sep 28, 2021
@feloxx @tiancaiamao
[parser] parser: remove an outdated comment (pingcap#104)
59ecf85
xhebox pushed a commit to xhebox/tidb that referenced this pull request Oct 8, 2021
@feloxx @xhebox
[parser] parser: remove an outdated comment (pingcap#104)
be50f93
ti-chi-bot pushed a commit that referenced this pull request Oct 9, 2021
@feloxx @ti-chi-bot
[parser] parser: remove an outdated comment (#104)
28b04d0
crazycs520 pushed a commit that referenced this pull request Oct 30, 2025
statistics: handle deleted tables correctly in the PQ (#57649) (#57674)…
a4af091 
… (#104)

Reviewed-on: https://git.pingcap.net/pingkai/tidb/pulls/104
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

contribution This PR is from a community contributor.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@cznic @coocood @shenli @qiuyesuifeng @sre-bot