Commit Graph

2511 Commits

Author SHA1 Message Date
d64166c65b Merge pull request #814 from c-wind/master
add txn.Rollback on txn error
2015-12-31 12:39:24 +08:00
cc0d4d8b8b Merge branch 'master' into master 2015-12-31 12:35:35 +08:00
1faad8a14e Merge pull request #813 from pingcap/disksing/new-tso
hbase: update for new tso
2015-12-31 12:29:33 +08:00
c0e86a5150 add txn.Rollback on txn error 2015-12-31 12:23:09 +08:00
1f0ddbfa22 Merge branch 'master' into disksing/new-tso 2015-12-31 10:21:09 +08:00
e45c31b89d Merge pull request #754 from hhkbp2/complete-adddate,subdate-functions
add ast evaluation for date arith
2015-12-29 14:35:00 +08:00
405e6c57d4 add ast evaluation for date arith 2015-12-29 11:42:02 +08:00
0376f4ae5c Merge pull request #808 from pingcap/ngaut/reduce-allocation
util: Reduce allocation.
2015-12-29 11:04:38 +08:00
202f56b4b8 Address comments 2015-12-29 10:51:46 +08:00
2cc2024562 Merge pull request #807 from pingcap/coocood/pk-handle
*:Unify integer PK and handle phase1
2015-12-29 10:33:37 +08:00
d47e773bad util/types: remove optimisation not related to this PR. 2015-12-29 10:23:54 +08:00
fca76e816c *: address comment. 2015-12-29 10:17:43 +08:00
c4e18bb422 Merge branch 'master' into coocood/pk-handle
Conflicts:
	plan/plans/index_test.go
2015-12-29 09:59:54 +08:00
3b56db1566 Merge pull request #806 from pingcap/disksing/reduce-string-bytes-convert
*: reduce string bytes convert
2015-12-28 20:09:57 +08:00
1664303233 Merge pull request #796 from pingcap/shenli/variable-error
*: Move variable errors to sessionctx/variable
2015-12-28 19:16:58 +08:00
58ffe22390 hbase: update for new tso 2015-12-28 17:06:51 +08:00
085200467b *: fix CI check 2015-12-28 13:23:09 +08:00
5382590706 ddl, stmt/stmts: address comment. 2015-12-28 12:52:48 +08:00
bd3681ec0e *: minor changes 2015-12-28 12:49:26 +08:00
bd3db841fa util: Reduce allocation. 2015-12-28 12:30:56 +08:00
39624b3949 *: address comment 2015-12-28 11:07:07 +08:00
2bb206fbc9 table/tables: use types.ToInt64 2015-12-26 22:03:32 +08:00
e5eef7b2fd Merge remote-tracking branch 'origin/master' into shenli/variable-error 2015-12-26 21:55:20 +08:00
c3bdfb1fed stmt/stmts: insert use primary key value as record ID 2015-12-25 21:02:52 +08:00
48c8b75edb *: reduce string bytes convert 2015-12-25 20:52:36 +08:00
56ff3d3000 model, ddl: add PKIsHandle field in TableInfo. 2015-12-25 20:29:21 +08:00
b601e3b111 Merge pull request #805 from pingcap/ngaut/clean-up-convt2e
kv: Clean up convT2E which was slow.
2015-12-25 19:57:50 +08:00
8dba28dd91 Merge remote-tracking branch 'origin/master' into clean-up-convt2e
Conflicts:
	kv/union_store.go
2015-12-25 19:41:27 +08:00
75a7b8b0d9 Merge pull request #793 from pingcap/shenli/kv-error
*: Move kv errors to kv package
2015-12-25 19:25:10 +08:00
f7c82e27ce Address comments 2015-12-25 19:22:18 +08:00
e867f143ed kv: Clean up convT2E which was slow. 2015-12-25 18:48:38 +08:00
a19ca03427 Merge pull request #799 from pingcap/disksing/remove-cache-snapshot
kv: remove cacheSnapshot
2015-12-25 11:25:16 +08:00
3b410a00ff Merge pull request #744 from pingcap/zimuxia/update-inspectkv
*:  Support compare records
2015-12-24 17:40:06 +08:00
a15502ef0b kv: remove prefetch 2015-12-24 17:36:01 +08:00
981ef439f8 kv: remove cacheSnapshot 2015-12-24 17:23:55 +08:00
7226d0081d Merge pull request #797 from pingcap/disksing/remove-rangeget
kv: remove RangePrefetchOnCacheMiss option and RangeGet interface
2015-12-24 16:40:42 +08:00
e9298e4826 kv: remove RangePrefetch and RangeGet 2015-12-24 16:07:21 +08:00
42d999f00a kv: remove RangePrefetchOnCacheMiss option 2015-12-24 15:52:50 +08:00
5391b3e91d Merge pull request #795 from pingcap/disksing/reduce-transaction-interface
kv: reduce the Transaction interface by removing Inc and GetInt64
2015-12-24 15:48:25 +08:00
0b99e0440b *: Move variable errors to sessionctx/variable 2015-12-24 15:27:41 +08:00
c63d681a5e kv: reduce the Transaction interface by removing Inc and GetInt64 2015-12-24 14:57:11 +08:00
a5d15d436a Merge pull request #794 from pingcap/disksing/kv-refine-interfaces
kv, store: refine Transaction interface, make 'UnionStore' optional
2015-12-24 14:56:33 +08:00
xia
a46a5a4654 inspectkv: update test 2015-12-24 14:07:43 +08:00
xia
eea06c63c6 inspectkv: address comments 2015-12-24 14:05:02 +08:00
d8fe27d0a5 Merge branch 'master' into disksing/kv-refine-interfaces 2015-12-24 14:02:26 +08:00
xia
92030b14ae inspectkv: address comments 2015-12-24 13:57:39 +08:00
7212e1164f Merge pull request #792 from pingcap/coocood/fix-default-field-type
util/types: fix DefaultFieldTypeForValue
2015-12-24 13:54:07 +08:00
15a5e4f24b kv, store: refine Transaction interface, make 'UnionStore' optional 2015-12-24 13:49:08 +08:00
7010fb84a8 Merge pull request #791 from pingcap/disksing/simplify-localstore
localstore: delay compactor notification, simplify dbTxn
2015-12-24 13:48:06 +08:00
6c4c4d9dc8 Merge branch 'master' into disksing/simplify-localstore 2015-12-24 13:44:21 +08:00