Commit Graph

244 Commits

Author SHA1 Message Date
97e328bf44 Merge pull request #636 from pingcap/shenli/index-id
*: Add ID to IndexInfo and use IndexID in prefix instead of IndexName
2015-11-30 19:39:59 +08:00
1a28ff83a0 Merge remote-tracking branch 'origin/master' into shenli/index-id
Conflicts:
	ddl/ddl.go
	kv/index_iter.go
2015-11-27 14:28:59 +08:00
75352d81a4 Merge branch 'master' into disksing/refactor-lasetinsertid
Conflicts:
	ddl/ddl_test.go
	plan/plans/from_test.go
	session_test.go
	stmt/stmts/insert.go
	stmt/stmts/replace.go
2015-11-27 13:29:51 +08:00
xia
b97612130a *: tiny clean 2015-11-26 11:36:57 +08:00
b9135eadb4 *: Add ID to IndexInfo and use IndexID in prefix instead of IndexName 2015-11-24 21:58:26 +08:00
6b5e22a93f *: merge master and fix conflict. 2015-11-23 13:34:48 +08:00
e1d30ae367 table: remove dependency on 'LastInsertID' 2015-11-23 13:32:34 +08:00
d8ae7c1e36 *: Make go vet happy 2015-11-23 13:19:12 +08:00
5f3f6b1d97 *: merge master and fix conflict. 2015-11-23 10:44:59 +08:00
xia
d815cfa3d1 plan: tiny clean 2015-11-20 13:11:43 +08:00
xia
fd7eeded6c Merge remote-tracking branch 'origin/siddontang/dev-schema-change' into zimuxia/show_status 2015-11-20 13:05:49 +08:00
xia
65dc9e9d12 *: remove session variable statuses 2015-11-19 20:00:46 +08:00
842931a56c *: merge master and fix conflict. 2015-11-19 16:08:50 +08:00
xia
8f13e6ae12 plan: rename MockStatistics to mockStatistics 2015-11-18 13:37:16 +08:00
xia
200686bd57 *: rename mockStatist to mockStatistics, and
do tiny clean
2015-11-18 13:33:38 +08:00
xia
ed027d34c8 *: update comments 2015-11-17 17:42:36 +08:00
154c00f004 *: minor change 2015-11-17 17:27:31 +08:00
xia
7b41184fe6 *: rename statist to statistics 2015-11-17 15:12:53 +08:00
xia
051a476b2a *: update code structure 2015-11-17 14:49:55 +08:00
149180ace7 hbase-store: optimize query performance
distinguish point query and range query, use different prefetch strategy.
When we're doing range query, we cloud prefetch next coming rows, but in point
query, we shouldn't do that.
2015-11-16 20:48:36 +08:00
xia
6ba84b78f4 *: fix using stat when ddl is closed 2015-11-16 14:35:54 +08:00
xia
1b721ab994 Merge remote-tracking branch 'origin/siddontang/dev-schema-change' into zimuxia/show_status
Conflicts:
	ddl/ddl.go
	session.go
2015-11-16 13:27:38 +08:00
f34b03f9e2 *: address comment 2015-11-16 13:21:30 +08:00
xia
04c9ea4966 *: update test and pass golint 2015-11-16 12:00:32 +08:00
e48a46254e kv, stmt: add kv.Option, optimize table scan 2015-11-16 12:00:22 +08:00
42cea84752 *: merge master and fix conflict. 2015-11-16 10:30:15 +08:00
e667be893b *: add test 2015-11-16 09:59:14 +08:00
dbf676c820 *: update the function call 2015-11-16 09:58:01 +08:00
xia
45f91fd417 *: support show status 2015-11-13 21:01:13 +08:00
301ea1c93a *: Merge branch 'master' into siddontang/dev-schema-change 2015-11-13 09:41:12 +08:00
xia
1ad237a952 Merge branch 'master' into zimuxia/store-status
Conflicts:
	plan/plans/info.go
2015-11-12 20:48:37 +08:00
xia
2b7064c567 *: store status variables to the db
and update info test
2015-11-12 20:36:29 +08:00
xia
6cf2c6f3b0 plan: add init function 2015-11-12 20:34:43 +08:00
6d229525ac Merge pull request #576 from pingcap/coocood/index-point-lookup
plan: fix index point lookup.
2015-11-12 19:14:19 +08:00
c1b4921f6a Merge pull request #568 from pingcap/shenli/mysqldump
Add support for mysqldump
2015-11-12 16:03:25 +08:00
7bd318c835 plan: fix index point lookup.
The type converted seek value should be used to as the index key.
2015-11-12 11:53:22 +08:00
542bfebd36 *: merge master and fix conflict. 2015-11-12 10:21:50 +08:00
59e1187f18 plan: address comment. 2015-11-11 18:33:43 +08:00
2d36bc727b plan: fix comment. 2015-11-11 18:13:55 +08:00
78f9001f93 plan: call kv.Index Exists for point lookup.
Optimisation for index point lookup.
2015-11-11 18:09:55 +08:00
7daf2e92e2 Merge remote-tracking branch 'origin/master' into shenli/mysqldump
Conflicts:
	parser/scanner.l
2015-11-11 17:19:01 +08:00
b3a137d8a8 *: Address comment 2015-11-11 12:26:44 +08:00
ea0953b328 Merge master and pass mysqldump dump data 2015-11-11 00:36:10 +08:00
xia
3684664f5d *: use terror instead of error 2015-11-10 20:16:22 +08:00
xia
809f5055b1 *: adjust the show status results and add test 2015-11-10 19:15:08 +08:00
2f334fc652 *: Merge branch 'master' into siddontang/dev-schema-change 2015-11-10 14:36:37 +08:00
xia
b1206037b5 *: update comments 2015-11-10 12:16:34 +08:00
xia
415085546b Merge branch 'master' into zimuxia/issue525
Conflicts:
	expression/variable.go
	parser/scanner.l
	plan/plans/show.go
	plan/plans/show_test.go
	stmt/stmts/set.go
2015-11-09 20:22:05 +08:00
xia
4bf9133d4a plan: support show status and add the test 2015-11-09 19:50:58 +08:00
7964aff649 *: merge master and fix conflict.
@qiuyesuifeng  we can’t pass test now, should fix the test first.
2015-11-09 13:32:06 +08:00