Merge remote-tracking branch 'origin/develop' into develop

Author: olejeglejeg

api/api_test.go

@@ -4,6 +4,7 @@ import (
 	"graph-db/internal/app/core"
 	"graph-db/internal/app/core/globals"
 	"testing"
+	"graph-db/internal/app/core/structs"
 )
 
 var fh core.FileHandler
@@ -75,4 +76,49 @@ func TestCreateRelationship(t *testing.T) {
 		t.Errorf("First node previous relationship mismatch")
 	}
 	DropDatabase("test_db")
+}
+
+func TestCreatePropertyForNode(t *testing.T) {
+	core.InitDb("test_db", "local")
+	node1 := CreateNode("node1")
+	property1 := CreatePropertyForNode(&node1, "color", 2, "red")
+	if property1.GetId() != 0 {
+		t.Errorf("Property id mismatch")
+	}
+	if property1.GetNextProperty() != nil {
+		t.Errorf("Next property is not null")
+	}
+	if property1.GetValueType() != 2 {
+		t.Errorf("Value type mismatch")
+	}
+	if structs.GetStringValue(*property1.GetValue()) != "red" {
+		t.Errorf("String value mismatch")
+	}
+	property2 := CreatePropertyForNode(&node1, "amount", 0, 780)
+	if property2.GetId() != 1 {
+		t.Errorf("Property id mismatch")
+	}
+	if property1.GetNextProperty() != property2 {
+		t.Errorf("Next property is not first")
+	}
+	if property2.GetValueType() != 0 {
+		t.Errorf("Value type mismatch")
+	}
+	if structs.GetIntegerValue(*property2.GetValue()) != 780 {
+		t.Errorf("Integer value mismatch")
+	}
+	property3 := CreatePropertyForNode(&node1, "price", 1, 70.5)
+	if property3.GetId() != 2 {
+		t.Errorf("Property id mismatch")
+	}
+	if property2.GetNextProperty() != property3 {
+		t.Errorf("Next property is not first")
+	}
+	if property3.GetValueType() != 1 {
+		t.Errorf("Value type mismatch")
+	}
+	if structs.GetDoubleValue(*property3.GetValue()) != 70.5 {
+		t.Errorf("Double value mismatch")
+	}
+	DropDatabase("test_db")
 }

api/storage_controller.go

