Refactored Node.ID()

Author: lkarlslund

modules/aql/bloom.go

@@ -9,7 +9,7 @@ const totalBits = bloomSize * bloomItemSize
 type bloom [bloomSize]byte
 
 // Calculate a bit to set or test
-func (b *bloom) hash(item engine.ObjectID) int {
+func (b *bloom) hash(item engine.NodeID) int {
 	// incoming item value is a pointer, so mix it up a bit
 	hash := int(item ^ item>>17 ^ item>>31)
 
@@ -18,13 +18,13 @@ func (b *bloom) hash(item engine.ObjectID) int {
 	return bit
 }
 
-func (b *bloom) Add(item engine.ObjectID) {
+func (b *bloom) Add(item engine.NodeID) {
 	// hash the value to a given bit
 	bit := b.hash(item)
 	b[bit/bloomItemSize] |= 1 << (bit % bloomItemSize)
 }
 
-func (b *bloom) Has(item engine.ObjectID) bool {
+func (b *bloom) Has(item engine.NodeID) bool {
 	// hash the value to a given bit
 	bit := b.hash(item)
 	return b[bit/bloomItemSize]&(1<<(bit%bloomItemSize)) != 0

modules/engine/graph.go

@@ -6,7 +6,6 @@ import (
 	"sync"
 	"sync/atomic"
 	"time"
-	"unsafe"
 
 	gsync "github.com/SaveTheRbtz/generic-sync-map-go"
 	"github.com/akyoto/cache"
@@ -377,13 +376,8 @@ func (os *IndexedGraph) NodeIndex(node *Node) (NodeIndexType, bool) {
 	return os.nodeLookup.Load(node)
 }
 
-func (os *IndexedGraph) LookupNodeByID(id ObjectID) (*Node, bool) {
-	// It's a uintptr ... shoot me!
-	fakenode := (*Node)(unsafe.Pointer(uintptr(id)))
-	if os.Contains(fakenode) {
-		return fakenode, true
-	}
-	return nil, false
+func (os *IndexedGraph) LookupNodeByID(id NodeID) (*Node, bool) {
+	return os.Find(AttributeNodeId, AttributeValueInt(id))
 }
 
 // Attemps to merge the object into the objects

modules/engine/node.go

@@ -11,7 +11,6 @@ import (
 	"sync"
 	"sync/atomic"
 	"time"
-	"unsafe"
 
 	"github.com/gofrs/uuid"
 	"github.com/icza/gox/stringsx"
@@ -23,6 +22,9 @@ import (
 var threadbuckets = runtime.NumCPU() * runtime.NumCPU() * 64
 var threadsafeobjectmutexes = make([]sync.RWMutex, threadbuckets)
 
+var AttributeNodeId = NewAttribute("nodeID").Single().Hidden()
+var uniqueNodeID atomic.Uint32
+
 var UnknownGUID = uuid.UUID{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}
 
 var BlankSID = windowssecurity.SID("")
@@ -48,10 +50,14 @@ func NewNode(flexinit ...any) *Node {
 }
 
 // Temporary workaround
-type ObjectID uintptr
+type NodeID uint32
 
-func (o *Node) ID() ObjectID {
-	return ObjectID(uintptr(unsafe.Pointer(o)))
+func (o *Node) ID() NodeID {
+	n := o.OneAttr(AttributeNodeId)
+	if n == nil {
+		return 0
+	}
+	return NodeID(n.(AttributeValueInt))
 }
 
 func (o *Node) lockbucket() int {
@@ -686,6 +692,7 @@ func (o *Node) Meta() map[string]string {
 
 func (o *Node) init() {
 	o.values.init()
+	o.Set(AttributeNodeId, AttributeValueInt(NodeID(uniqueNodeID.Add(1))))
 }
 
 func (o *Node) String() string {

modules/frontend/ui.go

@@ -190,7 +190,7 @@ func AddUIEndpoints(ws *WebService) {
 }
 
 type APINodeDetails struct {
-	ID                engine.ObjectID     `json:"id"`
+	ID                engine.NodeID       `json:"id"`
 	Label             string              `json:"label"`
 	DistinguishedName string              `json:"distinguishedname"`
 	Attributes        map[string][]string `json:"attributes"`
@@ -284,7 +284,7 @@ func AddDataEndpoints(ws *WebService) {
 				c.String(500, "Error parsing ID")
 				return
 			}
-			o, found = ws.SuperGraph.LookupNodeByID(engine.ObjectID(id))
+			o, found = ws.SuperGraph.LookupNodeByID(engine.NodeID(id))
 			// o, found = ws.SuperGraph.Find(engine.UniqueID, engine.NewAttributeValueGUID(id))
 		case "dn", "distinguishedname":
 			o, found = ws.SuperGraph.Find(activedirectory.DistinguishedName, engine.AttributeValueString(c.Param("id")))
@@ -329,7 +329,7 @@ func AddDataEndpoints(ws *WebService) {
 					c.String(500, "Error parsing ID")
 					return
 				}
-				o, found = ws.SuperGraph.LookupNodeByID(engine.ObjectID(thisId))
+				o, found = ws.SuperGraph.LookupNodeByID(engine.NodeID(thisId))
 				if !found {
 					c.AbortWithStatus(404)
 					return
@@ -407,7 +407,7 @@ func AddDataEndpoints(ws *WebService) {
 				return
 			}
 
-			if parent, found := ws.SuperGraph.LookupNodeByID(engine.ObjectID(id)); found {
+			if parent, found := ws.SuperGraph.LookupNodeByID(engine.NodeID(id)); found {
 				// if parent, found := ws.SuperGraph.Find(engine.UniqueID, engine.NewAttributeValueGUID(id)); found {
 				children = parent.Children()
 			} else {
@@ -416,10 +416,10 @@ func AddDataEndpoints(ws *WebService) {
 			}
 		}
 		type treeData struct {
-			Label    string          `json:"text"`
-			Type     string          `json:"type,omitempty"`
-			ID       engine.ObjectID `json:"id"`
-			Children bool            `json:"children,omitempty"`
+			Label    string        `json:"text"`
+			Type     string        `json:"type,omitempty"`
+			ID       engine.NodeID `json:"id"`
+			Children bool          `json:"children,omitempty"`
 		}
 		var results []treeData
 		children.Iterate(func(object *engine.Node) bool {

modules/frontend/xgmml.go

@@ -2,6 +2,7 @@ package frontend
 
 import (
 	"encoding/xml"
+
 	"github.com/lkarlslund/adalanche/modules/engine"
 )
 
@@ -37,15 +38,15 @@ type XGMMLNode struct {
 	XMLName    xml.Name `xml:"node"`
 	Label      string   `xml:"label,attr"`
 	Attributes []XGMMLAttribute
-	Weight     int             `xml:"weight,attr,omitempty"`
-	Id         engine.ObjectID `xml:"id,attr"`
+	Weight     int           `xml:"weight,attr,omitempty"`
+	Id         engine.NodeID `xml:"id,attr"`
 }
 type XGMMLEdge struct {
 	XMLName    xml.Name `xml:"edge"`
 	Label      string   `xml:"label,attr"`
 	Attributes []XGMMLAttribute
-	Source     engine.ObjectID `xml:"source,attr"`
-	Target     engine.ObjectID `xml:"target,attr"`
+	Source     engine.NodeID `xml:"source,attr"`
+	Target     engine.NodeID `xml:"target,attr"`
 }
 type XGMMLAttribute struct {
 	XMLName xml.Name `xml:"att"`