expression: rewrite builtin function: DATEDIFF #4212

spongedu · 2017-08-16T14:59:35Z

zz-jason · 2017-08-17T02:15:38Z

expression/builtin_time.go

+	bf, err := newBaseBuiltinFuncWithTp(args, ctx, tpInt, tpTime, tpTime)
+	if err != nil {
+		return nil, errors.Trace(err)
+	}


set Flen and Decimal of bf.tp

zz-jason · 2017-08-17T02:18:12Z

expression/builtin_time.go

+func (b *builtinDateDiffSig) evalInt(row []types.Datum) (int64, bool, error) {
+	ctx := b.ctx.GetSessionVars().StmtCtx
+	t1, isNull, err := b.args[0].EvalTime(row, ctx)
+	if isNull || err != nil {


in mysql:

MySQL > select datediff("2014-12-09", "aaaa"); Field 1: `datediff("2014-12-09", "aaaa")` Catalog: `def` Database: `` Table: `` Org_table: `` Type: LONGLONG Collation: binary (63) Length: 7 Max_length: 0 Decimals: 0 Flags: BINARY NUM +--------------------------------+ | datediff("2014-12-09", "aaaa") | +--------------------------------+ | NULL | +--------------------------------+ 1 row in set, 1 warning (0.00 sec) MySQL > show warnings; Field 1: `Level` Catalog: `def` Database: `` Table: `` Org_table: `` Type: VAR_STRING Collation: utf8_general_ci (33) Length: 21 Max_length: 7 Decimals: 31 Flags: NOT_NULL Field 2: `Code` Catalog: `def` Database: `` Table: `` Org_table: `` Type: LONG Collation: binary (63) Length: 4 Max_length: 4 Decimals: 0 Flags: NOT_NULL UNSIGNED BINARY NUM Field 3: `Message` Catalog: `def` Database: `` Table: `` Org_table: `` Type: VAR_STRING Collation: utf8_general_ci (33) Length: 1536 Max_length: 32 Decimals: 31 Flags: NOT_NULL +---------+------+----------------------------------+ | Level | Code | Message | +---------+------+----------------------------------+ | Warning | 1292 | Incorrect datetime value: 'aaaa' | +---------+------+----------------------------------+ 1 row in set (0.00 sec)

zz-jason · 2017-08-17T02:20:57Z

expression/integration_test.go

@@ -963,6 +963,9 @@ func (s *testIntegrationSuite) TestTimeBuiltin(c *C) {
 	result.Check(testkit.Rows("62966505600 63426672000 63426721412 63426721412"))
 	result = tk.MustQuery("select to_days(950501), to_days('2007-10-07'), to_days('2007-10-07 00:00:59'), to_days('0000-01-01')")
 	result.Check(testkit.Rows("728779 733321 733321 1"))
+	result = tk.MustQuery("select datediff('2007-12-31 23:59:59','2007-12-30'), datediff('2010-11-30 23:59:59', " +


add more tests like datediff("2014-12-09", "aaaa");

zz-jason · 2017-08-17T02:21:19Z

plan/typeinfer_test.go

@@ -994,5 +994,12 @@ func (s *testPlanSuite) createTestCase4TimeFuncs() []typeInferTestCase {
 		{"microsecond(c_blob     )", mysql.TypeLonglong, charset.CharsetBin, mysql.BinaryFlag, 6, 0},
 		{"microsecond(c_set      )", mysql.TypeLonglong, charset.CharsetBin, mysql.BinaryFlag, 6, 0},
 		{"microsecond(c_enum     )", mysql.TypeLonglong, charset.CharsetBin, mysql.BinaryFlag, 6, 0},
+
+		{"datediff(c_char, c_datetime)", mysql.TypeLonglong, charset.CharsetBin, mysql.BinaryFlag, 20, 0},


Flen is not correct

Indeed it's not consistent with mysql. But I think it's reasonable to set it to mysql.MaxIntWidth. I'll take a look how this was set in mysql......

winkyao · 2017-08-17T02:31:39Z

expression/integration_test.go

@@ -963,6 +963,9 @@ func (s *testIntegrationSuite) TestTimeBuiltin(c *C) {
 	result.Check(testkit.Rows("62966505600 63426672000 63426721412 63426721412"))
 	result = tk.MustQuery("select to_days(950501), to_days('2007-10-07'), to_days('2007-10-07 00:00:59'), to_days('0000-01-01')")
 	result.Check(testkit.Rows("728779 733321 733321 1"))
+	result = tk.MustQuery("select datediff('2007-12-31 23:59:59','2007-12-30'), datediff('2010-11-30 23:59:59', " +


add case like select datediff('2007-12-31 23:59:59', '23:59:59'); .

zz-jason · 2017-08-22T14:03:31Z

@spongedu plz resolve conflicts

XuHuaiyu · 2017-08-23T05:57:59Z

PTAL @winkyao @zz-jason

zz-jason

LGTM

zz-jason · 2017-08-23T07:16:29Z

@XuHuaiyu @winkyao PTAL

zz-jason · 2017-08-24T00:52:42Z

@spongedu please resolve conflicts

XuHuaiyu

rest LGTM

XuHuaiyu · 2017-08-24T05:54:45Z

expression/integration_test.go

@@ -1078,6 +1078,9 @@ func (s *testIntegrationSuite) TestTimeBuiltin(c *C) {
 	result.Check(testkit.Rows("62966505600 63426672000 63426721412 63426721412"))
 	result = tk.MustQuery("select to_days(950501), to_days('2007-10-07'), to_days('2007-10-07 00:00:59'), to_days('0000-01-01')")
 	result.Check(testkit.Rows("728779 733321 733321 1"))
+	result = tk.MustQuery("select datediff('2007-12-31 23:59:59','2007-12-30'), datediff('2010-11-30 23:59:59', " +


add test cases like

"0000-01-01", "0001-01-01"

"0001-00-01", "0001-00-01"

"0001-01-00", "0001-01-00"

"2017-01-01", "2017-01-01"

Done. @XuHuaiyu PTAL

XuHuaiyu · 2017-08-24T06:55:21Z

Please merge the master, I've split tpTime into tpDatetime and tpTimestamp.

spongedu · 2017-08-24T07:11:49Z

@XuHuaiyu Done

XuHuaiyu · 2017-08-24T07:14:09Z

please fix ci

spongedu · 2017-08-24T07:51:05Z

@XuHuaiyu Done. PTAL

XuHuaiyu

LGTM

zz-jason changed the title ~~expression: rewrite builtin datediff~~ expression: rewrite builtin function: DATEDIFF Aug 16, 2017

zz-jason added the contribution This PR is from a community contributor. label Aug 16, 2017

zz-jason mentioned this pull request Aug 16, 2017

rewrite builtin functions #4080

Closed

zz-jason reviewed Aug 17, 2017

View reviewed changes

winkyao reviewed Aug 17, 2017

View reviewed changes

zz-jason reviewed Aug 23, 2017

View reviewed changes

zz-jason added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 23, 2017

spongedu force-pushed the rewrite_builtin_datediff branch 2 times, most recently from 399dba5 to 71c2db8 Compare August 23, 2017 12:50

XuHuaiyu reviewed Aug 24, 2017

View reviewed changes

spongedu force-pushed the rewrite_builtin_datediff branch 2 times, most recently from eedfb4e to e3504f9 Compare August 24, 2017 06:44

expression: rewrite builtin DATEDIFF

fe55689

spongedu force-pushed the rewrite_builtin_datediff branch from e3504f9 to fe55689 Compare August 24, 2017 07:10

spongedu added 2 commits August 24, 2017 15:25

resolve merge error

affbb2a

Merge branch 'master' into rewrite_builtin_datediff

57f0209

Merge branch 'master' into rewrite_builtin_datediff

82d2354

XuHuaiyu approved these changes Aug 24, 2017

View reviewed changes

XuHuaiyu merged commit ff57b06 into pingcap:master Aug 24, 2017

spongedu deleted the rewrite_builtin_datediff branch August 24, 2017 08:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

expression: rewrite builtin function: DATEDIFF #4212

expression: rewrite builtin function: DATEDIFF #4212

spongedu commented Aug 16, 2017

zz-jason Aug 17, 2017

zz-jason Aug 17, 2017

zz-jason Aug 17, 2017

spongedu Aug 17, 2017

zz-jason Aug 17, 2017

spongedu Aug 17, 2017

winkyao Aug 17, 2017

spongedu Aug 17, 2017

zz-jason commented Aug 22, 2017

XuHuaiyu commented Aug 23, 2017

zz-jason left a comment

zz-jason commented Aug 23, 2017

zz-jason commented Aug 24, 2017

XuHuaiyu left a comment

XuHuaiyu Aug 24, 2017 •

edited

Loading

spongedu Aug 24, 2017

XuHuaiyu commented Aug 24, 2017

spongedu commented Aug 24, 2017

XuHuaiyu commented Aug 24, 2017

spongedu commented Aug 24, 2017

XuHuaiyu left a comment

expression: rewrite builtin function: DATEDIFF #4212

expression: rewrite builtin function: DATEDIFF #4212

Conversation

spongedu commented Aug 16, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zz-jason commented Aug 22, 2017

XuHuaiyu commented Aug 23, 2017

zz-jason left a comment

Choose a reason for hiding this comment

zz-jason commented Aug 23, 2017

zz-jason commented Aug 24, 2017

XuHuaiyu left a comment

Choose a reason for hiding this comment

XuHuaiyu Aug 24, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

XuHuaiyu commented Aug 24, 2017

spongedu commented Aug 24, 2017

XuHuaiyu commented Aug 24, 2017

spongedu commented Aug 24, 2017

XuHuaiyu left a comment

Choose a reason for hiding this comment

XuHuaiyu Aug 24, 2017 •

edited

Loading