Feature/indexing

.github/workflows/tests.yml

@@ -29,6 +29,7 @@ jobs:
           name: gripBin
           path: grip
 
+
   unitTests:
     needs: build
     name: Unit tests
@@ -65,7 +66,6 @@ jobs:
           sleep 5
           python conformance/run_kafka.py
 
-
   badgerTest:
     needs: build
     name: Badger Conformance
@@ -86,7 +86,6 @@ jobs:
           sleep 5
           make test-conformance
 
-
   pebbleTest:
     needs: build
     name: Pebble Conformance
@@ -107,7 +106,6 @@ jobs:
           sleep 5
           make test-conformance
 
-
   mongoTest:
     needs: build
     name: Mongo Test
@@ -127,8 +125,7 @@ jobs:
           make start-mongo
           ./grip server --rpc-port 18202 --http-port 18201 --config ./test/mongo.yml &
           sleep 5
-          make test-conformance
-
+          python conformance/run_conformance.py http://localhost:18201 --exclude nested_index
 
   mongoCoreTest:
     needs: build
@@ -171,8 +168,7 @@ jobs:
           sleep 15
           ./grip server --rpc-port 18202 --http-port 18201 --config ./test/psql.yml &
           sleep 5
-          python conformance/run_conformance.py http://localhost:18201 --exclude index aggregations
-
+          python conformance/run_conformance.py http://localhost:18201 --exclude aggregations
 
   sqliteTest:
     needs: build
@@ -192,8 +188,7 @@ jobs:
           chmod +x grip
           ./grip server --rpc-port 18202 --http-port 18201 --config ./test/sqlite.yml &
           sleep 5
-          python conformance/run_conformance.py http://localhost:18201 --exclude index aggregations
-
+          python conformance/run_conformance.py http://localhost:18201 --exclude aggregations
 
   gripperTest:
     needs: build
@@ -218,8 +213,7 @@ jobs:
           sleep 5
           ./grip server --rpc-port 18202 --http-port 18201 --config ./gripper/test-graph/config.yaml --er tableServer=localhost:50051 &
           sleep 5
-          python conformance/run_conformance.py http://localhost:18201 --readOnly swapi --exclude pivot
-
+          python conformance/run_conformance.py http://localhost:18201 --readOnly swapi --exclude index pivot
 
   authTest:
     needs: build
@@ -251,8 +245,6 @@ jobs:
           # run specialized role based tests
           make test-authorization ARGS="--grip_config_file_path test/pebble-auth.yml"
 
-
-
   gridsTest:
     needs: build
     name: GRIDs Conformance

accounts/basic.go

@@ -4,6 +4,8 @@ import (
 	"encoding/base64"
 	"fmt"
 	"strings"
+
+	"github.com/bmeg/grip/log"
 )
 
 // BasicCredential describes a username and password for use with Funnel's basic auth.
