Skip to content

Commit

Permalink
fix ci
Browse files Browse the repository at this point in the history
Signed-off-by: “EricZequan” <zequany33@gmail.com>
  • Loading branch information
EricZequan committed Sep 4, 2024
1 parent d39aebf commit 6c12422
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 12 deletions.
11 changes: 2 additions & 9 deletions pkg/expression/explain.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,18 +141,11 @@ func (expr *Constant) ExplainInfo(ctx EvalContext) string {
if redact == errors.RedactLogEnable {
return "?"
}
dt, err := expr.Eval(ctx, chunk.Row{})
_, err := expr.Eval(ctx, chunk.Row{})
if err != nil {
return "not recognized const value"
}
if redact == errors.RedactLogMarker {
builder := new(strings.Builder)
builder.WriteString("‹")
builder.WriteString(dt.StringTruncate())
builder.WriteString("›")
return builder.String()
}
return dt.StringTruncate()
return expr.StringWithCtx(ctx, redact)
}

// ExplainNormalizedInfo implements the Expression interface.
Expand Down
2 changes: 1 addition & 1 deletion tests/integrationtest/t/infoschema/infoschema.test
Original file line number Diff line number Diff line change
Expand Up @@ -244,4 +244,4 @@ select sequence_schema, sequence_name from information_schema.sequences where se
select sequence_schema, sequence_name from information_schema.sequences where sequence_schema = 'db1' and sequence_name = 's2';
select sequence_schema, sequence_name from information_schema.sequences;
drop database db1;
drop database db2;
drop database db2;
Original file line number Diff line number Diff line change
Expand Up @@ -294,4 +294,4 @@ EXPLAIN format='brief' SELECT /*+ use_index_merge(t, fpi, nslc_old, nslc) */ * F
drop table if exists t;
CREATE TABLE t (nslc json DEFAULT NULL,fpi json DEFAULT NULL,point_of_sale_country int,KEY nslc ((cast(nslc as char(1000) array)),point_of_sale_country),KEY fpi ((cast(fpi as unsigned array))));
explain format='brief' SELECT /*+ use_index_merge(t, nslc) */ * FROM t WHERE 57260686 member of (fpi) AND "OC8p1763XTkt.org/s/link" member of (nslc) LIMIT 1;
explain format='brief' SELECT /*+ use_index_merge(t, fpi) */ * FROM t WHERE 57260686 member of (fpi) AND "OC8p1763XTkt.org/s/link" member of (nslc) LIMIT 1;
explain format='brief' SELECT /*+ use_index_merge(t, fpi) */ * FROM t WHERE 57260686 member of (fpi) AND "OC8p1763XTkt.org/s/link" member of (nslc) LIMIT 1;
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set tidb_enable_prepared_plan_cache=1;
drop table if exists UK_MU15569;
CREATE TABLE `UK_MU15569` (`COL1` varbinary(20) DEFAULT NULL,`COL2` bit(16) DEFAULT NULL,`COL3` time DEFAULT NULL,`COL4` int(11) DEFAULT NULL,UNIQUE KEY `U_M_COL4` (`COL1`(10),`COL2`),UNIQUE KEY `U_M_COL5` (`COL3`,`COL2`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
insert into UK_MU15569 values(BINARY 'ABCDEFG', 0xCA74, '-836:46:08', 735655453);
insert into UK_MU15569 values(0x1C4FDBA09B42D999AC3019B6A9C0C787FBA08446, 0xCA74, '-836:46:08', 735655453);
prepare stmt from 'select * from UK_MU15569 where col2 >= ? and col1 is not null and col3 = ?;';
set @a=-32373, @b='545:50:46.85487';
execute stmt using @a,@b;
Expand Down

0 comments on commit 6c12422

Please sign in to comment.