Skip to content
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.

Sign up for GitHub

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

Jump to bottom

release-2.2 branch merge master #1078

Merged
merged 63 commits into from
Aug 29, 2019
Merged

release-2.2 branch merge master #1078

merged 63 commits into from
Aug 29, 2019

Conversation

marsishandsome
Copy link
Collaborator

release-2.2 branch merge master

marsishandsome and others added 30 commits July 24, 2019 16:03
@marsishandsome
2.2.0 -> 2.3.0 (pingcap#947)
bfe89f0
@birdstorm @zhexuany
Add tests for primary key (pingcap#948)
5de9ab8
@marsishandsome
add changelog (pingcap#955)
d42330b
@birdstorm
add multi-column tests (pingcap#954)
b8354a8
@marsishandsome
fix range partition throw UnsupportedSyntaxException error (pingcap#960)
49ac6c5
@zhexuany
fix view parsing problem (pingcap#953)
0fb1b6f
@zhexuany
make tispark can read from a hash partition table (pingcap#966)
35f8781
@marsishandsome
increase ci worker number (pingcap#965)
290d07c
@marsishandsome
update readme for tispark-2.1.2 release (pingcap#968)
f9e4be9
@marsishandsome
update document for pyspark (pingcap#975)
10592d4
@marsishandsome @zhexuany
fix one jar bug (pingcap#972)
22ee66e
@zhexuany
adding common port number used by spark cluster (pingcap#973)
86348d1
@zhexuany
fix cost model in table scan (pingcap#977)
12d53b3
@zhexuany
create an UninitializedType for TypeDecimal (pingcap#979)
9b7bb49
@marsishandsome
update sparkr doc (pingcap#976)
b5e6e53
@marsishandsome
use spark-2.4.3 to run ut (pingcap#978)
0586fa6 
* use spark-2.4.3 to run ut

* fix ci
@zhexuany
a better design for get auto table id (pingcap#980)
1973d53
@marsishandsome
fix bug: ci SpecialTiDBTypeTestSuite failed with tidb-3.0.1 (pingcap#984
1a95291 
)
@marsishandsome
improve TiConfiguration getPdAddrsString function (pingcap#963)
0c3bcfe
@zhexuany
bump grpc to 1.17 (pingcap#982)
3314557
@birdstorm @zhexuany
Add multiple-column PK tests (pingcap#970)
a59c6f5
@birdstorm @zhexuany
add retry for batchGet (pingcap#986)
93128b8
@marsishandsome
use tispark self-made m2 cahce file (pingcap#990)
102894a
@marsishandsome
add spark sql document for batch write (pingcap#991)
b5d339c
@marsishandsome @zhexuany
add auto mode for test.data.load (pingcap#994)
aa21adb
@birdstorm @zhexuany
fix typo (pingcap#996)
465911f
@zhexuany
fix index scan bug (pingcap#995)
911e890
@zhexuany
refine doc (pingcap#1003)
db2e53a
@marsishandsome
add tidb-3.0 compatibility document (pingcap#998)
827d96f 
* add tidb-3.0 compatibility document

* address code review

* address code review
@marsishandsome
add log4j config document (pingcap#1008)
db2a2d6
marsishandsome and others added 25 commits August 15, 2019 17:52
@marsishandsome
check by grammarly (pingcap#1022)
f90f961
@marsishandsome
add benchmark result for batch write (pingcap#1025)
73f765e
@marsishandsome
release tispark 2.1.3 (pingcap#1026) (pingcap#1035)
6f00a5d 
(cherry picked from commit 107eb2b)
@marsishandsome
support setting random seed in daily regression test (pingcap#1032)
0f7aec6
@zhexuany
Remove create in tisession (pingcap#1021)
e799863
@marsishandsome
set tikv region size from 96M to 1M (pingcap#1031)
9551f7d
@zhexuany
adding unique indices test for batch write (pingcap#1014)
e7d51f5
@marsishandsome
use one unique seed (pingcap#1043)
95f9698
@birdstorm
remove unused code (pingcap#1030)
ce9f818
@zhexuany
adding batch write pk insertion test (pingcap#1044)
1cc6dc6
@marsishandsome
fix table not found bug in TiSession because of synchronization (ping…
0e430a9 
…cap#1041)
@zhexuany
fix test failure (pingcap#1051)
deac3fe
@marsishandsome
fix reflection bug: pass in different arguments for different version…
bb7c646 
… of same function (pingcap#1037) (pingcap#1052)

(cherry picked from commit a5462c2)
@zhexuany
Adding pk and unique index test for batch write (pingcap#1049)
7e3b92d
@marsishandsome
fix distinct without alias bug: disable pushdown aggregate with alias (…
a1e6b79 
…pingcap#1054)
@zhexuany
improve the doc (pingcap#1053)
fdb938e
@birdstorm @zhexuany
Refactor RegionStoreClient logic (pingcap#989)
60eec59
@zhexuany
using stream rather removeIf (pingcap#1057)
420279a
@birdstorm @zhexuany
Remove redundant pre-write/commit logic in LockResolverTest (pingcap#…
b72a7b2 
…1062)
@zhexuany
adding recreate flag when create tisession (pingcap#1064)
f578c3b
@zhexuany
fix issue 1047 (pingcap#1066)
8bebb76
@zhexuany
cleanup code in TiBatchWrite (pingcap#1067)
927cacf
@marsishandsome
release tispark-2.1.4 (pingcap#1068) (pingcap#1069)
b402ade 
(cherry picked from commit fd8068a)
@marsishandsome
update document for tispark-2.1.4 release (pingcap#1070)
8888d30
@marsishandsome
Merge remote-tracking branch 'origin/master' into feature/merge-master
22dee73
@marsishandsome
Copy link
Collaborator Author

/run-all-tests

zhexuany
zhexuany approved these changes Aug 29, 2019
View reviewed changes
Copy link
Contributor

@zhexuany zhexuany left a comment

Choose a reason for hiding this comment

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

LGTM

@marsishandsome marsishandsome merged commit 5aeb1b8 into pingcap:release-2.2 Aug 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zhexuany zhexuany zhexuany approved these changes

@birdstorm birdstorm Awaiting requested review from birdstorm

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@marsishandsome @zhexuany @birdstorm