@@ -18,7 +20,7 @@ func (ba BasicAuth) Validate(md MetaData) (string, error) {
 	var auth []string
 	var ok bool
 
-	fmt.Printf("Running BasicAuth: %#v\n", md)
+	log.Infof("Running BasicAuth: %#v\n", md)
 
 	if auth, ok = md["Authorization"]; !ok {
 		if auth, ok = md["authorization"]; !ok {
@@ -28,7 +30,7 @@ func (ba BasicAuth) Validate(md MetaData) (string, error) {
 
 	if len(auth) > 0 {
 		user, password, ok := parseBasicAuth(auth[0])
-		fmt.Printf("User: %s Password: %s OK: %s\n", user, password, ok)
+		log.Infof("Authenticating as User: %s OK: %t\n", user, ok)
 		for _, c := range ba {
 			if c.User == user && c.Password == password {
 				return user, nil

accounts/interface.go

@@ -43,6 +43,7 @@ var MethodMap = map[string]Operation{
 	"/gripql.Edit/DeleteVertex":  Write,
 	"/gripql.Edit/DeleteEdge":    Write,
 	"/gripql.Edit/AddIndex":      Write,
+	"/gripql.Edit/DeleteIndex":   Write,
 	"/gripql.Edit/AddSchema":     Write,
 	"/gripql.Edit/AddJsonSchema": Write,
 	"/gripql.Edit/AddMapping":    Write,

conformance/run_util.py

@@ -180,19 +180,22 @@ def setGraph(self, name):
         self._conn.addGraph(self.curGraph)
 
         G = self._conn.graph(self.curGraph)
+        bulk = G.bulkAdd()
 
         with open(os.path.join(BASE, "graphs", "%s.vertices" % (name))) as handle:
             for line in handle:
                 data = json.loads(line)
 
-                G.addVertex(data["_id"], data["_label"], self.collect_fields_dict(data))
+                bulk.addVertex(data["_id"], data["_label"], self.collect_fields_dict(data))
 
         with open(os.path.join(BASE, "graphs", "%s.edges" % (name))) as handle:
             for line in handle:
                 data = json.loads(line)
-                G.addEdge(src=data["_from"], dst=data["_to"],
+                bulk.addEdge(src=data["_from"], dst=data["_to"],
                           id=data.get("_id", None), label=data["_label"],
                           data=self.collect_fields_dict(data))
+
+        bulk.execute()
         self.curName = name
         return G
 

conformance/tests/auth_basic.py

@@ -1,7 +1,5 @@
 from __future__ import absolute_import
 
-import requests
-
 
 def test_current_user_has_policy(manager):
     """Ensure current user has a policy defined."""
@@ -18,7 +16,7 @@ def test_current_user_can_query(manager):
     account = manager.current_user_account()
     assert account, f"Could not find account for {manager.user}"
     policies = account.policies
-    assert len(policies) > 0, f"Should have at least one policy"
+    assert len(policies) > 0, "Should have at least one policy"
     errors = []
 
     if not account.is_admin:
@@ -56,7 +54,7 @@ def test_current_user_can_read(manager):
     account = manager.current_user_account()
     assert account, f"Could not find account for {manager.user}"
     policies = account.policies
-    assert len(policies) > 0, f"Should have at least one policy"
+    assert len(policies) > 0, "Should have at least one policy"
     errors = []
     # non admin user
     if not account.is_admin:
@@ -92,7 +90,7 @@ def test_current_user_can_write(manager):
     account = manager.current_user_account()
     assert account, f"Could not find account for {manager.user}"
     policies = account.policies
-    assert len(policies) > 0, f"Should have at least one policy"
+    assert len(policies) > 0, "Should have at least one policy"
     errors = []
     # non admin user
     if not account.is_admin:
@@ -109,7 +107,7 @@ def test_current_user_can_write(manager):
         try:
             manager.test_write('dummy')
             errors.append(f"{manager.user} should not be able to write dummy graph")
-        except AssertionError as e:
+        except AssertionError:
             pass
 
     else:

conformance/tests/ot_has.py

@@ -137,7 +137,6 @@ def test_has_prev(man):
     q = q.has(gripql.neq("$1._id", "$._id"))
     count = 0
     for i in q.render(["$1._id", "$._id"]):
-        print(i)
         if i[0] == i[1]:
             errors.append("History based filter failed: %s" % (i[0]) )
         count += 1
@@ -171,6 +170,7 @@ def test_has_neq(man):
             "Fail: G.query().V().has(gripql.not_(gripql.eq(\"_label\", \"Character\"))) %s != %s" %
             (count, 21))
 
+
     count = 0
     for i in G.query().V().hasLabel("Character").has(gripql.neq("eye_color", "brown")):
         count += 1
@@ -181,6 +181,7 @@ def test_has_neq(man):
             "Fail: G.query().V().has(gripql.not_(gripql.eq(\"eye_color\", \"brown\"))) %s != %s" %
             (count, 14))
 
+
     return errors