wp
This commit is contained in:
235
database/api.go
235
database/api.go
@@ -215,7 +215,7 @@ func (s *Database) AddMetric(req proto.AddMetricReq) uint16 {
|
||||
|
||||
switch resultCode {
|
||||
case Succeed:
|
||||
waitCh := s.txlog.WriteAddedMetric(txlog.AddedMetric{
|
||||
waitCh := s.txlog.Append(txlog.AddedMetric{
|
||||
MetricID: req.MetricID,
|
||||
MetricType: req.MetricType,
|
||||
FracDigits: req.FracDigits,
|
||||
@@ -289,21 +289,18 @@ func (s *Database) DeleteMetric(req proto.DeleteMetricReq) uint16 {
|
||||
switch result.ResultCode {
|
||||
case Succeed:
|
||||
var (
|
||||
freeDataPages []uint32
|
||||
freeIndexPages []uint32
|
||||
freePageNumbers []uint32
|
||||
)
|
||||
if result.RootPageNo > 0 {
|
||||
pageLists, err := s.atree.GetAllPages(result.RootPageNo)
|
||||
var err error
|
||||
freePageNumbers, err = s.atree.GetAllPages(result.RootPageNo)
|
||||
if err != nil {
|
||||
diploma.Abort(diploma.FailedAtreeRequest, err)
|
||||
}
|
||||
freeDataPages = pageLists.DataPages
|
||||
freeIndexPages = pageLists.IndexPages
|
||||
}
|
||||
waitCh := s.txlog.WriteDeletedMetric(txlog.DeletedMetric{
|
||||
MetricID: req.MetricID,
|
||||
FreeDataPages: freeDataPages,
|
||||
FreeIndexPages: freeIndexPages,
|
||||
waitCh := s.txlog.Append(txlog.DeletedMetric{
|
||||
MetricID: req.MetricID,
|
||||
FreePageNumbers: freePageNumbers,
|
||||
})
|
||||
<-waitCh
|
||||
|
||||
@@ -348,7 +345,7 @@ func (s *Database) AppendMeasure(req proto.AppendMeasureReq) uint16 {
|
||||
|
||||
switch result.ResultCode {
|
||||
case CanAppend:
|
||||
waitCh := s.txlog.WriteAppendMeasure(txlog.AppendedMeasure{
|
||||
waitCh := s.txlog.Append(txlog.AppendedMeasure{
|
||||
MetricID: req.MetricID,
|
||||
Timestamp: req.Timestamp,
|
||||
Value: req.Value,
|
||||
@@ -357,35 +354,58 @@ func (s *Database) AppendMeasure(req proto.AppendMeasureReq) uint16 {
|
||||
|
||||
case NewPage:
|
||||
filled := result.FilledPage
|
||||
report, err := s.atree.AppendDataPage(atree.AppendDataPageReq{
|
||||
MetricID: req.MetricID,
|
||||
Timestamp: req.Timestamp,
|
||||
Value: req.Value,
|
||||
Since: filled.Since,
|
||||
RootPageNo: filled.RootPageNo,
|
||||
PrevPageNo: filled.PrevPageNo,
|
||||
|
||||
var path atree.PathToDataPage
|
||||
if filled.RootPageNo > 0 {
|
||||
path, err := s.atree.FindPathToLastPage(filled.RootPageNo)
|
||||
if err != nil {
|
||||
// FIX
|
||||
diploma.Abort(diploma.WriteToAtreeFailed, err)
|
||||
}
|
||||
// for _, leg := range path.Legs {
|
||||
// pagesToRelease = append(pagesToRelease, leg.PageNo)
|
||||
// }
|
||||
|
||||
if path.LastPageNo != filled.PrevPageNo {
|
||||
diploma.Abort(
|
||||
diploma.WrongPrevPageNo,
|
||||
fmt.Errorf("bug: last pageNo %d in tree != prev pageNo %d in _metric",
|
||||
path.LastPageNo, filled.PrevPageNo),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
// report, err := s.atree.AppendDataPages(atree.AppendDataPageReq{
|
||||
// MetricID: req.MetricID,
|
||||
// Timestamp: req.Timestamp,
|
||||
// Value: req.Value,
|
||||
// Since: filled.Since,
|
||||
// RootPageNo: filled.RootPageNo,
|
||||
// PrevPageNo: filled.PrevPageNo,
|
||||
// TimestampsChunks: filled.TimestampsChunks,
|
||||
// TimestampsSize: filled.TimestampsSize,
|
||||
// ValuesChunks: filled.ValuesChunks,
|
||||
// ValuesSize: filled.ValuesSize,
|
||||
// })
|
||||
// if err != nil {
|
||||
// diploma.Abort(diploma.WriteToAtreeFailed, err)
|
||||
// }
|
||||
// _ = report
|
||||
|
||||
//waitCh := s.txlog.WriteAppended(path, report)
|
||||
|
||||
waitCh := s.txlog.Append(txlog.AppendedPagesReq{
|
||||
Legs: path.Legs,
|
||||
MetricID: req.MetricID,
|
||||
Timestamp: req.Timestamp,
|
||||
Value: req.Value,
|
||||
LastPageNo: filled.PrevPageNo,
|
||||
//Pages: ,
|
||||
TimestampsChunks: filled.TimestampsChunks,
|
||||
TimestampsSize: filled.TimestampsSize,
|
||||
ValuesChunks: filled.ValuesChunks,
|
||||
ValuesSize: filled.ValuesSize,
|
||||
})
|
||||
if err != nil {
|
||||
diploma.Abort(diploma.WriteToAtreeFailed, err)
|
||||
}
|
||||
_ = report
|
||||
waitCh := s.txlog.WriteAppendedMeasureWithOverflow(
|
||||
txlog.AppendedMeasureWithOverflow{
|
||||
// FIX
|
||||
// MetricID: req.MetricID,
|
||||
// Timestamp: req.Timestamp,
|
||||
// Value: req.Value,
|
||||
// IsDataPageReused: report.IsDataPageReused,
|
||||
// DataPageNo: report.DataPageNo,
|
||||
// IsRootChanged: report.IsRootChanged,
|
||||
// RootPageNo: report.NewRootPageNo,
|
||||
// ReusedIndexPages: report.ReusedIndexPages,
|
||||
},
|
||||
false,
|
||||
},
|
||||
)
|
||||
<-waitCh
|
||||
|
||||
@@ -442,7 +462,9 @@ func (s *Database) AppendMeasures(req proto.AppendMeasuresReq) uint16 {
|
||||
until = result.Until
|
||||
untilValue = result.UntilValue
|
||||
//
|
||||
toAppendMeasures []proto.Measure
|
||||
//toAppendMeasures []proto.Measure
|
||||
|
||||
dataPages []atree.NotLinkedDataPage
|
||||
)
|
||||
|
||||
for idx, measure := range req.Measures {
|
||||
@@ -451,30 +473,32 @@ func (s *Database) AppendMeasures(req proto.AppendMeasuresReq) uint16 {
|
||||
since = measure.Timestamp
|
||||
} else {
|
||||
if measure.Timestamp <= until {
|
||||
if len(toAppendMeasures) > 0 {
|
||||
waitCh := s.txlog.WriteAppendMeasures(
|
||||
txlog.AppendedMeasures{
|
||||
MetricID: req.MetricID,
|
||||
Measures: toAppendMeasures,
|
||||
},
|
||||
false,
|
||||
)
|
||||
<-waitCh
|
||||
}
|
||||
// пишу в БД що вже встиг закодувати FIX
|
||||
// if len(toAppendMeasures) > 0 {
|
||||
// waitCh := s.txlog.WriteAppendMeasures(
|
||||
// txlog.AppendedMeasures{
|
||||
// MetricID: req.MetricID,
|
||||
// Measures: toAppendMeasures,
|
||||
// },
|
||||
// false,
|
||||
// )
|
||||
// <-waitCh
|
||||
// }
|
||||
return proto.ErrExpiredMeasure
|
||||
}
|
||||
|
||||
if result.MetricType == diploma.Cumulative && measure.Value < untilValue {
|
||||
if len(toAppendMeasures) > 0 {
|
||||
waitCh := s.txlog.WriteAppendMeasures(
|
||||
txlog.AppendedMeasures{
|
||||
MetricID: req.MetricID,
|
||||
Measures: toAppendMeasures,
|
||||
},
|
||||
false,
|
||||
)
|
||||
<-waitCh
|
||||
}
|
||||
// пишу в БД що вже встиг закодувати FIX
|
||||
// if len(toAppendMeasures) > 0 {
|
||||
// waitCh := s.txlog.WriteAppendMeasures(
|
||||
// txlog.AppendedMeasures{
|
||||
// MetricID: req.MetricID,
|
||||
// Measures: toAppendMeasures,
|
||||
// },
|
||||
// false,
|
||||
// )
|
||||
// <-waitCh
|
||||
// }
|
||||
return proto.ErrNonMonotonicValue
|
||||
}
|
||||
}
|
||||
@@ -485,38 +509,40 @@ func (s *Database) AppendMeasures(req proto.AppendMeasuresReq) uint16 {
|
||||
totalSpace := timestamps.Size() + values.Size() + extraSpace
|
||||
|
||||
if totalSpace <= atree.DataPagePayloadSize {
|
||||
// накопичую
|
||||
timestamps.Append(measure.Timestamp)
|
||||
values.Append(measure.Value)
|
||||
toAppendMeasures = append(toAppendMeasures, measure)
|
||||
//toAppendMeasures = append(toAppendMeasures, measure)
|
||||
} else {
|
||||
if len(toAppendMeasures) > 0 {
|
||||
waitCh := s.txlog.WriteAppendMeasures(
|
||||
txlog.AppendedMeasures{
|
||||
MetricID: req.MetricID,
|
||||
Measures: toAppendMeasures,
|
||||
},
|
||||
true,
|
||||
)
|
||||
<-waitCh
|
||||
// сторінка заповнена
|
||||
// if len(toAppendMeasures) > 0 {
|
||||
// waitCh := s.txlog.WriteAppendMeasures(
|
||||
// txlog.AppendedMeasures{
|
||||
// MetricID: req.MetricID,
|
||||
// Measures: toAppendMeasures,
|
||||
// },
|
||||
// true,
|
||||
// )
|
||||
// <-waitCh
|
||||
|
||||
toAppendMeasures = nil
|
||||
}
|
||||
report, err := s.atree.AppendDataPage(atree.AppendDataPageReq{
|
||||
MetricID: req.MetricID,
|
||||
Timestamp: until,
|
||||
Value: untilValue,
|
||||
Since: since,
|
||||
RootPageNo: rootPageNo,
|
||||
PrevPageNo: prevPageNo,
|
||||
// toAppendMeasures = nil
|
||||
// }
|
||||
|
||||
pageData := make([]byte, atree.PageSize)
|
||||
|
||||
atree.ChunksToNotLinkedDataPage(pageData, atree.ChunksToNotLinkedDataPageReq{
|
||||
//PrevPageNo: path.LastPageNo,
|
||||
TimestampsChunks: timestampsBuf.Chunks(),
|
||||
TimestampsSize: uint16(timestamps.Size()),
|
||||
ValuesChunks: valuesBuf.Chunks(),
|
||||
ValuesSize: uint16(values.Size()),
|
||||
})
|
||||
if err != nil {
|
||||
diploma.Abort(diploma.WriteToAtreeFailed, err)
|
||||
}
|
||||
_ = report
|
||||
|
||||
dataPages = append(dataPages, atree.NotLinkedDataPage{
|
||||
Since: since,
|
||||
Data: pageData,
|
||||
})
|
||||
|
||||
// FIX
|
||||
// prevPageNo = report.DataPageNo
|
||||
// if report.IsRootChanged {
|
||||
@@ -540,7 +566,7 @@ func (s *Database) AppendMeasures(req proto.AppendMeasuresReq) uint16 {
|
||||
timestampsBuf = conbuf.New(nil)
|
||||
valuesBuf = conbuf.New(nil)
|
||||
|
||||
timestamps = chunkenc.NewReverseTimeDeltaOfDeltaCompressor(
|
||||
timestamps = chunkenc.NewReverseTimeDeltaCompressor(
|
||||
timestampsBuf, 0)
|
||||
if result.MetricType == diploma.Cumulative {
|
||||
values = chunkenc.NewReverseCumulativeDeltaCompressor(
|
||||
@@ -560,16 +586,32 @@ func (s *Database) AppendMeasures(req proto.AppendMeasuresReq) uint16 {
|
||||
untilValue = measure.Value
|
||||
}
|
||||
|
||||
if len(toAppendMeasures) > 0 {
|
||||
waitCh := s.txlog.WriteAppendMeasures(
|
||||
txlog.AppendedMeasures{
|
||||
MetricID: req.MetricID,
|
||||
Measures: toAppendMeasures,
|
||||
},
|
||||
false,
|
||||
)
|
||||
<-waitCh
|
||||
}
|
||||
waitCh := s.txlog.Append(txlog.AppendedPagesReq{
|
||||
MetricID: req.MetricID,
|
||||
Timestamp: until,
|
||||
Value: untilValue,
|
||||
LastPageNo: prevPageNo,
|
||||
//Measures: toAppendMeasures,
|
||||
},
|
||||
)
|
||||
<-waitCh
|
||||
|
||||
// report, err := s.atree.AppendDataPage(atree.AppendDataPageReq{})
|
||||
// if err != nil {
|
||||
// diploma.Abort(diploma.WriteToAtreeFailed, err)
|
||||
// }
|
||||
// _ = report
|
||||
|
||||
// if len(toAppendMeasures) > 0 {
|
||||
// waitCh := s.txlog.WriteAppendMeasures(
|
||||
// txlog.AppendedMeasures{
|
||||
// MetricID: req.MetricID,
|
||||
// Measures: toAppendMeasures,
|
||||
// },
|
||||
// false,
|
||||
// )
|
||||
// <-waitCh
|
||||
// }
|
||||
|
||||
case NoMetric:
|
||||
return proto.ErrNoMetric
|
||||
@@ -602,22 +644,21 @@ func (s *Database) DeleteMeasures(req proto.DeleteMeasuresReq) uint16 {
|
||||
|
||||
case DeleteFromAtreeNotNeeded:
|
||||
// регистрирую удаление в TransactionLog
|
||||
waitCh := s.txlog.WriteDeletedMeasures(txlog.DeletedMeasures{
|
||||
waitCh := s.txlog.Append(txlog.DeletedMeasures{
|
||||
MetricID: req.MetricID,
|
||||
})
|
||||
<-waitCh
|
||||
|
||||
case DeleteFromAtreeRequired:
|
||||
// собираю номера всех data и index страниц метрики (типа запись REDO лога).
|
||||
pageLists, err := s.atree.GetAllPages(req.MetricID)
|
||||
pageNumbers, err := s.atree.GetAllPages(req.MetricID)
|
||||
if err != nil {
|
||||
diploma.Abort(diploma.FailedAtreeRequest, err)
|
||||
}
|
||||
// регистрирую удаление в TransactionLog
|
||||
waitCh := s.txlog.WriteDeletedMeasures(txlog.DeletedMeasures{
|
||||
MetricID: req.MetricID,
|
||||
FreeDataPages: pageLists.DataPages,
|
||||
FreeIndexPages: pageLists.IndexPages,
|
||||
waitCh := s.txlog.Append(txlog.DeletedMeasures{
|
||||
MetricID: req.MetricID,
|
||||
FreePageNumbers: pageNumbers,
|
||||
})
|
||||
<-waitCh
|
||||
|
||||
|
||||
Reference in New Issue
Block a user