Handled error, copyright change, use WriteRune

cluster/cluster.go

-/*
- * Copyright 2016 DGraph Labs, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package cluster
-
-func Init() {
-	//TODO::Code to start a RAFT group
-}
-
-func Join() {
-	// TODO::Code when a new node joins the cluster
-}

cluster/doc.go

+/*
+ * Copyright 201666666 DGraph Labs, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * 		http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+
+This package includes getting the list of predicates that a node serves
+and sharing it with other nodes in the cluster.
+
+A RAFT backed key-value store will maintain a globally consistent
+mapping from a given predicate to the information of the node
+that serves that predicate
+*/
 package cluster

cluster/ipList.go

+package cluster
+
+type ipList struct {
+	ip string
+}

cluster/predicateList.go → cluster/predicates.go

@@ -21,11 +21,17 @@ import (
 	"bytes"
 
 	"github.com/dgraph-io/dgraph/store"
+	"github.com/dgraph-io/dgraph/x"
 )
 
+var glog = x.Log("cluster")
+
 func getPredicate(b []byte) string {
 	buf := bytes.NewBuffer(b)
-	a, _ := buf.ReadString('|')
+	a, err := buf.ReadString('|')
+	if err != nil {
+		glog.WithField("byte", b).Fatal("error retreiving predicate")
+	}
 	str := string(a[:len(a)-1]) // omit the trailing '|'
 	return str
 }

cluster/predicateList_test.go → cluster/predicates_test.go

 /*
- * Copyright 2015 DGraph Labs, Inc.
+ * Copyright 2016 DGraph Labs, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

posting/list.go

@@ -105,7 +105,8 @@ func samePosting(a *types.Posting, b *types.Posting) bool {
 
 // key = (entity uid, attribute)
 func Key(uid uint64, attr string) []byte {
-	buf := bytes.NewBufferString(attr + "|")
+	buf := bytes.NewBufferString(attr)
+	buf.WriteRune('|')
 	if err := binary.Write(buf, binary.LittleEndian, uid); err != nil {
 		glog.Fatalf("Error while creating key with attr: %v uid: %v\n", attr, uid)
 	}