Skip to content

Commit

Permalink
util: add JSON in fieldTypeMergeRules (pingcap#4189)
Browse files Browse the repository at this point in the history
  • Loading branch information
@XuHuaiyu @hicqu
XuHuaiyu authored and hicqu committed Aug 16, 2017
1 parent 16a5f74 commit 5f70f63
Show file tree
Hide file tree
Showing 2 changed files with 134 additions and 33 deletions.
147 changes: 117 additions & 30 deletions util/types/field_type.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ func NewFieldType(tp byte) *FieldType {
// Aggregation is performed by MergeFieldType function.
func AggFieldType(tps []*FieldType) *FieldType {
var currType FieldType
for _, t := range tps {
if currType.Tp == mysql.TypeUnspecified {
for i, t := range tps {
if i == 0 && currType.Tp == mysql.TypeUnspecified {
currType = *t
continue
}
Expand Down Expand Up @@ -384,7 +384,7 @@ func getFieldTypeIndex(tp byte) int {

const (
fieldTypeTearFrom = int(mysql.TypeBit) + 1
fieldTypeTearTo = int(mysql.TypeNewDecimal) - 1
fieldTypeTearTo = int(mysql.TypeJSON) - 1
fieldTypeNum = fieldTypeTearFrom + (255 - fieldTypeTearTo)
)

Expand All @@ -407,7 +407,9 @@ var fieldTypeMergeRules = [fieldTypeNum][fieldTypeNum]byte{
mysql.TypeVarchar, mysql.TypeVarchar,
//mysql.TypeNewDate mysql.TypeVarchar
mysql.TypeVarchar, mysql.TypeVarchar,
//mysql.TypeBit <16>-<245>
//mysql.TypeBit <16>-<244>
mysql.TypeVarchar,
//mysql.TypeJSON
mysql.TypeVarchar,
//mysql.TypeNewDecimal mysql.TypeEnum
mysql.TypeNewDecimal, mysql.TypeVarchar,
Expand Down Expand Up @@ -438,7 +440,9 @@ var fieldTypeMergeRules = [fieldTypeNum][fieldTypeNum]byte{
mysql.TypeVarchar, mysql.TypeTiny,
//mysql.TypeNewDate mysql.TypeVarchar
mysql.TypeVarchar, mysql.TypeVarchar,
//mysql.TypeBit <16>-<245>
//mysql.TypeBit <16>-<244>
mysql.TypeVarchar,
//mysql.TypeJSON
mysql.TypeVarchar,
//mysql.TypeNewDecimal mysql.TypeEnum
mysql.TypeNewDecimal, mysql.TypeVarchar,
Expand Down Expand Up @@ -469,7 +473,9 @@ var fieldTypeMergeRules = [fieldTypeNum][fieldTypeNum]byte{
mysql.TypeVarchar, mysql.TypeShort,
//mysql.TypeNewDate mysql.TypeVarchar
mysql.TypeVarchar, mysql.TypeVarchar,
//mysql.TypeBit <16>-<245>
//mysql.TypeBit <16>-<244>
mysql.TypeVarchar,
//mysql.TypeJSON
mysql.TypeVarchar,
//mysql.TypeNewDecimal mysql.TypeEnum
mysql.TypeNewDecimal, mysql.TypeVarchar,
Expand Down Expand Up @@ -500,7 +506,9 @@ var fieldTypeMergeRules = [fieldTypeNum][fieldTypeNum]byte{
mysql.TypeVarchar, mysql.TypeLong,
//mysql.TypeNewDate mysql.TypeVarchar
mysql.TypeVarchar, mysql.TypeVarchar,
//mysql.TypeBit <16>-<245>
//mysql.TypeBit <16>-<244>
mysql.TypeVarchar,
//mysql.TypeJSON
mysql.TypeVarchar,
//mysql.TypeNewDecimal mysql.TypeEnum
mysql.TypeNewDecimal, mysql.TypeVarchar,
Expand Down Expand Up @@ -531,7 +539,9 @@ var fieldTypeMergeRules = [fieldTypeNum][fieldTypeNum]byte{
mysql.TypeVarchar, mysql.TypeFloat,
//mysql.TypeNewDate mysql.TypeVarchar
mysql.TypeVarchar, mysql.TypeVarchar,
//mysql.TypeBit <16>-<245>
//mysql.TypeBit <16>-<244>
mysql.TypeVarchar,
//mysql.TypeJSON
mysql.TypeVarchar,
//mysql.TypeNewDecimal mysql.TypeEnum
mysql.TypeDouble, mysql.TypeVarchar,
Expand Down Expand Up @@ -562,7 +572,9 @@ var fieldTypeMergeRules = [fieldTypeNum][fieldTypeNum]byte{
mysql.TypeVarchar, mysql.TypeDouble,
//mysql.TypeNewDate mysql.TypeVarchar
mysql.TypeVarchar, mysql.TypeVarchar,
//mysql.TypeBit <16>-<245>
//mysql.TypeBit <16>-<244>
mysql.TypeVarchar,
//mysql.TypeJSON
mysql.TypeVarchar,
//mysql.TypeNewDecimal mysql.TypeEnum
mysql.TypeDouble, mysql.TypeVarchar,
Expand Down Expand Up @@ -593,8 +605,10 @@ var fieldTypeMergeRules = [fieldTypeNum][fieldTypeNum]byte{
mysql.TypeDatetime, mysql.TypeYear,
//mysql.TypeNewDate mysql.TypeVarchar
mysql.TypeNewDate, mysql.TypeVarchar,
//mysql.TypeBit <16>-<245>
//mysql.TypeBit <16>-<244>
mysql.TypeBit,
//mysql.TypeJSON
mysql.TypeJSON,
//mysql.TypeNewDecimal mysql.TypeEnum
mysql.TypeNewDecimal, mysql.TypeEnum,
//mysql.TypeSet mysql.TypeTinyBlob
Expand Down Expand Up @@ -624,7 +638,9 @@ var fieldTypeMergeRules = [fieldTypeNum][fieldTypeNum]byte{
mysql.TypeDatetime, mysql.TypeVarchar,
//mysql.TypeNewDate mysql.TypeVarchar
mysql.TypeNewDate, mysql.TypeVarchar,
//mysql.TypeBit <16>-<245>
//mysql.TypeBit <16>-<244>
mysql.TypeVarchar,
//mysql.TypeJSON
mysql.TypeVarchar,
//mysql.TypeNewDecimal mysql.TypeEnum
mysql.TypeVarchar, mysql.TypeVarchar,
Expand Down Expand Up @@ -655,7 +671,9 @@ var fieldTypeMergeRules = [fieldTypeNum][fieldTypeNum]byte{
mysql.TypeVarchar, mysql.TypeLonglong,
//mysql.TypeNewDate mysql.TypeVarchar
mysql.TypeNewDate, mysql.TypeVarchar,
//mysql.TypeBit <16>-<245>
//mysql.TypeBit <16>-<244>
mysql.TypeVarchar,
//mysql.TypeJSON
mysql.TypeVarchar,
//mysql.TypeNewDecimal mysql.TypeEnum
mysql.TypeNewDecimal, mysql.TypeVarchar,
Expand Down Expand Up @@ -686,7 +704,9 @@ var fieldTypeMergeRules = [fieldTypeNum][fieldTypeNum]byte{
mysql.TypeVarchar, mysql.TypeInt24,
//mysql.TypeNewDate mysql.TypeVarchar
mysql.TypeNewDate, mysql.TypeVarchar,
//mysql.TypeBit <16>-<245>
//mysql.TypeBit <16>-<244>
mysql.TypeVarchar,
//mysql.TypeJSON
mysql.TypeVarchar,
//mysql.TypeNewDecimal mysql.TypeEnum
mysql.TypeNewDecimal, mysql.TypeVarchar,
Expand Down Expand Up @@ -717,7 +737,9 @@ var fieldTypeMergeRules = [fieldTypeNum][fieldTypeNum]byte{
mysql.TypeDatetime, mysql.TypeVarchar,
//mysql.TypeNewDate mysql.TypeVarchar
mysql.TypeNewDate, mysql.TypeVarchar,
//mysql.TypeBit <16>-<245>
//mysql.TypeBit <16>-<244>
mysql.TypeVarchar,
//mysql.TypeJSON
mysql.TypeVarchar,
//mysql.TypeNewDecimal mysql.TypeEnum
mysql.TypeVarchar, mysql.TypeVarchar,
Expand Down Expand Up @@ -748,7 +770,9 @@ var fieldTypeMergeRules = [fieldTypeNum][fieldTypeNum]byte{
mysql.TypeDatetime, mysql.TypeVarchar,
//mysql.TypeNewDate mysql.TypeVarchar
mysql.TypeNewDate, mysql.TypeVarchar,
//mysql.TypeBit <16>-<245>
//mysql.TypeBit <16>-<244>
mysql.TypeVarchar,
//mysql.TypeJSON
mysql.TypeVarchar,
//mysql.TypeNewDecimal mysql.TypeEnum
mysql.TypeVarchar, mysql.TypeVarchar,
Expand Down Expand Up @@ -779,7 +803,9 @@ var fieldTypeMergeRules = [fieldTypeNum][fieldTypeNum]byte{
mysql.TypeDatetime, mysql.TypeVarchar,
//mysql.TypeNewDate mysql.TypeVarchar
mysql.TypeNewDate, mysql.TypeVarchar,
//mysql.TypeBit <16>-<245>
//mysql.TypeBit <16>-<244>
mysql.TypeVarchar,
//mysql.TypeJSON
mysql.TypeVarchar,
//mysql.TypeNewDecimal mysql.TypeEnum
mysql.TypeVarchar, mysql.TypeVarchar,
Expand Down Expand Up @@ -810,7 +836,9 @@ var fieldTypeMergeRules = [fieldTypeNum][fieldTypeNum]byte{
mysql.TypeVarchar, mysql.TypeYear,
//mysql.TypeNewDate mysql.TypeVarchar
mysql.TypeVarchar, mysql.TypeVarchar,
//mysql.TypeBit <16>-<245>
//mysql.TypeBit <16>-<244>
mysql.TypeVarchar,
//mysql.TypeJSON
mysql.TypeVarchar,
//mysql.TypeNewDecimal mysql.TypeEnum
mysql.TypeNewDecimal, mysql.TypeVarchar,
Expand Down Expand Up @@ -841,7 +869,9 @@ var fieldTypeMergeRules = [fieldTypeNum][fieldTypeNum]byte{
mysql.TypeDatetime, mysql.TypeVarchar,
//mysql.TypeNewDate mysql.TypeVarchar
mysql.TypeNewDate, mysql.TypeVarchar,
//mysql.TypeBit <16>-<245>
//mysql.TypeBit <16>-<244>
mysql.TypeVarchar,
//mysql.TypeJSON
mysql.TypeVarchar,
//mysql.TypeNewDecimal mysql.TypeEnum
mysql.TypeVarchar, mysql.TypeVarchar,
Expand Down Expand Up @@ -872,7 +902,9 @@ var fieldTypeMergeRules = [fieldTypeNum][fieldTypeNum]byte{
mysql.TypeVarchar, mysql.TypeVarchar,
//mysql.TypeNewDate mysql.TypeVarchar
mysql.TypeVarchar, mysql.TypeVarchar,
//mysql.TypeBit <16>-<245>
//mysql.TypeBit <16>-<244>
mysql.TypeVarchar,
//mysql.TypeJSON
mysql.TypeVarchar,
//mysql.TypeNewDecimal mysql.TypeEnum
mysql.TypeVarchar, mysql.TypeVarchar,
Expand Down Expand Up @@ -903,8 +935,10 @@ var fieldTypeMergeRules = [fieldTypeNum][fieldTypeNum]byte{
mysql.TypeVarchar, mysql.TypeVarchar,
//mysql.TypeNewDate mysql.TypeVarchar
mysql.TypeVarchar, mysql.TypeVarchar,
//mysql.TypeBit <16>-<245>
//mysql.TypeBit <16>-<244>
mysql.TypeBit,
//mysql.TypeJSON
mysql.TypeVarchar,
//mysql.TypeNewDecimal mysql.TypeEnum
mysql.TypeVarchar, mysql.TypeVarchar,
//mysql.TypeSet mysql.TypeTinyBlob
Expand All @@ -916,6 +950,39 @@ var fieldTypeMergeRules = [fieldTypeNum][fieldTypeNum]byte{
//mysql.TypeString mysql.TypeGeometry
mysql.TypeString, mysql.TypeVarchar,
},
/* mysql.TypeJSON -> */
{
//mysql.TypeDecimal mysql.TypeTiny
mysql.TypeVarchar, mysql.TypeVarchar,
//mysql.TypeShort mysql.TypeLong
mysql.TypeVarchar, mysql.TypeVarchar,
//mysql.TypeNewFloat mysql.TypeDouble
mysql.TypeVarchar, mysql.TypeVarchar,
//mysql.TypeNull mysql.TypeTimestamp
mysql.TypeJSON, mysql.TypeVarchar,
//mysql.TypeLongLONG mysql.TypeInt24
mysql.TypeVarchar, mysql.TypeVarchar,
//mysql.TypeDate MYSQL_TYPE_TIME
mysql.TypeVarchar, mysql.TypeVarchar,
//mysql.TypeDatetime MYSQL_TYPE_YEAR
mysql.TypeVarchar, mysql.TypeVarchar,
//mysql.TypeNewDate mysql.TypeVarchar
mysql.TypeVarchar, mysql.TypeVarchar,
//mysql.TypeBit <16>-<244>
mysql.TypeVarchar,
//mysql.TypeJSON
mysql.TypeJSON,
//mysql.TypeNewDecimal MYSQL_TYPE_ENUM
mysql.TypeVarchar, mysql.TypeVarchar,
//mysql.TypeSet mysql.TypeTinyBlob
mysql.TypeVarchar, mysql.TypeLongBlob,
//mysql.TypeMediumBlob mysql.TypeLongBlob
mysql.TypeLongBlob, mysql.TypeLongBlob,
//mysql.TypeBlob mysql.TypeVarString
mysql.TypeLongBlob, mysql.TypeVarchar,
//mysql.TypeString MYSQL_TYPE_GEOMETRY
mysql.TypeString, mysql.TypeVarchar,
},
/* mysql.TypeNewDecimal -> */
{
//mysql.TypeDecimal mysql.TypeTiny
Expand All @@ -934,7 +1001,9 @@ var fieldTypeMergeRules = [fieldTypeNum][fieldTypeNum]byte{
mysql.TypeVarchar, mysql.TypeNewDecimal,
//mysql.TypeNewDate mysql.TypeVarchar
mysql.TypeVarchar, mysql.TypeVarchar,
//mysql.TypeBit <16>-<245>
//mysql.TypeBit <16>-<244>
mysql.TypeVarchar,
//mysql.TypeJSON
mysql.TypeVarchar,
//mysql.TypeNewDecimal mysql.TypeEnum
mysql.TypeNewDecimal, mysql.TypeVarchar,
Expand Down Expand Up @@ -965,7 +1034,9 @@ var fieldTypeMergeRules = [fieldTypeNum][fieldTypeNum]byte{
mysql.TypeVarchar, mysql.TypeVarchar,
//mysql.TypeNewDate mysql.TypeVarchar
mysql.TypeVarchar, mysql.TypeVarchar,
//mysql.TypeBit <16>-<245>
//mysql.TypeBit <16>-<244>
mysql.TypeVarchar,
//mysql.TypeJSON
mysql.TypeVarchar,
//mysql.TypeNewDecimal mysql.TypeEnum
mysql.TypeVarchar, mysql.TypeVarchar,
Expand Down Expand Up @@ -996,7 +1067,9 @@ var fieldTypeMergeRules = [fieldTypeNum][fieldTypeNum]byte{
mysql.TypeVarchar, mysql.TypeVarchar,
//mysql.TypeNewDate mysql.TypeVarchar
mysql.TypeVarchar, mysql.TypeVarchar,
//mysql.TypeBit <16>-<245>
//mysql.TypeBit <16>-<244>
mysql.TypeVarchar,
//mysql.TypeJSON
mysql.TypeVarchar,
//mysql.TypeNewDecimal mysql.TypeEnum
mysql.TypeVarchar, mysql.TypeVarchar,
Expand Down Expand Up @@ -1027,8 +1100,10 @@ var fieldTypeMergeRules = [fieldTypeNum][fieldTypeNum]byte{
mysql.TypeTinyBlob, mysql.TypeTinyBlob,
//mysql.TypeNewDate mysql.TypeVarchar
mysql.TypeTinyBlob, mysql.TypeTinyBlob,
//mysql.TypeBit <16>-<245>
//mysql.TypeBit <16>-<244>
mysql.TypeTinyBlob,
//mysql.TypeJSON
mysql.TypeLongBlob,
//mysql.TypeNewDecimal mysql.TypeEnum
mysql.TypeTinyBlob, mysql.TypeTinyBlob,
//mysql.TypeSet mysql.TypeTinyBlob
Expand Down Expand Up @@ -1058,8 +1133,10 @@ var fieldTypeMergeRules = [fieldTypeNum][fieldTypeNum]byte{
mysql.TypeMediumBlob, mysql.TypeMediumBlob,
//mysql.TypeNewDate mysql.TypeVarchar
mysql.TypeMediumBlob, mysql.TypeMediumBlob,
//mysql.TypeBit <16>-<245>
//mysql.TypeBit <16>-<244>
mysql.TypeMediumBlob,
//mysql.TypeJSON
mysql.TypeLongBlob,
//mysql.TypeNewDecimal mysql.TypeEnum
mysql.TypeMediumBlob, mysql.TypeMediumBlob,
//mysql.TypeSet mysql.TypeTinyBlob
Expand Down Expand Up @@ -1089,7 +1166,9 @@ var fieldTypeMergeRules = [fieldTypeNum][fieldTypeNum]byte{
mysql.TypeLongBlob, mysql.TypeLongBlob,
//mysql.TypeNewDate mysql.TypeVarchar
mysql.TypeLongBlob, mysql.TypeLongBlob,
//mysql.TypeBit <16>-<245>
//mysql.TypeBit <16>-<244>
mysql.TypeLongBlob,
//mysql.TypeJSON
mysql.TypeLongBlob,
//mysql.TypeNewDecimal mysql.TypeEnum
mysql.TypeLongBlob, mysql.TypeLongBlob,
Expand Down Expand Up @@ -1120,8 +1199,10 @@ var fieldTypeMergeRules = [fieldTypeNum][fieldTypeNum]byte{
mysql.TypeBlob, mysql.TypeBlob,
//mysql.TypeNewDate mysql.TypeVarchar
mysql.TypeBlob, mysql.TypeBlob,
//mysql.TypeBit <16>-<245>
//mysql.TypeBit <16>-<244>
mysql.TypeBlob,
//mysql.TypeJSON
mysql.TypeLongBlob,
//mysql.TypeNewDecimal mysql.TypeEnum
mysql.TypeBlob, mysql.TypeBlob,
//mysql.TypeSet mysql.TypeTinyBlob
Expand Down Expand Up @@ -1151,7 +1232,9 @@ var fieldTypeMergeRules = [fieldTypeNum][fieldTypeNum]byte{
mysql.TypeVarchar, mysql.TypeVarchar,
//mysql.TypeNewDate mysql.TypeVarchar
mysql.TypeVarchar, mysql.TypeVarchar,
//mysql.TypeBit <16>-<245>
//mysql.TypeBit <16>-<244>
mysql.TypeVarchar,
//mysql.TypeJSON
mysql.TypeVarchar,
//mysql.TypeNewDecimal mysql.TypeEnum
mysql.TypeVarchar, mysql.TypeVarchar,
Expand Down Expand Up @@ -1182,7 +1265,9 @@ var fieldTypeMergeRules = [fieldTypeNum][fieldTypeNum]byte{
mysql.TypeString, mysql.TypeString,
//mysql.TypeNewDate mysql.TypeVarchar
mysql.TypeString, mysql.TypeVarchar,
//mysql.TypeBit <16>-<245>
//mysql.TypeBit <16>-<244>
mysql.TypeString,
//mysql.TypeJSON
mysql.TypeString,
//mysql.TypeNewDecimal mysql.TypeEnum
mysql.TypeString, mysql.TypeString,
Expand Down Expand Up @@ -1213,7 +1298,9 @@ var fieldTypeMergeRules = [fieldTypeNum][fieldTypeNum]byte{
mysql.TypeVarchar, mysql.TypeVarchar,
//mysql.TypeNewDate mysql.TypeVarchar
mysql.TypeVarchar, mysql.TypeVarchar,
//mysql.TypeBit <16>-<245>
//mysql.TypeBit <16>-<244>
mysql.TypeVarchar,
//mysql.TypeJSON
mysql.TypeVarchar,
//mysql.TypeNewDecimal mysql.TypeEnum
mysql.TypeVarchar, mysql.TypeVarchar,
Expand Down
Loading

0 comments on commit 5f70f63

Please sign in to comment.