@@ -41,23 +41,23 @@ func CreateRelationship(firstNode *structs.Node, secondNode *structs.Node, title
 		firstNode.SetRelationship(relationship)
 		relationship.SetPreviousRelationship1(nil)
 	} else {
-		lastRelationship1 := *firstNode.GetRelationship()
+		lastRelationship1 := firstNode.GetRelationship()
 		for true {
 			if lastRelationship1.GetFirstNode().GetId() == firstNode.GetId() {
 				if lastRelationship1.GetFirstNextRelationship() == nil {
-					firstNode.GetRelationship().SetNextRelationship1(relationship)
-					relationship.SetPreviousRelationship1(firstNode.GetRelationship())
+					lastRelationship1.SetNextRelationship1(relationship)
+					relationship.SetPreviousRelationship1(lastRelationship1)
 					break
 				} else {
-					lastRelationship1 = *lastRelationship1.GetFirstNextRelationship()
+					lastRelationship1 = lastRelationship1.GetFirstNextRelationship()
 				}
 			} else {
 				if lastRelationship1.GetSecondNextRelationship() == nil {
-					firstNode.GetRelationship().SetNextRelationship2(relationship)
-					relationship.SetPreviousRelationship1(firstNode.GetRelationship())
+					lastRelationship1.SetNextRelationship2(relationship)
+					relationship.SetPreviousRelationship1(lastRelationship1)
 					break
 				} else {
-					lastRelationship1 = *lastRelationship1.GetSecondNextRelationship()
+					lastRelationship1 = lastRelationship1.GetSecondNextRelationship()
 				}
 			}
 		}
@@ -67,23 +67,23 @@ func CreateRelationship(firstNode *structs.Node, secondNode *structs.Node, title
 		secondNode.SetRelationship(relationship)
 		relationship.SetPreviousRelationship2(nil)
 	} else {
-		lastRelationship2 := *secondNode.GetRelationship()
+		lastRelationship2 := secondNode.GetRelationship()
 		for true {
 			if lastRelationship2.GetFirstNode().GetId() == secondNode.GetId() {
 				if lastRelationship2.GetFirstNextRelationship() == nil {
-					secondNode.GetRelationship().SetNextRelationship1(relationship)
-					relationship.SetPreviousRelationship2(secondNode.GetRelationship())
+					lastRelationship2.SetNextRelationship1(relationship)
+					relationship.SetPreviousRelationship2(lastRelationship2)
 					break
 				} else {
-					lastRelationship2 = *lastRelationship2.GetFirstNextRelationship()
+					lastRelationship2 = lastRelationship2.GetFirstNextRelationship()
 				}
 			} else {
 				if lastRelationship2.GetSecondNextRelationship() == nil {
-					secondNode.GetRelationship().SetNextRelationship2(relationship)
-					relationship.SetPreviousRelationship2(secondNode.GetRelationship())
+					lastRelationship2.SetNextRelationship2(relationship)
+					relationship.SetPreviousRelationship2(lastRelationship2)
 					break
 				} else {
-					lastRelationship2 = *lastRelationship2.GetSecondNextRelationship()
+					lastRelationship2 = lastRelationship2.GetSecondNextRelationship()
 				}
 			}
 		}
@@ -96,6 +96,31 @@ func CreateRelationship(firstNode *structs.Node, secondNode *structs.Node, title
 	return relationship
 }
 
+func CreatePropertyForNode(node *structs.Node, title string, valueType int, value interface{}) (property *structs.Property){
+	property = structs.CreateProperty()
+	property.SetValueType(int8(valueType))
+	property.SetValue(int8(valueType), value)
+	propertyTitle, err := structs.AddPropertyTitle(title)
+	utils.CheckError(err)
+	property.SetTitle(propertyTitle)
+
+	if node.GetProperty() == nil {
+		node.SetProperty(property)
+	} else {
+		lastProperty := node.GetProperty()
+		for true {
+			if lastProperty.GetNextProperty() == nil {
+				lastProperty.SetNextProperty(property)
+				break
+			} else {
+				lastProperty = lastProperty.GetNextProperty()
+			}
+		}
+	}
+
+	return property
+}
+
 func GetNode(id int) (node *structs.Node) {
 	//todo Recover from error or make node.Get() return error
 	return node.Get(id)

cmd/graph-db/main.go

@@ -2,14 +2,14 @@ package main
 
 import (
 	"graph-db/internal/app/core"
-	"log"
 	"graph-db/internal/pkg/utils"
 	"graph-db/internal/app/core/globals"
+	"log"
 )
 
 func main() {
 	//err := core.InitDb("asd", "local")
-	//err := core.SwitchDb("asd")
+	//err = core.SwitchDb("asd")
 	//utils.CheckError(err)
 
 	dbTitle := "asd"

internal/app/core/structs/properties.go

@@ -30,6 +30,7 @@ func CreateProperty() *Property {
 	id, err := globals.FileHandler.ReadId(globals.PropertiesId)
 	utils.CheckError(err)
 	p.id = id
+	p.valueType = -1
 	p.isUsed = true
 	p.isWritten = false
 	p.write()
@@ -70,7 +71,7 @@ func (p Property) GetNextProperty() *Property {
 			err error
 			bs = make([]byte, globals.PropertiesSize)
 		)
-		if len(p.byteString) < 0 {
+		if len(p.byteString) <= 0 {
 			offset := p.id * globals.PropertiesSize
 			err = globals.FileHandler.Read(globals.PropertiesStore, offset, &bs, p.id)
 			utils.CheckError(err)
@@ -105,7 +106,7 @@ func (p *Property) GetTitle() *PropertyTitle {
 			err error
 			bs = make([]byte, globals.PropertiesSize)
 		)
-		if len(p.byteString) < 0 {
+		if len(p.byteString) <= 0 {
 			offset := p.id * globals.PropertiesSize
 			err = globals.FileHandler.Read(globals.PropertiesStore, offset, &bs, p.id)
 			utils.CheckError(err)
@@ -135,7 +136,7 @@ func (p *Property) GetValueType() int8 {
 
 func (p *Property) SetValueType(valueType int8) {
 	p.valueType = valueType
-	p.write()
+	//p.write()
 }
 
 func (p *Property) GetValue() *Value {
@@ -149,7 +150,7 @@ func (p *Property) GetValue() *Value {
 			bs = make([]byte, globals.PropertiesSize)
 			value Value
 		)
-		if len(p.byteString) < 0 {
+		if len(p.byteString) <= 0 {
 			offset := p.id * globals.PropertiesSize
 			err = globals.FileHandler.Read(globals.PropertiesStore, offset, &bs, p.id)
 			utils.CheckError(err)
@@ -188,13 +189,20 @@ func (p *Property) GetValue() *Value {
 	}
 }
 
-func (p *Property) SetValue(value *Value) {
-	p.value = value
+func (p *Property) SetValue(valueType int8, value interface{}) {
+	var val Value
+	if valueType == 0 {
+		val = CreateIntegerValue(value.(int))
+	} else if valueType == 1 {
+		val = CreateDoubleValue(value.(float64))
+	} else {
+		val = CreateStringValue(value.(string))
+	}
+	p.value = &val
 	p.write()
 }
 
 func (p *Property) toBytes() (bs []byte) {
-
 	var (
 		isUsed []byte
 		nextProperty *Property
@@ -212,7 +220,12 @@ func (p *Property) toBytes() (bs []byte) {
 	nextPropertyBs := utils.Int32ToByteArray(int32(IfNilAssignMinusOne(nextProperty)))
 	titleBs := utils.Int32ToByteArray(int32(IfNilAssignMinusOne(title)))
 	valueTypeBs := utils.Int8ToByteArray(valueType)
-	valueBs := utils.Int32ToByteArray(int32(IfNilAssignMinusOne(value)))
+	var valueBs []byte
+	if valueType == 0 {
+		valueBs = utils.Int32ToByteArray(int32((*value).(*IntegerValue).GetValue()))
+	} else {
+		valueBs = utils.Int32ToByteArray(int32(IfNilAssignMinusOne(value)))
+	}
 
 	bs = append(isUsed, nextPropertyBs...)
 	bs = append(bs, titleBs...)
@@ -241,13 +254,21 @@ func (p *Property) fromBytes(bs []byte) {
 
 	id, err = utils.ByteArrayToInt32(bs[1:5])
 	utils.CheckError(err)
-	nextProperty.id = int(id)
-	p.nextProperty = &nextProperty
+	if id == -1 {
+		p.nextProperty = nil
+	} else {
+		nextProperty.id = int(id)
+		p.nextProperty = &nextProperty
+	}
 
 	id, err = utils.ByteArrayToInt32(bs[5:9])
 	utils.CheckError(err)
-	title.id = int(id)
-	p.title = &title
+	if id == -1 {
+		p.title = nil
+	} else {
+		title.id = int(id)
+		p.title = &title
+	}
 
 	vType := utils.ByteArrayToInt8(bs[9:10])
 	valueType = int8(vType)

internal/app/core/structs/relationships.go

@@ -134,7 +134,7 @@ func (r *Relationship) getRelationship(start int, end int) *Relationship {
 		relationshipId int32
 		bs = make([]byte, globals.RelationshipsSize)
 	)
-	if len(r.byteString) < 0 {
+	if len(r.byteString) <= 0 {
 		offset := r.id * globals.RelationshipsSize
 		err = globals.FileHandler.Read(globals.RelationshipsStore, offset, &bs, r.id)
 		utils.CheckError(err)
@@ -186,7 +186,7 @@ func (r *Relationship) GetTitle() *RelationshipTitle {
 			err error
 			bs = make([]byte, globals.RelationshipsSize)
 		)
-		if len(r.byteString) < 0 {
+		if len(r.byteString) <= 0 {
 			offset := r.id * globals.RelationshipsSize
 			err = globals.FileHandler.Read(globals.RelationshipsTitlesStore, offset, &bs, r.id)
 			utils.CheckError(err)
@@ -264,7 +264,7 @@ func (r *Relationship) GetProperty() *Property {
 			err error
 			bs = make([]byte, globals.RelationshipsSize)
 		)
-		if len(r.byteString) < 0 {
+		if len(r.byteString) <= 0 {
 			offset := r.id * globals.RelationshipsSize
 			err = globals.FileHandler.Read(globals.RelationshipsTitlesStore, offset, &bs, r.id)
 			utils.CheckError(err)
@@ -350,40 +350,72 @@ func (r *Relationship) fromBytes(bs []byte) {
 
 	id, err = utils.ByteArrayToInt32(bs[1:5])
 	utils.CheckError(err)
-	node1.id = int(id)
-	r.node1 = &node1
+	if id == -1 {
+		r.node1 = nil
+ 	} else {
+		node1.id = int(id)
+		r.node1 = &node1
+	}
 	id, err = utils.ByteArrayToInt32(bs[5:9])
 	utils.CheckError(err)
-	node2.id = int(id)
-	r.node2 = &node2
+	if id == -1 {
+		r.node2 = nil
+	} else {
+		node2.id = int(id)
+		r.node2 = &node2
+	}
 
 	id, err = utils.ByteArrayToInt32(bs[9:13])
 	utils.CheckError(err)
-	title.id = int(id)
-	r.title = &title
+	if id == -1 {
+		r.title = nil
+	} else {
+		title.id = int(id)
+		r.title = &title
+	}
 
 	id, err = utils.ByteArrayToInt32(bs[13:17])
 	utils.CheckError(err)
-	previousRelationship1.id = int(id)
-	r.previousRelationship1 = &previousRelationship1
+	if id == -1 {
+		r.previousRelationship1 = nil
+	} else {
+		previousRelationship1.id = int(id)
+		r.previousRelationship1 = &previousRelationship1
+	}
 	id, err = utils.ByteArrayToInt32(bs[17:21])
 	utils.CheckError(err)
-	previousRelationship2.id = int(id)
-	r.previousRelationship2 = &previousRelationship2
+	if id == -1 {
+		r.previousRelationship2 = nil
+	} else {
+		previousRelationship2.id = int(id)
+		r.previousRelationship2 = &previousRelationship2
+	}
 
 	id, err = utils.ByteArrayToInt32(bs[21:25])
 	utils.CheckError(err)
-	nextRelationship1.id = int(id)
-	r.nextRelationship1 = &nextRelationship1
+	if id == -1 {
+		r.nextRelationship1 = nil
+	} else {
+		nextRelationship1.id = int(id)
+		r.nextRelationship1 = &nextRelationship1
+	}
 	id, err = utils.ByteArrayToInt32(bs[25:29])
 	utils.CheckError(err)
-	nextRelationship2.id = int(id)
-	r.nextRelationship2 = &nextRelationship2
+	if id == -1 {
+		r.nextRelationship2 = nil
+	} else {
+		nextRelationship2.id = int(id)
+		r.nextRelationship2 = &nextRelationship2
+	}
 
 	id, err = utils.ByteArrayToInt32(bs[29:33])
 	utils.CheckError(err)
-	property.id = int(id)
-	r.property = &property
+	if id == -1 {
+		r.property = nil
+	} else {
+		property.id = int(id)
+		r.property = &property
+	}
 
 	r.isFirst, err = utils.ByteArrayToBool(bs[33:34])
 	utils.CheckError(err)