From 7afcfd0decfe6aa47a932a723022b4a5ad80517f Mon Sep 17 00:00:00 2001 From: richardjcai Date: Fri, 3 Apr 2020 13:16:35 -0400 Subject: [PATCH] Add LogicalColumnID field to ColumnDescriptor. The LogicalColumnID field mimics the ColumnID field however LogicalColumnID may be swapped between two columns whereas ColumnID cannot. LogicalColumnID is referenced for virtual tables (pg_catalog, information_schema) and most notably affects column ordering for SHOW COLUMNS. This LogicalColumnID field support swapping the order of two columns - currently only used for ALTER COLUMN TYPE when a shadow column is created and swapped with it's original column. Does not affect existing behaviour. Release note: None --- pkg/ccl/backupccl/restore_planning.go | 3 + pkg/sql/information_schema.go | 10 +- pkg/sql/logical_column_id_test.go | 76 ++++ pkg/sql/pg_catalog.go | 42 +- pkg/sql/sqlbase/structured.go | 31 +- pkg/sql/sqlbase/structured.pb.go | 587 ++++++++++++++------------ pkg/sql/sqlbase/structured.proto | 8 + pkg/sql/sqlbase/structured_test.go | 27 +- pkg/sql/sqlbase/system.go | 253 +++++------ 9 files changed, 605 insertions(+), 432 deletions(-) create mode 100644 pkg/sql/logical_column_id_test.go 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/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/logical_column_id_test.go b/pkg/sql/logical_column_id_test.go new file mode 100644 index 000000000000..38ae80c4f94c --- /dev/null +++ b/pkg/sql/logical_column_id_test.go @@ -0,0 +1,76 @@ +// Copyright 2020 The Cockroach Authors. +// +// Use of this software is governed by the Business Source License +// included in the file licenses/BSL.txt. +// +// As of the Change Date specified in that file, in accordance with +// the Business Source License, use of this software will be governed +// by the Apache License, Version 2.0, included in the file +// licenses/APL.txt. + +package sql + +import ( + "context" + "testing" + + "github.com/cockroachdb/cockroach/pkg/kv" + "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" + "github.com/cockroachdb/cockroach/pkg/sql/tests" + "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" + "github.com/cockroachdb/cockroach/pkg/util/leaktest" +) + +// TestAddLogicalColumnID writes a TableDescriptor to disk without +// LogicalColumnIDs set and reads it back expecting the LogicalColumnID +// to be updated on read and equal to ColumnID. +func TestAddLogicalColumnID(t *testing.T) { + defer leaktest.AfterTest(t)() + ctx := context.Background() + params, _ := tests.CreateTestServerParams() + s, sqlDB, kvDB := serverutils.StartServer(t, params) + defer s.Stopper().Stop(ctx) + + tests := []struct { + name string + query string + }{ + {"t1", "CREATE TABLE t1 (x INT);"}, + {"t2", "CREATE TABLE t2 (x INT, y INT);"}, + } + for i := range tests { + if _, err := sqlDB.Exec(tests[i].query); err != nil { + t.Fatal(err) + } + + removeLogicalColumnIDs := func(tDesc *sqlbase.TableDescriptor) { + for i := range tDesc.Columns { + tDesc.Columns[i].LogicalColumnID = 0 + } + } + + desc := sqlbase.GetTableDescriptor(kvDB, "defaultdb", tests[i].name) + + err := kvDB.Txn(ctx, func(ctx context.Context, txn *kv.Txn) error { + b := txn.NewBatch() + removeLogicalColumnIDs(desc) + if err := writeDescToBatch(ctx, false, s.ClusterSettings(), b, desc.ID, desc); err != nil { + return err + } + return txn.Run(ctx, b) + }) + + if err != nil { + t.Fatal(err) + } + + desc = sqlbase.GetTableDescriptor(kvDB, "defaultdb", desc.Name) + + for i := range desc.Columns { + if desc.Columns[i].LogicalColumnID != desc.Columns[i].ID { + t.Fatalf("Expected LogicalColumnID to be %d, got %d.", + desc.Columns[i].ID, desc.Columns[i].LogicalColumnID) + } + } + } +} 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..9b1f5446f3dc 100644 --- a/pkg/sql/sqlbase/structured.go +++ b/pkg/sql/sqlbase/structured.go @@ -387,6 +387,9 @@ func GetTableDescFromIDWithFKsChanged( if err != nil { return nil, false, err } + + table.MaybeFillInLogicalColumnID() + return table, changed, err } @@ -889,11 +892,16 @@ func (desc *TableDescriptor) MaybeFillInDescriptor( ) error { desc.maybeUpgradeFormatVersion() desc.Privileges.MaybeFixPrivileges(desc.ID) + + var err error if protoGetter != nil { - if _, err := desc.MaybeUpgradeForeignKeyRepresentation(ctx, protoGetter, false /* skipFKsWithNoMatchingTable*/); err != nil { + if _, err = desc.MaybeUpgradeForeignKeyRepresentation(ctx, protoGetter, false /* skipFKsWithNoMatchingTable*/); err != nil { return err } } + + desc.MaybeFillInLogicalColumnID() + return nil } @@ -1198,6 +1206,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 e8f55ff0fd45..3ed33cac2999 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_b87e13aca48e46e7, []int{0} + return fileDescriptor_structured_5d9e2d446ffe4785, []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_b87e13aca48e46e7, []int{0, 0} + return fileDescriptor_structured_5d9e2d446ffe4785, []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_b87e13aca48e46e7, []int{0, 1} + return fileDescriptor_structured_5d9e2d446ffe4785, []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_b87e13aca48e46e7, []int{7, 0} + return fileDescriptor_structured_5d9e2d446ffe4785, []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_b87e13aca48e46e7, []int{7, 1} + return fileDescriptor_structured_5d9e2d446ffe4785, []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_b87e13aca48e46e7, []int{8, 0} + return fileDescriptor_structured_5d9e2d446ffe4785, []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_b87e13aca48e46e7, []int{10, 0} + return fileDescriptor_structured_5d9e2d446ffe4785, []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_b87e13aca48e46e7, []int{10, 1} + return fileDescriptor_structured_5d9e2d446ffe4785, []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_b87e13aca48e46e7, []int{11, 0} + return fileDescriptor_structured_5d9e2d446ffe4785, []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_b87e13aca48e46e7, []int{11, 1} + return fileDescriptor_structured_5d9e2d446ffe4785, []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_b87e13aca48e46e7, []int{0} + return fileDescriptor_structured_5d9e2d446ffe4785, []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_b87e13aca48e46e7, []int{1} + return fileDescriptor_structured_5d9e2d446ffe4785, []int{1} } func (m *ForeignKeyConstraint) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -596,13 +596,20 @@ type ColumnDescriptor struct { // Expression to use to compute the value of this column if this is a // computed column. ComputeExpr *string `protobuf:"bytes,11,opt,name=compute_expr,json=computeExpr" json:"compute_expr,omitempty"` + // LogicalColumnID is used to order columns visually. This is because + // ordinal_position in information_schema determines a table's visual column + // ordering to the user. + // This only differs from ID when the Column order is swapped or + // the ColumnDescriptor must be remade while remaining visual ordering. + // This does not exist in TableDescriptors pre 20.2. + 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_b87e13aca48e46e7, []int{2} + return fileDescriptor_structured_5d9e2d446ffe4785, []int{2} } func (m *ColumnDescriptor) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -658,7 +665,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_b87e13aca48e46e7, []int{3} + return fileDescriptor_structured_5d9e2d446ffe4785, []int{3} } func (m *ColumnFamilyDescriptor) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -704,7 +711,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_b87e13aca48e46e7, []int{4} + return fileDescriptor_structured_5d9e2d446ffe4785, []int{4} } func (m *InterleaveDescriptor) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -748,7 +755,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_b87e13aca48e46e7, []int{4, 0} + return fileDescriptor_structured_5d9e2d446ffe4785, []int{4, 0} } func (m *InterleaveDescriptor_Ancestor) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -803,7 +810,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_b87e13aca48e46e7, []int{5} + return fileDescriptor_structured_5d9e2d446ffe4785, []int{5} } func (m *ShardedDescriptor) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -848,7 +855,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_b87e13aca48e46e7, []int{6} + return fileDescriptor_structured_5d9e2d446ffe4785, []int{6} } func (m *PartitioningDescriptor) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -891,7 +898,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_b87e13aca48e46e7, []int{6, 0} + return fileDescriptor_structured_5d9e2d446ffe4785, []int{6, 0} } func (m *PartitioningDescriptor_List) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -936,7 +943,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_b87e13aca48e46e7, []int{6, 1} + return fileDescriptor_structured_5d9e2d446ffe4785, []int{6, 1} } func (m *PartitioningDescriptor_Range) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1082,7 +1089,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_b87e13aca48e46e7, []int{7} + return fileDescriptor_structured_5d9e2d446ffe4785, []int{7} } func (m *IndexDescriptor) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1133,7 +1140,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_b87e13aca48e46e7, []int{8} + return fileDescriptor_structured_5d9e2d446ffe4785, []int{8} } func (m *ConstraintToUpdate) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1176,7 +1183,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_b87e13aca48e46e7, []int{9} + return fileDescriptor_structured_5d9e2d446ffe4785, []int{9} } func (m *PrimaryKeySwap) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1231,7 +1238,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_b87e13aca48e46e7, []int{10} + return fileDescriptor_structured_5d9e2d446ffe4785, []int{10} } func (m *DescriptorMutation) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1580,7 +1587,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_b87e13aca48e46e7, []int{11} + return fileDescriptor_structured_5d9e2d446ffe4785, []int{11} } func (m *TableDescriptor) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1880,7 +1887,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_b87e13aca48e46e7, []int{11, 0} + return fileDescriptor_structured_5d9e2d446ffe4785, []int{11, 0} } func (m *TableDescriptor_SchemaChangeLease) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1921,7 +1928,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_b87e13aca48e46e7, []int{11, 1} + return fileDescriptor_structured_5d9e2d446ffe4785, []int{11, 1} } func (m *TableDescriptor_CheckConstraint) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2027,7 +2034,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_b87e13aca48e46e7, []int{11, 2} + return fileDescriptor_structured_5d9e2d446ffe4785, []int{11, 2} } func (m *TableDescriptor_NameInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2067,7 +2074,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_b87e13aca48e46e7, []int{11, 3} + return fileDescriptor_structured_5d9e2d446ffe4785, []int{11, 3} } func (m *TableDescriptor_Reference) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2104,7 +2111,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_b87e13aca48e46e7, []int{11, 4} + return fileDescriptor_structured_5d9e2d446ffe4785, []int{11, 4} } func (m *TableDescriptor_MutationJob) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2147,7 +2154,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_b87e13aca48e46e7, []int{11, 5} + return fileDescriptor_structured_5d9e2d446ffe4785, []int{11, 5} } func (m *TableDescriptor_SequenceOpts) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2187,7 +2194,7 @@ func (m *TableDescriptor_SequenceOpts_SequenceOwner) String() string { } func (*TableDescriptor_SequenceOpts_SequenceOwner) ProtoMessage() {} func (*TableDescriptor_SequenceOpts_SequenceOwner) Descriptor() ([]byte, []int) { - return fileDescriptor_structured_b87e13aca48e46e7, []int{11, 5, 0} + return fileDescriptor_structured_5d9e2d446ffe4785, []int{11, 5, 0} } func (m *TableDescriptor_SequenceOpts_SequenceOwner) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2227,7 +2234,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_b87e13aca48e46e7, []int{11, 6} + return fileDescriptor_structured_5d9e2d446ffe4785, []int{11, 6} } func (m *TableDescriptor_Replacement) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2264,7 +2271,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_b87e13aca48e46e7, []int{11, 7} + return fileDescriptor_structured_5d9e2d446ffe4785, []int{11, 7} } func (m *TableDescriptor_GCDescriptorMutation) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2303,7 +2310,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_b87e13aca48e46e7, []int{12} + return fileDescriptor_structured_5d9e2d446ffe4785, []int{12} } func (m *DatabaseDescriptor) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2361,7 +2368,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_b87e13aca48e46e7, []int{13} + return fileDescriptor_structured_5d9e2d446ffe4785, []int{13} } func (m *Descriptor) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2713,6 +2720,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 +4080,9 @@ func (m *ColumnDescriptor) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintStructured(dAtA, i, uint64(num)) } } + dAtA[i] = 0x68 + i++ + i = encodeVarintStructured(dAtA, i, uint64(m.LogicalColumnID)) return i, nil } @@ -5506,6 +5519,7 @@ func (m *ColumnDescriptor) Size() (n int) { n += 1 + sovStructured(uint64(e)) } } + n += 1 + sovStructured(uint64(m.LogicalColumnID)) return n } @@ -7069,6 +7083,25 @@ func (m *ColumnDescriptor) Unmarshal(dAtA []byte) error { } else { return fmt.Errorf("proto: wrong wireType = %d for field OwnsSequenceIds", wireType) } + 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 +12156,246 @@ var ( ) func init() { - proto.RegisterFile("sql/sqlbase/structured.proto", fileDescriptor_structured_b87e13aca48e46e7) -} - -var fileDescriptor_structured_b87e13aca48e46e7 = []byte{ - // 3756 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, 0xf1, 0x3e, 0x14, 0x06, 0xce, 0x68, 0x3c, 0xf1, 0x31, 0x9b, 0x54, 0x66, 0x93, 0x72, - 0x1a, 0x9d, 0x74, 0x13, 0x2a, 0xce, 0x6b, 0x7b, 0x0a, 0xb6, 0x10, 0x87, 0x25, 0x0c, 0x11, 0xd8, - 0xe0, 0x92, 0x72, 0x4a, 0x7e, 0x27, 0x95, 0xcb, 0x2b, 0xb0, 0x93, 0xca, 0x65, 0x95, 0x5c, 0xfd, - 0x2f, 0x13, 0x70, 0x97, 0x1d, 0xf2, 0x96, 0x3e, 0x32, 0xad, 0xf3, 0xb7, 0xbd, 0x30, 0x86, 0xc2, - 0x2f, 0x8c, 0xee, 0x85, 0xfa, 0x29, 0x22, 0xc6, 0x3c, 0x15, 0xdd, 0x0b, 0xa1, 0xf5, 0x08, 0x09, - 0x3d, 0x01, 0x88, 0xb8, 0xb2, 0x14, 0xdd, 0xc4, 0xbb, 0x97, 0x17, 0xb5, 0xfc, 0x6c, 0x07, 0x96, - 0x1f, 0x44, 0xdc, 0x56, 0x45, 0xdc, 0x4e, 0x80, 0x40, 0xaf, 0xa8, 0xd8, 0x7c, 0xc0, 0xd7, 0x54, - 0x6e, 0x33, 0x06, 0x21, 0x1e, 0x77, 0xb0, 0x46, 0x6c, 0xd0, 0xe0, 0x11, 0xe1, 0x9f, 0x12, 0xb0, - 0xd4, 0xb5, 0x7d, 0xec, 0x5a, 0x58, 0x3f, 0xc5, 0x91, 0xe3, 0xf8, 0x39, 0xe4, 0x75, 0x7b, 0x80, - 0x3d, 0xdf, 0x71, 0xbd, 0xaa, 0xb4, 0x9a, 0x5c, 0x93, 0x37, 0x7f, 0xeb, 0x1a, 0x33, 0x9e, 0x25, - 0xbf, 0xde, 0xe0, 0xc2, 0xfc, 0x24, 0x43, 0xb0, 0xe5, 0x7f, 0x96, 0x20, 0x27, 0x46, 0xd1, 0x23, - 0xc8, 0x4d, 0x45, 0x9c, 0x3b, 0x7c, 0x37, 0xd9, 0xb8, 0xe3, 0xcd, 0xfa, 0xdc, 0xdd, 0xfe, 0x36, - 0xe4, 0xa8, 0xe1, 0x6a, 0xc1, 0x9d, 0x2c, 0x0b, 0x09, 0x6e, 0xbb, 0xd1, 0xe4, 0x28, 0x4b, 0x79, - 0xbb, 0x06, 0x6a, 0xcd, 0xca, 0x5b, 0x92, 0x54, 0xfe, 0x1d, 0x71, 0x7e, 0x07, 0xf1, 0xcc, 0xe5, - 0x4a, 0x2a, 0xc3, 0xce, 0x8c, 0x9f, 0xdc, 0x3f, 0x4a, 0x50, 0x21, 0x02, 0x06, 0x36, 0x22, 0xc7, - 0xf6, 0x00, 0xc0, 0xf4, 0x34, 0x8f, 0xd1, 0xe9, 0x8e, 0x84, 0x95, 0xe4, 0x4d, 0x8f, 0xb3, 0x07, - 0xaa, 0x96, 0xb8, 0xa2, 0x6a, 0x3f, 0x85, 0x22, 0x95, 0xd5, 0x8e, 0x26, 0x83, 0x97, 0xd8, 0xf7, - 0xe8, 0x0a, 0xd3, 0xcd, 0x25, 0xbe, 0xc2, 0x02, 0x45, 0x68, 0xb2, 0x31, 0xb5, 0xe0, 0x45, 0xbe, - 0xae, 0x68, 0x5f, 0xea, 0x8a, 0xf6, 0xf1, 0x85, 0xff, 0x6f, 0x12, 0xee, 0xee, 0xeb, 0xae, 0x6f, - 0x12, 0xd7, 0x6d, 0xda, 0xc7, 0x91, 0xd5, 0x3f, 0x04, 0xd9, 0x9e, 0x8c, 0xb8, 0x82, 0x79, 0xfc, - 0x42, 0xd8, 0xfa, 0xc0, 0x9e, 0x8c, 0x98, 0xee, 0x78, 0xc4, 0x33, 0x59, 0xa6, 0xe7, 0xd3, 0xd8, - 0x2e, 0x6f, 0x6e, 0x5e, 0xa3, 0x16, 0xb3, 0xe7, 0x58, 0xdf, 0x33, 0x3d, 0x5f, 0xec, 0x99, 0xa0, - 0xa0, 0x3e, 0xa4, 0x5d, 0xdd, 0x3e, 0xc6, 0xd4, 0x5e, 0xe4, 0xcd, 0xc7, 0xb7, 0x83, 0x53, 0x89, - 0xa8, 0x88, 0x17, 0x14, 0x67, 0xf9, 0xaf, 0x25, 0x48, 0x91, 0x59, 0x6e, 0x30, 0xe9, 0xbb, 0x90, - 0x39, 0xd5, 0xad, 0x09, 0x66, 0xf9, 0x49, 0x41, 0xe5, 0x5f, 0xe8, 0x8f, 0xa0, 0xec, 0x4d, 0x8e, - 0xc6, 0x91, 0xa9, 0xe8, 0x0d, 0xc8, 0x9b, 0x9f, 0xdc, 0x6a, 0x55, 0x41, 0x2a, 0x1c, 0xc7, 0x62, - 0x17, 0xb0, 0xfc, 0x0a, 0xd2, 0x74, 0xd5, 0x37, 0xac, 0xef, 0x3e, 0x14, 0x7c, 0x47, 0xc3, 0x67, - 0x03, 0x6b, 0xe2, 0x99, 0xa7, 0x4c, 0x53, 0x0a, 0xaa, 0xec, 0x3b, 0x1d, 0x41, 0x42, 0x0f, 0xa1, - 0x34, 0x74, 0x9d, 0x91, 0x66, 0xda, 0x82, 0x89, 0x06, 0x0a, 0xb5, 0x48, 0xa8, 0x5d, 0x41, 0x8c, - 0xa9, 0xec, 0xdf, 0xcb, 0x50, 0xa6, 0x86, 0x31, 0x97, 0xdb, 0x7b, 0x18, 0x71, 0x7b, 0x77, 0x62, - 0x6e, 0x2f, 0xb0, 0x2e, 0xe2, 0xf5, 0xee, 0x41, 0x66, 0x62, 0x9b, 0xaf, 0x26, 0x6c, 0xfe, 0x20, - 0x26, 0x30, 0xda, 0x1c, 0x5a, 0x89, 0x3e, 0x06, 0x44, 0x5c, 0x01, 0xd6, 0x62, 0x8c, 0x69, 0xca, - 0xa8, 0xd0, 0x91, 0xd6, 0xb5, 0x1e, 0x34, 0x73, 0x0b, 0x0f, 0xba, 0x0d, 0x0a, 0x3e, 0xf3, 0x5d, - 0x3d, 0x9a, 0x4c, 0x66, 0xa9, 0xfc, 0xca, 0xe5, 0x45, 0xad, 0xd4, 0x21, 0x63, 0xb3, 0x41, 0x4a, - 0x38, 0x32, 0x66, 0x10, 0x2d, 0xa9, 0x70, 0x0c, 0xc3, 0x74, 0x31, 0x4d, 0x81, 0xbc, 0x6a, 0x6e, - 0x35, 0x79, 0x43, 0xaa, 0x33, 0x75, 0xec, 0xeb, 0x6d, 0x21, 0xa8, 0x2a, 0x0c, 0x2a, 0x20, 0x78, - 0xe8, 0x00, 0xe4, 0x21, 0xcb, 0x8c, 0xb4, 0x97, 0xf8, 0x9c, 0xe6, 0x50, 0xf2, 0xe6, 0x4f, 0xe6, - 0xcf, 0xa1, 0x9a, 0x19, 0x72, 0x05, 0x55, 0x49, 0x85, 0x61, 0x30, 0x88, 0x5e, 0x40, 0x31, 0x92, - 0xfa, 0x1c, 0x9d, 0xd3, 0xc0, 0xfc, 0x66, 0xb0, 0x85, 0x10, 0xa8, 0x79, 0x8e, 0xbe, 0x00, 0x30, - 0x83, 0x00, 0x40, 0xe3, 0xb7, 0xbc, 0xf9, 0xd1, 0x2d, 0x22, 0x85, 0xf0, 0x2f, 0x21, 0x08, 0x7a, - 0x01, 0xa5, 0xf0, 0x8b, 0x2e, 0xb6, 0x70, 0xeb, 0xc5, 0x32, 0xd4, 0x62, 0x04, 0xa7, 0x49, 0x72, - 0xe8, 0x25, 0x92, 0x59, 0x38, 0x9e, 0xe9, 0xe3, 0xa8, 0x1a, 0x14, 0xa9, 0x1a, 0xd4, 0x2f, 0x2f, - 0x6a, 0xa8, 0x25, 0xc6, 0x67, 0xab, 0x02, 0x1a, 0x4c, 0x8d, 0x33, 0xc5, 0x8a, 0x29, 0x30, 0x41, - 0x2c, 0x85, 0x8a, 0x75, 0x10, 0xaa, 0xf0, 0x15, 0xc5, 0x8a, 0xa8, 0x37, 0x2b, 0x7a, 0x0a, 0x31, - 0xdf, 0x53, 0x7e, 0x73, 0xdf, 0x13, 0x03, 0x42, 0x1d, 0x9e, 0x4b, 0x2a, 0x34, 0x1f, 0xff, 0x68, - 0x4e, 0x25, 0x3d, 0x3c, 0x1f, 0x8b, 0x83, 0x64, 0x49, 0xe4, 0x63, 0x40, 0x03, 0x17, 0xeb, 0x3e, - 0x36, 0x48, 0xb6, 0x66, 0x99, 0x03, 0xd3, 0xb7, 0xce, 0xab, 0x95, 0x88, 0xdd, 0x57, 0xf8, 0x78, - 0x27, 0x18, 0x46, 0x4f, 0x20, 0x7b, 0x8a, 0x5d, 0xcf, 0x74, 0xec, 0x2a, 0xa2, 0xce, 0x64, 0x85, - 0xe7, 0xda, 0x77, 0xa7, 0xe6, 0xfb, 0x92, 0x71, 0xa9, 0x82, 0x1d, 0x6d, 0x43, 0x11, 0xdb, 0x03, - 0xc7, 0x30, 0xed, 0x63, 0x8d, 0x2e, 0x7f, 0x31, 0xcc, 0x77, 0x7e, 0xb8, 0xa8, 0xbd, 0x37, 0x25, - 0xdf, 0xe1, 0xbc, 0x64, 0xd9, 0x6a, 0x01, 0x47, 0xbe, 0xd0, 0x36, 0x64, 0x45, 0x4c, 0x5e, 0xa2, - 0x67, 0xba, 0x76, 0xcd, 0x11, 0x5c, 0x89, 0xe8, 0x7c, 0x5f, 0x42, 0x9c, 0xe4, 0xd1, 0x86, 0xe9, - 0x91, 0x5c, 0xc4, 0xa8, 0xde, 0x89, 0xe6, 0xd1, 0x82, 0x5a, 0x5f, 0x81, 0x7c, 0x60, 0xcc, 0x28, - 0x0b, 0xc9, 0xc6, 0x41, 0x8b, 0x55, 0xe7, 0xed, 0xce, 0x41, 0x4b, 0x91, 0xea, 0xf7, 0x21, 0x45, - 0xd7, 0x24, 0x43, 0x76, 0xab, 0xaf, 0xbe, 0x68, 0xa8, 0x6d, 0xd6, 0x11, 0xe8, 0xf6, 0xbe, 0xec, - 0xa8, 0x87, 0x9d, 0xb6, 0x22, 0xdc, 0xf5, 0xbf, 0x24, 0x01, 0x85, 0x85, 0xe1, 0xa1, 0xc3, 0x8b, - 0xab, 0x63, 0x28, 0x0f, 0x02, 0x2a, 0x3b, 0x17, 0x69, 0x35, 0xb1, 0x56, 0xda, 0x7c, 0xf2, 0xff, - 0x16, 0x97, 0x02, 0x23, 0x4a, 0x0a, 0xef, 0xb8, 0x34, 0x88, 0x51, 0x23, 0x69, 0x4a, 0x62, 0x2a, - 0x34, 0xa8, 0x90, 0x1e, 0x9c, 0xe0, 0xc1, 0x4b, 0x1e, 0x1c, 0x7f, 0xe7, 0x9a, 0x89, 0x69, 0x06, - 0x17, 0xd1, 0xa7, 0x16, 0x91, 0x09, 0xa7, 0x16, 0x51, 0x9b, 0x42, 0x21, 0x35, 0xee, 0xf5, 0x52, - 0x37, 0x3a, 0x92, 0x59, 0x4d, 0x0c, 0xe1, 0x48, 0x22, 0x4e, 0xef, 0x09, 0x94, 0x6d, 0xc7, 0xd7, - 0x48, 0x89, 0xc3, 0x8d, 0x93, 0x16, 0x2e, 0xc5, 0xa6, 0xc2, 0x55, 0x28, 0x34, 0xc5, 0xa2, 0xed, - 0xf8, 0xbd, 0x89, 0x65, 0x31, 0x42, 0xfd, 0x33, 0x28, 0xc5, 0xcf, 0x08, 0xe5, 0x21, 0xdd, 0xda, - 0xee, 0xb4, 0x76, 0x95, 0x05, 0x54, 0x06, 0x79, 0xab, 0xaf, 0x76, 0xba, 0x4f, 0x7b, 0xda, 0x6e, - 0xe7, 0x0f, 0x58, 0x07, 0xa7, 0xd7, 0x17, 0x1d, 0x9c, 0xa0, 0xf8, 0x48, 0x2b, 0x99, 0xfa, 0xff, - 0x48, 0x50, 0xda, 0x77, 0xcd, 0x91, 0xee, 0x9e, 0xef, 0xe2, 0xf3, 0x83, 0xd7, 0xfa, 0x18, 0x7d, - 0x0e, 0x4b, 0x36, 0x7e, 0xad, 0x8d, 0x19, 0x55, 0x0b, 0x92, 0x59, 0x69, 0x76, 0x7b, 0xaf, 0x62, - 0xe3, 0xd7, 0x1c, 0xa1, 0xcb, 0x73, 0xd9, 0x8f, 0x41, 0x76, 0x2c, 0x5e, 0xbf, 0x62, 0xd1, 0x62, - 0x91, 0xa3, 0x42, 0xe0, 0x58, 0xac, 0x5c, 0xa5, 0xf1, 0x55, 0x26, 0xf3, 0x09, 0xee, 0xe4, 0x0c, - 0x6e, 0x1b, 0xbf, 0x16, 0xdc, 0x9f, 0xc3, 0x12, 0xc1, 0xbe, 0xb2, 0xba, 0xd4, 0x35, 0xab, 0x73, - 0x2c, 0x23, 0xbe, 0x3a, 0xae, 0xbc, 0xff, 0x9a, 0x06, 0x14, 0x5e, 0xfd, 0xb3, 0x89, 0xaf, 0x53, - 0x7b, 0x68, 0x40, 0x86, 0x5f, 0x84, 0x44, 0x2f, 0xf8, 0xc3, 0x6b, 0x75, 0x36, 0x5e, 0x4f, 0x6f, - 0x2f, 0xa8, 0x5c, 0x10, 0xfd, 0x2c, 0xda, 0x0f, 0x95, 0x37, 0x3f, 0x98, 0xcf, 0x99, 0x6d, 0x2f, - 0x88, 0x46, 0xe9, 0x2e, 0xa4, 0x3d, 0x5f, 0xf7, 0x59, 0xbe, 0x52, 0xda, 0xdc, 0xb8, 0x46, 0xfe, - 0xea, 0xe2, 0xd7, 0x0f, 0x88, 0x98, 0xd0, 0x5a, 0x8a, 0x81, 0x5e, 0x40, 0x3e, 0xc8, 0x01, 0x78, - 0x73, 0xf5, 0xf1, 0xfc, 0x80, 0x81, 0x9f, 0x10, 0x35, 0x42, 0x80, 0x85, 0x1a, 0x20, 0x8f, 0x38, - 0x5b, 0x58, 0xe9, 0xad, 0xf2, 0x34, 0x0c, 0x04, 0x02, 0x4d, 0xc7, 0x22, 0x5f, 0x2a, 0x08, 0xa1, - 0x2e, 0x75, 0x55, 0xae, 0x63, 0x59, 0x47, 0xfa, 0xe0, 0x25, 0x6d, 0x18, 0x05, 0xae, 0x4a, 0x50, - 0xd1, 0x2e, 0x49, 0xa6, 0x84, 0x96, 0xd3, 0xf6, 0x8f, 0x3c, 0x47, 0x8b, 0x4a, 0x78, 0x91, 0xed, - 0x05, 0x35, 0x22, 0x8e, 0xfa, 0x50, 0x1a, 0xc7, 0x34, 0x9d, 0x67, 0x2e, 0x0f, 0xaf, 0x0b, 0x5f, - 0x31, 0xe6, 0xed, 0x05, 0x75, 0x4a, 0xbc, 0xfe, 0x39, 0xa4, 0xe9, 0x89, 0x13, 0x4f, 0xf9, 0xbc, - 0xb7, 0xdb, 0xeb, 0xbf, 0xe8, 0x31, 0xe3, 0x6b, 0x77, 0xf6, 0x3a, 0x87, 0x1d, 0xad, 0xdf, 0xdb, - 0x23, 0xc6, 0xf7, 0x2e, 0xdc, 0xe1, 0x84, 0x46, 0xaf, 0xad, 0xbd, 0x50, 0xbb, 0x62, 0x28, 0x51, - 0x5f, 0x8b, 0xba, 0xe2, 0x1c, 0xa4, 0x7a, 0xfd, 0x5e, 0x47, 0x59, 0xa0, 0x4e, 0xb9, 0xdd, 0x56, - 0x24, 0xea, 0x94, 0xd5, 0xfe, 0xbe, 0xb0, 0xd9, 0x66, 0x01, 0xc0, 0x08, 0x6e, 0x69, 0x27, 0x95, - 0xcb, 0x28, 0xd9, 0xfa, 0x9f, 0x3f, 0x80, 0xf2, 0x94, 0x23, 0xbb, 0x21, 0x69, 0x5e, 0xa5, 0x49, - 0x73, 0x32, 0x74, 0x32, 0x41, 0xd2, 0x9c, 0xe0, 0xf9, 0xf2, 0x63, 0xc8, 0x8f, 0x75, 0x17, 0xdb, - 0x7e, 0x68, 0x55, 0xa2, 0xa9, 0x90, 0xdb, 0xa7, 0x03, 0x01, 0x7b, 0x8e, 0x31, 0x76, 0x89, 0x50, - 0x10, 0x43, 0x99, 0x26, 0xbc, 0xcb, 0x0d, 0xb1, 0x72, 0x43, 0xf8, 0xdc, 0x87, 0xca, 0xc8, 0x31, - 0xcc, 0xa1, 0x39, 0x60, 0x6a, 0xe4, 0x9b, 0x23, 0xd6, 0x39, 0x94, 0x37, 0x7f, 0x14, 0xb9, 0x93, - 0x89, 0x6f, 0x5a, 0xeb, 0x27, 0xd6, 0x60, 0xfd, 0x50, 0xbc, 0x72, 0xf0, 0x1d, 0x29, 0x51, 0x69, - 0x32, 0x88, 0x9e, 0x42, 0x56, 0xd4, 0x86, 0x39, 0x9a, 0x91, 0xcd, 0x6b, 0xbe, 0x22, 0x8a, 0x72, - 0x69, 0xb4, 0x05, 0x25, 0x1b, 0x9f, 0x45, 0x5b, 0x19, 0xf9, 0x98, 0x82, 0x17, 0x7a, 0xf8, 0x6c, - 0x76, 0x1f, 0xa3, 0x60, 0x87, 0x23, 0x06, 0xfa, 0x02, 0x8a, 0x31, 0x4f, 0x45, 0x9b, 0x82, 0x73, - 0xfb, 0x84, 0x20, 0x55, 0x8a, 0x38, 0x30, 0xb4, 0x05, 0x59, 0xe1, 0x2a, 0x65, 0xba, 0xc7, 0xdb, - 0x81, 0x09, 0x61, 0xd4, 0x84, 0x22, 0xdd, 0x62, 0xe0, 0x41, 0x0b, 0x61, 0xf2, 0x73, 0x79, 0x51, - 0x93, 0xc9, 0x0e, 0x67, 0x34, 0x2c, 0x64, 0x3b, 0xa0, 0x1b, 0x68, 0x07, 0x20, 0x78, 0x5d, 0x22, - 0x59, 0xea, 0x4d, 0x85, 0xc0, 0xbe, 0x60, 0x0c, 0x97, 0xa4, 0x46, 0xa4, 0xd1, 0x33, 0xc8, 0x0b, - 0xdf, 0xc0, 0xd2, 0xd3, 0xeb, 0x4d, 0xfd, 0xaa, 0xa7, 0x12, 0xfe, 0x29, 0x40, 0x20, 0x29, 0x80, - 0x85, 0x75, 0x0f, 0xf3, 0x1c, 0xf5, 0xc9, 0x9c, 0x29, 0xc0, 0xc1, 0xe0, 0x04, 0x8f, 0xf4, 0xd6, - 0x09, 0xa9, 0x7f, 0xf7, 0x88, 0x7c, 0x33, 0x51, 0x95, 0x54, 0x06, 0x85, 0x7a, 0xa0, 0xd0, 0x23, - 0x8b, 0x3a, 0x3e, 0x85, 0x9e, 0xda, 0xfb, 0xfc, 0xd4, 0x4a, 0xe4, 0xd4, 0xae, 0x75, 0x7e, 0x54, - 0xa7, 0x9e, 0x85, 0x0e, 0xf0, 0xf7, 0xa1, 0x34, 0x74, 0xdc, 0x91, 0xee, 0x6b, 0xc2, 0x78, 0x2a, - 0x61, 0x35, 0xfb, 0xc3, 0x45, 0xad, 0xb8, 0x45, 0x47, 0x85, 0xe1, 0x14, 0x87, 0xd1, 0x4f, 0xb4, - 0x2d, 0xe2, 0xc4, 0x22, 0x75, 0xeb, 0x1f, 0xcf, 0xbb, 0xc3, 0xab, 0x41, 0xa2, 0x07, 0x19, 0x9a, - 0xe3, 0x78, 0xd5, 0x25, 0x7a, 0xee, 0x6f, 0x98, 0x2f, 0xa9, 0x1c, 0x05, 0xfd, 0x02, 0x4a, 0x06, - 0xa1, 0x90, 0xbc, 0x98, 0x55, 0xcb, 0x77, 0x28, 0xee, 0xc6, 0x9c, 0xb8, 0xa4, 0x92, 0xee, 0xda, - 0x43, 0x47, 0x14, 0x49, 0x02, 0x8c, 0x55, 0xd8, 0x7d, 0xc8, 0x0d, 0xf5, 0x91, 0x69, 0x99, 0xd8, - 0xab, 0xde, 0xa5, 0xb8, 0x9f, 0xdc, 0x68, 0xe5, 0xd3, 0x9d, 0x54, 0x11, 0x65, 0x04, 0x48, 0x60, - 0xec, 0x94, 0x70, 0x4e, 0x2e, 0xf5, 0x9d, 0xab, 0xc6, 0x2e, 0x3a, 0xa9, 0xb1, 0xae, 0x2a, 0x35, - 0x76, 0xfe, 0x65, 0xa0, 0x07, 0x00, 0xa7, 0x26, 0x7e, 0xad, 0xbd, 0x9a, 0x60, 0xf7, 0xbc, 0x5a, - 0x8d, 0xf8, 0xde, 0x3c, 0xa1, 0x7f, 0x41, 0xc8, 0xe8, 0x53, 0xc8, 0x1b, 0x78, 0x8c, 0x6d, 0xc3, - 0xeb, 0xdb, 0xd5, 0x77, 0x69, 0xae, 0xb3, 0x78, 0x79, 0x51, 0xcb, 0xb7, 0x05, 0x91, 0xfb, 0xd6, - 0x90, 0x0b, 0x7d, 0x05, 0x05, 0xf6, 0x81, 0x8d, 0xbe, 0xdd, 0x3c, 0xaf, 0x2e, 0xd3, 0x4d, 0x3f, - 0x9a, 0xf3, 0x30, 0xc3, 0x92, 0x33, 0xe8, 0xd2, 0xb5, 0x23, 0x68, 0x6a, 0x0c, 0x1b, 0xfd, 0x02, - 0x0a, 0x42, 0xbb, 0x77, 0x9c, 0x23, 0xaf, 0xfa, 0xde, 0x8d, 0x2d, 0xb4, 0xe9, 0xb9, 0x9e, 0x85, - 0xa2, 0xc2, 0x77, 0x45, 0xd1, 0xd0, 0xcf, 0xa1, 0x18, 0x74, 0xc9, 0x9d, 0xb1, 0xef, 0x55, 0xef, - 0x51, 0xe3, 0x7c, 0x3c, 0xaf, 0xea, 0x72, 0xd9, 0xfe, 0x98, 0x76, 0x17, 0x23, 0x5f, 0xe8, 0x3e, - 0xe4, 0x0d, 0xd7, 0x19, 0xb3, 0x18, 0xf2, 0xa3, 0x55, 0x69, 0x2d, 0x19, 0xd4, 0x3d, 0xae, 0x33, - 0xa6, 0xc1, 0x41, 0x83, 0x92, 0x8b, 0xc7, 0x96, 0x3e, 0xc0, 0x23, 0x12, 0xdd, 0x9c, 0x61, 0x75, - 0x85, 0xce, 0xbe, 0x39, 0xf7, 0x41, 0x06, 0xc2, 0x42, 0x31, 0x23, 0x78, 0xfd, 0x21, 0x7a, 0x0e, - 0xa0, 0x4f, 0x0c, 0xd3, 0xd7, 0x46, 0x8e, 0x81, 0xab, 0xb5, 0x1b, 0x9f, 0x96, 0xa6, 0xc1, 0x1b, - 0x44, 0xf0, 0x99, 0x63, 0xe0, 0xa0, 0x1f, 0x2d, 0x08, 0xe8, 0x53, 0x90, 0xe9, 0xd6, 0xbe, 0x72, - 0x8e, 0x88, 0x6e, 0xae, 0xd2, 0xcd, 0x55, 0xf8, 0x5d, 0xe6, 0xdb, 0xae, 0x33, 0xde, 0x71, 0x8e, - 0xa8, 0xc6, 0xf0, 0x9f, 0x06, 0xf2, 0xa0, 0x70, 0x3c, 0xd0, 0x42, 0x77, 0x7a, 0x9f, 0xde, 0xe2, - 0xef, 0xcd, 0xb9, 0x96, 0xa7, 0xad, 0x19, 0x0e, 0x76, 0x51, 0xc4, 0x85, 0xa7, 0x2d, 0x41, 0xf3, - 0x54, 0xf9, 0x78, 0x10, 0x7c, 0xa0, 0x0f, 0xa1, 0xc0, 0x8a, 0x6b, 0x6e, 0x00, 0xf5, 0x88, 0x01, - 0xc8, 0x6c, 0x84, 0x99, 0x40, 0x0f, 0x78, 0x15, 0xae, 0xe9, 0x9e, 0xe6, 0x0c, 0xd9, 0x9d, 0x3d, - 0x98, 0x3f, 0xee, 0x97, 0x98, 0x74, 0xc3, 0xeb, 0x0f, 0xe9, 0xc5, 0x0e, 0xa0, 0xe0, 0x4c, 0xfc, - 0x23, 0x67, 0x62, 0x1b, 0xda, 0xf0, 0xa5, 0x57, 0x7d, 0x9f, 0xee, 0xf6, 0x56, 0xa5, 0x59, 0xb0, - 0xbb, 0x3e, 0x07, 0xda, 0xda, 0xf5, 0x54, 0x59, 0xa0, 0x6e, 0xbd, 0xf4, 0xd0, 0x9f, 0x80, 0x6c, - 0xda, 0xe1, 0x1c, 0x0f, 0x6f, 0x3f, 0x07, 0x12, 0xc9, 0x71, 0xd7, 0x0e, 0xa6, 0x00, 0x8e, 0x49, - 0x66, 0xf8, 0x08, 0x4a, 0xce, 0x70, 0x68, 0x99, 0x36, 0xd6, 0x5c, 0xac, 0x7b, 0x8e, 0x5d, 0xfd, - 0x20, 0x72, 0x82, 0x45, 0x3e, 0xa6, 0xd2, 0x21, 0x54, 0x87, 0xbc, 0x8f, 0x47, 0x63, 0xc7, 0xd5, - 0xdd, 0xf3, 0xea, 0x87, 0xd1, 0x36, 0x7e, 0x40, 0x46, 0x47, 0xb0, 0x3c, 0xb1, 0xf1, 0xd9, 0xd8, - 0xf1, 0xb0, 0xa1, 0xf1, 0x9c, 0xce, 0xa3, 0xf1, 0x8d, 0xe8, 0xd1, 0x1a, 0xf5, 0x71, 0x0f, 0xf9, - 0xa2, 0xde, 0x79, 0x2e, 0x38, 0x59, 0x8e, 0xc7, 0xe2, 0x60, 0x90, 0xe9, 0xbd, 0x33, 0x99, 0x39, - 0x6c, 0x2c, 0x7f, 0x2b, 0x41, 0xe5, 0x4a, 0xcc, 0x44, 0x7f, 0x0c, 0x59, 0xdb, 0x31, 0x22, 0x8f, - 0x26, 0x1d, 0x3e, 0x4d, 0xa6, 0xe7, 0x18, 0xec, 0xcd, 0xe4, 0xf1, 0x5c, 0xef, 0x84, 0xf4, 0xd7, - 0xf8, 0x68, 0x9d, 0x89, 0xa9, 0x19, 0x82, 0xda, 0x35, 0xd0, 0x27, 0x50, 0xc6, 0x67, 0x63, 0xd3, - 0x8d, 0xe4, 0x8d, 0x89, 0x88, 0xcd, 0x97, 0xc2, 0x41, 0xa2, 0x20, 0xbc, 0xad, 0xfd, 0x0f, 0x09, - 0x28, 0x4f, 0x45, 0x2c, 0x92, 0x28, 0xd3, 0x67, 0xbd, 0x58, 0xa2, 0x4c, 0x28, 0x37, 0xbc, 0x81, - 0x44, 0x5f, 0xcd, 0x93, 0x6f, 0xfb, 0x6a, 0x1e, 0x6f, 0x17, 0xa7, 0x6f, 0xd1, 0x2e, 0xfe, 0x29, - 0xdc, 0x35, 0x3d, 0xcd, 0x76, 0x6c, 0xd1, 0x3e, 0x08, 0xea, 0xa4, 0xe8, 0xdb, 0xe7, 0xa2, 0xe9, - 0xf5, 0x1c, 0x9b, 0x35, 0x0e, 0x82, 0x5d, 0x87, 0xcf, 0xa4, 0xd9, 0xab, 0xcf, 0xa4, 0x41, 0x7b, - 0x20, 0xa5, 0xa4, 0x97, 0xff, 0x4e, 0x82, 0x9c, 0x88, 0xc6, 0xf1, 0xca, 0x40, 0x9a, 0xb3, 0x32, - 0xb8, 0xfe, 0x1c, 0xb7, 0x40, 0xb9, 0xa2, 0x94, 0xac, 0x30, 0xb9, 0x27, 0xb2, 0xa9, 0x99, 0xba, - 0x58, 0x1a, 0xc7, 0x54, 0x90, 0xdf, 0xee, 0x37, 0x12, 0xe4, 0xa3, 0xff, 0x5a, 0x4a, 0x04, 0x6b, - 0x9c, 0x5d, 0xe6, 0xbc, 0xe1, 0x33, 0x5d, 0xfc, 0xbe, 0x92, 0xf3, 0xdf, 0x17, 0x5f, 0xe6, 0x9f, - 0x82, 0x1c, 0x09, 0x92, 0xd3, 0x55, 0xb4, 0xf4, 0x06, 0x55, 0xf4, 0xfb, 0x90, 0xe1, 0x91, 0x81, - 0x99, 0x40, 0x91, 0x4b, 0xa7, 0x59, 0x54, 0x48, 0x7f, 0x45, 0x22, 0x02, 0x9f, 0xfd, 0xdf, 0x92, - 0x50, 0x88, 0x06, 0x51, 0xe2, 0x46, 0x4c, 0x7b, 0xe0, 0xd2, 0x08, 0x46, 0x67, 0x4f, 0x06, 0xaf, - 0x81, 0x82, 0x4c, 0x42, 0xeb, 0xc8, 0xb4, 0x35, 0xfa, 0x02, 0x15, 0x33, 0xb3, 0xdc, 0xc8, 0xb4, - 0xbf, 0x24, 0x54, 0xca, 0xa2, 0x9f, 0x71, 0x96, 0x64, 0x8c, 0x45, 0x3f, 0x63, 0x2c, 0xcb, 0x34, - 0x5b, 0x75, 0x7d, 0x5a, 0x52, 0x26, 0x23, 0xf9, 0xa7, 0xeb, 0xa3, 0x15, 0xc8, 0x9e, 0x9a, 0xae, - 0x3f, 0xd1, 0x2d, 0x5a, 0x3d, 0x0a, 0x85, 0x14, 0x44, 0x64, 0x43, 0x29, 0x4c, 0x1b, 0x5e, 0xdb, - 0xd8, 0xa5, 0x2a, 0x2e, 0x6f, 0x36, 0xde, 0x20, 0x6f, 0x08, 0x3f, 0x08, 0x90, 0x70, 0xae, 0x5e, - 0x94, 0xb8, 0xfc, 0x37, 0x12, 0x14, 0x63, 0x6c, 0xa8, 0x0b, 0x65, 0x3a, 0x71, 0xa4, 0x20, 0x64, - 0x77, 0x75, 0x3f, 0xf8, 0xff, 0x11, 0x19, 0x9e, 0x59, 0x11, 0x16, 0x9d, 0xc8, 0x90, 0x81, 0x3e, - 0x87, 0x12, 0x83, 0x0a, 0xde, 0x95, 0xe3, 0xea, 0x57, 0xa0, 0x48, 0xf1, 0xc7, 0xe5, 0x82, 0x13, - 0xd2, 0x8c, 0xe8, 0x93, 0xd9, 0xb2, 0x0d, 0x72, 0x24, 0x2f, 0x99, 0x43, 0xef, 0x7f, 0x17, 0x52, - 0x81, 0xbf, 0x9c, 0x33, 0xde, 0x52, 0x01, 0x3e, 0xdf, 0xd7, 0x12, 0x2c, 0xcd, 0xca, 0x0f, 0x62, - 0xf6, 0xc4, 0x14, 0x69, 0x2e, 0x7b, 0x7a, 0x10, 0xcd, 0xdb, 0x98, 0x72, 0x89, 0x67, 0x9c, 0x30, - 0x73, 0xfb, 0x20, 0x50, 0x71, 0xa6, 0x5b, 0xe5, 0x98, 0x8a, 0x93, 0xfa, 0x2c, 0xa2, 0xe4, 0xf5, - 0xc7, 0xa2, 0x2d, 0x03, 0x90, 0xd9, 0x7f, 0xde, 0xdc, 0xeb, 0xb6, 0x66, 0xb6, 0x54, 0x90, 0x0c, - 0xd9, 0xfe, 0xd6, 0xd6, 0x5e, 0xb7, 0xd7, 0x51, 0x92, 0xf5, 0x35, 0xc8, 0x07, 0x29, 0x18, 0x2a, - 0x40, 0xae, 0xdd, 0x3d, 0x68, 0x34, 0xf7, 0x3a, 0x6d, 0x65, 0x01, 0x15, 0x21, 0xaf, 0x76, 0x1a, - 0x6d, 0xda, 0xb8, 0x51, 0xa4, 0xcf, 0x72, 0x7f, 0xf1, 0x75, 0x4d, 0xe2, 0x2e, 0x32, 0xa3, 0x64, - 0x77, 0x52, 0x39, 0xa4, 0x2c, 0xd6, 0xff, 0x56, 0x02, 0xd4, 0xd6, 0x7d, 0x9d, 0xe8, 0xdf, 0x2d, - 0x1a, 0x31, 0x89, 0x1b, 0x6e, 0x2a, 0x5e, 0x5c, 0x27, 0xdf, 0xa6, 0xb8, 0x0e, 0x17, 0x5d, 0xff, - 0x46, 0x02, 0x88, 0x2c, 0xf0, 0x67, 0xd1, 0xbf, 0x77, 0x5e, 0xdf, 0x4b, 0x98, 0xb2, 0xa8, 0xed, - 0x05, 0xf1, 0xe7, 0xcf, 0xa7, 0x90, 0x33, 0xf8, 0xb6, 0xb9, 0x4a, 0x5d, 0x5b, 0xb4, 0x5f, 0x39, - 0x9d, 0x6d, 0x92, 0x9d, 0x73, 0x2a, 0x6f, 0x70, 0x65, 0x21, 0x3d, 0xb1, 0x4d, 0xc7, 0xfe, 0x89, - 0x1a, 0x7d, 0x5a, 0x10, 0xd1, 0x93, 0x5c, 0x05, 0xfd, 0xad, 0xfb, 0xd8, 0x60, 0xad, 0xb6, 0xe7, - 0xf6, 0x69, 0x40, 0x90, 0x50, 0x09, 0x80, 0x8f, 0x9b, 0xf6, 0xb1, 0x92, 0xa0, 0x17, 0xe9, 0x3a, - 0xe3, 0x31, 0xf9, 0x4a, 0x36, 0x7f, 0xfc, 0xdd, 0x7f, 0xad, 0x2c, 0x7c, 0x77, 0xb9, 0x22, 0xfd, - 0xf2, 0x72, 0x45, 0xfa, 0xd5, 0xe5, 0x8a, 0xf4, 0x9f, 0x97, 0x2b, 0xd2, 0x5f, 0x7d, 0xbf, 0xb2, - 0xf0, 0xcb, 0xef, 0x57, 0x16, 0x7e, 0xf5, 0xfd, 0xca, 0xc2, 0x1f, 0x66, 0xf9, 0x62, 0xff, 0x2f, - 0x00, 0x00, 0xff, 0xff, 0x64, 0x08, 0x44, 0x85, 0x90, 0x2b, 0x00, 0x00, + proto.RegisterFile("sql/sqlbase/structured.proto", fileDescriptor_structured_5d9e2d446ffe4785) +} + +var fileDescriptor_structured_5d9e2d446ffe4785 = []byte{ + // 3784 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x5a, 0xcb, 0x6f, 0x1b, 0x49, + 0x7a, 0x57, 0xf3, 0xcd, 0xaf, 0xf9, 0x68, 0x96, 0x64, 0x9b, 0xa3, 0xf1, 0x8a, 0x32, 0xbd, 0x9e, + 0xd1, 0xee, 0xcc, 0x48, 0x1e, 0x39, 0x0f, 0xef, 0x24, 0x58, 0x0c, 0x5f, 0xb2, 0x28, 0xc9, 0xa4, + 0xa6, 0x25, 0x8f, 0x37, 0xc1, 0x26, 0x9d, 0x16, 0xbb, 0x28, 0xf5, 0xb8, 0xd9, 0x4d, 0x77, 0x37, + 0x65, 0x09, 0xc8, 0x29, 0xb9, 0xe4, 0x14, 0xe4, 0x1f, 0x08, 0x30, 0x08, 0x06, 0xc9, 0x1e, 0x72, + 0xc9, 0x25, 0xb9, 0x05, 0xc8, 0x25, 0x98, 0x5b, 0x16, 0xc8, 0x65, 0x91, 0x83, 0x90, 0x68, 0x2e, + 0x39, 0xe4, 0x9c, 0x00, 0x73, 0x0a, 0xea, 0xd5, 0x0f, 0x8a, 0x52, 0x28, 0x7b, 0x73, 0x63, 0x7f, + 0x55, 0xdf, 0xaf, 0xaa, 0xbe, 0xfa, 0xde, 0x45, 0xb8, 0xef, 0xbd, 0xb6, 0x36, 0xbc, 0xd7, 0xd6, + 0x91, 0xee, 0xe1, 0x0d, 0xcf, 0x77, 0x27, 0x03, 0x7f, 0xe2, 0x62, 0x63, 0x7d, 0xec, 0x3a, 0xbe, + 0x83, 0xee, 0x0c, 0x9c, 0xc1, 0x2b, 0xd7, 0xd1, 0x07, 0x27, 0xeb, 0xde, 0x6b, 0x6b, 0x9d, 0xcf, + 0x5b, 0xae, 0x4e, 0x7c, 0xd3, 0xda, 0x38, 0xb1, 0x06, 0x1b, 0xbe, 0x39, 0xc2, 0x9e, 0xaf, 0x8f, + 0xc6, 0x8c, 0x61, 0xf9, 0xfd, 0x28, 0xdc, 0xd8, 0x35, 0x4f, 0x4d, 0x0b, 0x1f, 0x63, 0x3e, 0xb8, + 0x74, 0xec, 0x1c, 0x3b, 0xf4, 0xe7, 0x06, 0xf9, 0xc5, 0xa8, 0xf5, 0x3f, 0x49, 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, 0x5e, 0xd4, 0x16, 0xbe, + 0xbf, 0xa8, 0x25, 0xba, 0x6d, 0x95, 0x0d, 0xa0, 0x47, 0x90, 0x36, 0x6d, 0x03, 0x9f, 0x55, 0x13, + 0x74, 0x46, 0x99, 0xcf, 0xc8, 0x76, 0x09, 0x91, 0x4c, 0xa3, 0xa3, 0xa8, 0x0a, 0x29, 0x5b, 0x1f, + 0xe1, 0x6a, 0x72, 0x55, 0x5a, 0xcb, 0x37, 0x53, 0x64, 0x96, 0x4a, 0x29, 0x68, 0x17, 0x72, 0xa7, + 0xba, 0x65, 0x1a, 0xa6, 0x7f, 0x5e, 0x4d, 0xad, 0x4a, 0x6b, 0xa5, 0xcd, 0x1f, 0xad, 0xcf, 0x3c, + 0xf1, 0x7a, 0xcb, 0xb1, 0x3d, 0xdf, 0xd5, 0x4d, 0xdb, 0xff, 0x92, 0x33, 0x70, 0xa0, 0x00, 0x00, + 0x3d, 0x86, 0x8a, 0x77, 0xa2, 0xbb, 0xd8, 0xd0, 0xc6, 0x2e, 0x1e, 0x9a, 0x67, 0x9a, 0x85, 0xed, + 0x6a, 0x7a, 0x55, 0x5a, 0x4b, 0xf3, 0xa9, 0x65, 0x36, 0xbc, 0x4f, 0x47, 0xf7, 0xb0, 0x8d, 0x0e, + 0x21, 0xef, 0xd8, 0x9a, 0x81, 0x2d, 0xec, 0xe3, 0x6a, 0x86, 0xae, 0xff, 0xe9, 0x35, 0xeb, 0xcf, + 0x10, 0xd0, 0x7a, 0x63, 0xe0, 0x9b, 0x8e, 0x2d, 0xf6, 0xe1, 0xd8, 0x6d, 0x0a, 0xc4, 0x51, 0x27, + 0x63, 0x43, 0xf7, 0x71, 0x35, 0xfb, 0xce, 0xa8, 0x2f, 0x28, 0x10, 0xda, 0x83, 0xf4, 0x48, 0xf7, + 0x07, 0x27, 0xd5, 0x1c, 0x45, 0x7c, 0x7c, 0x0b, 0xc4, 0xe7, 0x84, 0x8f, 0x03, 0x32, 0x90, 0xfa, + 0x4b, 0xc8, 0xb0, 0x75, 0x50, 0x11, 0xf2, 0xbd, 0xbe, 0xd6, 0x68, 0x1d, 0x76, 0xfb, 0x3d, 0x65, + 0x01, 0x15, 0x20, 0xa7, 0x76, 0x0e, 0x0e, 0xd5, 0x6e, 0xeb, 0x50, 0x91, 0xc8, 0xd7, 0x41, 0xe7, + 0x50, 0xeb, 0xbd, 0xd8, 0xdb, 0x53, 0x12, 0xa8, 0x0c, 0x32, 0xf9, 0x6a, 0x77, 0xb6, 0x1a, 0x2f, + 0xf6, 0x0e, 0x95, 0x24, 0x92, 0x21, 0xdb, 0x6a, 0x1c, 0xb4, 0x1a, 0xed, 0x8e, 0x92, 0x5a, 0x4e, + 0xfd, 0xe2, 0x9b, 0x95, 0x85, 0xfa, 0x63, 0x48, 0xd3, 0xe5, 0x10, 0x40, 0xe6, 0xa0, 0xfb, 0x7c, + 0x7f, 0xaf, 0xa3, 0x2c, 0xa0, 0x1c, 0xa4, 0xb6, 0x08, 0x84, 0x44, 0x38, 0xf6, 0x1b, 0xea, 0x61, + 0xb7, 0xb1, 0xa7, 0x24, 0x18, 0xc7, 0x67, 0xa9, 0xff, 0xfc, 0xba, 0x26, 0xd5, 0xff, 0x35, 0x03, + 0x4b, 0xe1, 0xde, 0xc3, 0xdb, 0x46, 0x2d, 0x28, 0x3b, 0xae, 0x79, 0x6c, 0xda, 0x1a, 0xd5, 0x39, + 0xcd, 0x34, 0xb8, 0x3e, 0xbe, 0x4f, 0xce, 0x73, 0x79, 0x51, 0x2b, 0xf6, 0xe9, 0xf0, 0x21, 0x19, + 0xed, 0xb6, 0xb9, 0x82, 0x16, 0x9d, 0x08, 0xd1, 0x40, 0xbb, 0x50, 0xe1, 0x20, 0x03, 0xc7, 0x9a, + 0x8c, 0x6c, 0xcd, 0x34, 0xbc, 0x6a, 0x62, 0x35, 0xb9, 0x56, 0x6c, 0xd6, 0x2e, 0x2f, 0x6a, 0x65, + 0x06, 0xd1, 0xa2, 0x63, 0xdd, 0xb6, 0xf7, 0xfd, 0x45, 0x2d, 0x27, 0x3e, 0x54, 0xbe, 0x3c, 0xff, + 0x36, 0x3c, 0xf4, 0x12, 0xee, 0xb8, 0x42, 0xb6, 0x46, 0x14, 0x30, 0x49, 0x01, 0x1f, 0x5e, 0x5e, + 0xd4, 0x16, 0x03, 0xe1, 0x1b, 0xb3, 0x41, 0x17, 0xdd, 0xe9, 0x09, 0x86, 0x87, 0xfa, 0x10, 0x21, + 0x87, 0xc7, 0x4d, 0xd1, 0xe3, 0xd6, 0xf8, 0x71, 0x2b, 0x21, 0x74, 0xfc, 0xc8, 0x15, 0x77, 0x6a, + 0xc0, 0x08, 0x0c, 0x2f, 0x7d, 0xa3, 0xe1, 0x65, 0xde, 0xd5, 0xf0, 0x62, 0x66, 0x94, 0xfd, 0x7f, + 0x31, 0xa3, 0xdc, 0xaf, 0xdd, 0x8c, 0xf2, 0xbf, 0x06, 0x33, 0x42, 0x0d, 0x58, 0xb4, 0xf0, 0xb1, + 0x3e, 0x38, 0xd7, 0xb8, 0x7a, 0x31, 0x77, 0x08, 0xf4, 0xc6, 0x2a, 0x53, 0xee, 0xb0, 0x2a, 0xa9, + 0x15, 0x36, 0x9b, 0xa9, 0x1b, 0x25, 0xa3, 0x2e, 0xdc, 0xe3, 0x10, 0x91, 0xbb, 0x67, 0x30, 0xf2, + 0x75, 0x30, 0x77, 0x18, 0x47, 0xa8, 0x09, 0x74, 0x88, 0x59, 0xd2, 0x4e, 0x2a, 0x57, 0x50, 0x8a, + 0x3b, 0xa9, 0x5c, 0x51, 0x29, 0xd5, 0xff, 0x2b, 0x09, 0x0a, 0xd3, 0xaf, 0x36, 0xf6, 0x06, 0xae, + 0x39, 0xf6, 0x1d, 0x37, 0xd0, 0x0a, 0xe9, 0x8a, 0x56, 0x7c, 0x00, 0x09, 0xd3, 0xe0, 0xce, 0xfc, + 0x2e, 0xd7, 0xb7, 0x04, 0x55, 0xb0, 0x50, 0x73, 0x13, 0xa6, 0x81, 0xf6, 0x20, 0xe5, 0x9f, 0x8f, + 0x99, 0x43, 0x2f, 0x34, 0x9f, 0x92, 0x99, 0xff, 0x76, 0x51, 0x7b, 0x7c, 0x6c, 0xfa, 0x27, 0x93, + 0xa3, 0xf5, 0x81, 0x33, 0xda, 0x08, 0xa4, 0x6a, 0x1c, 0x85, 0xbf, 0x37, 0xc6, 0xaf, 0x8e, 0x49, + 0x6c, 0xda, 0x20, 0xcc, 0xde, 0xfa, 0xa1, 0x4a, 0x51, 0xd0, 0x2a, 0xe4, 0xec, 0x89, 0x65, 0xd1, + 0x50, 0x43, 0x74, 0x3d, 0x27, 0x2e, 0x4d, 0x50, 0xd1, 0x03, 0x28, 0x18, 0x78, 0xa8, 0x4f, 0x2c, + 0x5f, 0xc3, 0x67, 0x63, 0x97, 0xe9, 0xb3, 0x2a, 0x73, 0x5a, 0xe7, 0x6c, 0xec, 0xa2, 0xfb, 0x90, + 0x39, 0x31, 0x0d, 0x03, 0xdb, 0x54, 0x9d, 0x05, 0x04, 0xa7, 0xa1, 0x4d, 0xa8, 0x4c, 0x3c, 0xec, + 0x69, 0x1e, 0x7e, 0x3d, 0x21, 0x02, 0xa3, 0xe6, 0x0a, 0xd4, 0x5c, 0x33, 0xdc, 0x7c, 0xca, 0x64, + 0xc2, 0x01, 0x1f, 0x27, 0xd6, 0xf8, 0x00, 0x0a, 0x03, 0x67, 0x34, 0x9e, 0xf8, 0x98, 0x2d, 0x2a, + 0xb3, 0x45, 0x39, 0x8d, 0x2e, 0xba, 0x09, 0x15, 0xe7, 0x8d, 0x3d, 0x05, 0x5b, 0x88, 0xc3, 0x92, + 0x09, 0x51, 0xd8, 0x26, 0x80, 0xe5, 0x1c, 0x9b, 0x03, 0xdd, 0x22, 0xb6, 0x5d, 0xa4, 0xb2, 0x7e, + 0xc8, 0x65, 0x5d, 0xde, 0x63, 0x23, 0x42, 0xd8, 0x31, 0xc1, 0xe7, 0x39, 0x5b, 0xd7, 0x08, 0x2e, + 0x3a, 0xa7, 0xe4, 0x77, 0x52, 0xb9, 0xbc, 0x02, 0x3b, 0xa9, 0x5c, 0x56, 0xc9, 0xd5, 0xff, 0x3c, + 0x01, 0x77, 0xd9, 0xfc, 0x2d, 0x7d, 0x64, 0x5a, 0xe7, 0xef, 0x7a, 0xe9, 0x0c, 0x85, 0x5f, 0x3a, + 0x95, 0x07, 0xf5, 0x75, 0x84, 0x8d, 0x79, 0x3b, 0x2a, 0x0f, 0x42, 0xeb, 0x11, 0x12, 0x7a, 0x0a, + 0x10, 0x71, 0x87, 0x29, 0x2a, 0x88, 0xf7, 0x2e, 0x2f, 0x6a, 0xf9, 0xd9, 0x4e, 0x30, 0x3f, 0x88, + 0xb8, 0xbe, 0x8a, 0xb8, 0xe1, 0x00, 0x81, 0x5e, 0x73, 0x44, 0x38, 0x6d, 0x36, 0x61, 0xa6, 0x70, + 0xca, 0x46, 0x6c, 0x90, 0x8b, 0xa8, 0xfe, 0x0f, 0x09, 0x58, 0xea, 0xda, 0x3e, 0x76, 0x2d, 0xac, + 0x9f, 0xe2, 0x88, 0x38, 0x7e, 0x06, 0x79, 0xdd, 0x1e, 0x60, 0xcf, 0x77, 0x5c, 0xaf, 0x2a, 0xad, + 0x26, 0xd7, 0xe4, 0xcd, 0xdf, 0xb8, 0xc6, 0x15, 0xcc, 0xe2, 0x5f, 0x6f, 0x70, 0x66, 0x2e, 0xc9, + 0x10, 0x6c, 0xf9, 0x1f, 0x25, 0xc8, 0x89, 0x51, 0xf4, 0x18, 0x72, 0x53, 0x51, 0xeb, 0x0e, 0x3f, + 0x4d, 0x36, 0xee, 0xbc, 0xb3, 0x3e, 0x77, 0xd9, 0xbf, 0x09, 0x39, 0x6a, 0xfc, 0x5a, 0x70, 0x27, + 0xcb, 0x82, 0x83, 0xdb, 0x7f, 0x34, 0xc1, 0xca, 0xd2, 0xb9, 0x5d, 0x03, 0xb5, 0x66, 0xe5, 0x3e, + 0x49, 0xca, 0x7f, 0x4f, 0xc8, 0xef, 0x20, 0x9e, 0xfd, 0x5c, 0x49, 0x87, 0x98, 0xcc, 0xb8, 0xe4, + 0xfe, 0x5e, 0x82, 0x0a, 0x61, 0x30, 0xb0, 0x11, 0x11, 0xdb, 0x43, 0x00, 0xd3, 0xd3, 0x3c, 0x46, + 0xa7, 0x27, 0x12, 0x96, 0x96, 0x37, 0x3d, 0x3e, 0x3d, 0x50, 0xb5, 0xc4, 0x15, 0x55, 0xfb, 0x09, + 0x14, 0x29, 0xaf, 0x76, 0x34, 0x19, 0xbc, 0xc2, 0xbe, 0x47, 0x77, 0x98, 0x6e, 0x2e, 0xf1, 0x1d, + 0x16, 0x28, 0x42, 0x93, 0x8d, 0xa9, 0x05, 0x2f, 0xf2, 0x75, 0x45, 0xfb, 0x52, 0x57, 0xb4, 0x8f, + 0x6f, 0xfc, 0x7f, 0x92, 0x70, 0x77, 0x5f, 0x77, 0x7d, 0x93, 0xb8, 0x7f, 0xd3, 0x3e, 0x8e, 0xec, + 0xfe, 0x11, 0xc8, 0xf6, 0x64, 0xc4, 0x15, 0xcc, 0xe3, 0x17, 0xc2, 0xf6, 0x07, 0xf6, 0x64, 0xc4, + 0x74, 0xc7, 0x23, 0xde, 0xcd, 0x32, 0x3d, 0x9f, 0xe6, 0x07, 0xf2, 0xe6, 0xe6, 0x35, 0x6a, 0x31, + 0x7b, 0x8d, 0xf5, 0x3d, 0xd3, 0xf3, 0xc5, 0x99, 0x09, 0x0a, 0xea, 0x43, 0xda, 0xd5, 0xed, 0x63, + 0x4c, 0xed, 0x45, 0xde, 0x7c, 0x72, 0x3b, 0x38, 0x95, 0xb0, 0x8a, 0x98, 0x43, 0x71, 0x96, 0xff, + 0x52, 0x82, 0x14, 0x59, 0xe5, 0x06, 0x93, 0xbe, 0x0b, 0x99, 0x53, 0xdd, 0x9a, 0x60, 0x96, 0xe3, + 0x14, 0x54, 0xfe, 0x85, 0xfe, 0x00, 0xca, 0xde, 0xe4, 0x68, 0x1c, 0x59, 0x8a, 0xde, 0x80, 0xbc, + 0xf9, 0xc9, 0xad, 0x76, 0x15, 0xa4, 0xd3, 0x71, 0x2c, 0x76, 0x01, 0xcb, 0xaf, 0x21, 0x4d, 0x77, + 0x7d, 0xc3, 0xfe, 0x1e, 0x40, 0xc1, 0x77, 0x34, 0x7c, 0x36, 0xb0, 0x26, 0x9e, 0x79, 0xca, 0x34, + 0xa5, 0xa0, 0xca, 0xbe, 0xd3, 0x11, 0x24, 0xf4, 0x08, 0x4a, 0x43, 0xd7, 0x19, 0x69, 0xa6, 0x2d, + 0x26, 0xd1, 0x60, 0xa3, 0x16, 0x09, 0xb5, 0x2b, 0x88, 0x31, 0x95, 0xfd, 0x5b, 0x19, 0xca, 0xd4, + 0x30, 0xe6, 0x72, 0x7b, 0x8f, 0x22, 0x6e, 0xef, 0x4e, 0xcc, 0xed, 0x05, 0xd6, 0x45, 0xbc, 0xde, + 0x7d, 0xc8, 0x4c, 0x6c, 0xf3, 0xf5, 0x84, 0xad, 0x1f, 0xc4, 0x15, 0x46, 0x9b, 0x43, 0x2b, 0xd1, + 0xc7, 0x80, 0x88, 0x2b, 0xc0, 0x5a, 0x6c, 0x62, 0x9a, 0x4e, 0x54, 0xe8, 0x48, 0xeb, 0x5a, 0x0f, + 0x9a, 0xb9, 0x85, 0x07, 0xdd, 0x06, 0x05, 0x9f, 0xf9, 0xae, 0x1e, 0x4d, 0x48, 0xb3, 0x94, 0x7f, + 0xe5, 0xf2, 0xa2, 0x56, 0xea, 0x90, 0xb1, 0xd9, 0x20, 0x25, 0x1c, 0x19, 0x33, 0x88, 0x96, 0x54, + 0x38, 0x86, 0x61, 0xba, 0x98, 0xa6, 0x51, 0x5e, 0x35, 0xb7, 0x9a, 0xbc, 0x21, 0x5d, 0x9a, 0x12, + 0xfb, 0x7a, 0x5b, 0x30, 0xaa, 0x0a, 0x83, 0x0a, 0x08, 0x1e, 0x3a, 0x00, 0x79, 0xc8, 0xb2, 0x2b, + 0xed, 0x15, 0x3e, 0xa7, 0x79, 0x98, 0xbc, 0xf9, 0xe3, 0xf9, 0xf3, 0xb0, 0x66, 0x86, 0x5c, 0x41, + 0x55, 0x52, 0x61, 0x18, 0x0c, 0xa2, 0x97, 0x50, 0x8c, 0xa4, 0x4f, 0x47, 0xe7, 0x34, 0xb8, 0xbf, + 0x1d, 0x6c, 0x21, 0x04, 0x6a, 0x9e, 0xa3, 0x2f, 0x00, 0xcc, 0x20, 0x00, 0xd0, 0x1c, 0x40, 0xde, + 0xfc, 0xe8, 0x16, 0x91, 0x42, 0xf8, 0x97, 0x10, 0x04, 0xbd, 0x84, 0x52, 0xf8, 0x45, 0x37, 0x5b, + 0xb8, 0xf5, 0x66, 0x19, 0x6a, 0x31, 0x82, 0xd3, 0x24, 0x79, 0xf8, 0x12, 0xc9, 0x4e, 0x1c, 0xcf, + 0xf4, 0x71, 0x54, 0x0d, 0x8a, 0x54, 0x0d, 0xea, 0x97, 0x17, 0x35, 0xd4, 0x12, 0xe3, 0xb3, 0x55, + 0x01, 0x0d, 0xa6, 0xc6, 0x99, 0x62, 0xc5, 0x14, 0x98, 0x20, 0x96, 0x42, 0xc5, 0x3a, 0x08, 0x55, + 0xf8, 0x8a, 0x62, 0x45, 0xd4, 0x9b, 0x15, 0x4e, 0x85, 0x98, 0xef, 0x29, 0xbf, 0xbd, 0xef, 0x89, + 0x01, 0xa1, 0x0e, 0xcf, 0x47, 0x15, 0x9a, 0xd3, 0x7f, 0x34, 0xa7, 0x92, 0x1e, 0x9e, 0x8f, 0x85, + 0x20, 0x59, 0x22, 0xfa, 0x04, 0xd0, 0xc0, 0xc5, 0xba, 0x8f, 0x0d, 0x92, 0xf1, 0x59, 0xe6, 0xc0, + 0xf4, 0xad, 0xf3, 0x6a, 0x25, 0x62, 0xf7, 0x15, 0x3e, 0xde, 0x09, 0x86, 0xd1, 0x53, 0xc8, 0x9e, + 0x62, 0xd7, 0x33, 0x1d, 0xbb, 0x8a, 0xa8, 0x33, 0x59, 0xe1, 0xf9, 0xfa, 0xdd, 0xa9, 0xf5, 0xbe, + 0x64, 0xb3, 0x54, 0x31, 0x1d, 0x6d, 0x43, 0x11, 0xdb, 0x03, 0xc7, 0x30, 0xed, 0x63, 0x8d, 0x6e, + 0x7f, 0x31, 0xcc, 0x77, 0xbe, 0xbf, 0xa8, 0xbd, 0x3f, 0xc5, 0xdf, 0xe1, 0x73, 0xc9, 0xb6, 0xd5, + 0x02, 0x8e, 0x7c, 0xa1, 0x6d, 0xc8, 0x8a, 0x98, 0xbc, 0x44, 0x65, 0xba, 0x76, 0x8d, 0x08, 0xae, + 0x44, 0x74, 0x7e, 0x2e, 0xc1, 0x4e, 0x72, 0x71, 0xc3, 0xf4, 0x48, 0x2e, 0x62, 0x54, 0xef, 0x44, + 0x73, 0x71, 0x41, 0xad, 0xaf, 0x40, 0x3e, 0x30, 0x66, 0x94, 0x85, 0x64, 0xe3, 0xa0, 0xc5, 0x2a, + 0xfc, 0x76, 0xe7, 0xa0, 0xa5, 0x48, 0xf5, 0x07, 0x90, 0xa2, 0x7b, 0x92, 0x21, 0xbb, 0xd5, 0x57, + 0x5f, 0x36, 0xd4, 0x36, 0xeb, 0x2a, 0x74, 0x7b, 0x5f, 0x76, 0xd4, 0xc3, 0x4e, 0x5b, 0x11, 0xee, + 0xfa, 0x9f, 0x92, 0x80, 0xc2, 0xe2, 0xf2, 0xd0, 0xe1, 0x05, 0xda, 0x31, 0x94, 0x07, 0x01, 0x95, + 0xc9, 0x45, 0x5a, 0x4d, 0xac, 0x95, 0x36, 0x9f, 0xfe, 0x9f, 0x05, 0xaa, 0xc0, 0x88, 0x92, 0xc2, + 0x3b, 0x2e, 0x0d, 0x62, 0xd4, 0x48, 0x9a, 0x92, 0x98, 0x0a, 0x0d, 0x2a, 0xa4, 0x07, 0x27, 0x78, + 0xf0, 0x8a, 0x07, 0xc7, 0xdf, 0xba, 0x66, 0x61, 0x9a, 0xc1, 0x45, 0xf4, 0xa9, 0x45, 0x78, 0xc2, + 0xa5, 0x45, 0xd4, 0xa6, 0x50, 0x48, 0x8d, 0x7b, 0xbd, 0xd4, 0x8d, 0x8e, 0x64, 0x56, 0x23, 0x44, + 0x38, 0x92, 0x88, 0xd3, 0x7b, 0x0a, 0x65, 0xdb, 0xf1, 0x35, 0x52, 0x26, 0x71, 0xe3, 0xa4, 0xc5, + 0x4f, 0xb1, 0xa9, 0x70, 0x15, 0x0a, 0x4d, 0xb1, 0x68, 0x3b, 0x7e, 0x6f, 0x62, 0xf1, 0xca, 0xa2, + 0xfe, 0x19, 0x94, 0xe2, 0x32, 0x42, 0x79, 0x48, 0xb7, 0xb6, 0x3b, 0xad, 0x5d, 0x65, 0x01, 0x95, + 0x41, 0xde, 0xea, 0xab, 0x9d, 0xee, 0xb3, 0x9e, 0xb6, 0xdb, 0xf9, 0x3d, 0xd6, 0x05, 0xea, 0xf5, + 0x45, 0x17, 0x28, 0x28, 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, + 0x46, 0xd5, 0x82, 0x64, 0x56, 0x9a, 0xdd, 0x22, 0xac, 0xd8, 0xf8, 0x0d, 0x47, 0xe8, 0xf2, 0x5c, + 0xf6, 0x63, 0x90, 0x1d, 0x8b, 0xd7, 0xc0, 0x58, 0xb4, 0x69, 0xe4, 0x28, 0x13, 0x38, 0x16, 0x2b, + 0x79, 0x69, 0x7c, 0x95, 0xc9, 0x7a, 0x62, 0x76, 0x72, 0xc6, 0x6c, 0x1b, 0xbf, 0x11, 0xb3, 0x3f, + 0x87, 0x25, 0x82, 0x7d, 0x65, 0x77, 0xa9, 0x6b, 0x76, 0xe7, 0x58, 0x46, 0x7c, 0x77, 0x5c, 0x79, + 0xff, 0x39, 0x0d, 0x28, 0xbc, 0xfa, 0xe7, 0x13, 0x5f, 0xa7, 0xf6, 0xd0, 0x80, 0x0c, 0xbf, 0x08, + 0x89, 0x5e, 0xf0, 0x87, 0xd7, 0xea, 0x6c, 0xbc, 0x26, 0xdf, 0x5e, 0x50, 0x39, 0x23, 0xfa, 0x69, + 0xb4, 0xa7, 0x2a, 0x6f, 0x7e, 0x30, 0x9f, 0x33, 0xdb, 0x5e, 0x10, 0xcd, 0xd6, 0x5d, 0x48, 0x7b, + 0xbe, 0xee, 0xb3, 0x7c, 0xa5, 0xb4, 0xb9, 0x71, 0x0d, 0xff, 0xd5, 0xcd, 0xaf, 0x1f, 0x10, 0x36, + 0xa1, 0xb5, 0x14, 0x03, 0xbd, 0x84, 0x7c, 0x90, 0x03, 0xf0, 0x06, 0xed, 0x93, 0xf9, 0x01, 0x03, + 0x3f, 0x21, 0x6a, 0x84, 0x00, 0x0b, 0x35, 0x40, 0x1e, 0xf1, 0x69, 0x61, 0xa5, 0xb7, 0xca, 0xd3, + 0x30, 0x10, 0x08, 0x34, 0x1d, 0x8b, 0x7c, 0xa9, 0x20, 0x98, 0xba, 0xd4, 0x55, 0xb9, 0x8e, 0x65, + 0x1d, 0xe9, 0x83, 0x57, 0xb4, 0xe9, 0x14, 0xb8, 0x2a, 0x41, 0x45, 0xbb, 0x24, 0x99, 0x12, 0x5a, + 0x4e, 0x5b, 0x48, 0xf2, 0x1c, 0x6d, 0x2e, 0xe1, 0x45, 0xb6, 0x17, 0xd4, 0x08, 0x3b, 0xea, 0x43, + 0x69, 0x1c, 0xd3, 0x74, 0x9e, 0xb9, 0x3c, 0xba, 0x2e, 0x7c, 0xc5, 0x26, 0x6f, 0x2f, 0xa8, 0x53, + 0xec, 0xf5, 0xcf, 0x21, 0x4d, 0x25, 0x4e, 0x3c, 0xe5, 0x8b, 0xde, 0x6e, 0xaf, 0xff, 0xb2, 0xc7, + 0x8c, 0xaf, 0xdd, 0xd9, 0xeb, 0x1c, 0x76, 0xb4, 0x7e, 0x6f, 0x8f, 0x18, 0xdf, 0x7b, 0x70, 0x87, + 0x13, 0x1a, 0xbd, 0xb6, 0xf6, 0x52, 0xed, 0x8a, 0xa1, 0x44, 0x7d, 0x2d, 0xea, 0x8a, 0x73, 0x90, + 0xea, 0xf5, 0x7b, 0x1d, 0x65, 0x81, 0x3a, 0xe5, 0x76, 0x5b, 0x91, 0xa8, 0x53, 0x56, 0xfb, 0xfb, + 0xc2, 0x66, 0x9b, 0x05, 0x00, 0x23, 0xb8, 0xa5, 0x9d, 0x54, 0x2e, 0xa3, 0x64, 0xeb, 0x7f, 0xfa, + 0x10, 0xca, 0x53, 0x8e, 0xec, 0x86, 0xa4, 0x79, 0x95, 0x26, 0xcd, 0xc9, 0xd0, 0xc9, 0x04, 0x49, + 0x73, 0x82, 0xe7, 0xcb, 0x4f, 0x20, 0x3f, 0xd6, 0x5d, 0x6c, 0xfb, 0xa1, 0x55, 0x89, 0xa6, 0x42, + 0x6e, 0x9f, 0x0e, 0x04, 0xd3, 0x73, 0x6c, 0x62, 0x97, 0x30, 0x05, 0x31, 0x94, 0x69, 0xc2, 0x7b, + 0xdc, 0x10, 0x2b, 0x37, 0x84, 0xcf, 0x7d, 0xa8, 0x8c, 0x1c, 0xc3, 0x1c, 0x9a, 0x03, 0xa6, 0x46, + 0xbe, 0x39, 0x62, 0xdd, 0x47, 0x79, 0xf3, 0x07, 0x91, 0x3b, 0x99, 0xf8, 0xa6, 0xb5, 0x7e, 0x62, + 0x0d, 0xd6, 0x0f, 0xc5, 0x4b, 0x09, 0x3f, 0x91, 0x12, 0xe5, 0x26, 0x83, 0xe8, 0x19, 0x64, 0x45, + 0x6d, 0x98, 0xa3, 0x19, 0xd9, 0xbc, 0xe6, 0x2b, 0xa2, 0x28, 0xe7, 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, 0xb1, 0x38, 0xb7, 0x4f, 0x08, 0x52, 0xa5, 0x88, + 0x03, 0x43, 0x5b, 0x90, 0x15, 0xae, 0x52, 0xa6, 0x67, 0xbc, 0x1d, 0x98, 0x60, 0x46, 0x4d, 0x28, + 0xd2, 0x23, 0x06, 0x1e, 0xb4, 0x10, 0x26, 0x3f, 0x97, 0x17, 0x35, 0x99, 0x9c, 0x70, 0x46, 0xc3, + 0x42, 0xb6, 0x03, 0xba, 0x81, 0x76, 0x00, 0x82, 0x17, 0x2a, 0x8f, 0xb6, 0xc2, 0xae, 0x4f, 0x82, + 0xf7, 0xc5, 0xc4, 0x70, 0x4b, 0x6a, 0x84, 0x1b, 0x3d, 0x87, 0xbc, 0xf0, 0x0d, 0x2c, 0x3d, 0xbd, + 0xde, 0xd4, 0xaf, 0x7a, 0x2a, 0xe1, 0x9f, 0x02, 0x04, 0x92, 0x02, 0x58, 0x58, 0xf7, 0x30, 0xcf, + 0x51, 0x9f, 0xce, 0x99, 0x02, 0x1c, 0x0c, 0x4e, 0xf0, 0x48, 0x6f, 0x9d, 0x90, 0xfa, 0x77, 0x8f, + 0xf0, 0x37, 0x13, 0x55, 0x49, 0x65, 0x50, 0xa8, 0x07, 0x0a, 0x15, 0x59, 0xd4, 0xf1, 0x29, 0x54, + 0x6a, 0x3f, 0xe4, 0x52, 0x2b, 0x11, 0xa9, 0x5d, 0xeb, 0xfc, 0xa8, 0x4e, 0x3d, 0x0f, 0x1d, 0xe0, + 0xef, 0x42, 0x69, 0xe8, 0xb8, 0x23, 0xdd, 0xd7, 0x84, 0xf1, 0x54, 0xc2, 0x6a, 0xf6, 0xfb, 0x8b, + 0x5a, 0x71, 0x8b, 0x8e, 0x0a, 0xc3, 0x29, 0x0e, 0xa3, 0x9f, 0x68, 0x5b, 0xc4, 0x89, 0x45, 0xea, + 0xd6, 0x3f, 0x9e, 0xf7, 0x84, 0x57, 0x83, 0x44, 0x0f, 0x32, 0x34, 0xc7, 0xf1, 0xaa, 0x4b, 0x54, + 0xee, 0x6f, 0x99, 0x2f, 0xa9, 0x1c, 0x05, 0xfd, 0x1c, 0x4a, 0x06, 0xa1, 0x90, 0xbc, 0x98, 0x55, + 0xcb, 0x77, 0x28, 0xee, 0xc6, 0x9c, 0xb8, 0xa4, 0x92, 0xee, 0xda, 0x43, 0x47, 0x14, 0x49, 0x02, + 0x8c, 0x55, 0xd8, 0x7d, 0xc8, 0x0d, 0xf5, 0x91, 0x69, 0x99, 0xd8, 0xab, 0xde, 0xa5, 0xb8, 0x9f, + 0xdc, 0x68, 0xe5, 0xd3, 0x9d, 0x54, 0x11, 0x65, 0x04, 0x48, 0x60, 0xec, 0x94, 0x70, 0x4e, 0x2e, + 0xf5, 0xde, 0x55, 0x63, 0x17, 0x9d, 0xd4, 0x58, 0x57, 0x95, 0x1a, 0x3b, 0xff, 0x32, 0xd0, 0x43, + 0x80, 0x53, 0x13, 0xbf, 0xd1, 0x5e, 0x4f, 0xb0, 0x7b, 0x5e, 0xad, 0x46, 0x7c, 0x6f, 0x9e, 0xd0, + 0xbf, 0x20, 0x64, 0xf4, 0x29, 0xe4, 0x0d, 0x3c, 0xc6, 0xb6, 0xe1, 0xf5, 0xed, 0xea, 0x7b, 0x34, + 0xd7, 0x59, 0xbc, 0xbc, 0xa8, 0xe5, 0xdb, 0x82, 0xc8, 0x7d, 0x6b, 0x38, 0x0b, 0x7d, 0x05, 0x05, + 0xf6, 0x81, 0x8d, 0xbe, 0xdd, 0x3c, 0xaf, 0x2e, 0xd3, 0x43, 0x3f, 0x9e, 0x53, 0x98, 0x61, 0xc9, + 0x19, 0x74, 0xe9, 0xda, 0x11, 0x34, 0x35, 0x86, 0x8d, 0x7e, 0x0e, 0x05, 0xa1, 0xdd, 0x3b, 0xce, + 0x91, 0x57, 0x7d, 0xff, 0xc6, 0x16, 0xda, 0xf4, 0x5a, 0xcf, 0x43, 0x56, 0xe1, 0xbb, 0xa2, 0x68, + 0xe8, 0x67, 0x50, 0x0c, 0x3a, 0xed, 0xce, 0xd8, 0xf7, 0xaa, 0xf7, 0xa9, 0x71, 0x3e, 0x99, 0x57, + 0x75, 0x39, 0x6f, 0x7f, 0x4c, 0xbb, 0x8b, 0x91, 0x2f, 0xf4, 0x00, 0xf2, 0x86, 0xeb, 0x8c, 0x59, + 0x0c, 0xf9, 0xc1, 0xaa, 0xb4, 0x96, 0x0c, 0xea, 0x1e, 0xd7, 0x19, 0xd3, 0xe0, 0xa0, 0x41, 0xc9, + 0xc5, 0x63, 0x4b, 0x1f, 0xe0, 0x11, 0x89, 0x6e, 0xce, 0xb0, 0xba, 0x42, 0x57, 0xdf, 0x9c, 0x5b, + 0x90, 0x01, 0xb3, 0x50, 0xcc, 0x08, 0x5e, 0x7f, 0x88, 0x5e, 0x00, 0xe8, 0x13, 0xc3, 0xf4, 0xb5, + 0x91, 0x63, 0xe0, 0x6a, 0xed, 0xc6, 0xe7, 0xa9, 0x69, 0xf0, 0x06, 0x61, 0x7c, 0xee, 0x18, 0x38, + 0xe8, 0x47, 0x0b, 0x02, 0xfa, 0x14, 0x64, 0x7a, 0xb4, 0xaf, 0x9c, 0x23, 0xa2, 0x9b, 0xab, 0xf4, + 0x70, 0x15, 0x7e, 0x97, 0xf9, 0xb6, 0xeb, 0x8c, 0x77, 0x9c, 0x23, 0xaa, 0x31, 0xfc, 0xa7, 0x81, + 0x3c, 0x28, 0x1c, 0x0f, 0xb4, 0xd0, 0x9d, 0x3e, 0xa0, 0xb7, 0xf8, 0x3b, 0x73, 0xee, 0xe5, 0x59, + 0x6b, 0x86, 0x83, 0x5d, 0x14, 0x71, 0xe1, 0x59, 0x4b, 0xd0, 0x3c, 0x55, 0x3e, 0x1e, 0x04, 0x1f, + 0xe8, 0x43, 0x28, 0xb0, 0xe2, 0x9a, 0x1b, 0x40, 0x3d, 0x62, 0x00, 0x32, 0x1b, 0x61, 0x26, 0xd0, + 0x03, 0x5e, 0x85, 0x6b, 0xba, 0xa7, 0x39, 0x43, 0x76, 0x67, 0x0f, 0xe7, 0x8f, 0xfb, 0x25, 0xc6, + 0xdd, 0xf0, 0xfa, 0x43, 0x7a, 0xb1, 0x03, 0x28, 0x38, 0x13, 0xff, 0xc8, 0x99, 0xd8, 0x86, 0x36, + 0x7c, 0xe5, 0x55, 0x7f, 0x48, 0x4f, 0x7b, 0xab, 0xd2, 0x2c, 0x38, 0x5d, 0x9f, 0x03, 0x6d, 0xed, + 0x7a, 0xaa, 0x2c, 0x50, 0xb7, 0x5e, 0x79, 0xe8, 0x8f, 0x40, 0x36, 0xed, 0x70, 0x8d, 0x47, 0xb7, + 0x5f, 0x03, 0x89, 0xe4, 0xb8, 0x6b, 0x07, 0x4b, 0x00, 0xc7, 0x24, 0x2b, 0x7c, 0x04, 0x25, 0x67, + 0x38, 0xb4, 0x4c, 0x1b, 0x6b, 0x2e, 0xd6, 0x3d, 0xc7, 0xae, 0x7e, 0x10, 0x91, 0x60, 0x91, 0x8f, + 0xa9, 0x74, 0x08, 0xd5, 0x21, 0xef, 0xe3, 0xd1, 0xd8, 0x71, 0x75, 0xf7, 0xbc, 0xfa, 0x61, 0xb4, + 0x8d, 0x1f, 0x90, 0xd1, 0x11, 0x2c, 0x4f, 0x6c, 0x7c, 0x36, 0x76, 0x3c, 0x6c, 0x68, 0x3c, 0xa7, + 0xf3, 0x68, 0x7c, 0x23, 0x7a, 0xb4, 0x46, 0x7d, 0xdc, 0x23, 0xbe, 0xa9, 0x7b, 0x2f, 0xc4, 0x4c, + 0x96, 0xe3, 0xb1, 0x38, 0x18, 0x64, 0x7a, 0xf7, 0x26, 0x33, 0x87, 0x8d, 0xe5, 0x5f, 0x48, 0x50, + 0xb9, 0x12, 0x33, 0xd1, 0x1f, 0x42, 0xd6, 0x76, 0x8c, 0xc8, 0xa3, 0x49, 0x87, 0x2f, 0x93, 0xe9, + 0x39, 0x06, 0x7b, 0x33, 0x79, 0x32, 0xd7, 0x5b, 0x23, 0xfd, 0x35, 0x3e, 0x5a, 0x67, 0x6c, 0x6a, + 0x86, 0xa0, 0x76, 0x0d, 0xf4, 0x09, 0x94, 0xf1, 0xd9, 0xd8, 0x74, 0x23, 0x79, 0x63, 0x22, 0x62, + 0xf3, 0xa5, 0x70, 0x90, 0x28, 0x08, 0x6f, 0x6b, 0xff, 0x5d, 0x02, 0xca, 0x53, 0x11, 0x8b, 0x24, + 0xca, 0xf4, 0x69, 0x30, 0x96, 0x28, 0x13, 0xca, 0x0d, 0x6f, 0x20, 0xd1, 0x97, 0xf7, 0xe4, 0xbb, + 0xbe, 0xbc, 0xc7, 0xdb, 0xc5, 0xe9, 0x5b, 0xb4, 0x8b, 0x7f, 0x02, 0x77, 0x4d, 0x4f, 0xb3, 0x1d, + 0x5b, 0xb4, 0x0f, 0x82, 0x3a, 0x29, 0xfa, 0x7e, 0xba, 0x68, 0x7a, 0x3d, 0xc7, 0x66, 0x8d, 0x83, + 0xe0, 0xd4, 0xe1, 0x53, 0x6b, 0xf6, 0xea, 0x53, 0x6b, 0xd0, 0x1e, 0x48, 0x29, 0xe9, 0xe5, 0xbf, + 0x91, 0x20, 0x27, 0xa2, 0x71, 0xbc, 0x32, 0x90, 0xe6, 0xac, 0x0c, 0xae, 0x97, 0xe3, 0x16, 0x28, + 0x57, 0x94, 0x92, 0x15, 0x26, 0xf7, 0x45, 0x36, 0x35, 0x53, 0x17, 0x4b, 0xe3, 0x98, 0x0a, 0xf2, + 0xdb, 0xfd, 0x46, 0x82, 0x7c, 0xf4, 0x9f, 0x4f, 0x89, 0x60, 0x8f, 0xb3, 0xcb, 0x9c, 0xb7, 0x7c, + 0xa6, 0x8b, 0xdf, 0x57, 0x72, 0xfe, 0xfb, 0xe2, 0xdb, 0xfc, 0x63, 0x90, 0x23, 0x41, 0x72, 0xba, + 0x8a, 0x96, 0xde, 0xa2, 0x8a, 0xfe, 0x21, 0x64, 0x78, 0x64, 0x60, 0x26, 0x50, 0xe4, 0xdc, 0x69, + 0x16, 0x15, 0xd2, 0x5f, 0x91, 0x88, 0xc0, 0x57, 0xff, 0x97, 0x24, 0x14, 0xa2, 0x41, 0x94, 0xb8, + 0x11, 0xd3, 0x1e, 0xb8, 0x34, 0x82, 0xd1, 0xd5, 0x93, 0xc1, 0x6b, 0xa0, 0x20, 0x93, 0xd0, 0x3a, + 0x32, 0x6d, 0x8d, 0xbe, 0x40, 0xc5, 0xcc, 0x2c, 0x37, 0x32, 0xed, 0x2f, 0x09, 0x95, 0x4e, 0xd1, + 0xcf, 0xf8, 0x94, 0x64, 0x6c, 0x8a, 0x7e, 0xc6, 0xa6, 0x2c, 0xd3, 0x6c, 0xd5, 0xf5, 0x69, 0x49, + 0x99, 0x8c, 0xe4, 0x9f, 0xae, 0x8f, 0x56, 0x20, 0x7b, 0x6a, 0xba, 0xfe, 0x44, 0xb7, 0x68, 0xf5, + 0x28, 0x14, 0x52, 0x10, 0x91, 0x0d, 0xa5, 0x30, 0x6d, 0x78, 0x63, 0x63, 0x97, 0xaa, 0xb8, 0xbc, + 0xd9, 0x78, 0x8b, 0xbc, 0x21, 0xfc, 0x20, 0x40, 0xc2, 0xb9, 0x7a, 0x51, 0xe2, 0xf2, 0x5f, 0x49, + 0x50, 0x8c, 0x4d, 0x43, 0x5d, 0x28, 0xd3, 0x85, 0x23, 0x05, 0x21, 0xbb, 0xab, 0x07, 0xc1, 0x7f, + 0x98, 0xc8, 0xf0, 0xcc, 0x8a, 0xb0, 0xe8, 0x44, 0x86, 0x0c, 0xf4, 0x39, 0x94, 0x18, 0x54, 0xf0, + 0xae, 0x1c, 0x57, 0xbf, 0x02, 0x45, 0x8a, 0x3f, 0x2e, 0x17, 0x9c, 0x90, 0x66, 0x44, 0x9f, 0xcc, + 0x96, 0x6d, 0x90, 0x23, 0x79, 0xc9, 0x1c, 0x7a, 0xff, 0xdb, 0x90, 0x0a, 0xfc, 0xe5, 0x9c, 0xf1, + 0x96, 0x32, 0xf0, 0xf5, 0xbe, 0x96, 0x60, 0x69, 0x56, 0x7e, 0x10, 0xb3, 0x27, 0xa6, 0x48, 0x73, + 0xd9, 0xd3, 0xc3, 0x68, 0xde, 0xc6, 0x94, 0x4b, 0x3c, 0xe3, 0x84, 0x99, 0xdb, 0x07, 0x81, 0x8a, + 0x33, 0xdd, 0x2a, 0xc7, 0x54, 0x9c, 0xd4, 0x67, 0x11, 0x25, 0xaf, 0x3f, 0x11, 0x6d, 0x19, 0x80, + 0xcc, 0xfe, 0x8b, 0xe6, 0x5e, 0xb7, 0x35, 0xb3, 0xa5, 0x82, 0x64, 0xc8, 0xf6, 0xb7, 0xb6, 0xf6, + 0xba, 0xbd, 0x8e, 0x92, 0xac, 0xaf, 0x41, 0x3e, 0x48, 0xc1, 0x50, 0x01, 0x72, 0xed, 0xee, 0x41, + 0xa3, 0xb9, 0xd7, 0x69, 0x2b, 0x0b, 0xa8, 0x08, 0x79, 0xb5, 0xd3, 0x68, 0xd3, 0xc6, 0x8d, 0x22, + 0x7d, 0x96, 0xfb, 0xb3, 0xaf, 0x6b, 0x12, 0x77, 0x91, 0x19, 0x25, 0xbb, 0x93, 0xca, 0x21, 0x65, + 0xb1, 0xfe, 0xd7, 0x12, 0xa0, 0xb6, 0xee, 0xeb, 0x44, 0xff, 0x6e, 0xd1, 0x88, 0x49, 0xdc, 0x70, + 0x53, 0xf1, 0xe2, 0x3a, 0xf9, 0x2e, 0xc5, 0x75, 0xb8, 0xe9, 0xfa, 0x37, 0x12, 0x40, 0x64, 0x83, + 0x3f, 0x8d, 0xfe, 0x45, 0xf4, 0xfa, 0x5e, 0xc2, 0x94, 0x45, 0x6d, 0x2f, 0x88, 0x3f, 0x90, 0x3e, + 0x83, 0x9c, 0xc1, 0x8f, 0xcd, 0x55, 0xea, 0xda, 0xa2, 0xfd, 0x8a, 0x74, 0xb6, 0x49, 0x76, 0xce, + 0xa9, 0xbc, 0xc1, 0x95, 0x85, 0xf4, 0xc4, 0x36, 0x1d, 0xfb, 0xc7, 0x6a, 0xf4, 0x69, 0x41, 0x44, + 0x4f, 0x72, 0x15, 0xf4, 0xb7, 0xee, 0x63, 0x83, 0xb5, 0xda, 0x5e, 0xd8, 0xa7, 0x01, 0x41, 0x42, + 0x25, 0x00, 0x3e, 0x6e, 0xda, 0xc7, 0x4a, 0x82, 0x5e, 0xa4, 0xeb, 0x8c, 0xc7, 0xe4, 0x2b, 0xd9, + 0xfc, 0xd1, 0xb7, 0xff, 0xb1, 0xb2, 0xf0, 0xed, 0xe5, 0x8a, 0xf4, 0xcb, 0xcb, 0x15, 0xe9, 0x57, + 0x97, 0x2b, 0xd2, 0xbf, 0x5f, 0xae, 0x48, 0x7f, 0xf1, 0xdd, 0xca, 0xc2, 0x2f, 0xbf, 0x5b, 0x59, + 0xf8, 0xd5, 0x77, 0x2b, 0x0b, 0xbf, 0x9f, 0xe5, 0x9b, 0xfd, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x74, 0xa9, 0x6e, 0xb1, 0xd4, 0x2b, 0x00, 0x00, } diff --git a/pkg/sql/sqlbase/structured.proto b/pkg/sql/sqlbase/structured.proto index e40c9abd24a7..f6d184d9864d 100644 --- a/pkg/sql/sqlbase/structured.proto +++ b/pkg/sql/sqlbase/structured.proto @@ -129,6 +129,14 @@ message ColumnDescriptor { // Expression to use to compute the value of this column if this is a // computed column. optional string compute_expr = 11; + // LogicalColumnID is used to order columns visually. This is because + // ordinal_position in information_schema determines a table's visual column + // ordering to the user. + // This only differs from ID when the Column order is swapped or + // the ColumnDescriptor must be remade while remaining visual ordering. + // This does not exist in TableDescriptors pre 20.2. + 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..c51940f14c8c 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,24 @@ 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 357c4e3b6729..97fec8512fca 100644 --- a/pkg/sql/sqlbase/system.go +++ b/pkg/sql/sqlbase/system.go @@ -378,9 +378,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{ @@ -422,10 +422,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{ @@ -457,8 +457,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{ @@ -486,9 +487,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{ @@ -512,8 +513,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{ @@ -546,10 +548,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{ @@ -583,10 +585,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{ @@ -618,12 +620,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{ @@ -659,13 +661,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{ @@ -700,9 +702,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{ @@ -728,11 +730,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{ @@ -778,14 +780,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{ @@ -843,15 +845,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{ @@ -898,10 +900,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{ @@ -936,9 +938,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{ @@ -1002,10 +1004,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{ @@ -1035,8 +1037,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{ @@ -1076,13 +1078,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{ @@ -1129,11 +1131,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{ @@ -1179,13 +1181,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{ @@ -1228,15 +1230,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{ { @@ -1278,13 +1281,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{ @@ -1320,9 +1323,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{ @@ -1356,9 +1359,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{ @@ -1385,11 +1388,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{ @@ -1429,13 +1432,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{