mirror of
https://github.com/dolthub/dolt.git
synced 2026-04-14 04:21:48 -05:00
3b12c6b242
Until this point, __DOLT_DEV__ has left MergeState in the working set as an address pointing at a types.Struct with the root value ref and the from commit inlined. This converts MergeState to store the commit as an address and to store both addrs inline the MergeState table.
41 lines
1.1 KiB
Plaintext
41 lines
1.1 KiB
Plaintext
// Copyright 2022 Dolthub, Inc.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
table WorkingSet {
|
|
// 20-byte hashes of root values.
|
|
working_root_addr:[ubyte] (required);
|
|
staged_root_addr:[ubyte];
|
|
|
|
// Meta
|
|
name:string (required);
|
|
email:string (required);
|
|
desc:string (required);
|
|
timestamp_millis:uint64;
|
|
|
|
merge_state:MergeState;
|
|
}
|
|
|
|
table MergeState {
|
|
// An address for the the working root value before the merge started.
|
|
pre_working_root_addr:[ubyte] (required);
|
|
|
|
// The commit that we are merging.
|
|
from_commit_addr:[ubyte] (required);
|
|
}
|
|
|
|
// KEEP THIS IN SYNC WITH fileidentifiers.go
|
|
file_identifier "WRST";
|
|
|
|
root_type WorkingSet;
|