wp

database/api.go

@@ -6,13 +6,13 @@ import (
 	"io"
 	"net"
 
-	qb "gordenko.dev/dima/qb"
+	bin "gordenko.dev/dima/bin/little"
+	"gordenko.dev/dima/qb"
 	"gordenko.dev/dima/qb/atree"
-	"gordenko.dev/dima/qb/bin"
 	"gordenko.dev/dima/qb/bufreader"
 	"gordenko.dev/dima/qb/proto"
+	"gordenko.dev/dima/qb/storage"
 	"gordenko.dev/dima/qb/transform"
-	"gordenko.dev/dima/qb/txlog"
 )
 
 var (
@@ -213,7 +213,7 @@ func (s *Database) AddMetric(req proto.AddMetricReq) uint16 {
 
 	switch resultCode {
 	case Succeed:
-		s.txlog.Append(txlog.AddedMetric{
+		s.storage.Append(storage.MetricAddRecord{
 			MetricID:   req.MetricID,
 			MetricType: req.MetricType,
 			FracDigits: req.FracDigits,
@@ -286,20 +286,20 @@ func (s *Database) DeleteMetric(req proto.DeleteMetricReq) uint16 {
 
 	switch result.ResultCode {
 	case Succeed:
-		var (
-			freePageNumbers []uint32
-		)
-		if result.RootPageNo > 0 {
-			var err error
-			freePageNumbers, err = s.atree.GetAllPages(result.RootPageNo)
-			if err != nil {
-				qb.Abort(qb.FailedAtreeRequest, err)
-			}
-		}
-		s.txlog.Append(txlog.DeletedMetric{
-			MetricID:        req.MetricID,
-			FreePageNumbers: freePageNumbers,
-		})
+		// var (
+		// //freePageNumbers []uint32
+		// )
+		// if result.RootPageNo > 0 {
+		// 	var err error
+		// 	freePageNumbers, err = s.atree.GetAllPages(result.RootPageNo)
+		// 	if err != nil {
+		// 		qb.Abort(qb.FailedAtreeRequest, err)
+		// 	}
+		// }
+		// s.storage.Append(storage.DeletedMetric{
+		// 	MetricID: req.MetricID,
+		// 	//FreePageNumbers: freePageNumbers, FIX
+		// })
 		//<-waitCh
 
 	case NoMetric:
@@ -343,7 +343,7 @@ type FilledPage struct {
 
 // 	switch result.ResultCode {
 // 	case CanAppend:
-// 		waitCh := s.txlog.Append(txlog.AppendedMeasure{
+// 		waitCh := s.storage.Append(storage.AppendedMeasure{
 // 			MetricID:  req.MetricID,
 // 			Timestamp: req.Timestamp,
 // 			Value:     req.Value,
@@ -390,9 +390,9 @@ type FilledPage struct {
 // 		// }
 // 		// _ = report
 
-// 		//waitCh := s.txlog.WriteAppended(path, report)
+// 		//waitCh := s.storage.WriteAppended(path, report)
 
-// 		waitCh := s.txlog.Append(txlog.AppendedPagesReq{
+// 		waitCh := s.storage.Append(storage.AppendedPagesReq{
 // 			Legs:       path.Legs,
 // 			MetricID:   req.MetricID,
 // 			Timestamp:  req.Timestamp,
@@ -459,8 +459,8 @@ func (s *Database) AppendMeasures(req proto.AppendMeasuresReq) uint16 {
 		// _ = report
 
 		// if len(toAppendMeasures) > 0 {
-		// 	waitCh := s.txlog.WriteAppendMeasures(
-		// 		txlog.AppendedMeasures{
+		// 	waitCh := s.storage.WriteAppendMeasures(
+		// 		storage.AppendedMeasures{
 		// 			MetricID: req.MetricID,
 		// 			Measures: toAppendMeasures,
 		// 		},
@@ -500,7 +500,7 @@ func (s *Database) DeleteMeasures(req proto.DeleteMeasuresReq) uint16 {
 
 	case DeleteFromAtreeNotNeeded:
 		// регистрирую удаление в TransactionLog
-		s.txlog.Append(txlog.DeletedMeasures{
+		s.storage.Append(storage.DeletedMeasures{
 			MetricID: req.MetricID,
 		})
 		//<-waitCh
@@ -512,7 +512,7 @@ func (s *Database) DeleteMeasures(req proto.DeleteMeasuresReq) uint16 {
 			qb.Abort(qb.FailedAtreeRequest, err)
 		}
 		// регистрирую удаление в TransactionLog
-		s.txlog.Append(txlog.DeletedMeasures{
+		s.storage.Append(storage.DeletedMeasures{
 			MetricID:        req.MetricID,
 			FreePageNumbers: pageNumbers,
 		})