From aafb012ab627ed0d90277094480bfe92d2bda5fd Mon Sep 17 00:00:00 2001
From: Ashwin <ashwin2007ray@gmail.com>
Date: Tue, 16 Feb 2016 17:32:28 +1100
Subject: [PATCH] Changes to limit line length to 80 chars
---
loader/loader.go | 4 +++-
rdf/parse.go | 13 ++++++-------
server/loader/main.go | 3 ++-
server/uidassigner/main.go | 11 +++++++----
uid/assigner.go | 9 ++++++---
5 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/loader/loader.go b/loader/loader.go
index 48b0776a..8b781dfd 100644
--- a/loader/loader.go
+++ b/loader/loader.go
@@ -197,7 +197,9 @@ func (s *state) handleNQuadsWhileAssign(wg *sync.WaitGroup) {
}
// Blocking function.
-func HandleRdfReader(reader io.Reader, instanceIdx uint64, numInstances uint64) (uint64, error) {
+func HandleRdfReader(reader io.Reader, instanceIdx uint64,
+ numInstances uint64) (uint64, error) {
+
s := new(state)
s.ctr = new(counters)
ticker := time.NewTicker(time.Second)
diff --git a/rdf/parse.go b/rdf/parse.go
index 8d59bb34..789553d4 100644
--- a/rdf/parse.go
+++ b/rdf/parse.go
@@ -23,7 +23,6 @@ import (
"time"
"github.com/dgraph-io/dgraph/lex"
- "github.com/dgraph-io/dgraph/store"
"github.com/dgraph-io/dgraph/uid"
"github.com/dgraph-io/dgraph/x"
)
@@ -37,23 +36,23 @@ type NQuad struct {
Language string
}
-func GetUid(s string, instanceIdx uint64, numInstances uint64,
- rStore *store.Store) (uint64, error) {
+func GetUid(s string, instanceIdx uint64, numInstances uint64) (uint64, error) {
if strings.HasPrefix(s, "_uid_:") {
return strconv.ParseUint(s[6:], 0, 64)
}
return uid.GetOrAssign(s, instanceIdx, numInstances)
}
-func (nq NQuad) ToEdge(instanceIdx, numInstances uint64,
- rStore *store.Store) (result x.DirectedEdge, rerr error) {
- sid, err := GetUid(nq.Subject, instanceIdx, numInstances, rStore)
+func (nq NQuad) ToEdge(instanceIdx,
+ numInstances uint64) (result x.DirectedEdge, rerr error) {
+
+ sid, err := GetUid(nq.Subject, instanceIdx, numInstances)
if err != nil {
return result, err
}
result.Entity = sid
if len(nq.ObjectId) > 0 {
- oid, err := GetUid(nq.ObjectId, instanceIdx, numInstances, rStore)
+ oid, err := GetUid(nq.ObjectId, instanceIdx, numInstances)
if err != nil {
return result, err
}
diff --git a/server/loader/main.go b/server/loader/main.go
index 8f6bcf7c..3b5bc31f 100644
--- a/server/loader/main.go
+++ b/server/loader/main.go
@@ -43,7 +43,8 @@ var numInstances = flag.Uint64("numInstances", 1,
var postingDir = flag.String("postings", "", "Directory to store posting lists")
var uidDir = flag.String("uidDir", "", "Directory to read UID posting lists")
var cpuprofile = flag.String("cpuprofile", "", "write cpu profile to file")
-var numcpu = flag.Int("numCpu", runtime.NumCPU(), "Number of cores to be used by the process")
+var numcpu = flag.Int("numCpu", runtime.NumCPU(),
+ "Number of cores to be used by the process")
func main() {
flag.Parse()
diff --git a/server/uidassigner/main.go b/server/uidassigner/main.go
index cdf0d29d..a2984b66 100644
--- a/server/uidassigner/main.go
+++ b/server/uidassigner/main.go
@@ -24,9 +24,11 @@ var instanceIdx = flag.Uint64("instanceIdx", 0,
"Only pick entities, where Fingerprint % numInstance == instanceIdx.")
var numInstances = flag.Uint64("numInstances", 1,
"Total number of instances among which uid assigning is shared")
-var uidDir = flag.String("uidpostings", "", "Directory to store xid to uid posting lists")
+var uidDir = flag.String("uidpostings", "",
+ "Directory to store xid to uid posting lists")
var cpuprofile = flag.String("cpuprofile", "", "write cpu profile to file")
-var numcpu = flag.Int("numCpu", runtime.NumCPU(), "Number of cores to be used by the process")
+var numcpu = flag.Int("numCpu", runtime.NumCPU(),
+ "Number of cores to be used by the process")
func main() {
flag.Parse()
@@ -51,7 +53,7 @@ func main() {
glog.WithField("instanceIdx", *instanceIdx).
WithField("numInstances", *numInstances).
- Info("Only those XIDs with FP(xid) % numInstance == instanceIdx will be given UID")
+ Info("Only XIDs with FP(xid)%numInstance == instanceIdx will be given UID")
if len(*rdfGzips) == 0 {
glog.Fatal("No RDF GZIP files specified")
@@ -81,7 +83,8 @@ func main() {
glog.WithError(err).Fatal("Unable to create gzip reader.")
}
- count, err := loader.HandleRdfReaderWhileAssign(r, *instanceIdx, *numInstances)
+ count, err := loader.HandleRdfReaderWhileAssign(r, *instanceIdx,
+ *numInstances)
if err != nil {
glog.WithError(err).Fatal("While handling rdf reader.")
}
diff --git a/uid/assigner.go b/uid/assigner.go
index fad1d574..ef835558 100644
--- a/uid/assigner.go
+++ b/uid/assigner.go
@@ -98,11 +98,11 @@ func Init(ps *store.Store) {
uidStore = ps
}
-func allocateUniqueUid(xid string, instanceIdx uint64, numInstances uint64) (uid uint64, rerr error) {
+func allocateUniqueUid(xid string, instanceIdx uint64,
+ numInstances uint64) (uid uint64, rerr error) {
mod := math.MaxUint64 / numInstances
minIdx := instanceIdx * mod
-
for sp := ""; ; sp += " " {
txid := xid + sp
@@ -148,6 +148,7 @@ func allocateUniqueUid(xid string, instanceIdx uint64, numInstances uint64) (uid
func assignNew(pl *posting.List, xid string, instanceIdx uint64,
numInstances uint64) (uint64, error) {
+
entry := lmgr.newOrExisting(xid)
entry.Lock()
entry.ts = time.Now()
@@ -187,7 +188,9 @@ func stringKey(xid string) []byte {
return buf.Bytes()
}
-func GetOrAssign(xid string, instanceIdx uint64, numInstances uint64) (uid uint64, rerr error) {
+func GetOrAssign(xid string, instanceIdx uint64,
+ numInstances uint64) (uid uint64, rerr error) {
+
key := stringKey(xid)
pl := posting.GetOrCreate(key, uidStore)
if pl.Length() == 0 {
--
GitLab