Feat/nosv (#14)

* Removed use of SV functions
* Aligned with immudb schema without SV, refactored directory layout
* Added Scan and Reference methods

Author: SimoneLazzaris

.coveragerc

@@ -1,6 +1,6 @@
 [run]
 source = immudb
-omit = immudb/service/*,immudb/schema/*
+omit = immudb/grpc/*
 
 [report]
-omit = immudb/service/*,immudb/schema/*
+omit = immudb/grpc/*

.gitignore

@@ -4,3 +4,8 @@ __pycache__/
 *.vscode
 rootfile
 .coverage
+bin/
+build/
+dist/
+immudb_py.egg-info/
+lib/

Makefile

@@ -1,25 +1,14 @@
 SHELL := /bin/bash
 
-PROTOC ?= $(shell which protoc)
-GRPC_PYTHON_PLUGIN ?= $(shell which grpc_python_plugin)
+
 PYTEST ?= python -m pytest
 PIP ?= pip
 COVERAGE ?= $(shell which coverage)
 
-PROTO_DIR := proto
-PROTO_FILE := ${PROTO_DIR}/schema.proto
-PROTO_URL := https://raw.githubusercontent.com/codenotary/immudb/master/pkg/api/schema/schema.proto
-
-SCHEMA_OUT_DIR := immudb/schema
-GRPC_OUT_DIR := immudb/service
+all: init test
 
-	
-.PHONY: ${PROTO_DIR}
-${PROTO_DIR}:
-	${PROTOC} -I ${PROTO_DIR} ${PROTO_FILE} \
-		--python_out=${SCHEMA_OUT_DIR} \
-		--grpc_out=${GRPC_OUT_DIR} \
-		--plugin=protoc-gen-grpc=${GRPC_PYTHON_PLUGIN}
+proto: immudb/grpc
+	make -C immudb/grpc
 
 init:
 	$(PIP) install -r requirements.txt --user

README.md

@@ -146,7 +146,7 @@ read or write operation:
 
 ### Multi-key read and write
 
-Transactional multi-key read and write operations are supported by immudb and immupy.
+Transactional multi-key read and write operations are supported by immudb and immudb-py.
 Atomic multi-key write (all entries are persisted or none):
 
 ```python

devtest.py

@@ -5,9 +5,9 @@
 a.login("immudb","immudb")
 print(a.databaseUse(b"defaultdb"))
 #print(a.databaseCreate(b"testdb"))
-print(a.databaseList())
-print("Use:")
-print(a.databaseUse(b"defaultdb"))
+#print(a.databaseList())
+#print("Use:")
+#print(a.databaseUse(b"defaultdb"))
 
 # print(a.databaseUse(b"testdb"))
 
@@ -25,6 +25,10 @@
 # print(resp)
 
 
-xset = {b"key1": b"value1", b"key2": b"value2"}
-print(a.setAll(xset))
-print(a.getAll(xset.keys()))
+#xset = {b"key3": b"value3", b"key4": b"value4"}
+#print(a.setAll(xset))
+#print(a.getAll(xset.keys()))
+
+#print(a.safeSet(b'keykey2', b'valval2'))
+#print(a.get(b'keykey2'))
+print(a.history(b'key1'))

immudb/client.py

@@ -7,8 +7,10 @@
                           get, listUsers, safeGet, safeSet, setValue, history, 
                           scan, reference)
 from immudb.rootService import RootService
-from immudb.service import schema_pb2_grpc
+from immudb.grpc import schema_pb2_grpc
 
+OLDEST_FIRST=True
+NEWEST_FIRST=False
 
 class ImmudbClient:
     def __init__(self, immudUrl=None):
@@ -97,7 +99,7 @@ def getAll(self, keys: list):
         klist = [schema_pb2_grpc.schema__pb2.Key(key=k) for k in keys]
         request = schema_pb2_grpc.schema__pb2.KeyList(keys=klist)
         resp = batchGet.call(self.__stub, self.__rs, request)
-        return {i.key: i.value.payload for i in resp.itemlist.items}
+        return resp
 
     def setAll(self, kv: dict):
         _KVs = []
@@ -146,8 +148,13 @@ def databaseCreate(self, dbName: bytes):
     def currentRoot(self):
         return currentRoot.call(self.__stub, self.__rs, None)
 
-    def history(self, key: bytes):
-        request = schema_pb2_grpc.schema__pb2.Key(key=key)
+    def history(self, key: bytes, offset: int, limit: int, sortorder: bool):
+        request = schema_pb2_grpc.schema__pb2.HistoryOptions(
+                key=key,
+                offset=offset,
+                limit=limit,
+                reverse=sortorder
+                )
         return history.call(self.__stub, self.__rs, request)
 
     def logout(self):
@@ -179,3 +186,24 @@ def zscan(self):
 
 
 
+    def scan(self, prefix: bytes, offset: bytes, limit:int=10, reverse:bool=False, deep:bool=False):
+        request = schema_pb2_grpc.schema__pb2.ScanOptions(
+            prefix=prefix,
+            offset=offset,
+            limit=limit,
+            reverse=reverse,
+            deep=deep)
+        return scan.call(self.__stub, self.__rs, request)
+    
+    def reference(self, refkey: bytes, key:  bytes):
+        request = schema_pb2_grpc.schema__pb2.ReferenceOptions(
+            reference = refkey,
+            key=key
+            )
+        return reference.call(self.__stub, self.__rs, request)
+    
+    def zadd(self):
+        pass
+    
+    def zscan(self):
+        pass

immudb/consistency.py

@@ -1,6 +1,6 @@
 import hashlib
 
-from immudb.schema import schema_pb2
+from immudb.grpc import schema_pb2
 from immudb import constants
 
 

immudb/grpc/Makefile

@@ -0,0 +1,66 @@
+SHELL := /bin/bash
+
+PROTOC ?= $(shell which protoc)
+GRPC_PYTHON_PLUGIN ?= $(shell which grpc_python_plugin)
+PYTEST ?= python -m pytest
+PIP ?= pip
+COVERAGE ?= $(shell which coverage)
+
+PROTO_DIR := proto
+PROTO_FILE := ${PROTO_DIR}/schema.proto 
+PROTO_URL := https://raw.githubusercontent.com/codenotary/immudb/master/pkg/api/schema/schema.proto
+
+SCHEMA_OUT_DIR := immudb/schema
+GRPC_OUT_DIR := immudb/service
+GOPATH ?= ${HOME}/go
+PROTOC_INCLUDE_PATH := \-I${GOPATH}/pkg/mod \
+		-I${GOPATH}/pkg/mod/github.com/grpc-ecosystem/[email protected]/third_party/googleapis \
+		-I${GOPATH}/pkg/mod/github.com/dgraph-io/badger/[email protected] \
+		-I${GOPATH}/pkg/mod/github.com/grpc-ecosystem/[email protected] \
+		-I${GOPATH}/pkg/mod/github.com/grpc-ecosystem/[email protected]/protoc-gen-swagger
+
+.PHONY: ${PROTO_DIR}
+${PROTO_DIR}:
+	${PROTOC} -I${PROTO_DIR} ${PROTOC_INCLUDE_PATH} \
+	${PROTO_FILE} \
+	--python_out=. --grpc_out=. \
+	--plugin=protoc-gen-grpc=/home/simone/sw/immu-py/bin/grpc_python_plugin
+	
+	
+# 	python3 -m grpc_tools.protoc \
+# 		${PROTOC_INCLUDE_PATH} \
+# 		${PROTO_FILE} \
+# 		--python_out=. \
+# 		--grpc_python_out=.
+# 	python3 -m grpc_tools.protoc \
+# 		${PROTOC_INCLUDE_PATH} \
+# 		${GOPATH}/pkg/mod/github.com/grpc-ecosystem/[email protected]/protoc-gen-swagger/options/annotations.proto \
+# 		--python_out=. \
+# 		--grpc_python_out=.
+# 	python3 -m grpc_tools.protoc \
+# 		${PROTOC_INCLUDE_PATH} \
+# 		${GOPATH}/pkg/mod/github.com/grpc-ecosystem/[email protected]/protoc-gen-swagger/options/openapiv2.proto \
+# 		--python_out=. \
+# 		--grpc_python_out=.
+	./fixup.sh
+
+init:
+	$(PIP) install -r requirements.txt --user
+
+dev:
+	$(PIP) install -r requirements-dev.txt --user
+
+test:
+	$(PYTEST) -vv --color=yes tests/
+
+coverage:
+	$(COVERAGE) run -m pytest tests
+
+install:
+	python setup.py install
+
+.PHONY: dist
+dist:
+	mkdir -p ./dist
+	rm ./dist/*
+	python setup.py sdist bdist_wheel

immudb/schema/__init__.py renamed to immudb/grpc/__init__.py

@@ -0,0 +1,2 @@
+#!/bin/sh
+sed -i -r 's/^import (.+_pb2.*)/from . import \1/g' *_pb2*.py