diff --git a/pkg/ccl/backupccl/restore_planning.go b/pkg/ccl/backupccl/restore_planning.go index 16468d88549c..a215eeb0ce96 100644 --- a/pkg/ccl/backupccl/restore_planning.go +++ b/pkg/ccl/backupccl/restore_planning.go @@ -389,6 +389,8 @@ func allocateTableRewrites( // backup descriptors provided. if skipFKsWithNoMatchingTable is set, FKs whose // "other" table is missing from the set provided are omitted during the // upgrade, instead of causing an error to be returned. +// Also assigns LogicalColumnIDs for TableDescriptors that do not have it, +// namely TableDescriptors created before 20.2. func maybeUpgradeTableDescsInBackupManifests( ctx context.Context, backupManifests []BackupManifest, skipFKsWithNoMatchingTable bool, ) error { @@ -413,6 +415,7 @@ func maybeUpgradeTableDescsInBackupManifests( if _, err := table.MaybeUpgradeForeignKeyRepresentation(ctx, protoGetter, skipFKsWithNoMatchingTable); err != nil { return err } + table.MaybeFillInLogicalColumnID() // TODO(lucy): Is this necessary? backupManifest.Descriptors[j] = *sqlbase.WrapDescriptor(table) } diff --git a/pkg/sql/descriptor.go b/pkg/sql/descriptor.go index a08a0c74f281..bccbdc2c64f0 100644 --- a/pkg/sql/descriptor.go +++ b/pkg/sql/descriptor.go @@ -255,7 +255,7 @@ func getDescriptorByID( return pgerror.Newf(pgcode.WrongObjectType, "%q is not a table", desc.String()) } - if err := table.MaybeFillInDescriptor(ctx, txn); err != nil { + if _, err := table.MaybeFillInDescriptor(ctx, txn); err != nil { return err } @@ -320,7 +320,7 @@ func GetAllDescriptors(ctx context.Context, txn *kv.Txn) ([]sqlbase.DescriptorPr switch t := desc.Union.(type) { case *sqlbase.Descriptor_Table: table := desc.Table(kv.Value.Timestamp) - if err := table.MaybeFillInDescriptor(ctx, txn); err != nil { + if _, err := table.MaybeFillInDescriptor(ctx, txn); err != nil { return nil, err } descs = append(descs, table) diff --git a/pkg/sql/information_schema.go b/pkg/sql/information_schema.go index 19593201e15d..e365853f48fd 100644 --- a/pkg/sql/information_schema.go +++ b/pkg/sql/information_schema.go @@ -387,11 +387,11 @@ https://www.postgresql.org/docs/9.5/infoschema-columns.html`, collationName = tree.NewDString(locale) } return addRow( - dbNameStr, // table_catalog - scNameStr, // table_schema - tree.NewDString(table.Name), // table_name - tree.NewDString(column.Name), // column_name - tree.NewDInt(tree.DInt(column.ID)), // ordinal_position + dbNameStr, // table_catalog + scNameStr, // table_schema + tree.NewDString(table.Name), // table_name + tree.NewDString(column.Name), // column_name + tree.NewDInt(tree.DInt(column.LogicalColumnID)), // ordinal_position dStringPtrOrNull(column.DefaultExpr), // column_default yesOrNoDatum(column.Nullable), // is_nullable tree.NewDString(column.Type.InformationSchemaName()), // data_type diff --git a/pkg/sql/lease.go b/pkg/sql/lease.go index c86ed253cd87..0c50fbf81dfb 100644 --- a/pkg/sql/lease.go +++ b/pkg/sql/lease.go @@ -205,7 +205,7 @@ func (s LeaseStore) acquire( if err := FilterTableState(tableDesc); err != nil { return err } - if err := tableDesc.MaybeFillInDescriptor(ctx, txn); err != nil { + if _, err := tableDesc.MaybeFillInDescriptor(ctx, txn); err != nil { return err } // Once the descriptor is set it is immutable and care must be taken @@ -583,7 +583,7 @@ func (s LeaseStore) getForExpiration( if prevTimestamp.LessEq(tableDesc.ModificationTime) { return errors.AssertionFailedf("unable to read table= (%d, %s)", id, expiration) } - if err := tableDesc.MaybeFillInDescriptor(ctx, txn); err != nil { + if _, err := tableDesc.MaybeFillInDescriptor(ctx, txn); err != nil { return err } // Create a tableVersionState with the table and without a lease. @@ -1799,7 +1799,7 @@ func (m *LeaseManager) RefreshLeases(s *stop.Stopper, db *kv.DB, g *gossip.Gossi // Note that we don't need to "fill in" the descriptor here. Nobody // actually reads the table, but it's necessary for the call to // ValidateTable(). - if err := table.MaybeFillInDescriptor(ctx, nil); err != nil { + if _, err := table.MaybeFillInDescriptor(ctx, nil); err != nil { log.Warningf(ctx, "%s: unable to fill in table descriptor %v", kv.Key, table) return } diff --git a/pkg/sql/pg_catalog.go b/pkg/sql/pg_catalog.go index 81fe8bbeaead..0a502939bd37 100644 --- a/pkg/sql/pg_catalog.go +++ b/pkg/sql/pg_catalog.go @@ -391,9 +391,7 @@ CREATE TABLE pg_catalog.pg_attrdef ( h := makeOidHasher() return forEachTableDesc(ctx, p, dbContext, virtualMany, func(db *sqlbase.DatabaseDescriptor, scName string, table *sqlbase.TableDescriptor) error { - colNum := 0 return forEachColumnInTable(table, func(column *sqlbase.ColumnDescriptor) error { - colNum++ if column.DefaultExpr == nil { // pg_attrdef only expects rows for columns with default values. return nil @@ -408,11 +406,11 @@ CREATE TABLE pg_catalog.pg_attrdef ( defSrc = tree.NewDString(ctx.String()) } return addRow( - h.ColumnOid(table.ID, column.ID), // oid - defaultOid(table.ID), // adrelid - tree.NewDInt(tree.DInt(colNum)), // adnum - defSrc, // adbin - defSrc, // adsrc + h.ColumnOid(table.ID, column.ID), // oid + defaultOid(table.ID), // adrelid + tree.NewDInt(tree.DInt(column.LogicalColumnID)), // adnum + defSrc, // adbin + defSrc, // adsrc ) }) }) @@ -450,7 +448,7 @@ CREATE TABLE pg_catalog.pg_attribute ( h := makeOidHasher() return forEachTableDesc(ctx, p, dbContext, virtualMany, func(db *sqlbase.DatabaseDescriptor, scName string, table *sqlbase.TableDescriptor) error { // addColumn adds adds either a table or a index column to the pg_attribute table. - addColumn := func(column *sqlbase.ColumnDescriptor, attRelID tree.Datum, colID sqlbase.ColumnID) error { + addColumn := func(column *sqlbase.ColumnDescriptor, attRelID tree.Datum, logicalColID sqlbase.ColumnID) error { colTyp := &column.Type attTypMod := int32(-1) if width := colTyp.Width(); width != 0 { @@ -470,18 +468,18 @@ CREATE TABLE pg_catalog.pg_attribute ( } } return addRow( - attRelID, // attrelid - tree.NewDName(column.Name), // attname - typOid(colTyp), // atttypid - zeroVal, // attstattarget - typLen(colTyp), // attlen - tree.NewDInt(tree.DInt(colID)), // attnum - zeroVal, // attndims - negOneVal, // attcacheoff - tree.NewDInt(tree.DInt(attTypMod)), // atttypmod - tree.DNull, // attbyval (see pg_type.typbyval) - tree.DNull, // attstorage - tree.DNull, // attalign + attRelID, // attrelid + tree.NewDName(column.Name), // attname + typOid(colTyp), // atttypid + zeroVal, // attstattarget + typLen(colTyp), // attlen + tree.NewDInt(tree.DInt(logicalColID)), // attnum + zeroVal, // attndims + negOneVal, // attcacheoff + tree.NewDInt(tree.DInt(attTypMod)), // atttypmod + tree.DNull, // attbyval (see pg_type.typbyval) + tree.DNull, // attstorage + tree.DNull, // attalign tree.MakeDBool(tree.DBool(!column.Nullable)), // attnotnull tree.MakeDBool(tree.DBool(column.DefaultExpr != nil)), // atthasdef tree.DBoolFalse, // attisdropped @@ -497,7 +495,7 @@ CREATE TABLE pg_catalog.pg_attribute ( // Columns for table. if err := forEachColumnInTable(table, func(column *sqlbase.ColumnDescriptor) error { tableID := defaultOid(table.ID) - return addColumn(column, tableID, column.ID) + return addColumn(column, tableID, column.LogicalColumnID) }); err != nil { return err } @@ -507,7 +505,7 @@ CREATE TABLE pg_catalog.pg_attribute ( return forEachColumnInIndex(table, index, func(column *sqlbase.ColumnDescriptor) error { idxID := h.IndexOid(table.ID, index.ID) - return addColumn(column, idxID, column.ID) + return addColumn(column, idxID, column.LogicalColumnID) }, ) }) diff --git a/pkg/sql/sqlbase/structured.go b/pkg/sql/sqlbase/structured.go index 9d22201bfd93..74424a5b4943 100644 --- a/pkg/sql/sqlbase/structured.go +++ b/pkg/sql/sqlbase/structured.go @@ -363,7 +363,7 @@ func GetTableDescFromID( return nil, err } - if err := table.MaybeFillInDescriptor(ctx, protoGetter); err != nil { + if _, err := table.MaybeFillInDescriptor(ctx, protoGetter); err != nil { return nil, err } @@ -381,12 +381,11 @@ func GetTableDescFromIDWithFKsChanged( if err != nil { return nil, false, err } - table.maybeUpgradeFormatVersion() - table.Privileges.MaybeFixPrivileges(table.ID) - changed, err := table.MaybeUpgradeForeignKeyRepresentation(ctx, protoGetter, false /* skipFKsWithNoMatchingTable */) + changed, err := table.MaybeFillInDescriptor(ctx, protoGetter) if err != nil { return nil, false, err } + return table, changed, err } @@ -886,15 +885,21 @@ func generatedFamilyName(familyID FamilyID, columnNames []string) string { // in a similar way. func (desc *TableDescriptor) MaybeFillInDescriptor( ctx context.Context, protoGetter protoGetter, -) error { +) (bool, error) { desc.maybeUpgradeFormatVersion() desc.Privileges.MaybeFixPrivileges(desc.ID) + + var changed bool + var err error if protoGetter != nil { - if _, err := desc.MaybeUpgradeForeignKeyRepresentation(ctx, protoGetter, false /* skipFKsWithNoMatchingTable*/); err != nil { - return err + if changed, err = desc.MaybeUpgradeForeignKeyRepresentation(ctx, protoGetter, false /* skipFKsWithNoMatchingTable*/); err != nil { + return false, err } } - return nil + + desc.MaybeFillInLogicalColumnID() + + return changed, nil } // MapProtoGetter is a protoGetter that has a hard-coded map of keys to proto @@ -1198,6 +1203,27 @@ func (desc *MutableTableDescriptor) MaybeFillColumnID( } columnNames[c.Name] = columnID c.ID = columnID + c.LogicalColumnID = columnID +} + +// MaybeFillInLogicalColumnID assigns a LogicalColumnID to a column +// if the ColumnID is set and the LogicalColumnID is not +// it assigns the ColumnID as the LogicalColumnID. +func (desc *TableDescriptor) MaybeFillInLogicalColumnID() { + for i := range desc.Columns { + col := &desc.Columns[i] + if col.ID != 0 && col.LogicalColumnID == 0 { + col.LogicalColumnID = col.ID + } + } + + for _, m := range desc.Mutations { + if col := m.GetColumn(); col != nil { + if col.ID != 0 && col.LogicalColumnID == 0 { + col.LogicalColumnID = col.ID + } + } + } } // AllocateIDs allocates column, family, and index ids for any column, family, diff --git a/pkg/sql/sqlbase/structured.pb.go b/pkg/sql/sqlbase/structured.pb.go index d0f9697d14dc..80c9932a41e5 100644 --- a/pkg/sql/sqlbase/structured.pb.go +++ b/pkg/sql/sqlbase/structured.pb.go @@ -73,7 +73,7 @@ func (x *ConstraintValidity) UnmarshalJSON(data []byte) error { return nil } func (ConstraintValidity) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{0} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{0} } type ForeignKeyReference_Action int32 @@ -118,7 +118,7 @@ func (x *ForeignKeyReference_Action) UnmarshalJSON(data []byte) error { return nil } func (ForeignKeyReference_Action) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{0, 0} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{0, 0} } // Match is the algorithm used to compare composite keys. @@ -158,7 +158,7 @@ func (x *ForeignKeyReference_Match) UnmarshalJSON(data []byte) error { return nil } func (ForeignKeyReference_Match) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{0, 1} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{0, 1} } // The direction of a column in the index. @@ -195,7 +195,7 @@ func (x *IndexDescriptor_Direction) UnmarshalJSON(data []byte) error { return nil } func (IndexDescriptor_Direction) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{7, 0} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{7, 0} } // The type of the index. @@ -232,7 +232,7 @@ func (x *IndexDescriptor_Type) UnmarshalJSON(data []byte) error { return nil } func (IndexDescriptor_Type) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{7, 1} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{7, 1} } type ConstraintToUpdate_ConstraintType int32 @@ -275,7 +275,7 @@ func (x *ConstraintToUpdate_ConstraintType) UnmarshalJSON(data []byte) error { return nil } func (ConstraintToUpdate_ConstraintType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{8, 0} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{8, 0} } // A descriptor within a mutation is unavailable for reads, writes @@ -340,7 +340,7 @@ func (x *DescriptorMutation_State) UnmarshalJSON(data []byte) error { return nil } func (DescriptorMutation_State) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{10, 0} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{10, 0} } // Direction of mutation. @@ -383,7 +383,7 @@ func (x *DescriptorMutation_Direction) UnmarshalJSON(data []byte) error { return nil } func (DescriptorMutation_Direction) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{10, 1} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{10, 1} } // State is set if this TableDescriptor is in the process of being added or deleted. @@ -434,7 +434,7 @@ func (x *TableDescriptor_State) UnmarshalJSON(data []byte) error { return nil } func (TableDescriptor_State) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{11, 0} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{11, 0} } // AuditMode indicates which auditing actions to take when this table is used. @@ -471,7 +471,7 @@ func (x *TableDescriptor_AuditMode) UnmarshalJSON(data []byte) error { return nil } func (TableDescriptor_AuditMode) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{11, 1} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{11, 1} } type ForeignKeyReference struct { @@ -493,7 +493,7 @@ func (m *ForeignKeyReference) Reset() { *m = ForeignKeyReference{} } func (m *ForeignKeyReference) String() string { return proto.CompactTextString(m) } func (*ForeignKeyReference) ProtoMessage() {} func (*ForeignKeyReference) Descriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{0} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{0} } func (m *ForeignKeyReference) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -555,7 +555,7 @@ func (m *ForeignKeyConstraint) Reset() { *m = ForeignKeyConstraint{} } func (m *ForeignKeyConstraint) String() string { return proto.CompactTextString(m) } func (*ForeignKeyConstraint) ProtoMessage() {} func (*ForeignKeyConstraint) Descriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{1} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{1} } func (m *ForeignKeyConstraint) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -595,14 +595,15 @@ type ColumnDescriptor struct { OwnsSequenceIds []ID `protobuf:"varint,11,rep,name=owns_sequence_ids,json=ownsSequenceIds,casttype=ID" json:"owns_sequence_ids,omitempty"` // Expression to use to compute the value of this column if this is a // computed column. - ComputeExpr *string `protobuf:"bytes,12,opt,name=compute_expr,json=computeExpr" json:"compute_expr,omitempty"` + ComputeExpr *string `protobuf:"bytes,12,opt,name=compute_expr,json=computeExpr" json:"compute_expr,omitempty"` + LogicalColumnID ColumnID `protobuf:"varint,13,opt,name=logical_id,json=logicalId,casttype=ColumnID" json:"logical_id"` } func (m *ColumnDescriptor) Reset() { *m = ColumnDescriptor{} } func (m *ColumnDescriptor) String() string { return proto.CompactTextString(m) } func (*ColumnDescriptor) ProtoMessage() {} func (*ColumnDescriptor) Descriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{2} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{2} } func (m *ColumnDescriptor) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -658,7 +659,7 @@ func (m *ColumnFamilyDescriptor) Reset() { *m = ColumnFamilyDescriptor{} func (m *ColumnFamilyDescriptor) String() string { return proto.CompactTextString(m) } func (*ColumnFamilyDescriptor) ProtoMessage() {} func (*ColumnFamilyDescriptor) Descriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{3} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{3} } func (m *ColumnFamilyDescriptor) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -704,7 +705,7 @@ func (m *InterleaveDescriptor) Reset() { *m = InterleaveDescriptor{} } func (m *InterleaveDescriptor) String() string { return proto.CompactTextString(m) } func (*InterleaveDescriptor) ProtoMessage() {} func (*InterleaveDescriptor) Descriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{4} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{4} } func (m *InterleaveDescriptor) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -748,7 +749,7 @@ func (m *InterleaveDescriptor_Ancestor) Reset() { *m = InterleaveDescrip func (m *InterleaveDescriptor_Ancestor) String() string { return proto.CompactTextString(m) } func (*InterleaveDescriptor_Ancestor) ProtoMessage() {} func (*InterleaveDescriptor_Ancestor) Descriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{4, 0} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{4, 0} } func (m *InterleaveDescriptor_Ancestor) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -803,7 +804,7 @@ func (m *ShardedDescriptor) Reset() { *m = ShardedDescriptor{} } func (m *ShardedDescriptor) String() string { return proto.CompactTextString(m) } func (*ShardedDescriptor) ProtoMessage() {} func (*ShardedDescriptor) Descriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{5} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{5} } func (m *ShardedDescriptor) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -848,7 +849,7 @@ func (m *PartitioningDescriptor) Reset() { *m = PartitioningDescriptor{} func (m *PartitioningDescriptor) String() string { return proto.CompactTextString(m) } func (*PartitioningDescriptor) ProtoMessage() {} func (*PartitioningDescriptor) Descriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{6} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{6} } func (m *PartitioningDescriptor) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -891,7 +892,7 @@ func (m *PartitioningDescriptor_List) Reset() { *m = PartitioningDescrip func (m *PartitioningDescriptor_List) String() string { return proto.CompactTextString(m) } func (*PartitioningDescriptor_List) ProtoMessage() {} func (*PartitioningDescriptor_List) Descriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{6, 0} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{6, 0} } func (m *PartitioningDescriptor_List) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -936,7 +937,7 @@ func (m *PartitioningDescriptor_Range) Reset() { *m = PartitioningDescri func (m *PartitioningDescriptor_Range) String() string { return proto.CompactTextString(m) } func (*PartitioningDescriptor_Range) ProtoMessage() {} func (*PartitioningDescriptor_Range) Descriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{6, 1} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{6, 1} } func (m *PartitioningDescriptor_Range) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1082,7 +1083,7 @@ func (m *IndexDescriptor) Reset() { *m = IndexDescriptor{} } func (m *IndexDescriptor) String() string { return proto.CompactTextString(m) } func (*IndexDescriptor) ProtoMessage() {} func (*IndexDescriptor) Descriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{7} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{7} } func (m *IndexDescriptor) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1133,7 +1134,7 @@ func (m *ConstraintToUpdate) Reset() { *m = ConstraintToUpdate{} } func (m *ConstraintToUpdate) String() string { return proto.CompactTextString(m) } func (*ConstraintToUpdate) ProtoMessage() {} func (*ConstraintToUpdate) Descriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{8} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{8} } func (m *ConstraintToUpdate) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1176,7 +1177,7 @@ func (m *PrimaryKeySwap) Reset() { *m = PrimaryKeySwap{} } func (m *PrimaryKeySwap) String() string { return proto.CompactTextString(m) } func (*PrimaryKeySwap) ProtoMessage() {} func (*PrimaryKeySwap) Descriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{9} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{9} } func (m *PrimaryKeySwap) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1231,7 +1232,7 @@ func (m *DescriptorMutation) Reset() { *m = DescriptorMutation{} } func (m *DescriptorMutation) String() string { return proto.CompactTextString(m) } func (*DescriptorMutation) ProtoMessage() {} func (*DescriptorMutation) Descriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{10} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{10} } func (m *DescriptorMutation) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1580,7 +1581,7 @@ func (m *TableDescriptor) Reset() { *m = TableDescriptor{} } func (m *TableDescriptor) String() string { return proto.CompactTextString(m) } func (*TableDescriptor) ProtoMessage() {} func (*TableDescriptor) Descriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{11} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{11} } func (m *TableDescriptor) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1880,7 +1881,7 @@ func (m *TableDescriptor_SchemaChangeLease) Reset() { *m = TableDescript func (m *TableDescriptor_SchemaChangeLease) String() string { return proto.CompactTextString(m) } func (*TableDescriptor_SchemaChangeLease) ProtoMessage() {} func (*TableDescriptor_SchemaChangeLease) Descriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{11, 0} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{11, 0} } func (m *TableDescriptor_SchemaChangeLease) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1921,7 +1922,7 @@ func (m *TableDescriptor_CheckConstraint) Reset() { *m = TableDescriptor func (m *TableDescriptor_CheckConstraint) String() string { return proto.CompactTextString(m) } func (*TableDescriptor_CheckConstraint) ProtoMessage() {} func (*TableDescriptor_CheckConstraint) Descriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{11, 1} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{11, 1} } func (m *TableDescriptor_CheckConstraint) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2027,7 +2028,7 @@ func (m *TableDescriptor_NameInfo) Reset() { *m = TableDescriptor_NameIn func (m *TableDescriptor_NameInfo) String() string { return proto.CompactTextString(m) } func (*TableDescriptor_NameInfo) ProtoMessage() {} func (*TableDescriptor_NameInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{11, 2} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{11, 2} } func (m *TableDescriptor_NameInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2067,7 +2068,7 @@ func (m *TableDescriptor_Reference) Reset() { *m = TableDescriptor_Refer func (m *TableDescriptor_Reference) String() string { return proto.CompactTextString(m) } func (*TableDescriptor_Reference) ProtoMessage() {} func (*TableDescriptor_Reference) Descriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{11, 3} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{11, 3} } func (m *TableDescriptor_Reference) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2104,7 +2105,7 @@ func (m *TableDescriptor_MutationJob) Reset() { *m = TableDescriptor_Mut func (m *TableDescriptor_MutationJob) String() string { return proto.CompactTextString(m) } func (*TableDescriptor_MutationJob) ProtoMessage() {} func (*TableDescriptor_MutationJob) Descriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{11, 4} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{11, 4} } func (m *TableDescriptor_MutationJob) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2147,7 +2148,7 @@ func (m *TableDescriptor_SequenceOpts) Reset() { *m = TableDescriptor_Se func (m *TableDescriptor_SequenceOpts) String() string { return proto.CompactTextString(m) } func (*TableDescriptor_SequenceOpts) ProtoMessage() {} func (*TableDescriptor_SequenceOpts) Descriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{11, 5} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{11, 5} } func (m *TableDescriptor_SequenceOpts) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2187,7 +2188,7 @@ func (m *TableDescriptor_SequenceOpts_SequenceOwner) String() string { } func (*TableDescriptor_SequenceOpts_SequenceOwner) ProtoMessage() {} func (*TableDescriptor_SequenceOpts_SequenceOwner) Descriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{11, 5, 0} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{11, 5, 0} } func (m *TableDescriptor_SequenceOpts_SequenceOwner) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2227,7 +2228,7 @@ func (m *TableDescriptor_Replacement) Reset() { *m = TableDescriptor_Rep func (m *TableDescriptor_Replacement) String() string { return proto.CompactTextString(m) } func (*TableDescriptor_Replacement) ProtoMessage() {} func (*TableDescriptor_Replacement) Descriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{11, 6} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{11, 6} } func (m *TableDescriptor_Replacement) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2264,7 +2265,7 @@ func (m *TableDescriptor_GCDescriptorMutation) Reset() { *m = TableDescr func (m *TableDescriptor_GCDescriptorMutation) String() string { return proto.CompactTextString(m) } func (*TableDescriptor_GCDescriptorMutation) ProtoMessage() {} func (*TableDescriptor_GCDescriptorMutation) Descriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{11, 7} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{11, 7} } func (m *TableDescriptor_GCDescriptorMutation) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2303,7 +2304,7 @@ func (m *DatabaseDescriptor) Reset() { *m = DatabaseDescriptor{} } func (m *DatabaseDescriptor) String() string { return proto.CompactTextString(m) } func (*DatabaseDescriptor) ProtoMessage() {} func (*DatabaseDescriptor) Descriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{12} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{12} } func (m *DatabaseDescriptor) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2361,7 +2362,7 @@ func (m *Descriptor) Reset() { *m = Descriptor{} } func (m *Descriptor) String() string { return proto.CompactTextString(m) } func (*Descriptor) ProtoMessage() {} func (*Descriptor) Descriptor() ([]byte, []int) { - return fileDescriptor_structured_dd7286d6a7cef579, []int{13} + return fileDescriptor_structured_f6e184c4d2e110d9, []int{13} } func (m *Descriptor) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2713,6 +2714,9 @@ func (this *ColumnDescriptor) Equal(that interface{}) bool { } else if that1.ComputeExpr != nil { return false } + if this.LogicalColumnID != that1.LogicalColumnID { + return false + } return true } func (this *ColumnFamilyDescriptor) Equal(that interface{}) bool { @@ -4070,6 +4074,9 @@ func (m *ColumnDescriptor) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintStructured(dAtA, i, uint64(len(*m.ComputeExpr))) i += copy(dAtA[i:], *m.ComputeExpr) } + dAtA[i] = 0x68 + i++ + i = encodeVarintStructured(dAtA, i, uint64(m.LogicalColumnID)) return i, nil } @@ -5506,6 +5513,7 @@ func (m *ColumnDescriptor) Size() (n int) { l = len(*m.ComputeExpr) n += 1 + l + sovStructured(uint64(l)) } + n += 1 + sovStructured(uint64(m.LogicalColumnID)) return n } @@ -7069,6 +7077,25 @@ func (m *ColumnDescriptor) Unmarshal(dAtA []byte) error { s := string(dAtA[iNdEx:postIndex]) m.ComputeExpr = &s iNdEx = postIndex + case 13: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field LogicalColumnID", wireType) + } + m.LogicalColumnID = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowStructured + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.LogicalColumnID |= (ColumnID(b) & 0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipStructured(dAtA[iNdEx:]) @@ -12123,244 +12150,246 @@ var ( ) func init() { - proto.RegisterFile("sql/sqlbase/structured.proto", fileDescriptor_structured_dd7286d6a7cef579) -} - -var fileDescriptor_structured_dd7286d6a7cef579 = []byte{ - // 3757 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x5a, 0xc9, 0x6f, 0x23, 0x57, - 0x7a, 0x57, 0x71, 0xe7, 0x57, 0x5c, 0x8a, 0x4f, 0xea, 0x36, 0x2d, 0xf7, 0x88, 0x6a, 0xb6, 0xdb, - 0xd6, 0x8c, 0x6d, 0xa9, 0xad, 0xce, 0xd2, 0xe3, 0x04, 0x03, 0x73, 0x53, 0x8b, 0x92, 0x9a, 0x94, - 0x4b, 0x6a, 0xf7, 0x24, 0x98, 0xa4, 0x52, 0x62, 0x3d, 0x4a, 0xe5, 0x2e, 0x56, 0xb1, 0xab, 0x8a, - 0x6a, 0x09, 0xc8, 0x29, 0xb9, 0xe4, 0x14, 0xe4, 0x1f, 0x08, 0x60, 0x04, 0x46, 0xe2, 0x43, 0x2e, - 0xb9, 0x24, 0xb7, 0x00, 0xb9, 0x04, 0xbe, 0x65, 0x80, 0x5c, 0x06, 0x39, 0x08, 0x89, 0x7c, 0xc9, - 0x5f, 0x90, 0x00, 0x3e, 0x05, 0x6f, 0xab, 0x85, 0xa2, 0x14, 0xaa, 0x7b, 0xe6, 0xc6, 0xfa, 0xde, - 0xf7, 0xfd, 0xde, 0xf6, 0xed, 0x8f, 0x70, 0xcf, 0x7b, 0x65, 0x6d, 0x78, 0xaf, 0xac, 0x23, 0xdd, - 0xc3, 0x1b, 0x9e, 0xef, 0x4e, 0x06, 0xfe, 0xc4, 0xc5, 0xc6, 0xfa, 0xd8, 0x75, 0x7c, 0x07, 0xdd, - 0x19, 0x38, 0x83, 0x97, 0xae, 0xa3, 0x0f, 0x4e, 0xd6, 0xbd, 0x57, 0xd6, 0x3a, 0xe7, 0x5b, 0xae, - 0x4e, 0x7c, 0xd3, 0xda, 0x38, 0xb1, 0x06, 0x1b, 0xbe, 0x39, 0xc2, 0x9e, 0xaf, 0x8f, 0xc6, 0x4c, - 0x60, 0xf9, 0xbd, 0x28, 0xdc, 0xd8, 0x35, 0x4f, 0x4d, 0x0b, 0x1f, 0x63, 0x3e, 0xb8, 0x74, 0xec, - 0x1c, 0x3b, 0xf4, 0xe7, 0x06, 0xf9, 0xc5, 0xa8, 0xf5, 0x3f, 0x4b, 0xc3, 0xe2, 0x96, 0xe3, 0x62, - 0xf3, 0xd8, 0xde, 0xc5, 0xe7, 0x2a, 0x1e, 0x62, 0x17, 0xdb, 0x03, 0x8c, 0x56, 0x21, 0xed, 0xeb, - 0x47, 0x16, 0xae, 0x4a, 0xab, 0xd2, 0x5a, 0xb1, 0x09, 0xdf, 0x5d, 0xd4, 0x16, 0x7e, 0xb8, 0xa8, - 0x25, 0xba, 0x6d, 0x95, 0x0d, 0xa0, 0x87, 0x90, 0x36, 0x6d, 0x03, 0x9f, 0x55, 0x13, 0x94, 0xa3, - 0xcc, 0x39, 0xb2, 0x5d, 0x42, 0x24, 0x6c, 0x74, 0x14, 0x55, 0x21, 0x65, 0xeb, 0x23, 0x5c, 0x4d, - 0xae, 0x4a, 0x6b, 0xf9, 0x66, 0x8a, 0x70, 0xa9, 0x94, 0x82, 0x76, 0x21, 0x77, 0xaa, 0x5b, 0xa6, - 0x61, 0xfa, 0xe7, 0xd5, 0xd4, 0xaa, 0xb4, 0x56, 0xda, 0xfc, 0xf1, 0xfa, 0xcc, 0x1d, 0xaf, 0xb7, - 0x1c, 0xdb, 0xf3, 0x5d, 0xdd, 0xb4, 0xfd, 0x2f, 0xb9, 0x00, 0x07, 0x0a, 0x00, 0xd0, 0x23, 0xa8, - 0x78, 0x27, 0xba, 0x8b, 0x0d, 0x6d, 0xec, 0xe2, 0xa1, 0x79, 0xa6, 0x59, 0xd8, 0xae, 0xa6, 0x57, - 0xa5, 0xb5, 0x34, 0x67, 0x2d, 0xb3, 0xe1, 0x7d, 0x3a, 0xba, 0x87, 0x6d, 0x74, 0x08, 0x79, 0xc7, - 0xd6, 0x0c, 0x6c, 0x61, 0x1f, 0x57, 0x33, 0x74, 0xfe, 0x4f, 0xaf, 0x99, 0x7f, 0xc6, 0x01, 0xad, - 0x37, 0x06, 0xbe, 0xe9, 0xd8, 0x62, 0x1d, 0x8e, 0xdd, 0xa6, 0x40, 0x1c, 0x75, 0x32, 0x36, 0x74, - 0x1f, 0x57, 0xb3, 0x6f, 0x8d, 0xfa, 0x9c, 0x02, 0xa1, 0x3d, 0x48, 0x8f, 0x74, 0x7f, 0x70, 0x52, - 0xcd, 0x51, 0xc4, 0x47, 0xb7, 0x40, 0x7c, 0x46, 0xe4, 0x38, 0x20, 0x03, 0xa9, 0xbf, 0x80, 0x0c, - 0x9b, 0x07, 0x15, 0x21, 0xdf, 0xeb, 0x6b, 0x8d, 0xd6, 0x61, 0xb7, 0xdf, 0x53, 0x16, 0x50, 0x01, - 0x72, 0x6a, 0xe7, 0xe0, 0x50, 0xed, 0xb6, 0x0e, 0x15, 0x89, 0x7c, 0x1d, 0x74, 0x0e, 0xb5, 0xde, - 0xf3, 0xbd, 0x3d, 0x25, 0x81, 0xca, 0x20, 0x93, 0xaf, 0x76, 0x67, 0xab, 0xf1, 0x7c, 0xef, 0x50, - 0x49, 0x22, 0x19, 0xb2, 0xad, 0xc6, 0x41, 0xab, 0xd1, 0xee, 0x28, 0xa9, 0xe5, 0xd4, 0xb7, 0xdf, - 0xac, 0x2c, 0xd4, 0x1f, 0x41, 0x9a, 0x4e, 0x87, 0x00, 0x32, 0x07, 0xdd, 0x67, 0xfb, 0x7b, 0x1d, - 0x65, 0x01, 0xe5, 0x20, 0xb5, 0x45, 0x20, 0x24, 0x22, 0xb1, 0xdf, 0x50, 0x0f, 0xbb, 0x8d, 0x3d, - 0x25, 0xc1, 0x24, 0x3e, 0x4b, 0xfd, 0xf7, 0xd7, 0x35, 0xa9, 0xfe, 0xef, 0x19, 0x58, 0x0a, 0xd7, - 0x1e, 0xde, 0x36, 0x6a, 0x41, 0xd9, 0x71, 0xcd, 0x63, 0xd3, 0xd6, 0xa8, 0xce, 0x69, 0xa6, 0xc1, - 0xf5, 0xf1, 0x3d, 0xb2, 0x9f, 0xcb, 0x8b, 0x5a, 0xb1, 0x4f, 0x87, 0x0f, 0xc9, 0x68, 0xb7, 0xcd, - 0x15, 0xb4, 0xe8, 0x44, 0x88, 0x06, 0xda, 0x85, 0x0a, 0x07, 0x19, 0x38, 0xd6, 0x64, 0x64, 0x6b, - 0xa6, 0xe1, 0x55, 0x13, 0xab, 0xc9, 0xb5, 0x62, 0xb3, 0x76, 0x79, 0x51, 0x2b, 0x33, 0x88, 0x16, - 0x1d, 0xeb, 0xb6, 0xbd, 0x1f, 0x2e, 0x6a, 0x39, 0xf1, 0xa1, 0xf2, 0xe9, 0xf9, 0xb7, 0xe1, 0xa1, - 0x17, 0x70, 0xc7, 0x15, 0x67, 0x6b, 0x44, 0x01, 0x93, 0x14, 0xf0, 0xc1, 0xe5, 0x45, 0x6d, 0x31, - 0x38, 0x7c, 0x63, 0x36, 0xe8, 0xa2, 0x3b, 0xcd, 0x60, 0x78, 0xa8, 0x0f, 0x11, 0x72, 0xb8, 0xdd, - 0x14, 0xdd, 0x6e, 0x8d, 0x6f, 0xb7, 0x12, 0x42, 0xc7, 0xb7, 0x5c, 0x71, 0xa7, 0x06, 0x8c, 0xc0, - 0xf0, 0xd2, 0x37, 0x1a, 0x5e, 0xe6, 0x6d, 0x0d, 0x2f, 0x66, 0x46, 0xd9, 0xdf, 0x88, 0x19, 0xe5, - 0x7e, 0xed, 0x66, 0x94, 0xff, 0x35, 0x98, 0x11, 0x6a, 0xc0, 0xa2, 0x85, 0x8f, 0xf5, 0xc1, 0xb9, - 0xc6, 0xd5, 0x8b, 0xb9, 0x43, 0xa0, 0x37, 0x56, 0x99, 0x72, 0x87, 0x55, 0x49, 0xad, 0x30, 0x6e, - 0xa6, 0x6e, 0x94, 0x8c, 0xba, 0xf0, 0x0e, 0x87, 0x88, 0xdc, 0x3d, 0x83, 0x91, 0xaf, 0x83, 0xb9, - 0xc3, 0x24, 0x42, 0x4d, 0xa0, 0x43, 0xcc, 0x92, 0x76, 0x52, 0xb9, 0x82, 0x52, 0xdc, 0x49, 0xe5, - 0x8a, 0x4a, 0xa9, 0xfe, 0x6d, 0x12, 0x14, 0xa6, 0x5f, 0x6d, 0xec, 0x0d, 0x5c, 0x73, 0xec, 0x3b, - 0x6e, 0xa0, 0x15, 0xd2, 0x15, 0xad, 0xf8, 0x00, 0x12, 0xa6, 0xc1, 0x9d, 0xf9, 0x5d, 0xae, 0x6f, - 0x09, 0xaa, 0x60, 0xa1, 0xe6, 0x26, 0x4c, 0x03, 0xed, 0x41, 0xca, 0x3f, 0x1f, 0x33, 0x87, 0x5e, - 0x68, 0x3e, 0x21, 0x9c, 0xff, 0x71, 0x51, 0x7b, 0x74, 0x6c, 0xfa, 0x27, 0x93, 0xa3, 0xf5, 0x81, - 0x33, 0xda, 0x08, 0x4e, 0xd5, 0x38, 0x0a, 0x7f, 0x6f, 0x8c, 0x5f, 0x1e, 0x93, 0xd8, 0xb4, 0x41, - 0x84, 0xbd, 0xf5, 0x43, 0x95, 0xa2, 0xa0, 0x55, 0xc8, 0xd9, 0x13, 0xcb, 0xa2, 0xa1, 0x86, 0xe8, - 0x7a, 0x4e, 0x5c, 0x9a, 0xa0, 0xa2, 0xfb, 0x50, 0x30, 0xf0, 0x50, 0x9f, 0x58, 0xbe, 0x86, 0xcf, - 0xc6, 0x2e, 0xd3, 0x67, 0x55, 0xe6, 0xb4, 0xce, 0xd9, 0xd8, 0x45, 0xf7, 0x20, 0x73, 0x62, 0x1a, - 0x06, 0xb6, 0xa9, 0x3a, 0x0b, 0x08, 0x4e, 0x43, 0x9b, 0x50, 0x99, 0x78, 0xd8, 0xd3, 0x3c, 0xfc, - 0x6a, 0x42, 0x0e, 0x8c, 0x9a, 0x2b, 0x50, 0x73, 0xcd, 0x70, 0xf3, 0x29, 0x13, 0x86, 0x03, 0x3e, - 0x4e, 0xac, 0x71, 0x13, 0x2a, 0xce, 0x6b, 0x7b, 0x4a, 0x46, 0x8e, 0xcb, 0x10, 0x86, 0xa8, 0xcc, - 0x7d, 0x28, 0x0c, 0x9c, 0xd1, 0x78, 0xe2, 0x63, 0xb6, 0xd0, 0x02, 0x5b, 0x28, 0xa7, 0x91, 0x85, - 0x06, 0x97, 0x94, 0x53, 0xf2, 0x3b, 0xa9, 0x5c, 0x5e, 0x81, 0x9d, 0x54, 0x2e, 0xab, 0xe4, 0xea, - 0x7f, 0x99, 0x80, 0xbb, 0xec, 0x90, 0xb7, 0xf4, 0x91, 0x69, 0x9d, 0xbf, 0xed, 0x85, 0x31, 0x14, - 0x7e, 0x61, 0x74, 0x5d, 0xd4, 0x4f, 0x11, 0x31, 0xe6, 0xa9, 0xe8, 0xba, 0x08, 0xad, 0x47, 0x48, - 0xe8, 0x09, 0x40, 0xc4, 0x95, 0xa5, 0xe8, 0x3e, 0xdf, 0xbd, 0xbc, 0xa8, 0xe5, 0x67, 0x3b, 0xb0, - 0xfc, 0x20, 0xe2, 0xb6, 0x2a, 0xe2, 0x76, 0x02, 0x04, 0x7a, 0x45, 0xc5, 0xe6, 0x03, 0xbe, 0xa6, - 0x72, 0x9b, 0x31, 0x08, 0xf1, 0xb8, 0x83, 0x35, 0x62, 0x83, 0x06, 0x8f, 0x08, 0xff, 0x94, 0x80, - 0xa5, 0xae, 0xed, 0x63, 0xd7, 0xc2, 0xfa, 0x29, 0x8e, 0x1c, 0xc7, 0xcf, 0x21, 0xaf, 0xdb, 0x03, - 0xec, 0xf9, 0x8e, 0xeb, 0x55, 0xa5, 0xd5, 0xe4, 0x9a, 0xbc, 0xf9, 0x5b, 0xd7, 0x98, 0xf1, 0x2c, - 0xf9, 0xf5, 0x06, 0x17, 0xe6, 0x27, 0x19, 0x82, 0x2d, 0xff, 0xb3, 0x04, 0x39, 0x31, 0x8a, 0x1e, - 0x41, 0x6e, 0x2a, 0xe2, 0xdc, 0xe1, 0xbb, 0xc9, 0xc6, 0x1d, 0x6f, 0xd6, 0xe7, 0xee, 0xf6, 0xb7, - 0x21, 0x47, 0x0d, 0x57, 0x0b, 0xee, 0x64, 0x59, 0x48, 0x70, 0xdb, 0x8d, 0x26, 0x47, 0x59, 0xca, - 0xdb, 0x35, 0x50, 0x6b, 0x56, 0xde, 0x92, 0xa4, 0xf2, 0xef, 0x88, 0xf3, 0x3b, 0x88, 0x67, 0x2e, - 0x57, 0x52, 0x19, 0x76, 0x66, 0xfc, 0xe4, 0xfe, 0x51, 0x82, 0x0a, 0x11, 0x30, 0xb0, 0x11, 0x39, - 0xb6, 0x07, 0x00, 0xa6, 0xa7, 0x79, 0x8c, 0x4e, 0x77, 0x24, 0xac, 0x24, 0x6f, 0x7a, 0x9c, 0x3d, - 0x50, 0xb5, 0xc4, 0x15, 0x55, 0xfb, 0x29, 0x14, 0xa9, 0xac, 0x76, 0x34, 0x19, 0xbc, 0xc4, 0xbe, - 0x47, 0x57, 0x98, 0x6e, 0x2e, 0xf1, 0x15, 0x16, 0x28, 0x42, 0x93, 0x8d, 0xa9, 0x05, 0x2f, 0xf2, - 0x75, 0x45, 0xfb, 0x52, 0x57, 0xb4, 0x8f, 0x2f, 0xfc, 0x7f, 0x93, 0x70, 0x77, 0x5f, 0x77, 0x7d, - 0x93, 0xb8, 0x6e, 0xd3, 0x3e, 0x8e, 0xac, 0xfe, 0x21, 0xc8, 0xf6, 0x64, 0xc4, 0x15, 0xcc, 0xe3, - 0x17, 0xc2, 0xd6, 0x07, 0xf6, 0x64, 0xc4, 0x74, 0xc7, 0x23, 0x9e, 0xc9, 0x32, 0x3d, 0x9f, 0xc6, - 0x76, 0x79, 0x73, 0xf3, 0x1a, 0xb5, 0x98, 0x3d, 0xc7, 0xfa, 0x9e, 0xe9, 0xf9, 0x62, 0xcf, 0x04, - 0x05, 0xf5, 0x21, 0xed, 0xea, 0xf6, 0x31, 0xa6, 0xf6, 0x22, 0x6f, 0x3e, 0xbe, 0x1d, 0x9c, 0x4a, - 0x44, 0x45, 0xbc, 0xa0, 0x38, 0xcb, 0x7f, 0x2d, 0x41, 0x8a, 0xcc, 0x72, 0x83, 0x49, 0xdf, 0x85, - 0xcc, 0xa9, 0x6e, 0x4d, 0x30, 0xcb, 0x4f, 0x0a, 0x2a, 0xff, 0x42, 0x7f, 0x04, 0x65, 0x6f, 0x72, - 0x34, 0x8e, 0x4c, 0x45, 0x6f, 0x40, 0xde, 0xfc, 0xe4, 0x56, 0xab, 0x0a, 0x52, 0xe1, 0x38, 0x16, - 0xbb, 0x80, 0xe5, 0x57, 0x90, 0xa6, 0xab, 0xbe, 0x61, 0x7d, 0xf7, 0xa1, 0xe0, 0x3b, 0x1a, 0x3e, - 0x1b, 0x58, 0x13, 0xcf, 0x3c, 0x65, 0x9a, 0x52, 0x50, 0x65, 0xdf, 0xe9, 0x08, 0x12, 0x7a, 0x08, - 0xa5, 0xa1, 0xeb, 0x8c, 0x34, 0xd3, 0x16, 0x4c, 0x34, 0x50, 0xa8, 0x45, 0x42, 0xed, 0x0a, 0x62, - 0x4c, 0x65, 0xff, 0x5e, 0x86, 0x32, 0x35, 0x8c, 0xb9, 0xdc, 0xde, 0xc3, 0x88, 0xdb, 0xbb, 0x13, - 0x73, 0x7b, 0x81, 0x75, 0x11, 0xaf, 0x77, 0x0f, 0x32, 0x13, 0xdb, 0x7c, 0x35, 0x61, 0xf3, 0x07, - 0x31, 0x81, 0xd1, 0xe6, 0xd0, 0x4a, 0xf4, 0x31, 0x20, 0xe2, 0x0a, 0xb0, 0x16, 0x63, 0x4c, 0x53, - 0x46, 0x85, 0x8e, 0xb4, 0xae, 0xf5, 0xa0, 0x99, 0x5b, 0x78, 0xd0, 0x6d, 0x50, 0xf0, 0x99, 0xef, - 0xea, 0xd1, 0x64, 0x32, 0x4b, 0xe5, 0x57, 0x2e, 0x2f, 0x6a, 0xa5, 0x0e, 0x19, 0x9b, 0x0d, 0x52, - 0xc2, 0x91, 0x31, 0x83, 0x68, 0x49, 0x85, 0x63, 0x18, 0xa6, 0x8b, 0x69, 0x0a, 0xe4, 0x55, 0x73, - 0xab, 0xc9, 0x1b, 0x52, 0x9d, 0xa9, 0x63, 0x5f, 0x6f, 0x0b, 0x41, 0x55, 0x61, 0x50, 0x01, 0xc1, - 0x43, 0x07, 0x20, 0x0f, 0x59, 0x66, 0xa4, 0xbd, 0xc4, 0xe7, 0x34, 0x87, 0x92, 0x37, 0x7f, 0x32, - 0x7f, 0x0e, 0xd5, 0xcc, 0x90, 0x2b, 0xa8, 0x4a, 0x2a, 0x0c, 0x83, 0x41, 0xf4, 0x02, 0x8a, 0x91, - 0xd4, 0xe7, 0xe8, 0x9c, 0x06, 0xe6, 0x37, 0x83, 0x2d, 0x84, 0x40, 0xcd, 0x73, 0xf4, 0x05, 0x80, - 0x19, 0x04, 0x00, 0x9a, 0x4d, 0xc9, 0x9b, 0x1f, 0xdd, 0x22, 0x52, 0x08, 0xff, 0x12, 0x82, 0xa0, - 0x17, 0x50, 0x0a, 0xbf, 0xe8, 0x62, 0x0b, 0xb7, 0x5e, 0x2c, 0x43, 0x2d, 0x46, 0x70, 0x9a, 0x24, - 0x87, 0x5e, 0x22, 0x59, 0x82, 0xe3, 0x99, 0x3e, 0x8e, 0xaa, 0x41, 0x91, 0xaa, 0x41, 0xfd, 0xf2, - 0xa2, 0x86, 0x5a, 0x62, 0x7c, 0xb6, 0x2a, 0xa0, 0xc1, 0xd4, 0x38, 0x53, 0xac, 0x98, 0x02, 0x13, - 0xc4, 0x52, 0xa8, 0x58, 0x07, 0xa1, 0x0a, 0x5f, 0x51, 0xac, 0x88, 0x7a, 0xb3, 0xa2, 0xa7, 0x10, - 0xf3, 0x3d, 0xe5, 0x37, 0xf7, 0x3d, 0x31, 0x20, 0xd4, 0xe1, 0xb9, 0xa4, 0x42, 0xf3, 0xf1, 0x8f, - 0xe6, 0x54, 0xd2, 0xc3, 0xf3, 0xb1, 0x38, 0x48, 0x96, 0x44, 0x3e, 0x06, 0x34, 0x70, 0xb1, 0xee, - 0x63, 0x83, 0x64, 0x5e, 0x96, 0x39, 0x30, 0x7d, 0xeb, 0xbc, 0x5a, 0x89, 0xd8, 0x7d, 0x85, 0x8f, - 0x77, 0x82, 0x61, 0xf4, 0x04, 0xb2, 0xa7, 0xd8, 0xf5, 0x4c, 0xc7, 0xae, 0x22, 0xea, 0x4c, 0x56, - 0x78, 0xae, 0x7d, 0x77, 0x6a, 0xbe, 0x2f, 0x19, 0x97, 0x2a, 0xd8, 0xd1, 0x36, 0x14, 0xb1, 0x3d, - 0x70, 0x0c, 0xd3, 0x3e, 0xd6, 0xe8, 0xf2, 0x17, 0xc3, 0x7c, 0xe7, 0x87, 0x8b, 0xda, 0x7b, 0x53, - 0xf2, 0x1d, 0xce, 0x4b, 0x96, 0xad, 0x16, 0x70, 0xe4, 0x0b, 0x6d, 0x43, 0x56, 0xc4, 0xe4, 0x25, - 0x7a, 0xa6, 0x6b, 0xd7, 0x1c, 0xc1, 0x95, 0x88, 0xce, 0xf7, 0x25, 0xc4, 0x49, 0x1e, 0x6d, 0x98, - 0x1e, 0xc9, 0x45, 0x8c, 0xea, 0x9d, 0x68, 0x1e, 0x2d, 0xa8, 0xf5, 0x15, 0xc8, 0x07, 0xc6, 0x8c, - 0xb2, 0x90, 0x6c, 0x1c, 0xb4, 0x58, 0x75, 0xde, 0xee, 0x1c, 0xb4, 0x14, 0xa9, 0x7e, 0x1f, 0x52, - 0x74, 0x4d, 0x32, 0x64, 0xb7, 0xfa, 0xea, 0x8b, 0x86, 0xda, 0x66, 0x1d, 0x81, 0x6e, 0xef, 0xcb, - 0x8e, 0x7a, 0xd8, 0x69, 0x2b, 0xc2, 0x5d, 0xff, 0x4b, 0x12, 0x50, 0x58, 0x18, 0x1e, 0x3a, 0xbc, - 0xb8, 0x3a, 0x86, 0xf2, 0x20, 0xa0, 0xb2, 0x73, 0x91, 0x56, 0x13, 0x6b, 0xa5, 0xcd, 0x27, 0xff, - 0x6f, 0x71, 0x29, 0x30, 0xa2, 0xa4, 0xf0, 0x8e, 0x4b, 0x83, 0x18, 0x35, 0x92, 0xa6, 0x24, 0xa6, - 0x42, 0x83, 0x0a, 0xe9, 0xc1, 0x09, 0x1e, 0xbc, 0xe4, 0xc1, 0xf1, 0x77, 0xae, 0x99, 0x98, 0x66, - 0x70, 0x11, 0x7d, 0x6a, 0x11, 0x99, 0x70, 0x6a, 0x11, 0xb5, 0x29, 0x14, 0x52, 0xe3, 0x5e, 0x2f, - 0x75, 0xa3, 0x23, 0x99, 0xd5, 0xc4, 0x10, 0x8e, 0x24, 0xe2, 0xf4, 0x9e, 0x40, 0xd9, 0x76, 0x7c, - 0x8d, 0x94, 0x38, 0xdc, 0x38, 0x69, 0xe1, 0x52, 0x6c, 0x2a, 0x5c, 0x85, 0x42, 0x53, 0x2c, 0xda, - 0x8e, 0xdf, 0x9b, 0x58, 0x16, 0x23, 0xd4, 0x3f, 0x83, 0x52, 0xfc, 0x8c, 0x50, 0x1e, 0xd2, 0xad, - 0xed, 0x4e, 0x6b, 0x57, 0x59, 0x40, 0x65, 0x90, 0xb7, 0xfa, 0x6a, 0xa7, 0xfb, 0xb4, 0xa7, 0xed, - 0x76, 0xfe, 0x80, 0x75, 0x70, 0x7a, 0x7d, 0xd1, 0xc1, 0x09, 0x8a, 0x8f, 0xb4, 0x92, 0xa9, 0xff, - 0x8f, 0x04, 0xa5, 0x7d, 0xd7, 0x1c, 0xe9, 0xee, 0xf9, 0x2e, 0x3e, 0x3f, 0x78, 0xad, 0x8f, 0xd1, - 0xe7, 0xb0, 0x64, 0xe3, 0xd7, 0xda, 0x98, 0x51, 0xb5, 0x20, 0x99, 0x95, 0x66, 0xb7, 0xf7, 0x2a, - 0x36, 0x7e, 0xcd, 0x11, 0xba, 0x3c, 0x97, 0xfd, 0x18, 0x64, 0xc7, 0xe2, 0xf5, 0x2b, 0x16, 0x2d, - 0x16, 0x39, 0x2a, 0x04, 0x8e, 0xc5, 0xca, 0x55, 0x1a, 0x5f, 0x65, 0x32, 0x9f, 0xe0, 0x4e, 0xce, - 0xe0, 0xb6, 0xf1, 0x6b, 0xc1, 0xfd, 0x39, 0x2c, 0x11, 0xec, 0x2b, 0xab, 0x4b, 0x5d, 0xb3, 0x3a, - 0xc7, 0x32, 0xe2, 0xab, 0xe3, 0xca, 0xfb, 0xaf, 0x69, 0x40, 0xe1, 0xd5, 0x3f, 0x9b, 0xf8, 0x3a, - 0xb5, 0x87, 0x06, 0x64, 0xf8, 0x45, 0x48, 0xf4, 0x82, 0x3f, 0xbc, 0x56, 0x67, 0xe3, 0xf5, 0xf4, - 0xf6, 0x82, 0xca, 0x05, 0xd1, 0xcf, 0xa2, 0xfd, 0x50, 0x79, 0xf3, 0x83, 0xf9, 0x9c, 0xd9, 0xf6, - 0x82, 0x68, 0x94, 0xee, 0x42, 0xda, 0xf3, 0x75, 0x9f, 0xe5, 0x2b, 0xa5, 0xcd, 0x8d, 0x6b, 0xe4, - 0xaf, 0x2e, 0x7e, 0xfd, 0x80, 0x88, 0x09, 0xad, 0xa5, 0x18, 0xe8, 0x05, 0xe4, 0x83, 0x1c, 0x80, - 0x37, 0x57, 0x1f, 0xcf, 0x0f, 0x18, 0xf8, 0x09, 0x51, 0x23, 0x04, 0x58, 0xa8, 0x01, 0xf2, 0x88, - 0xb3, 0x85, 0x95, 0xde, 0x2a, 0x4f, 0xc3, 0x40, 0x20, 0xd0, 0x74, 0x2c, 0xf2, 0xa5, 0x82, 0x10, - 0xea, 0x52, 0x57, 0xe5, 0x3a, 0x96, 0x75, 0xa4, 0x0f, 0x5e, 0xd2, 0x86, 0x51, 0xe0, 0xaa, 0x04, - 0x15, 0xed, 0x92, 0x64, 0x4a, 0x68, 0x39, 0x6d, 0xff, 0xc8, 0x73, 0xb4, 0xa8, 0x84, 0x17, 0xd9, - 0x5e, 0x50, 0x23, 0xe2, 0xa8, 0x0f, 0xa5, 0x71, 0x4c, 0xd3, 0x79, 0xe6, 0xf2, 0xf0, 0xba, 0xf0, - 0x15, 0x63, 0xde, 0x5e, 0x50, 0xa7, 0xc4, 0xeb, 0x9f, 0x43, 0x9a, 0x9e, 0x38, 0xf1, 0x94, 0xcf, - 0x7b, 0xbb, 0xbd, 0xfe, 0x8b, 0x1e, 0x33, 0xbe, 0x76, 0x67, 0xaf, 0x73, 0xd8, 0xd1, 0xfa, 0xbd, - 0x3d, 0x62, 0x7c, 0xef, 0xc2, 0x1d, 0x4e, 0x68, 0xf4, 0xda, 0xda, 0x0b, 0xb5, 0x2b, 0x86, 0x12, - 0xf5, 0xb5, 0xa8, 0x2b, 0xce, 0x41, 0xaa, 0xd7, 0xef, 0x75, 0x94, 0x05, 0xea, 0x94, 0xdb, 0x6d, - 0x45, 0xa2, 0x4e, 0x59, 0xed, 0xef, 0x0b, 0x9b, 0x6d, 0x16, 0x00, 0x8c, 0xe0, 0x96, 0x76, 0x52, - 0xb9, 0x8c, 0x92, 0xad, 0xff, 0xf9, 0x03, 0x28, 0x4f, 0x39, 0xb2, 0x1b, 0x92, 0xe6, 0x55, 0x9a, - 0x34, 0x27, 0x43, 0x27, 0x13, 0x24, 0xcd, 0x09, 0x9e, 0x2f, 0x3f, 0x86, 0xfc, 0x58, 0x77, 0xb1, - 0xed, 0x87, 0x56, 0x25, 0x9a, 0x0a, 0xb9, 0x7d, 0x3a, 0x10, 0xb0, 0xe7, 0x18, 0x63, 0x97, 0x08, - 0x05, 0x31, 0x94, 0x69, 0xc2, 0xbb, 0xdc, 0x10, 0x2b, 0x37, 0x84, 0xcf, 0x7d, 0xa8, 0x8c, 0x1c, - 0xc3, 0x1c, 0x9a, 0x03, 0xa6, 0x46, 0xbe, 0x39, 0x62, 0x9d, 0x43, 0x79, 0xf3, 0x47, 0x91, 0x3b, - 0x99, 0xf8, 0xa6, 0xb5, 0x7e, 0x62, 0x0d, 0xd6, 0x0f, 0xc5, 0x2b, 0x07, 0xdf, 0x91, 0x12, 0x95, - 0x26, 0x83, 0xe8, 0x29, 0x64, 0x45, 0x6d, 0x98, 0xa3, 0x19, 0xd9, 0xbc, 0xe6, 0x2b, 0xa2, 0x28, - 0x97, 0x46, 0x5b, 0x50, 0xb2, 0xf1, 0x59, 0xb4, 0x95, 0x91, 0x8f, 0x29, 0x78, 0xa1, 0x87, 0xcf, - 0x66, 0xf7, 0x31, 0x0a, 0x76, 0x38, 0x62, 0xa0, 0x2f, 0xa0, 0x18, 0xf3, 0x54, 0xb4, 0x29, 0x38, - 0xb7, 0x4f, 0x08, 0x52, 0xa5, 0x88, 0x03, 0x43, 0x5b, 0x90, 0x15, 0xae, 0x52, 0xa6, 0x7b, 0xbc, - 0x1d, 0x98, 0x10, 0x46, 0x4d, 0x28, 0xd2, 0x2d, 0x06, 0x1e, 0xb4, 0x10, 0x26, 0x3f, 0x97, 0x17, - 0x35, 0x99, 0xec, 0x70, 0x46, 0xc3, 0x42, 0xb6, 0x03, 0xba, 0x81, 0x76, 0x00, 0x82, 0xd7, 0x25, - 0x92, 0xa5, 0xde, 0x54, 0x08, 0xec, 0x0b, 0xc6, 0x70, 0x49, 0x6a, 0x44, 0x1a, 0x3d, 0x83, 0xbc, - 0xf0, 0x0d, 0x2c, 0x3d, 0xbd, 0xde, 0xd4, 0xaf, 0x7a, 0x2a, 0xe1, 0x9f, 0x02, 0x04, 0x92, 0x02, - 0x58, 0x58, 0xf7, 0x30, 0xcf, 0x51, 0x9f, 0xcc, 0x99, 0x02, 0x1c, 0x0c, 0x4e, 0xf0, 0x48, 0x6f, - 0x9d, 0x90, 0xfa, 0x77, 0x8f, 0xc8, 0x37, 0x13, 0x55, 0x49, 0x65, 0x50, 0xa8, 0x07, 0x0a, 0x3d, - 0xb2, 0xa8, 0xe3, 0x53, 0xe8, 0xa9, 0xbd, 0xcf, 0x4f, 0xad, 0x44, 0x4e, 0xed, 0x5a, 0xe7, 0x47, - 0x75, 0xea, 0x59, 0xe8, 0x00, 0x7f, 0x1f, 0x4a, 0x43, 0xc7, 0x1d, 0xe9, 0xbe, 0x26, 0x8c, 0xa7, - 0x12, 0x56, 0xb3, 0x3f, 0x5c, 0xd4, 0x8a, 0x5b, 0x74, 0x54, 0x18, 0x4e, 0x71, 0x18, 0xfd, 0x44, - 0xdb, 0x22, 0x4e, 0x2c, 0x52, 0xb7, 0xfe, 0xf1, 0xbc, 0x3b, 0xbc, 0x1a, 0x24, 0x7a, 0x90, 0xa1, - 0x39, 0x8e, 0x57, 0x5d, 0xa2, 0xe7, 0xfe, 0x86, 0xf9, 0x92, 0xca, 0x51, 0xd0, 0x2f, 0xa0, 0x64, - 0x10, 0x0a, 0xc9, 0x8b, 0x59, 0xb5, 0x7c, 0x87, 0xe2, 0x6e, 0xcc, 0x89, 0x4b, 0x2a, 0xe9, 0xae, - 0x3d, 0x74, 0x44, 0x91, 0x24, 0xc0, 0x58, 0x85, 0xdd, 0x87, 0xdc, 0x50, 0x1f, 0x99, 0x96, 0x89, - 0xbd, 0xea, 0x5d, 0x8a, 0xfb, 0xc9, 0x8d, 0x56, 0x3e, 0xdd, 0x49, 0x15, 0x51, 0x46, 0x80, 0x04, - 0xc6, 0x4e, 0x09, 0xe7, 0xe4, 0x52, 0xdf, 0xb9, 0x6a, 0xec, 0xa2, 0x93, 0x1a, 0xeb, 0xaa, 0x52, - 0x63, 0xe7, 0x5f, 0x06, 0x7a, 0x00, 0x70, 0x6a, 0xe2, 0xd7, 0xda, 0xab, 0x09, 0x76, 0xcf, 0xab, - 0xd5, 0x88, 0xef, 0xcd, 0x13, 0xfa, 0x17, 0x84, 0x8c, 0x3e, 0x85, 0xbc, 0x81, 0xc7, 0xd8, 0x36, - 0xbc, 0xbe, 0x5d, 0x7d, 0x97, 0xe6, 0x3a, 0x8b, 0x97, 0x17, 0xb5, 0x7c, 0x5b, 0x10, 0xb9, 0x6f, - 0x0d, 0xb9, 0xd0, 0x57, 0x50, 0x60, 0x1f, 0xd8, 0xe8, 0xdb, 0xcd, 0xf3, 0xea, 0x32, 0xdd, 0xf4, - 0xa3, 0x39, 0x0f, 0x33, 0x2c, 0x39, 0x83, 0x2e, 0x5d, 0x3b, 0x82, 0xa6, 0xc6, 0xb0, 0xd1, 0x2f, - 0xa0, 0x20, 0xb4, 0x7b, 0xc7, 0x39, 0xf2, 0xaa, 0xef, 0xdd, 0xd8, 0x42, 0x9b, 0x9e, 0xeb, 0x59, - 0x28, 0x2a, 0x7c, 0x57, 0x14, 0x0d, 0xfd, 0x1c, 0x8a, 0x41, 0x23, 0xdd, 0x19, 0xfb, 0x5e, 0xf5, - 0x1e, 0x35, 0xce, 0xc7, 0xf3, 0xaa, 0x2e, 0x97, 0xed, 0x8f, 0x69, 0x77, 0x31, 0xf2, 0x85, 0xee, - 0x43, 0xde, 0x70, 0x9d, 0x31, 0x8b, 0x21, 0x3f, 0x5a, 0x95, 0xd6, 0x92, 0x41, 0xdd, 0xe3, 0x3a, - 0x63, 0x1a, 0x1c, 0x34, 0x28, 0xb9, 0x78, 0x6c, 0xe9, 0x03, 0x3c, 0x22, 0xd1, 0xcd, 0x19, 0x56, - 0x57, 0xe8, 0xec, 0x9b, 0x73, 0x1f, 0x64, 0x20, 0x2c, 0x14, 0x33, 0x82, 0xd7, 0x1f, 0xa2, 0xe7, - 0x00, 0xfa, 0xc4, 0x30, 0x7d, 0x6d, 0xe4, 0x18, 0xb8, 0x5a, 0xbb, 0xf1, 0x69, 0x69, 0x1a, 0xbc, - 0x41, 0x04, 0x9f, 0x39, 0x06, 0x0e, 0xfa, 0xd1, 0x82, 0x80, 0x3e, 0x05, 0x99, 0x6e, 0xed, 0x2b, - 0xe7, 0x88, 0xe8, 0xe6, 0x2a, 0xdd, 0x5c, 0x85, 0xdf, 0x65, 0xbe, 0xed, 0x3a, 0xe3, 0x1d, 0xe7, - 0x88, 0x6a, 0x0c, 0xff, 0x69, 0x20, 0x0f, 0x0a, 0xc7, 0x03, 0x2d, 0x74, 0xa7, 0xf7, 0xe9, 0x2d, - 0xfe, 0xde, 0x9c, 0x6b, 0x79, 0xda, 0x9a, 0xe1, 0x60, 0x17, 0x45, 0x5c, 0x78, 0xda, 0x12, 0x34, - 0x4f, 0x95, 0x8f, 0x07, 0xc1, 0x07, 0xfa, 0x10, 0x0a, 0xac, 0xb8, 0xe6, 0x06, 0x50, 0x8f, 0x18, - 0x80, 0xcc, 0x46, 0x98, 0x09, 0xf4, 0x80, 0x57, 0xe1, 0x9a, 0xee, 0x69, 0xce, 0x90, 0xdd, 0xd9, - 0x83, 0xf9, 0xe3, 0x7e, 0x89, 0x49, 0x37, 0xbc, 0xfe, 0x90, 0x5e, 0xec, 0x00, 0x0a, 0xce, 0xc4, - 0x3f, 0x72, 0x26, 0xb6, 0xa1, 0x0d, 0x5f, 0x7a, 0xd5, 0xf7, 0xe9, 0x6e, 0x6f, 0x55, 0x9a, 0x05, - 0xbb, 0xeb, 0x73, 0xa0, 0xad, 0x5d, 0x4f, 0x95, 0x05, 0xea, 0xd6, 0x4b, 0x0f, 0xfd, 0x09, 0xc8, - 0xa6, 0x1d, 0xce, 0xf1, 0xf0, 0xf6, 0x73, 0x20, 0x91, 0x1c, 0x77, 0xed, 0x60, 0x0a, 0xe0, 0x98, - 0x64, 0x86, 0x8f, 0xa0, 0xe4, 0x0c, 0x87, 0x96, 0x69, 0x63, 0xcd, 0xc5, 0xba, 0xe7, 0xd8, 0xd5, - 0x0f, 0x22, 0x27, 0x58, 0xe4, 0x63, 0x2a, 0x1d, 0x42, 0x75, 0xc8, 0xfb, 0x78, 0x34, 0x76, 0x5c, - 0xdd, 0x3d, 0xaf, 0x7e, 0x18, 0x6d, 0xe3, 0x07, 0x64, 0x74, 0x04, 0xcb, 0x13, 0x1b, 0x9f, 0x8d, - 0x1d, 0x0f, 0x1b, 0x1a, 0xcf, 0xe9, 0x3c, 0x1a, 0xdf, 0x88, 0x1e, 0xad, 0x51, 0x1f, 0xf7, 0x90, - 0x2f, 0xea, 0x9d, 0xe7, 0x82, 0x93, 0xe5, 0x78, 0x2c, 0x0e, 0x06, 0x99, 0xde, 0x3b, 0x93, 0x99, - 0xc3, 0xc6, 0xf2, 0xb7, 0x12, 0x54, 0xae, 0xc4, 0x4c, 0xf4, 0xc7, 0x90, 0xb5, 0x1d, 0x23, 0xf2, - 0x68, 0xd2, 0xe1, 0xd3, 0x64, 0x7a, 0x8e, 0xc1, 0xde, 0x4c, 0x1e, 0xcf, 0xf5, 0x4e, 0x48, 0x7f, - 0x8d, 0x8f, 0xd6, 0x99, 0x98, 0x9a, 0x21, 0xa8, 0x5d, 0x03, 0x7d, 0x02, 0x65, 0x7c, 0x36, 0x36, - 0xdd, 0x48, 0xde, 0x98, 0x88, 0xd8, 0x7c, 0x29, 0x1c, 0x24, 0x0a, 0xc2, 0xdb, 0xda, 0xff, 0x90, - 0x80, 0xf2, 0x54, 0xc4, 0x22, 0x89, 0x32, 0x7d, 0xa2, 0x8b, 0x25, 0xca, 0x84, 0x72, 0xc3, 0x1b, - 0x48, 0xf4, 0xd5, 0x3c, 0xf9, 0xb6, 0xaf, 0xe6, 0xf1, 0x76, 0x71, 0xfa, 0x16, 0xed, 0xe2, 0x9f, - 0xc2, 0x5d, 0xd3, 0xd3, 0x6c, 0xc7, 0x16, 0xed, 0x83, 0xa0, 0x4e, 0x8a, 0xbe, 0x7d, 0x2e, 0x9a, - 0x5e, 0xcf, 0xb1, 0x59, 0xe3, 0x20, 0xd8, 0x75, 0xf8, 0x4c, 0x9a, 0xbd, 0xfa, 0x4c, 0x1a, 0xb4, - 0x07, 0x52, 0x4a, 0x7a, 0xf9, 0xef, 0x24, 0xc8, 0x89, 0x68, 0x1c, 0xaf, 0x0c, 0xa4, 0x39, 0x2b, - 0x83, 0xeb, 0xcf, 0x71, 0x0b, 0x94, 0x2b, 0x4a, 0xc9, 0x0a, 0x93, 0x7b, 0x22, 0x9b, 0x9a, 0xa9, - 0x8b, 0xa5, 0x71, 0x4c, 0x05, 0xf9, 0xed, 0x7e, 0x23, 0x41, 0x3e, 0xfa, 0xaf, 0xa5, 0x44, 0xb0, - 0xc6, 0xd9, 0x65, 0xce, 0x1b, 0x3e, 0xd3, 0xc5, 0xef, 0x2b, 0x39, 0xff, 0x7d, 0xf1, 0x65, 0xfe, - 0x29, 0xc8, 0x91, 0x20, 0x39, 0x5d, 0x45, 0x4b, 0x6f, 0x50, 0x45, 0xbf, 0x0f, 0x19, 0x1e, 0x19, - 0x98, 0x09, 0x14, 0xb9, 0x74, 0x9a, 0x45, 0x85, 0xf4, 0x57, 0x24, 0x22, 0xf0, 0xd9, 0xff, 0x2d, - 0x09, 0x85, 0x68, 0x10, 0x25, 0x6e, 0xc4, 0xb4, 0x07, 0x2e, 0x8d, 0x60, 0x74, 0xf6, 0x64, 0xf0, - 0x1a, 0x28, 0xc8, 0x24, 0xb4, 0x8e, 0x4c, 0x5b, 0xa3, 0x2f, 0x50, 0x31, 0x33, 0xcb, 0x8d, 0x4c, - 0xfb, 0x4b, 0x42, 0xa5, 0x2c, 0xfa, 0x19, 0x67, 0x49, 0xc6, 0x58, 0xf4, 0x33, 0xc6, 0xb2, 0x4c, - 0xb3, 0x55, 0xd7, 0xa7, 0x25, 0x65, 0x32, 0x92, 0x7f, 0xba, 0x3e, 0x5a, 0x81, 0xec, 0xa9, 0xe9, - 0xfa, 0x13, 0xdd, 0xa2, 0xd5, 0xa3, 0x50, 0x48, 0x41, 0x44, 0x36, 0x94, 0xc2, 0xb4, 0xe1, 0xb5, - 0x8d, 0x5d, 0xaa, 0xe2, 0xf2, 0x66, 0xe3, 0x0d, 0xf2, 0x86, 0xf0, 0x83, 0x00, 0x09, 0xe7, 0xea, - 0x45, 0x89, 0xcb, 0x7f, 0x23, 0x41, 0x31, 0xc6, 0x86, 0xba, 0x50, 0xa6, 0x13, 0x47, 0x0a, 0x42, - 0x76, 0x57, 0xf7, 0x83, 0xff, 0x1f, 0x91, 0xe1, 0x99, 0x15, 0x61, 0xd1, 0x89, 0x0c, 0x19, 0xe8, - 0x73, 0x28, 0x31, 0xa8, 0xe0, 0x5d, 0x39, 0xae, 0x7e, 0x05, 0x8a, 0x14, 0x7f, 0x5c, 0x2e, 0x38, - 0x21, 0xcd, 0x88, 0x3e, 0x99, 0x2d, 0xdb, 0x20, 0x47, 0xf2, 0x92, 0x39, 0xf4, 0xfe, 0x77, 0x21, - 0x15, 0xf8, 0xcb, 0x39, 0xe3, 0x2d, 0x15, 0xe0, 0xf3, 0x7d, 0x2d, 0xc1, 0xd2, 0xac, 0xfc, 0x20, - 0x66, 0x4f, 0x4c, 0x91, 0xe6, 0xb2, 0xa7, 0x07, 0xd1, 0xbc, 0x8d, 0x29, 0x97, 0x78, 0xc6, 0x09, - 0x33, 0xb7, 0x0f, 0x02, 0x15, 0x67, 0xba, 0x55, 0x8e, 0xa9, 0x38, 0xa9, 0xcf, 0x22, 0x4a, 0x5e, - 0x7f, 0x2c, 0xda, 0x32, 0x00, 0x99, 0xfd, 0xe7, 0xcd, 0xbd, 0x6e, 0x6b, 0x66, 0x4b, 0x05, 0xc9, - 0x90, 0xed, 0x6f, 0x6d, 0xed, 0x75, 0x7b, 0x1d, 0x25, 0x59, 0x5f, 0x83, 0x7c, 0x90, 0x82, 0xa1, - 0x02, 0xe4, 0xda, 0xdd, 0x83, 0x46, 0x73, 0xaf, 0xd3, 0x56, 0x16, 0x50, 0x11, 0xf2, 0x6a, 0xa7, - 0xd1, 0xa6, 0x8d, 0x1b, 0x45, 0xfa, 0x2c, 0xf7, 0x17, 0x5f, 0xd7, 0x24, 0xee, 0x22, 0x33, 0x4a, - 0x76, 0x27, 0x95, 0x43, 0xca, 0x62, 0xfd, 0x6f, 0x25, 0x40, 0x6d, 0xdd, 0xd7, 0x89, 0xfe, 0xdd, - 0xa2, 0x11, 0x93, 0xb8, 0xe1, 0xa6, 0xe2, 0xc5, 0x75, 0xf2, 0x6d, 0x8a, 0xeb, 0x70, 0xd1, 0xf5, - 0x6f, 0x24, 0x80, 0xc8, 0x02, 0x7f, 0x16, 0xfd, 0x7b, 0xe7, 0xf5, 0xbd, 0x84, 0x29, 0x8b, 0xda, - 0x5e, 0x10, 0x7f, 0xfe, 0x7c, 0x0a, 0x39, 0x83, 0x6f, 0x9b, 0xab, 0xd4, 0xb5, 0x45, 0xfb, 0x95, - 0xd3, 0xd9, 0x26, 0xd9, 0x39, 0xa7, 0xf2, 0x06, 0x57, 0x16, 0xd2, 0x13, 0xdb, 0x74, 0xec, 0x9f, - 0xa8, 0xd1, 0xa7, 0x05, 0x11, 0x3d, 0xc9, 0x55, 0xd0, 0xdf, 0xba, 0x8f, 0x0d, 0xd6, 0x6a, 0x7b, - 0x6e, 0x9f, 0x06, 0x04, 0x09, 0x95, 0x00, 0xf8, 0xb8, 0x69, 0x1f, 0x2b, 0x09, 0x7a, 0x91, 0xae, - 0x33, 0x1e, 0x93, 0xaf, 0x64, 0xf3, 0xc7, 0xdf, 0xfd, 0xd7, 0xca, 0xc2, 0x77, 0x97, 0x2b, 0xd2, - 0x2f, 0x2f, 0x57, 0xa4, 0x5f, 0x5d, 0xae, 0x48, 0xff, 0x79, 0xb9, 0x22, 0xfd, 0xd5, 0xf7, 0x2b, - 0x0b, 0xbf, 0xfc, 0x7e, 0x65, 0xe1, 0x57, 0xdf, 0xaf, 0x2c, 0xfc, 0x61, 0x96, 0x2f, 0xf6, 0xff, - 0x02, 0x00, 0x00, 0xff, 0xff, 0x21, 0x1c, 0x80, 0x1e, 0x90, 0x2b, 0x00, 0x00, + proto.RegisterFile("sql/sqlbase/structured.proto", fileDescriptor_structured_f6e184c4d2e110d9) +} + +var fileDescriptor_structured_f6e184c4d2e110d9 = []byte{ + // 3782 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x3a, 0x49, 0x6f, 0x1b, 0x59, + 0x7a, 0x2a, 0xee, 0xfc, 0x8a, 0x4b, 0xf1, 0x49, 0xb6, 0xd9, 0x6a, 0x8f, 0x28, 0xd3, 0xe3, 0x6e, + 0xcd, 0x74, 0xb7, 0xe4, 0x96, 0xb3, 0x78, 0x3a, 0xc1, 0xa0, 0xb9, 0xc9, 0xa2, 0x24, 0x93, 0xea, + 0x92, 0xdc, 0x9e, 0x04, 0x93, 0x54, 0x4a, 0xac, 0x47, 0xa9, 0xda, 0xc5, 0x2a, 0xba, 0xaa, 0x28, + 0x4b, 0x40, 0x4e, 0xc9, 0x25, 0xa7, 0x20, 0x7f, 0x20, 0x40, 0x23, 0x68, 0x24, 0x73, 0xc8, 0x25, + 0x97, 0xe4, 0x16, 0x20, 0x97, 0xa0, 0x6f, 0x19, 0x20, 0x97, 0x41, 0x0e, 0x42, 0xa2, 0xbe, 0xe4, + 0x90, 0x73, 0x02, 0xf4, 0x29, 0x78, 0x5b, 0x2d, 0x14, 0xa5, 0x50, 0xf6, 0xe4, 0xc6, 0xfa, 0xb6, + 0xf7, 0xde, 0xf7, 0xbe, 0xfd, 0x11, 0xee, 0x7b, 0xaf, 0xad, 0x0d, 0xef, 0xb5, 0x75, 0xa4, 0x7b, + 0x78, 0xc3, 0xf3, 0xdd, 0xc9, 0xc0, 0x9f, 0xb8, 0xd8, 0x58, 0x1f, 0xbb, 0x8e, 0xef, 0xa0, 0x3b, + 0x03, 0x67, 0xf0, 0xca, 0x75, 0xf4, 0xc1, 0xc9, 0xba, 0xf7, 0xda, 0x5a, 0xe7, 0x74, 0xcb, 0xd5, + 0x89, 0x6f, 0x5a, 0x1b, 0x27, 0xd6, 0x60, 0xc3, 0x37, 0x47, 0xd8, 0xf3, 0xf5, 0xd1, 0x98, 0x31, + 0x2c, 0xbf, 0x1f, 0x15, 0x37, 0x76, 0xcd, 0x53, 0xd3, 0xc2, 0xc7, 0x98, 0x23, 0x97, 0x8e, 0x9d, + 0x63, 0x87, 0xfe, 0xdc, 0x20, 0xbf, 0x18, 0xb4, 0xfe, 0x27, 0x69, 0x58, 0xdc, 0x72, 0x5c, 0x6c, + 0x1e, 0xdb, 0xbb, 0xf8, 0x5c, 0xc5, 0x43, 0xec, 0x62, 0x7b, 0x80, 0xd1, 0x2a, 0xa4, 0x7d, 0xfd, + 0xc8, 0xc2, 0x55, 0x69, 0x55, 0x5a, 0x2b, 0x36, 0xe1, 0xdb, 0x8b, 0xda, 0xc2, 0xf7, 0x17, 0xb5, + 0x44, 0xb7, 0xad, 0x32, 0x04, 0x7a, 0x04, 0x69, 0xd3, 0x36, 0xf0, 0x59, 0x35, 0x41, 0x29, 0xca, + 0x9c, 0x22, 0xdb, 0x25, 0x40, 0x42, 0x46, 0xb1, 0xa8, 0x0a, 0x29, 0x5b, 0x1f, 0xe1, 0x6a, 0x72, + 0x55, 0x5a, 0xcb, 0x37, 0x53, 0x84, 0x4a, 0xa5, 0x10, 0xb4, 0x0b, 0xb9, 0x53, 0xdd, 0x32, 0x0d, + 0xd3, 0x3f, 0xaf, 0xa6, 0x56, 0xa5, 0xb5, 0xd2, 0xe6, 0x8f, 0xd6, 0x67, 0x9e, 0x78, 0xbd, 0xe5, + 0xd8, 0x9e, 0xef, 0xea, 0xa6, 0xed, 0x7f, 0xc9, 0x19, 0xb8, 0xa0, 0x40, 0x00, 0x7a, 0x0c, 0x15, + 0xef, 0x44, 0x77, 0xb1, 0xa1, 0x8d, 0x5d, 0x3c, 0x34, 0xcf, 0x34, 0x0b, 0xdb, 0xd5, 0xf4, 0xaa, + 0xb4, 0x96, 0xe6, 0xa4, 0x65, 0x86, 0xde, 0xa7, 0xd8, 0x3d, 0x6c, 0xa3, 0x43, 0xc8, 0x3b, 0xb6, + 0x66, 0x60, 0x0b, 0xfb, 0xb8, 0x9a, 0xa1, 0xeb, 0x7f, 0x7a, 0xcd, 0xfa, 0x33, 0x14, 0xb4, 0xde, + 0x18, 0xf8, 0xa6, 0x63, 0x8b, 0x7d, 0x38, 0x76, 0x9b, 0x0a, 0xe2, 0x52, 0x27, 0x63, 0x43, 0xf7, + 0x71, 0x35, 0xfb, 0xce, 0x52, 0x5f, 0x50, 0x41, 0x68, 0x0f, 0xd2, 0x23, 0xdd, 0x1f, 0x9c, 0x54, + 0x73, 0x54, 0xe2, 0xe3, 0x5b, 0x48, 0x7c, 0x4e, 0xf8, 0xb8, 0x40, 0x26, 0xa4, 0xfe, 0x12, 0x32, + 0x6c, 0x1d, 0x54, 0x84, 0x7c, 0xaf, 0xaf, 0x35, 0x5a, 0x87, 0xdd, 0x7e, 0x4f, 0x59, 0x40, 0x05, + 0xc8, 0xa9, 0x9d, 0x83, 0x43, 0xb5, 0xdb, 0x3a, 0x54, 0x24, 0xf2, 0x75, 0xd0, 0x39, 0xd4, 0x7a, + 0x2f, 0xf6, 0xf6, 0x94, 0x04, 0x2a, 0x83, 0x4c, 0xbe, 0xda, 0x9d, 0xad, 0xc6, 0x8b, 0xbd, 0x43, + 0x25, 0x89, 0x64, 0xc8, 0xb6, 0x1a, 0x07, 0xad, 0x46, 0xbb, 0xa3, 0xa4, 0x96, 0x53, 0xbf, 0xf8, + 0x66, 0x65, 0xa1, 0xfe, 0x18, 0xd2, 0x74, 0x39, 0x04, 0x90, 0x39, 0xe8, 0x3e, 0xdf, 0xdf, 0xeb, + 0x28, 0x0b, 0x28, 0x07, 0xa9, 0x2d, 0x22, 0x42, 0x22, 0x1c, 0xfb, 0x0d, 0xf5, 0xb0, 0xdb, 0xd8, + 0x53, 0x12, 0x8c, 0xe3, 0xb3, 0xd4, 0x7f, 0x7e, 0x5d, 0x93, 0xea, 0xff, 0x9a, 0x81, 0xa5, 0x70, + 0xef, 0xe1, 0x6d, 0xa3, 0x16, 0x94, 0x1d, 0xd7, 0x3c, 0x36, 0x6d, 0x8d, 0xda, 0x9c, 0x66, 0x1a, + 0xdc, 0x1e, 0xdf, 0x27, 0xe7, 0xb9, 0xbc, 0xa8, 0x15, 0xfb, 0x14, 0x7d, 0x48, 0xb0, 0xdd, 0x36, + 0x37, 0xd0, 0xa2, 0x13, 0x01, 0x1a, 0x68, 0x17, 0x2a, 0x5c, 0xc8, 0xc0, 0xb1, 0x26, 0x23, 0x5b, + 0x33, 0x0d, 0xaf, 0x9a, 0x58, 0x4d, 0xae, 0x15, 0x9b, 0xb5, 0xcb, 0x8b, 0x5a, 0x99, 0x89, 0x68, + 0x51, 0x5c, 0xb7, 0xed, 0x7d, 0x7f, 0x51, 0xcb, 0x89, 0x0f, 0x95, 0x2f, 0xcf, 0xbf, 0x0d, 0x0f, + 0xbd, 0x84, 0x3b, 0xae, 0xd0, 0xad, 0x11, 0x15, 0x98, 0xa4, 0x02, 0x1f, 0x5e, 0x5e, 0xd4, 0x16, + 0x03, 0xe5, 0x1b, 0xb3, 0x85, 0x2e, 0xba, 0xd3, 0x04, 0x86, 0x87, 0xfa, 0x10, 0x01, 0x87, 0xc7, + 0x4d, 0xd1, 0xe3, 0xd6, 0xf8, 0x71, 0x2b, 0xa1, 0xe8, 0xf8, 0x91, 0x2b, 0xee, 0x14, 0xc2, 0x08, + 0x1c, 0x2f, 0x7d, 0xa3, 0xe3, 0x65, 0xde, 0xd5, 0xf1, 0x62, 0x6e, 0x94, 0xfd, 0x7f, 0x71, 0xa3, + 0xdc, 0xaf, 0xdd, 0x8d, 0xf2, 0xbf, 0x06, 0x37, 0x42, 0x0d, 0x58, 0xb4, 0xf0, 0xb1, 0x3e, 0x38, + 0xd7, 0xb8, 0x79, 0xb1, 0x70, 0x08, 0xf4, 0xc6, 0x2a, 0x53, 0xe1, 0xb0, 0x2a, 0xa9, 0x15, 0x46, + 0xcd, 0xcc, 0x8d, 0x82, 0x51, 0x17, 0xee, 0x71, 0x11, 0x91, 0xbb, 0x67, 0x62, 0xe4, 0xeb, 0xc4, + 0xdc, 0x61, 0x1c, 0xa1, 0x25, 0x50, 0x14, 0xf3, 0xa4, 0x9d, 0x54, 0xae, 0xa0, 0x14, 0x77, 0x52, + 0xb9, 0xa2, 0x52, 0xaa, 0xff, 0x57, 0x12, 0x14, 0x66, 0x5f, 0x6d, 0xec, 0x0d, 0x5c, 0x73, 0xec, + 0x3b, 0x6e, 0x60, 0x15, 0xd2, 0x15, 0xab, 0xf8, 0x00, 0x12, 0xa6, 0xc1, 0x83, 0xf9, 0x5d, 0x6e, + 0x6f, 0x09, 0x6a, 0x60, 0xa1, 0xe5, 0x26, 0x4c, 0x03, 0xed, 0x41, 0xca, 0x3f, 0x1f, 0xb3, 0x80, + 0x5e, 0x68, 0x3e, 0x25, 0x94, 0xff, 0x76, 0x51, 0x7b, 0x7c, 0x6c, 0xfa, 0x27, 0x93, 0xa3, 0xf5, + 0x81, 0x33, 0xda, 0x08, 0xb4, 0x6a, 0x1c, 0x85, 0xbf, 0x37, 0xc6, 0xaf, 0x8e, 0x49, 0x6e, 0xda, + 0x20, 0xcc, 0xde, 0xfa, 0xa1, 0x4a, 0xa5, 0xa0, 0x55, 0xc8, 0xd9, 0x13, 0xcb, 0xa2, 0xa9, 0x86, + 0xd8, 0x7a, 0x4e, 0x5c, 0x9a, 0x80, 0xa2, 0x07, 0x50, 0x30, 0xf0, 0x50, 0x9f, 0x58, 0xbe, 0x86, + 0xcf, 0xc6, 0x2e, 0xb3, 0x67, 0x55, 0xe6, 0xb0, 0xce, 0xd9, 0xd8, 0x45, 0xf7, 0x21, 0x73, 0x62, + 0x1a, 0x06, 0xb6, 0xa9, 0x39, 0x0b, 0x11, 0x1c, 0x86, 0x36, 0xa1, 0x32, 0xf1, 0xb0, 0xa7, 0x79, + 0xf8, 0xf5, 0x84, 0x28, 0x8c, 0xba, 0x2b, 0x50, 0x77, 0xcd, 0x70, 0xf7, 0x29, 0x13, 0x82, 0x03, + 0x8e, 0x27, 0xde, 0xb8, 0x09, 0x15, 0xe7, 0x8d, 0x3d, 0xc5, 0x23, 0xc7, 0x79, 0x08, 0x41, 0x94, + 0xe7, 0x01, 0x14, 0x06, 0xce, 0x68, 0x3c, 0xf1, 0x31, 0xdb, 0x68, 0x81, 0x6d, 0x94, 0xc3, 0xe8, + 0x46, 0x9b, 0x00, 0x96, 0x73, 0x6c, 0x0e, 0x74, 0x8b, 0xf8, 0x76, 0x91, 0xea, 0xfa, 0x21, 0xd7, + 0x75, 0x79, 0x8f, 0x61, 0x84, 0xb2, 0x63, 0x8a, 0xcf, 0x73, 0xb6, 0xae, 0x11, 0x5c, 0x74, 0x4e, + 0xc9, 0xef, 0xa4, 0x72, 0x79, 0x05, 0x76, 0x52, 0xb9, 0xac, 0x92, 0xab, 0xff, 0x79, 0x02, 0xee, + 0x32, 0xfa, 0x2d, 0x7d, 0x64, 0x5a, 0xe7, 0xef, 0x7a, 0xe9, 0x4c, 0x0a, 0xbf, 0x74, 0x7a, 0x36, + 0x1a, 0xeb, 0x08, 0x1b, 0x8b, 0x76, 0xf4, 0x6c, 0x04, 0xd6, 0x23, 0x20, 0xf4, 0x14, 0x20, 0x12, + 0x0e, 0x53, 0x54, 0x57, 0xef, 0x5d, 0x5e, 0xd4, 0xf2, 0xb3, 0x83, 0x60, 0x7e, 0x10, 0x09, 0x7d, + 0x15, 0x71, 0xc3, 0x81, 0x04, 0x7a, 0xcd, 0x11, 0xe5, 0xb4, 0x19, 0xc1, 0x4c, 0xe5, 0x94, 0x8d, + 0x18, 0x92, 0xab, 0xa8, 0xfe, 0x0f, 0x09, 0x58, 0xea, 0xda, 0x3e, 0x76, 0x2d, 0xac, 0x9f, 0xe2, + 0x88, 0x3a, 0x7e, 0x06, 0x79, 0xdd, 0x1e, 0x60, 0xcf, 0x77, 0x5c, 0xaf, 0x2a, 0xad, 0x26, 0xd7, + 0xe4, 0xcd, 0xdf, 0xb8, 0x26, 0x14, 0xcc, 0xe2, 0x5f, 0x6f, 0x70, 0x66, 0xae, 0xc9, 0x50, 0xd8, + 0xf2, 0x3f, 0x4a, 0x90, 0x13, 0x58, 0xf4, 0x18, 0x72, 0x53, 0x59, 0xeb, 0x0e, 0x3f, 0x4d, 0x36, + 0x1e, 0xbc, 0xb3, 0x3e, 0x0f, 0xd9, 0xbf, 0x09, 0x39, 0xea, 0xfc, 0x5a, 0x70, 0x27, 0xcb, 0x82, + 0x83, 0xfb, 0x7f, 0xb4, 0xc0, 0xca, 0x52, 0xda, 0xae, 0x81, 0x5a, 0xb3, 0x6a, 0x9f, 0x24, 0xe5, + 0xbf, 0x27, 0xf4, 0x77, 0x10, 0xaf, 0x7e, 0xae, 0x94, 0x43, 0x4c, 0x67, 0x5c, 0x73, 0x7f, 0x2f, + 0x41, 0x85, 0x30, 0x18, 0xd8, 0x88, 0xa8, 0xed, 0x21, 0x80, 0xe9, 0x69, 0x1e, 0x83, 0xd3, 0x13, + 0x09, 0x4f, 0xcb, 0x9b, 0x1e, 0x27, 0x0f, 0x4c, 0x2d, 0x71, 0xc5, 0xd4, 0x7e, 0x02, 0x45, 0xca, + 0xab, 0x1d, 0x4d, 0x06, 0xaf, 0xb0, 0xef, 0xd1, 0x1d, 0xa6, 0x9b, 0x4b, 0x7c, 0x87, 0x05, 0x2a, + 0xa1, 0xc9, 0x70, 0x6a, 0xc1, 0x8b, 0x7c, 0x5d, 0xb1, 0xbe, 0xd4, 0x15, 0xeb, 0xe3, 0x1b, 0xff, + 0x9f, 0x24, 0xdc, 0xdd, 0xd7, 0x5d, 0xdf, 0x24, 0xe1, 0xdf, 0xb4, 0x8f, 0x23, 0xbb, 0x7f, 0x04, + 0xb2, 0x3d, 0x19, 0x71, 0x03, 0xf3, 0xf8, 0x85, 0xb0, 0xfd, 0x81, 0x3d, 0x19, 0x31, 0xdb, 0xf1, + 0x48, 0x74, 0xb3, 0x4c, 0xcf, 0xa7, 0xf5, 0x81, 0xbc, 0xb9, 0x79, 0x8d, 0x59, 0xcc, 0x5e, 0x63, + 0x7d, 0xcf, 0xf4, 0x7c, 0x71, 0x66, 0x22, 0x05, 0xf5, 0x21, 0xed, 0xea, 0xf6, 0x31, 0xa6, 0xfe, + 0x22, 0x6f, 0x3e, 0xb9, 0x9d, 0x38, 0x95, 0xb0, 0x8a, 0x9c, 0x43, 0xe5, 0x2c, 0xff, 0xa5, 0x04, + 0x29, 0xb2, 0xca, 0x0d, 0x2e, 0x7d, 0x17, 0x32, 0xa7, 0xba, 0x35, 0xc1, 0xac, 0xc6, 0x29, 0xa8, + 0xfc, 0x0b, 0xfd, 0x01, 0x94, 0xbd, 0xc9, 0xd1, 0x38, 0xb2, 0x14, 0xbd, 0x01, 0x79, 0xf3, 0x93, + 0x5b, 0xed, 0x2a, 0x28, 0xa7, 0xe3, 0xb2, 0xd8, 0x05, 0x2c, 0xbf, 0x86, 0x34, 0xdd, 0xf5, 0x0d, + 0xfb, 0x7b, 0x00, 0x05, 0xdf, 0xd1, 0xf0, 0xd9, 0xc0, 0x9a, 0x78, 0xe6, 0x29, 0xb3, 0x94, 0x82, + 0x2a, 0xfb, 0x4e, 0x47, 0x80, 0xd0, 0x23, 0x28, 0x0d, 0x5d, 0x67, 0xa4, 0x99, 0xb6, 0x20, 0xa2, + 0xc9, 0x46, 0x2d, 0x12, 0x68, 0x57, 0x00, 0x63, 0x26, 0xfb, 0xb7, 0x32, 0x94, 0xa9, 0x63, 0xcc, + 0x15, 0xf6, 0x1e, 0x45, 0xc2, 0xde, 0x9d, 0x58, 0xd8, 0x0b, 0xbc, 0x8b, 0x44, 0xbd, 0xfb, 0x90, + 0x99, 0xd8, 0xe6, 0xeb, 0x09, 0x5b, 0x3f, 0xc8, 0x2b, 0x0c, 0x36, 0x87, 0x55, 0xa2, 0x8f, 0x01, + 0x91, 0x50, 0x80, 0xb5, 0x18, 0x61, 0x9a, 0x12, 0x2a, 0x14, 0xd3, 0xba, 0x36, 0x82, 0x66, 0x6e, + 0x11, 0x41, 0xb7, 0x41, 0xc1, 0x67, 0xbe, 0xab, 0x47, 0x0b, 0xd2, 0x2c, 0xe5, 0x5f, 0xb9, 0xbc, + 0xa8, 0x95, 0x3a, 0x04, 0x37, 0x5b, 0x48, 0x09, 0x47, 0x70, 0x06, 0xb1, 0x92, 0x0a, 0x97, 0x61, + 0x98, 0x2e, 0xa6, 0x65, 0x94, 0x57, 0xcd, 0xad, 0x26, 0x6f, 0x28, 0x97, 0xa6, 0xd4, 0xbe, 0xde, + 0x16, 0x8c, 0xaa, 0xc2, 0x44, 0x05, 0x00, 0x0f, 0x1d, 0x80, 0x3c, 0x64, 0xd5, 0x95, 0xf6, 0x0a, + 0x9f, 0xd3, 0x3a, 0x4c, 0xde, 0xfc, 0xf1, 0xfc, 0x75, 0x58, 0x33, 0x43, 0xae, 0xa0, 0x2a, 0xa9, + 0x30, 0x0c, 0x90, 0xe8, 0x25, 0x14, 0x23, 0xe5, 0xd3, 0xd1, 0x39, 0x4d, 0xee, 0x6f, 0x27, 0xb6, + 0x10, 0x0a, 0x6a, 0x9e, 0xa3, 0x2f, 0x00, 0xcc, 0x20, 0x01, 0xd0, 0x8a, 0x4c, 0xde, 0xfc, 0xe8, + 0x16, 0x99, 0x42, 0xc4, 0x97, 0x50, 0x08, 0x7a, 0x09, 0xa5, 0xf0, 0x8b, 0x6e, 0xb6, 0x70, 0xeb, + 0xcd, 0x32, 0xa9, 0xc5, 0x88, 0x9c, 0x26, 0xa9, 0xc3, 0x97, 0x48, 0xa5, 0xe1, 0x78, 0xa6, 0x8f, + 0xa3, 0x66, 0x50, 0xa4, 0x66, 0x50, 0xbf, 0xbc, 0xa8, 0xa1, 0x96, 0xc0, 0xcf, 0x36, 0x05, 0x34, + 0x98, 0xc2, 0x33, 0xc3, 0x8a, 0x19, 0x30, 0x91, 0x58, 0x0a, 0x0d, 0xeb, 0x20, 0x34, 0xe1, 0x2b, + 0x86, 0x15, 0x31, 0x6f, 0xd6, 0x38, 0x15, 0x62, 0xb1, 0xa7, 0xfc, 0xf6, 0xb1, 0x27, 0x26, 0x08, + 0x75, 0x78, 0x3d, 0xaa, 0xd0, 0x9a, 0xfe, 0xa3, 0x39, 0x8d, 0xf4, 0xf0, 0x7c, 0x2c, 0x14, 0xc9, + 0x0a, 0xd1, 0x27, 0x80, 0x06, 0x2e, 0xd6, 0x7d, 0x6c, 0x90, 0xea, 0xcd, 0x32, 0x07, 0xa6, 0x6f, + 0x9d, 0x57, 0x2b, 0x11, 0xbf, 0xaf, 0x70, 0x7c, 0x27, 0x40, 0xa3, 0xa7, 0x90, 0x3d, 0xc5, 0xae, + 0x67, 0x3a, 0x76, 0x15, 0xd1, 0x60, 0xb2, 0xc2, 0xeb, 0xf5, 0xbb, 0x53, 0xeb, 0x7d, 0xc9, 0xa8, + 0x54, 0x41, 0x8e, 0xb6, 0xa1, 0x88, 0xed, 0x81, 0x63, 0x98, 0xf6, 0xb1, 0x46, 0xb7, 0xbf, 0x18, + 0xd6, 0x3b, 0xdf, 0x5f, 0xd4, 0xde, 0x9f, 0xe2, 0xef, 0x70, 0x5a, 0xb2, 0x6d, 0xb5, 0x80, 0x23, + 0x5f, 0x68, 0x1b, 0xb2, 0x22, 0x27, 0x2f, 0x51, 0x9d, 0xae, 0x5d, 0xa3, 0x82, 0x2b, 0x19, 0x9d, + 0x9f, 0x4b, 0xb0, 0x93, 0x5a, 0xdc, 0x30, 0x3d, 0x52, 0x8b, 0x18, 0xd5, 0x3b, 0xd1, 0x5a, 0x5c, + 0x40, 0xeb, 0x2b, 0x90, 0x0f, 0x9c, 0x19, 0x65, 0x21, 0xd9, 0x38, 0x68, 0xb1, 0x0e, 0xbf, 0xdd, + 0x39, 0x68, 0x29, 0x52, 0xfd, 0x01, 0xa4, 0xe8, 0x9e, 0x64, 0xc8, 0x6e, 0xf5, 0xd5, 0x97, 0x0d, + 0xb5, 0xcd, 0xa6, 0x0a, 0xdd, 0xde, 0x97, 0x1d, 0xf5, 0xb0, 0xd3, 0x56, 0x44, 0xb8, 0xfe, 0xa7, + 0x24, 0xa0, 0xb0, 0xb9, 0x3c, 0x74, 0x78, 0x83, 0x76, 0x0c, 0xe5, 0x41, 0x00, 0x65, 0x7a, 0x91, + 0x56, 0x13, 0x6b, 0xa5, 0xcd, 0xa7, 0xff, 0x67, 0x83, 0x2a, 0x64, 0x44, 0x41, 0xe1, 0x1d, 0x97, + 0x06, 0x31, 0x68, 0xa4, 0x4c, 0x49, 0x4c, 0xa5, 0x06, 0x15, 0xd2, 0x83, 0x13, 0x3c, 0x78, 0xc5, + 0x93, 0xe3, 0x6f, 0x5d, 0xb3, 0x30, 0xad, 0xe0, 0x22, 0xf6, 0xd4, 0x22, 0x3c, 0xe1, 0xd2, 0x22, + 0x6b, 0x53, 0x51, 0x48, 0x8d, 0x47, 0xbd, 0xd4, 0x8d, 0x81, 0x64, 0xd6, 0x20, 0x44, 0x04, 0x92, + 0x48, 0xd0, 0x7b, 0x0a, 0x65, 0xdb, 0xf1, 0x35, 0xd2, 0x26, 0x71, 0xe7, 0xa4, 0xcd, 0x4f, 0xb1, + 0xa9, 0x70, 0x13, 0x0a, 0x5d, 0xb1, 0x68, 0x3b, 0x7e, 0x6f, 0x62, 0xf1, 0xce, 0xa2, 0xfe, 0x19, + 0x94, 0xe2, 0x3a, 0x42, 0x79, 0x48, 0xb7, 0xb6, 0x3b, 0xad, 0x5d, 0x65, 0x01, 0x95, 0x41, 0xde, + 0xea, 0xab, 0x9d, 0xee, 0xb3, 0x9e, 0xb6, 0xdb, 0xf9, 0x3d, 0x36, 0x05, 0xea, 0xf5, 0xc5, 0x14, + 0x28, 0x68, 0x3e, 0xd2, 0x4a, 0xa6, 0xfe, 0xdf, 0x12, 0x94, 0xf6, 0x5d, 0x73, 0xa4, 0xbb, 0xe7, + 0xbb, 0xf8, 0xfc, 0xe0, 0x8d, 0x3e, 0x46, 0x9f, 0xc3, 0x92, 0x8d, 0xdf, 0x68, 0x63, 0x06, 0xd5, + 0x82, 0x62, 0x56, 0x9a, 0x3d, 0x22, 0xac, 0xd8, 0xf8, 0x0d, 0x97, 0xd0, 0xe5, 0xb5, 0xec, 0xc7, + 0x20, 0x3b, 0x16, 0xef, 0x81, 0xb1, 0x18, 0xd3, 0xc8, 0x51, 0x26, 0x70, 0x2c, 0xd6, 0xf2, 0xd2, + 0xfc, 0x2a, 0x93, 0xf5, 0x04, 0x75, 0x72, 0x06, 0xb5, 0x8d, 0xdf, 0x08, 0xea, 0xcf, 0x61, 0x89, + 0xc8, 0xbe, 0xb2, 0xbb, 0xd4, 0x35, 0xbb, 0x73, 0x2c, 0x23, 0xbe, 0x3b, 0x6e, 0xbc, 0xff, 0x9c, + 0x06, 0x14, 0x5e, 0xfd, 0xf3, 0x89, 0xaf, 0x53, 0x7f, 0x68, 0x40, 0x86, 0x5f, 0x84, 0x44, 0x2f, + 0xf8, 0xc3, 0x6b, 0x6d, 0x36, 0xde, 0x93, 0x6f, 0x2f, 0xa8, 0x9c, 0x11, 0xfd, 0x34, 0x3a, 0x53, + 0x95, 0x37, 0x3f, 0x98, 0x2f, 0x98, 0x6d, 0x2f, 0x88, 0x61, 0xeb, 0x2e, 0xa4, 0x3d, 0x5f, 0xf7, + 0x59, 0xbd, 0x52, 0xda, 0xdc, 0xb8, 0x86, 0xff, 0xea, 0xe6, 0xd7, 0x0f, 0x08, 0x9b, 0xb0, 0x5a, + 0x2a, 0x03, 0xbd, 0x84, 0x7c, 0x50, 0x03, 0xf0, 0x01, 0xed, 0x93, 0xf9, 0x05, 0x06, 0x71, 0x42, + 0xf4, 0x08, 0x81, 0x2c, 0xd4, 0x00, 0x79, 0xc4, 0xc9, 0xc2, 0x4e, 0x6f, 0x95, 0x97, 0x61, 0x20, + 0x24, 0xd0, 0x72, 0x2c, 0xf2, 0xa5, 0x82, 0x60, 0xea, 0xd2, 0x50, 0xe5, 0x3a, 0x96, 0x75, 0xa4, + 0x0f, 0x5e, 0xd1, 0xa1, 0x53, 0x10, 0xaa, 0x04, 0x14, 0xed, 0x92, 0x62, 0x4a, 0x58, 0x39, 0x1d, + 0x21, 0xc9, 0x73, 0x8c, 0xb9, 0x44, 0x14, 0xd9, 0x5e, 0x50, 0x23, 0xec, 0xa8, 0x0f, 0xa5, 0x71, + 0xcc, 0xd2, 0x79, 0xe5, 0xf2, 0xe8, 0xba, 0xf4, 0x15, 0x23, 0xde, 0x5e, 0x50, 0xa7, 0xd8, 0xeb, + 0x9f, 0x43, 0x9a, 0x6a, 0x9c, 0x44, 0xca, 0x17, 0xbd, 0xdd, 0x5e, 0xff, 0x65, 0x8f, 0x39, 0x5f, + 0xbb, 0xb3, 0xd7, 0x39, 0xec, 0x68, 0xfd, 0xde, 0x1e, 0x71, 0xbe, 0xf7, 0xe0, 0x0e, 0x07, 0x34, + 0x7a, 0x6d, 0xed, 0xa5, 0xda, 0x15, 0xa8, 0x44, 0x7d, 0x2d, 0x1a, 0x8a, 0x73, 0x90, 0xea, 0xf5, + 0x7b, 0x1d, 0x65, 0x81, 0x06, 0xe5, 0x76, 0x5b, 0x91, 0x68, 0x50, 0x56, 0xfb, 0xfb, 0xc2, 0x67, + 0x9b, 0x05, 0x00, 0x23, 0xb8, 0xa5, 0x9d, 0x54, 0x2e, 0xa3, 0x64, 0xeb, 0x7f, 0xfa, 0x10, 0xca, + 0x53, 0x81, 0xec, 0x86, 0xa2, 0x79, 0x95, 0x16, 0xcd, 0xc9, 0x30, 0xc8, 0x04, 0x45, 0x73, 0x82, + 0xd7, 0xcb, 0x4f, 0x20, 0x3f, 0xd6, 0x5d, 0x6c, 0xfb, 0xa1, 0x57, 0x89, 0xa1, 0x42, 0x6e, 0x9f, + 0x22, 0x02, 0xf2, 0x1c, 0x23, 0xec, 0x12, 0xa6, 0x20, 0x87, 0x32, 0x4b, 0x78, 0x8f, 0x3b, 0x62, + 0xe5, 0x86, 0xf4, 0xb9, 0x0f, 0x95, 0x91, 0x63, 0x98, 0x43, 0x73, 0xc0, 0xcc, 0xc8, 0x37, 0x47, + 0x6c, 0xfa, 0x28, 0x6f, 0xfe, 0x20, 0x72, 0x27, 0x13, 0xdf, 0xb4, 0xd6, 0x4f, 0xac, 0xc1, 0xfa, + 0xa1, 0x78, 0x29, 0xe1, 0x27, 0x52, 0xa2, 0xdc, 0x04, 0x89, 0x9e, 0x41, 0x56, 0xf4, 0x86, 0x39, + 0x5a, 0x91, 0xcd, 0xeb, 0xbe, 0x22, 0x8b, 0x72, 0x6e, 0xb4, 0x05, 0x25, 0x1b, 0x9f, 0x45, 0x47, + 0x19, 0xf9, 0x98, 0x81, 0x17, 0x7a, 0xf8, 0x6c, 0xf6, 0x1c, 0xa3, 0x60, 0x87, 0x18, 0x03, 0x7d, + 0x01, 0xc5, 0x58, 0xa4, 0xa2, 0x83, 0xc5, 0xb9, 0x63, 0x42, 0x50, 0x2a, 0x45, 0x02, 0x18, 0xda, + 0x82, 0xac, 0x08, 0x95, 0x32, 0x3d, 0xe3, 0xed, 0x84, 0x09, 0x66, 0xd4, 0x84, 0x22, 0x3d, 0x62, + 0x10, 0x41, 0x0b, 0x61, 0xf1, 0x73, 0x79, 0x51, 0x93, 0xc9, 0x09, 0x67, 0x0c, 0x2c, 0x64, 0x3b, + 0x80, 0x1b, 0x68, 0x07, 0x20, 0x78, 0xa1, 0xf2, 0xe8, 0x28, 0xec, 0xfa, 0x22, 0x78, 0x5f, 0x10, + 0x86, 0x5b, 0x52, 0x23, 0xdc, 0xe8, 0x39, 0xe4, 0x45, 0x6c, 0x60, 0xe5, 0xe9, 0xf5, 0xae, 0x7e, + 0x35, 0x52, 0x89, 0xf8, 0x14, 0x48, 0x20, 0x25, 0x80, 0x85, 0x75, 0x0f, 0xf3, 0x1a, 0xf5, 0xe9, + 0x9c, 0x25, 0xc0, 0xc1, 0xe0, 0x04, 0x8f, 0xf4, 0xd6, 0x09, 0xe9, 0x7f, 0xf7, 0x08, 0x7f, 0x33, + 0x51, 0x95, 0x54, 0x26, 0x0a, 0xf5, 0x40, 0xa1, 0x2a, 0x8b, 0x06, 0x3e, 0x85, 0x6a, 0xed, 0x87, + 0x5c, 0x6b, 0x25, 0xa2, 0xb5, 0x6b, 0x83, 0x1f, 0xb5, 0xa9, 0xe7, 0x61, 0x00, 0xfc, 0x5d, 0x28, + 0x0d, 0x1d, 0x77, 0xa4, 0xfb, 0x9a, 0x70, 0x9e, 0x4a, 0xd8, 0xcd, 0x7e, 0x7f, 0x51, 0x2b, 0x6e, + 0x51, 0xac, 0x70, 0x9c, 0xe2, 0x30, 0xfa, 0x89, 0xb6, 0x45, 0x9e, 0x58, 0xa4, 0x61, 0xfd, 0xe3, + 0x79, 0x4f, 0x78, 0x35, 0x49, 0xf4, 0x20, 0x43, 0x6b, 0x1c, 0xaf, 0xba, 0x44, 0xf5, 0xfe, 0x96, + 0xf5, 0x92, 0xca, 0xa5, 0xa0, 0x9f, 0x43, 0xc9, 0x20, 0x10, 0x52, 0x17, 0xb3, 0x6e, 0xf9, 0x0e, + 0x95, 0xbb, 0x31, 0xa7, 0x5c, 0xd2, 0x49, 0x77, 0xed, 0xa1, 0x23, 0x9a, 0x24, 0x21, 0x8c, 0x75, + 0xd8, 0x7d, 0xc8, 0x0d, 0xf5, 0x91, 0x69, 0x99, 0xd8, 0xab, 0xde, 0xa5, 0x72, 0x3f, 0xb9, 0xd1, + 0xcb, 0xa7, 0x27, 0xa9, 0x22, 0xcb, 0x08, 0x21, 0x81, 0xb3, 0x53, 0xc0, 0x39, 0xb9, 0xd4, 0x7b, + 0x57, 0x9d, 0x5d, 0x4c, 0x52, 0x63, 0x53, 0x55, 0xea, 0xec, 0xfc, 0xcb, 0x40, 0x0f, 0x01, 0x4e, + 0x4d, 0xfc, 0x46, 0x7b, 0x3d, 0xc1, 0xee, 0x79, 0xb5, 0x1a, 0x89, 0xbd, 0x79, 0x02, 0xff, 0x82, + 0x80, 0xd1, 0xa7, 0x90, 0x37, 0xf0, 0x18, 0xdb, 0x86, 0xd7, 0xb7, 0xab, 0xef, 0xd1, 0x5a, 0x67, + 0xf1, 0xf2, 0xa2, 0x96, 0x6f, 0x0b, 0x20, 0x8f, 0xad, 0x21, 0x15, 0xfa, 0x0a, 0x0a, 0xec, 0x03, + 0x1b, 0x7d, 0xbb, 0x79, 0x5e, 0x5d, 0xa6, 0x87, 0x7e, 0x3c, 0xa7, 0x32, 0xc3, 0x96, 0x33, 0x98, + 0xd2, 0xb5, 0x23, 0xd2, 0xd4, 0x98, 0x6c, 0xf4, 0x73, 0x28, 0x08, 0xeb, 0xde, 0x71, 0x8e, 0xbc, + 0xea, 0xfb, 0x37, 0x8e, 0xd0, 0xa6, 0xd7, 0x7a, 0x1e, 0xb2, 0x8a, 0xd8, 0x15, 0x95, 0x86, 0x7e, + 0x06, 0xc5, 0x60, 0x18, 0xef, 0x8c, 0x7d, 0xaf, 0x7a, 0x9f, 0x3a, 0xe7, 0x93, 0x79, 0x4d, 0x97, + 0xf3, 0xf6, 0xc7, 0x74, 0xba, 0x18, 0xf9, 0x42, 0x0f, 0x20, 0x6f, 0xb8, 0xce, 0x98, 0xe5, 0x90, + 0x1f, 0xac, 0x4a, 0x6b, 0xc9, 0xa0, 0xef, 0x71, 0x9d, 0x31, 0x4d, 0x0e, 0x1a, 0x94, 0x5c, 0x3c, + 0xb6, 0xf4, 0x01, 0x1e, 0x91, 0xec, 0xe6, 0x0c, 0xab, 0x2b, 0x74, 0xf5, 0xcd, 0xb9, 0x15, 0x19, + 0x30, 0x0b, 0xc3, 0x8c, 0xc8, 0xeb, 0x0f, 0xd1, 0x0b, 0x00, 0x7d, 0x62, 0x98, 0xbe, 0x36, 0x72, + 0x0c, 0x5c, 0xad, 0xdd, 0xf8, 0x3c, 0x35, 0x2d, 0xbc, 0x41, 0x18, 0x9f, 0x3b, 0x06, 0x0e, 0xe6, + 0xd1, 0x02, 0x80, 0x3e, 0x05, 0x99, 0x1e, 0xed, 0x2b, 0xe7, 0x88, 0xd8, 0xe6, 0x2a, 0x3d, 0x5c, + 0x85, 0xdf, 0x65, 0xbe, 0xed, 0x3a, 0xe3, 0x1d, 0xe7, 0x88, 0x5a, 0x0c, 0xff, 0x69, 0x20, 0x0f, + 0x0a, 0xc7, 0x03, 0x2d, 0x0c, 0xa7, 0x0f, 0xe8, 0x2d, 0xfe, 0xce, 0x9c, 0x7b, 0x79, 0xd6, 0x9a, + 0x11, 0x60, 0x17, 0x45, 0x5e, 0x78, 0xd6, 0x12, 0x30, 0x4f, 0x95, 0x8f, 0x07, 0xc1, 0x07, 0xfa, + 0x10, 0x0a, 0xac, 0xb9, 0xe6, 0x0e, 0x50, 0x8f, 0x38, 0x80, 0xcc, 0x30, 0xcc, 0x05, 0x7a, 0xc0, + 0xbb, 0x70, 0x4d, 0xf7, 0x34, 0x67, 0xc8, 0xee, 0xec, 0xe1, 0xfc, 0x79, 0xbf, 0xc4, 0xb8, 0x1b, + 0x5e, 0x7f, 0x48, 0x2f, 0x76, 0x00, 0x05, 0x67, 0xe2, 0x1f, 0x39, 0x13, 0xdb, 0xd0, 0x86, 0xaf, + 0xbc, 0xea, 0x0f, 0xe9, 0x69, 0x6f, 0xd5, 0x9a, 0x05, 0xa7, 0xeb, 0x73, 0x41, 0x5b, 0xbb, 0x9e, + 0x2a, 0x0b, 0xa9, 0x5b, 0xaf, 0x3c, 0xf4, 0x47, 0x20, 0x9b, 0x76, 0xb8, 0xc6, 0xa3, 0xdb, 0xaf, + 0x81, 0x44, 0x71, 0xdc, 0xb5, 0x83, 0x25, 0x80, 0xcb, 0x24, 0x2b, 0x7c, 0x04, 0x25, 0x67, 0x38, + 0xb4, 0x4c, 0x1b, 0x6b, 0x2e, 0xd6, 0x3d, 0xc7, 0xae, 0x7e, 0x10, 0xd1, 0x60, 0x91, 0xe3, 0x54, + 0x8a, 0x42, 0x75, 0xc8, 0xfb, 0x78, 0x34, 0x76, 0x5c, 0xdd, 0x3d, 0xaf, 0x7e, 0x18, 0x1d, 0xe3, + 0x07, 0x60, 0x74, 0x04, 0xcb, 0x13, 0x1b, 0x9f, 0x8d, 0x1d, 0x0f, 0x1b, 0x1a, 0xaf, 0xe9, 0x3c, + 0x9a, 0xdf, 0x88, 0x1d, 0xad, 0xd1, 0x18, 0xf7, 0x88, 0x6f, 0xea, 0xde, 0x0b, 0x41, 0xc9, 0x6a, + 0x3c, 0x96, 0x07, 0x83, 0x4a, 0xef, 0xde, 0x64, 0x26, 0xda, 0x58, 0xfe, 0x85, 0x04, 0x95, 0x2b, + 0x39, 0x13, 0xfd, 0x21, 0x64, 0x6d, 0xc7, 0x88, 0x3c, 0x9a, 0x74, 0xf8, 0x32, 0x99, 0x9e, 0x63, + 0xb0, 0x37, 0x93, 0x27, 0x73, 0xbd, 0x35, 0xd2, 0x5f, 0xe3, 0xa3, 0x75, 0xc6, 0xa6, 0x66, 0x88, + 0xd4, 0xae, 0x81, 0x3e, 0x81, 0x32, 0x3e, 0x1b, 0x9b, 0x6e, 0xa4, 0x6e, 0x4c, 0x44, 0x7c, 0xbe, + 0x14, 0x22, 0x89, 0x81, 0xf0, 0xb1, 0xf6, 0xdf, 0x25, 0xa0, 0x3c, 0x95, 0xb1, 0x48, 0xa1, 0x4c, + 0x9f, 0xf9, 0x62, 0x85, 0x32, 0x81, 0xdc, 0xf0, 0x06, 0x12, 0x7d, 0x79, 0x4f, 0xbe, 0xeb, 0xcb, + 0x7b, 0x7c, 0x5c, 0x9c, 0xbe, 0xc5, 0xb8, 0xf8, 0x27, 0x70, 0xd7, 0xf4, 0x34, 0xdb, 0xb1, 0xc5, + 0xf8, 0x20, 0xe8, 0x93, 0xa2, 0xef, 0xa7, 0x8b, 0xa6, 0xd7, 0x73, 0x6c, 0x36, 0x38, 0x08, 0x4e, + 0x1d, 0x3e, 0xb5, 0x66, 0xaf, 0x3e, 0xb5, 0x06, 0xe3, 0x81, 0x94, 0x92, 0x5e, 0xfe, 0x1b, 0x09, + 0x72, 0x22, 0x1b, 0xc7, 0x3b, 0x03, 0x69, 0xce, 0xce, 0xe0, 0x7a, 0x3d, 0x6e, 0x81, 0x72, 0xc5, + 0x28, 0x59, 0x63, 0x72, 0x5f, 0x54, 0x53, 0x33, 0x6d, 0xb1, 0x34, 0x8e, 0x99, 0x20, 0xbf, 0xdd, + 0x6f, 0x24, 0xc8, 0x47, 0xff, 0xf9, 0x94, 0x08, 0xf6, 0x38, 0xbb, 0xcd, 0x79, 0xcb, 0x67, 0xba, + 0xf8, 0x7d, 0x25, 0xe7, 0xbf, 0x2f, 0xbe, 0xcd, 0x3f, 0x06, 0x39, 0x92, 0x24, 0xa7, 0xbb, 0x68, + 0xe9, 0x2d, 0xba, 0xe8, 0x1f, 0x42, 0x86, 0x67, 0x06, 0xe6, 0x02, 0x45, 0xce, 0x9d, 0x66, 0x59, + 0x21, 0xfd, 0x15, 0xc9, 0x08, 0x7c, 0xf5, 0x7f, 0x49, 0x42, 0x21, 0x9a, 0x44, 0x49, 0x18, 0x31, + 0xed, 0x81, 0x4b, 0x33, 0x18, 0x5d, 0x3d, 0x19, 0xbc, 0x06, 0x0a, 0x30, 0x49, 0xad, 0x23, 0xd3, + 0xd6, 0xe8, 0x0b, 0x54, 0xcc, 0xcd, 0x72, 0x23, 0xd3, 0xfe, 0x92, 0x40, 0x29, 0x89, 0x7e, 0xc6, + 0x49, 0x92, 0x31, 0x12, 0xfd, 0x8c, 0x91, 0x2c, 0xd3, 0x6a, 0xd5, 0xf5, 0x69, 0x4b, 0x99, 0x8c, + 0xd4, 0x9f, 0xae, 0x8f, 0x56, 0x20, 0x7b, 0x6a, 0xba, 0xfe, 0x44, 0xb7, 0x68, 0xf7, 0x28, 0x0c, + 0x52, 0x00, 0x91, 0x0d, 0xa5, 0xb0, 0x6c, 0x78, 0x63, 0x63, 0x97, 0x9a, 0xb8, 0xbc, 0xd9, 0x78, + 0x8b, 0xba, 0x21, 0xfc, 0x20, 0x82, 0x44, 0x70, 0xf5, 0xa2, 0xc0, 0xe5, 0xbf, 0x92, 0xa0, 0x18, + 0x23, 0x43, 0x5d, 0x28, 0xd3, 0x85, 0x23, 0x0d, 0x21, 0xbb, 0xab, 0x07, 0xc1, 0x7f, 0x98, 0x08, + 0x7a, 0x66, 0x47, 0x58, 0x74, 0x22, 0x28, 0x03, 0x7d, 0x0e, 0x25, 0x26, 0x2a, 0x78, 0x57, 0x8e, + 0x9b, 0x5f, 0x81, 0x4a, 0x8a, 0x3f, 0x2e, 0x17, 0x9c, 0x10, 0x66, 0x44, 0x9f, 0xcc, 0x96, 0x6d, + 0x90, 0x23, 0x75, 0xc9, 0x1c, 0x76, 0xff, 0xdb, 0x90, 0x0a, 0xe2, 0xe5, 0x9c, 0xf9, 0x96, 0x32, + 0xf0, 0xf5, 0xbe, 0x96, 0x60, 0x69, 0x56, 0x7d, 0x10, 0xf3, 0x27, 0x66, 0x48, 0x73, 0xf9, 0xd3, + 0xc3, 0x68, 0xdd, 0xc6, 0x8c, 0x4b, 0x3c, 0xe3, 0x84, 0x95, 0xdb, 0x07, 0x81, 0x89, 0x33, 0xdb, + 0x2a, 0xc7, 0x4c, 0x9c, 0xf4, 0x67, 0x11, 0x23, 0xaf, 0x3f, 0x11, 0x63, 0x19, 0x80, 0xcc, 0xfe, + 0x8b, 0xe6, 0x5e, 0xb7, 0x35, 0x73, 0xa4, 0x82, 0x64, 0xc8, 0xf6, 0xb7, 0xb6, 0xf6, 0xba, 0xbd, + 0x8e, 0x92, 0xac, 0xaf, 0x41, 0x3e, 0x28, 0xc1, 0x50, 0x01, 0x72, 0xed, 0xee, 0x41, 0xa3, 0xb9, + 0xd7, 0x69, 0x2b, 0x0b, 0xa8, 0x08, 0x79, 0xb5, 0xd3, 0x68, 0xd3, 0xc1, 0x8d, 0x22, 0x7d, 0x96, + 0xfb, 0xb3, 0xaf, 0x6b, 0x12, 0x0f, 0x91, 0x19, 0x25, 0xbb, 0x93, 0xca, 0x21, 0x65, 0xb1, 0xfe, + 0xd7, 0x12, 0xa0, 0xb6, 0xee, 0xeb, 0xc4, 0xfe, 0x6e, 0x31, 0x88, 0x49, 0xdc, 0x70, 0x53, 0xf1, + 0xe6, 0x3a, 0xf9, 0x2e, 0xcd, 0x75, 0xb8, 0xe9, 0xfa, 0x37, 0x12, 0x40, 0x64, 0x83, 0x3f, 0x8d, + 0xfe, 0x45, 0xf4, 0xfa, 0x59, 0xc2, 0x94, 0x47, 0x6d, 0x2f, 0x88, 0x3f, 0x90, 0x3e, 0x83, 0x9c, + 0xc1, 0x8f, 0xcd, 0x4d, 0xea, 0xda, 0xa6, 0xfd, 0x8a, 0x76, 0xb6, 0x49, 0x75, 0xce, 0xa1, 0x7c, + 0xc0, 0x95, 0x85, 0xf4, 0xc4, 0x36, 0x1d, 0xfb, 0xc7, 0x6a, 0xf4, 0x69, 0x41, 0x64, 0x4f, 0x72, + 0x15, 0xf4, 0xb7, 0xee, 0x63, 0x83, 0x8d, 0xda, 0x5e, 0xd8, 0xa7, 0x01, 0x40, 0x42, 0x25, 0x00, + 0x8e, 0x37, 0xed, 0x63, 0x25, 0x41, 0x2f, 0xd2, 0x75, 0xc6, 0x63, 0xf2, 0x95, 0x6c, 0xfe, 0xe8, + 0xdb, 0xff, 0x58, 0x59, 0xf8, 0xf6, 0x72, 0x45, 0xfa, 0xe5, 0xe5, 0x8a, 0xf4, 0xab, 0xcb, 0x15, + 0xe9, 0xdf, 0x2f, 0x57, 0xa4, 0xbf, 0xf8, 0x6e, 0x65, 0xe1, 0x97, 0xdf, 0xad, 0x2c, 0xfc, 0xea, + 0xbb, 0x95, 0x85, 0xdf, 0xcf, 0xf2, 0xcd, 0xfe, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2a, 0x34, + 0x92, 0x67, 0xd4, 0x2b, 0x00, 0x00, } diff --git a/pkg/sql/sqlbase/structured.proto b/pkg/sql/sqlbase/structured.proto index a211bde591b8..b756c061b825 100644 --- a/pkg/sql/sqlbase/structured.proto +++ b/pkg/sql/sqlbase/structured.proto @@ -129,6 +129,8 @@ message ColumnDescriptor { // Expression to use to compute the value of this column if this is a // computed column. optional string compute_expr = 12; + optional uint32 logical_id = 13 [(gogoproto.nullable) = false, + (gogoproto.customname) = "LogicalColumnID", (gogoproto.casttype) = "ColumnID"]; } // ColumnFamilyDescriptor is set of columns stored together in one kv entry. diff --git a/pkg/sql/sqlbase/structured_test.go b/pkg/sql/sqlbase/structured_test.go index 2c7044fed937..604b27fb9f33 100644 --- a/pkg/sql/sqlbase/structured_test.go +++ b/pkg/sql/sqlbase/structured_test.go @@ -80,9 +80,9 @@ func TestAllocateIDs(t *testing.T) { Version: 1, Name: "foo", Columns: []ColumnDescriptor{ - {ID: 1, Name: "a"}, - {ID: 2, Name: "b"}, - {ID: 3, Name: "c"}, + {ID: 1, Name: "a", LogicalColumnID: 1}, + {ID: 2, Name: "b", LogicalColumnID: 2}, + {ID: 3, Name: "c", LogicalColumnID: 3}, }, Families: []ColumnFamilyDescriptor{ { @@ -1369,3 +1369,23 @@ func TestSQLString(t *testing.T) { t.Errorf("Expected '%s', but got '%s'", expected, got) } } + +func TestLogicalColumnID(t *testing.T) { + tests := []struct { + desc TableDescriptor + expected ColumnID + }{ + {TableDescriptor{Columns: []ColumnDescriptor{{ID: 1, LogicalColumnID: 1}}}, 1}, + {TableDescriptor{Columns: []ColumnDescriptor{{ID: 2}}}, 2}, + } + + for i := range tests { + tests[i].desc.MaybeFillInLogicalColumnID() + actual := tests[i].desc.Columns[0].LogicalColumnID + expected := tests[i].expected + + if expected != actual { + t.Fatalf("Expected LogicalColumnID to be %d, got %d.", expected, actual) + } + } +} diff --git a/pkg/sql/sqlbase/system.go b/pkg/sql/sqlbase/system.go index 2acd13266543..39e8048ed300 100644 --- a/pkg/sql/sqlbase/system.go +++ b/pkg/sql/sqlbase/system.go @@ -373,9 +373,9 @@ var ( UnexposedParentSchemaID: keys.PublicSchemaID, Version: 1, Columns: []ColumnDescriptor{ - {Name: "parentID", ID: 1, Type: *types.Int}, - {Name: "name", ID: 2, Type: *types.String}, - {Name: "id", ID: 3, Type: *types.Int, Nullable: true}, + {Name: "parentID", ID: 1, LogicalColumnID: 1, Type: *types.Int}, + {Name: "name", ID: 2, LogicalColumnID: 2, Type: *types.String}, + {Name: "id", ID: 3, LogicalColumnID: 3, Type: *types.Int, Nullable: true}, }, NextColumnID: 4, Families: []ColumnFamilyDescriptor{ @@ -409,10 +409,10 @@ var ( UnexposedParentSchemaID: keys.PublicSchemaID, Version: 1, Columns: []ColumnDescriptor{ - {Name: "parentID", ID: 1, Type: *types.Int}, - {Name: "parentSchemaID", ID: 2, Type: *types.Int}, - {Name: "name", ID: 3, Type: *types.String}, - {Name: "id", ID: 4, Type: *types.Int, Nullable: true}, + {Name: "parentID", ID: 1, LogicalColumnID: 1, Type: *types.Int}, + {Name: "parentSchemaID", ID: 2, LogicalColumnID: 2, Type: *types.Int}, + {Name: "name", ID: 3, LogicalColumnID: 3, Type: *types.String}, + {Name: "id", ID: 4, LogicalColumnID: 4, Type: *types.Int, Nullable: true}, }, NextColumnID: 5, Families: []ColumnFamilyDescriptor{ @@ -444,8 +444,9 @@ var ( UnexposedParentSchemaID: keys.PublicSchemaID, Version: 1, Columns: []ColumnDescriptor{ - {Name: "id", ID: 1, Type: *types.Int}, - {Name: "descriptor", ID: keys.DescriptorTableDescriptorColID, Type: *types.Bytes, Nullable: true}, + {Name: "id", ID: 1, LogicalColumnID: 1, Type: *types.Int}, + {Name: "descriptor", ID: keys.DescriptorTableDescriptorColID, + LogicalColumnID: keys.DescriptorTableDescriptorColID, Type: *types.Bytes, Nullable: true}, }, NextColumnID: 3, Families: []ColumnFamilyDescriptor{ @@ -473,9 +474,9 @@ var ( UnexposedParentSchemaID: keys.PublicSchemaID, Version: 1, Columns: []ColumnDescriptor{ - {Name: "username", ID: 1, Type: *types.String}, - {Name: "hashedPassword", ID: 2, Type: *types.Bytes, Nullable: true}, - {Name: "isRole", ID: 3, Type: *types.Bool, DefaultExpr: &falseBoolString}, + {Name: "username", ID: 1, LogicalColumnID: 1, Type: *types.String}, + {Name: "hashedPassword", ID: 2, LogicalColumnID: 2, Type: *types.Bytes, Nullable: true}, + {Name: "isRole", ID: 3, LogicalColumnID: 3, Type: *types.Bool, DefaultExpr: &falseBoolString}, }, NextColumnID: 4, Families: []ColumnFamilyDescriptor{ @@ -499,8 +500,9 @@ var ( UnexposedParentSchemaID: keys.PublicSchemaID, Version: 1, Columns: []ColumnDescriptor{ - {Name: "id", ID: 1, Type: *types.Int}, - {Name: "config", ID: keys.ZonesTableConfigColumnID, Type: *types.Bytes, Nullable: true}, + {Name: "id", ID: 1, LogicalColumnID: 1, Type: *types.Int}, + {Name: "config", ID: keys.ZonesTableConfigColumnID, + LogicalColumnID: keys.ZonesTableConfigColumnID, Type: *types.Bytes, Nullable: true}, }, NextColumnID: 3, Families: []ColumnFamilyDescriptor{ @@ -533,10 +535,10 @@ var ( UnexposedParentSchemaID: keys.PublicSchemaID, Version: 1, Columns: []ColumnDescriptor{ - {Name: "name", ID: 1, Type: *types.String}, - {Name: "value", ID: 2, Type: *types.String}, - {Name: "lastUpdated", ID: 3, Type: *types.Timestamp, DefaultExpr: &nowString}, - {Name: "valueType", ID: 4, Type: *types.String, Nullable: true}, + {Name: "name", ID: 1, LogicalColumnID: 1, Type: *types.String}, + {Name: "value", ID: 2, LogicalColumnID: 2, Type: *types.String}, + {Name: "lastUpdated", ID: 3, LogicalColumnID: 3, Type: *types.Timestamp, DefaultExpr: &nowString}, + {Name: "valueType", ID: 4, LogicalColumnID: 4, Type: *types.String, Nullable: true}, }, NextColumnID: 5, Families: []ColumnFamilyDescriptor{ @@ -570,10 +572,10 @@ var ( UnexposedParentSchemaID: keys.PublicSchemaID, Version: 1, Columns: []ColumnDescriptor{ - {Name: "descID", ID: 1, Type: *types.Int}, - {Name: "version", ID: 2, Type: *types.Int}, - {Name: "nodeID", ID: 3, Type: *types.Int}, - {Name: "expiration", ID: 4, Type: *types.Timestamp}, + {Name: "descID", ID: 1, LogicalColumnID: 1, Type: *types.Int}, + {Name: "version", ID: 2, LogicalColumnID: 2, Type: *types.Int}, + {Name: "nodeID", ID: 3, LogicalColumnID: 3, Type: *types.Int}, + {Name: "expiration", ID: 4, LogicalColumnID: 4, Type: *types.Timestamp}, }, NextColumnID: 5, Families: []ColumnFamilyDescriptor{ @@ -605,12 +607,12 @@ var ( UnexposedParentSchemaID: keys.PublicSchemaID, Version: 1, Columns: []ColumnDescriptor{ - {Name: "timestamp", ID: 1, Type: *types.Timestamp}, - {Name: "eventType", ID: 2, Type: *types.String}, - {Name: "targetID", ID: 3, Type: *types.Int}, - {Name: "reportingID", ID: 4, Type: *types.Int}, - {Name: "info", ID: 5, Type: *types.String, Nullable: true}, - {Name: "uniqueID", ID: 6, Type: *types.Bytes, DefaultExpr: &uuidV4String}, + {Name: "timestamp", ID: 1, LogicalColumnID: 1, Type: *types.Timestamp}, + {Name: "eventType", ID: 2, LogicalColumnID: 2, Type: *types.String}, + {Name: "targetID", ID: 3, LogicalColumnID: 3, Type: *types.Int}, + {Name: "reportingID", ID: 4, LogicalColumnID: 4, Type: *types.Int}, + {Name: "info", ID: 5, LogicalColumnID: 5, Type: *types.String, Nullable: true}, + {Name: "uniqueID", ID: 6, LogicalColumnID: 6, Type: *types.Bytes, DefaultExpr: &uuidV4String}, }, NextColumnID: 7, Families: []ColumnFamilyDescriptor{ @@ -646,13 +648,13 @@ var ( UnexposedParentSchemaID: keys.PublicSchemaID, Version: 1, Columns: []ColumnDescriptor{ - {Name: "timestamp", ID: 1, Type: *types.Timestamp}, - {Name: "rangeID", ID: 2, Type: *types.Int}, - {Name: "storeID", ID: 3, Type: *types.Int}, - {Name: "eventType", ID: 4, Type: *types.String}, - {Name: "otherRangeID", ID: 5, Type: *types.Int, Nullable: true}, - {Name: "info", ID: 6, Type: *types.String, Nullable: true}, - {Name: "uniqueID", ID: 7, Type: *types.Int, DefaultExpr: &uniqueRowIDString}, + {Name: "timestamp", ID: 1, LogicalColumnID: 1, Type: *types.Timestamp}, + {Name: "rangeID", ID: 2, LogicalColumnID: 2, Type: *types.Int}, + {Name: "storeID", ID: 3, LogicalColumnID: 3, Type: *types.Int}, + {Name: "eventType", ID: 4, LogicalColumnID: 4, Type: *types.String}, + {Name: "otherRangeID", ID: 5, LogicalColumnID: 5, Type: *types.Int, Nullable: true}, + {Name: "info", ID: 6, LogicalColumnID: 6, Type: *types.String, Nullable: true}, + {Name: "uniqueID", ID: 7, LogicalColumnID: 7, Type: *types.Int, DefaultExpr: &uniqueRowIDString}, }, NextColumnID: 8, Families: []ColumnFamilyDescriptor{ @@ -687,9 +689,9 @@ var ( UnexposedParentSchemaID: keys.PublicSchemaID, Version: 1, Columns: []ColumnDescriptor{ - {Name: "key", ID: 1, Type: *types.String}, - {Name: "value", ID: 2, Type: *types.Bytes, Nullable: true}, - {Name: "lastUpdated", ID: 3, Type: *types.Timestamp}, + {Name: "key", ID: 1, LogicalColumnID: 1, Type: *types.String}, + {Name: "value", ID: 2, LogicalColumnID: 2, Type: *types.Bytes, Nullable: true}, + {Name: "lastUpdated", ID: 3, LogicalColumnID: 3, Type: *types.Timestamp}, }, NextColumnID: 4, Families: []ColumnFamilyDescriptor{ @@ -715,11 +717,11 @@ var ( UnexposedParentSchemaID: keys.PublicSchemaID, Version: 1, Columns: []ColumnDescriptor{ - {Name: "id", ID: 1, Type: *types.Int, DefaultExpr: &uniqueRowIDString}, - {Name: "status", ID: 2, Type: *types.String}, - {Name: "created", ID: 3, Type: *types.Timestamp, DefaultExpr: &nowString}, - {Name: "payload", ID: 4, Type: *types.Bytes}, - {Name: "progress", ID: 5, Type: *types.Bytes, Nullable: true}, + {Name: "id", ID: 1, LogicalColumnID: 1, Type: *types.Int, DefaultExpr: &uniqueRowIDString}, + {Name: "status", ID: 2, LogicalColumnID: 2, Type: *types.String}, + {Name: "created", ID: 3, LogicalColumnID: 3, Type: *types.Timestamp, DefaultExpr: &nowString}, + {Name: "payload", ID: 4, LogicalColumnID: 4, Type: *types.Bytes}, + {Name: "progress", ID: 5, LogicalColumnID: 5, Type: *types.Bytes, Nullable: true}, }, NextColumnID: 6, Families: []ColumnFamilyDescriptor{ @@ -765,14 +767,14 @@ var ( UnexposedParentSchemaID: keys.PublicSchemaID, Version: 1, Columns: []ColumnDescriptor{ - {Name: "id", ID: 1, Type: *types.Int, DefaultExpr: &uniqueRowIDString}, - {Name: "hashedSecret", ID: 2, Type: *types.Bytes}, - {Name: "username", ID: 3, Type: *types.String}, - {Name: "createdAt", ID: 4, Type: *types.Timestamp, DefaultExpr: &nowString}, - {Name: "expiresAt", ID: 5, Type: *types.Timestamp}, - {Name: "revokedAt", ID: 6, Type: *types.Timestamp, Nullable: true}, - {Name: "lastUsedAt", ID: 7, Type: *types.Timestamp, DefaultExpr: &nowString}, - {Name: "auditInfo", ID: 8, Type: *types.String, Nullable: true}, + {Name: "id", ID: 1, LogicalColumnID: 1, Type: *types.Int, DefaultExpr: &uniqueRowIDString}, + {Name: "hashedSecret", ID: 2, LogicalColumnID: 2, Type: *types.Bytes}, + {Name: "username", ID: 3, LogicalColumnID: 3, Type: *types.String}, + {Name: "createdAt", ID: 4, LogicalColumnID: 4, Type: *types.Timestamp, DefaultExpr: &nowString}, + {Name: "expiresAt", ID: 5, LogicalColumnID: 5, Type: *types.Timestamp}, + {Name: "revokedAt", ID: 6, LogicalColumnID: 6, Type: *types.Timestamp, Nullable: true}, + {Name: "lastUsedAt", ID: 7, LogicalColumnID: 7, Type: *types.Timestamp, DefaultExpr: &nowString}, + {Name: "auditInfo", ID: 8, LogicalColumnID: 8, Type: *types.String, Nullable: true}, }, NextColumnID: 9, Families: []ColumnFamilyDescriptor{ @@ -830,15 +832,15 @@ var ( UnexposedParentSchemaID: keys.PublicSchemaID, Version: 1, Columns: []ColumnDescriptor{ - {Name: "tableID", ID: 1, Type: *types.Int}, - {Name: "statisticID", ID: 2, Type: *types.Int, DefaultExpr: &uniqueRowIDString}, - {Name: "name", ID: 3, Type: *types.String, Nullable: true}, - {Name: "columnIDs", ID: 4, Type: *types.IntArray}, - {Name: "createdAt", ID: 5, Type: *types.Timestamp, DefaultExpr: &nowString}, - {Name: "rowCount", ID: 6, Type: *types.Int}, - {Name: "distinctCount", ID: 7, Type: *types.Int}, - {Name: "nullCount", ID: 8, Type: *types.Int}, - {Name: "histogram", ID: 9, Type: *types.Bytes, Nullable: true}, + {Name: "tableID", ID: 1, LogicalColumnID: 1, Type: *types.Int}, + {Name: "statisticID", ID: 2, LogicalColumnID: 2, Type: *types.Int, DefaultExpr: &uniqueRowIDString}, + {Name: "name", ID: 3, LogicalColumnID: 3, Type: *types.String, Nullable: true}, + {Name: "columnIDs", ID: 4, LogicalColumnID: 4, Type: *types.IntArray}, + {Name: "createdAt", ID: 5, LogicalColumnID: 5, Type: *types.Timestamp, DefaultExpr: &nowString}, + {Name: "rowCount", ID: 6, LogicalColumnID: 6, Type: *types.Int}, + {Name: "distinctCount", ID: 7, LogicalColumnID: 7, Type: *types.Int}, + {Name: "nullCount", ID: 8, LogicalColumnID: 8, Type: *types.Int}, + {Name: "histogram", ID: 9, LogicalColumnID: 9, Type: *types.Bytes, Nullable: true}, }, NextColumnID: 10, Families: []ColumnFamilyDescriptor{ @@ -885,10 +887,10 @@ var ( UnexposedParentSchemaID: keys.PublicSchemaID, Version: 1, Columns: []ColumnDescriptor{ - {Name: "localityKey", ID: 1, Type: *types.String}, - {Name: "localityValue", ID: 2, Type: *types.String}, - {Name: "latitude", ID: 3, Type: *latLonDecimal}, - {Name: "longitude", ID: 4, Type: *latLonDecimal}, + {Name: "localityKey", ID: 1, LogicalColumnID: 1, Type: *types.String}, + {Name: "localityValue", ID: 2, LogicalColumnID: 2, Type: *types.String}, + {Name: "latitude", ID: 3, LogicalColumnID: 3, Type: *latLonDecimal}, + {Name: "longitude", ID: 4, LogicalColumnID: 4, Type: *latLonDecimal}, }, NextColumnID: 5, Families: []ColumnFamilyDescriptor{ @@ -923,9 +925,9 @@ var ( UnexposedParentSchemaID: keys.PublicSchemaID, Version: 1, Columns: []ColumnDescriptor{ - {Name: "role", ID: 1, Type: *types.String}, - {Name: "member", ID: 2, Type: *types.String}, - {Name: "isAdmin", ID: 3, Type: *types.Bool}, + {Name: "role", ID: 1, LogicalColumnID: 1, Type: *types.String}, + {Name: "member", ID: 2, LogicalColumnID: 2, Type: *types.String}, + {Name: "isAdmin", ID: 3, LogicalColumnID: 3, Type: *types.Bool}, }, NextColumnID: 4, Families: []ColumnFamilyDescriptor{ @@ -989,10 +991,10 @@ var ( UnexposedParentSchemaID: keys.PublicSchemaID, Version: 1, Columns: []ColumnDescriptor{ - {Name: "type", ID: 1, Type: *types.Int}, - {Name: "object_id", ID: 2, Type: *types.Int}, - {Name: "sub_id", ID: 3, Type: *types.Int}, - {Name: "comment", ID: 4, Type: *types.String}, + {Name: "type", ID: 1, LogicalColumnID: 1, Type: *types.Int}, + {Name: "object_id", ID: 2, LogicalColumnID: 2, Type: *types.Int}, + {Name: "sub_id", ID: 3, LogicalColumnID: 3, Type: *types.Int}, + {Name: "comment", ID: 4, LogicalColumnID: 4, Type: *types.String}, }, NextColumnID: 5, Families: []ColumnFamilyDescriptor{ @@ -1022,8 +1024,8 @@ var ( UnexposedParentSchemaID: keys.PublicSchemaID, Version: 1, Columns: []ColumnDescriptor{ - {Name: "id", ID: 1, Type: *types.Int}, - {Name: "generated", ID: 2, Type: *types.TimestampTZ}, + {Name: "id", ID: 1, LogicalColumnID: 1, Type: *types.Int}, + {Name: "generated", ID: 2, LogicalColumnID: 2, Type: *types.TimestampTZ}, }, NextColumnID: 3, Families: []ColumnFamilyDescriptor{ @@ -1063,13 +1065,13 @@ var ( UnexposedParentSchemaID: keys.PublicSchemaID, Version: 1, Columns: []ColumnDescriptor{ - {Name: "zone_id", ID: 1, Type: *types.Int}, - {Name: "subzone_id", ID: 2, Type: *types.Int}, - {Name: "type", ID: 3, Type: *types.String}, - {Name: "config", ID: 4, Type: *types.String}, - {Name: "report_id", ID: 5, Type: *types.Int}, - {Name: "violation_start", ID: 6, Type: *types.TimestampTZ, Nullable: true}, - {Name: "violating_ranges", ID: 7, Type: *types.Int}, + {Name: "zone_id", ID: 1, LogicalColumnID: 1, Type: *types.Int}, + {Name: "subzone_id", ID: 2, LogicalColumnID: 2, Type: *types.Int}, + {Name: "type", ID: 3, LogicalColumnID: 3, Type: *types.String}, + {Name: "config", ID: 4, LogicalColumnID: 4, Type: *types.String}, + {Name: "report_id", ID: 5, LogicalColumnID: 5, Type: *types.Int}, + {Name: "violation_start", ID: 6, LogicalColumnID: 6, Type: *types.TimestampTZ, Nullable: true}, + {Name: "violating_ranges", ID: 7, LogicalColumnID: 7, Type: *types.Int}, }, NextColumnID: 8, Families: []ColumnFamilyDescriptor{ @@ -1116,11 +1118,11 @@ var ( UnexposedParentSchemaID: keys.PublicSchemaID, Version: 1, Columns: []ColumnDescriptor{ - {Name: "zone_id", ID: 1, Type: *types.Int}, - {Name: "subzone_id", ID: 2, Type: *types.Int}, - {Name: "locality", ID: 3, Type: *types.String}, - {Name: "report_id", ID: 4, Type: *types.Int}, - {Name: "at_risk_ranges", ID: 5, Type: *types.Int}, + {Name: "zone_id", ID: 1, LogicalColumnID: 1, Type: *types.Int}, + {Name: "subzone_id", ID: 2, LogicalColumnID: 2, Type: *types.Int}, + {Name: "locality", ID: 3, LogicalColumnID: 3, Type: *types.String}, + {Name: "report_id", ID: 4, LogicalColumnID: 4, Type: *types.Int}, + {Name: "at_risk_ranges", ID: 5, LogicalColumnID: 5, Type: *types.Int}, }, NextColumnID: 6, Families: []ColumnFamilyDescriptor{ @@ -1166,13 +1168,13 @@ var ( UnexposedParentSchemaID: keys.PublicSchemaID, Version: 1, Columns: []ColumnDescriptor{ - {Name: "zone_id", ID: 1, Type: *types.Int}, - {Name: "subzone_id", ID: 2, Type: *types.Int}, - {Name: "report_id", ID: 3, Type: *types.Int}, - {Name: "total_ranges", ID: 4, Type: *types.Int}, - {Name: "unavailable_ranges", ID: 5, Type: *types.Int}, - {Name: "under_replicated_ranges", ID: 6, Type: *types.Int}, - {Name: "over_replicated_ranges", ID: 7, Type: *types.Int}, + {Name: "zone_id", ID: 1, LogicalColumnID: 1, Type: *types.Int}, + {Name: "subzone_id", ID: 2, LogicalColumnID: 2, Type: *types.Int}, + {Name: "report_id", ID: 3, LogicalColumnID: 3, Type: *types.Int}, + {Name: "total_ranges", ID: 4, LogicalColumnID: 4, Type: *types.Int}, + {Name: "unavailable_ranges", ID: 5, LogicalColumnID: 5, Type: *types.Int}, + {Name: "under_replicated_ranges", ID: 6, LogicalColumnID: 6, Type: *types.Int}, + {Name: "over_replicated_ranges", ID: 7, LogicalColumnID: 7, Type: *types.Int}, }, NextColumnID: 8, Families: []ColumnFamilyDescriptor{ @@ -1215,15 +1217,16 @@ var ( Version: 1, Columns: []ColumnDescriptor{ { - Name: "singleton", - ID: 1, - Type: *types.Bool, - DefaultExpr: &trueBoolString, + Name: "singleton", + ID: 1, + LogicalColumnID: 1, + Type: *types.Bool, + DefaultExpr: &trueBoolString, }, - {Name: "version", ID: 2, Type: *types.Int}, - {Name: "num_records", ID: 3, Type: *types.Int}, - {Name: "num_spans", ID: 4, Type: *types.Int}, - {Name: "total_bytes", ID: 5, Type: *types.Int}, + {Name: "version", ID: 2, LogicalColumnID: 2, Type: *types.Int}, + {Name: "num_records", ID: 3, LogicalColumnID: 3, Type: *types.Int}, + {Name: "num_spans", ID: 4, LogicalColumnID: 4, Type: *types.Int}, + {Name: "total_bytes", ID: 5, LogicalColumnID: 5, Type: *types.Int}, }, Checks: []*TableDescriptor_CheckConstraint{ { @@ -1265,13 +1268,13 @@ var ( UnexposedParentSchemaID: keys.PublicSchemaID, Version: 1, Columns: []ColumnDescriptor{ - {Name: "id", ID: 1, Type: *types.Uuid}, - {Name: "ts", ID: 2, Type: *types.Decimal}, - {Name: "meta_type", ID: 3, Type: *types.String}, - {Name: "meta", ID: 4, Type: *types.Bytes, Nullable: true}, - {Name: "num_spans", ID: 5, Type: *types.Int}, - {Name: "spans", ID: 6, Type: *types.Bytes}, - {Name: "verified", ID: 7, Type: *types.Bool, DefaultExpr: &falseBoolString}, + {Name: "id", ID: 1, LogicalColumnID: 1, Type: *types.Uuid}, + {Name: "ts", ID: 2, LogicalColumnID: 2, Type: *types.Decimal}, + {Name: "meta_type", ID: 3, LogicalColumnID: 3, Type: *types.String}, + {Name: "meta", ID: 4, LogicalColumnID: 4, Type: *types.Bytes, Nullable: true}, + {Name: "num_spans", ID: 5, LogicalColumnID: 5, Type: *types.Int}, + {Name: "spans", ID: 6, LogicalColumnID: 6, Type: *types.Bytes}, + {Name: "verified", ID: 7, LogicalColumnID: 7, Type: *types.Bool, DefaultExpr: &falseBoolString}, }, NextColumnID: 8, Families: []ColumnFamilyDescriptor{ @@ -1307,9 +1310,9 @@ var ( UnexposedParentSchemaID: keys.PublicSchemaID, Version: 1, Columns: []ColumnDescriptor{ - {Name: "username", ID: 1, Type: *types.String}, - {Name: "option", ID: 2, Type: *types.String}, - {Name: "value", ID: 3, Type: *types.String, Nullable: true}, + {Name: "username", ID: 1, LogicalColumnID: 1, Type: *types.String}, + {Name: "option", ID: 2, LogicalColumnID: 2, Type: *types.String}, + {Name: "value", ID: 3, LogicalColumnID: 3, Type: *types.String, Nullable: true}, }, NextColumnID: 4, Families: []ColumnFamilyDescriptor{ @@ -1343,9 +1346,9 @@ var ( UnexposedParentSchemaID: keys.PublicSchemaID, Version: 1, Columns: []ColumnDescriptor{ - {Name: "id", ID: 1, Type: *types.Int, DefaultExpr: &uniqueRowIDString}, - {Name: "description", ID: 2, Type: *types.String, Nullable: true}, - {Name: "data", ID: 3, Type: *types.Bytes}, + {Name: "id", ID: 1, LogicalColumnID: 1, Type: *types.Int, DefaultExpr: &uniqueRowIDString}, + {Name: "description", ID: 2, LogicalColumnID: 2, Type: *types.String, Nullable: true}, + {Name: "data", ID: 3, LogicalColumnID: 3, Type: *types.Bytes}, }, NextColumnID: 4, Families: []ColumnFamilyDescriptor{ @@ -1372,11 +1375,11 @@ var ( UnexposedParentSchemaID: keys.PublicSchemaID, Version: 1, Columns: []ColumnDescriptor{ - {Name: "id", ID: 1, Type: *types.Int, DefaultExpr: &uniqueRowIDString, Nullable: false}, - {Name: "completed", ID: 2, Type: *types.Bool, Nullable: false, DefaultExpr: &falseBoolString}, - {Name: "statement_fingerprint", ID: 3, Type: *types.String, Nullable: false}, - {Name: "statement_diagnostics_id", ID: 4, Type: *types.Int, Nullable: true}, - {Name: "requested_at", ID: 5, Type: *types.TimestampTZ, Nullable: false}, + {Name: "id", ID: 1, LogicalColumnID: 1, Type: *types.Int, DefaultExpr: &uniqueRowIDString, Nullable: false}, + {Name: "completed", ID: 2, LogicalColumnID: 2, Type: *types.Bool, Nullable: false, DefaultExpr: &falseBoolString}, + {Name: "statement_fingerprint", ID: 3, LogicalColumnID: 3, Type: *types.String, Nullable: false}, + {Name: "statement_diagnostics_id", ID: 4, LogicalColumnID: 4, Type: *types.Int, Nullable: true}, + {Name: "requested_at", ID: 5, LogicalColumnID: 5, Type: *types.TimestampTZ, Nullable: false}, }, NextColumnID: 6, Families: []ColumnFamilyDescriptor{ @@ -1416,13 +1419,13 @@ var ( UnexposedParentSchemaID: keys.PublicSchemaID, Version: 1, Columns: []ColumnDescriptor{ - {Name: "id", ID: 1, Type: *types.Int, DefaultExpr: &uniqueRowIDString, Nullable: false}, - {Name: "statement_fingerprint", ID: 2, Type: *types.String, Nullable: false}, - {Name: "statement", ID: 3, Type: *types.String, Nullable: false}, - {Name: "collected_at", ID: 4, Type: *types.TimestampTZ, Nullable: false}, - {Name: "trace", ID: 5, Type: *types.Jsonb, Nullable: true}, - {Name: "bundle_chunks", ID: 6, Type: *types.IntArray, Nullable: true}, - {Name: "error", ID: 7, Type: *types.String, Nullable: true}, + {Name: "id", ID: 1, LogicalColumnID: 1, Type: *types.Int, DefaultExpr: &uniqueRowIDString, Nullable: false}, + {Name: "statement_fingerprint", ID: 2, LogicalColumnID: 2, Type: *types.String, Nullable: false}, + {Name: "statement", ID: 3, LogicalColumnID: 3, Type: *types.String, Nullable: false}, + {Name: "collected_at", ID: 4, LogicalColumnID: 4, Type: *types.TimestampTZ, Nullable: false}, + {Name: "trace", ID: 5, LogicalColumnID: 5, Type: *types.Jsonb, Nullable: true}, + {Name: "bundle_chunks", ID: 6, LogicalColumnID: 6, Type: *types.IntArray, Nullable: true}, + {Name: "error", ID: 7, LogicalColumnID: 7, Type: *types.String, Nullable: true}, }, NextColumnID: 8, Families: []ColumnFamilyDescriptor{ diff --git a/pkg/sql/sqlbase/testutils.go b/pkg/sql/sqlbase/testutils.go index ad853becb4d5..e78f248b2282 100644 --- a/pkg/sql/sqlbase/testutils.go +++ b/pkg/sql/sqlbase/testutils.go @@ -80,7 +80,7 @@ func GetTableDescriptor(kvDB *kv.DB, database string, table string) *TableDescri if tableDesc == nil { return nil } - err = tableDesc.MaybeFillInDescriptor(ctx, kvDB) + _, err = tableDesc.MaybeFillInDescriptor(ctx, kvDB) if err != nil { log.Fatalf(ctx, "failure to fill in descriptor. err: %v", err) }