grumlin 0.22.0 → 0.22.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 519d93b97b2cd8f07a1e11e75e45b0b7ca780947e82b3624d5e6c7c6d719ec27
-  data.tar.gz: 5eed9eab9e99fe02246995adbc8c01988bd21d150df234946a575d01cda518f2
+  metadata.gz: bdd374421192255c1b8a9eb86bd3be6247992f5d480c87dfff44be0d03c81171
+  data.tar.gz: 0daa84321a8c03711739d3f236c4c3c99cc91d7366aa1c3be7cc9f504d1e4f47
 SHA512:
-  metadata.gz: 76cd4990acd94d119b2a716e25b10d35bdc970e794a77de4d25dcc7e3f67f5129236ff1c037a4f0f0c3208643afca9695b6dc602bb84ae01d61a84c1b89364fe
-  data.tar.gz: afda51dc7010f1fc508e96b203727ebee971597b6425aa2ec29932d7957e1b2b12d8959526a5fc10d92e46926e94dab1ca3d62eb583bbb36498f99bbd3e11689
+  metadata.gz: 80ab5b7c904b4fc5bffd9904ca0a07f8eecb278475b080ba0b2d9916c9c0e58a8dee3399ecbf34ab59ea8a93fa426e0edcfe31e8ad5a721262108db71cf8b4c2
+  data.tar.gz: c7c3fa75552675a033044e3afc7144cf435df7a7ddcc0d9c611ae926633057fd968d9cd1f41aa54d6f7c7c937cf41ebaacb39c748859742bb9939edb696238a5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grumlin (0.22.0)
+    grumlin (0.22.3)
       async-pool (~> 0.3)
       async-websocket (~> 0.19)
       oj (~> 3.13)
@@ -21,17 +21,17 @@ GEM
       console (~> 1.10)
       nio4r (~> 2.3)
       timers (~> 4.1)
-    async-http (0.57.0)
+    async-http (0.59.1)
       async (>= 1.25)
       async-io (>= 1.28)
       async-pool (>= 0.2)
       protocol-http (~> 0.23.1)
       protocol-http1 (~> 0.14.0)
       protocol-http2 (~> 0.14.0)
-      traces (~> 0.4.0)
+      traces (>= 0.4.0)
     async-io (1.33.0)
       async
-    async-pool (0.3.10)
+    async-pool (0.3.11)
       async (>= 1.25)
     async-rspec (1.16.1)
       rspec (~> 3.0)
@@ -81,7 +81,7 @@ GEM
     parser (3.1.2.0)
       ast (~> 2.4.1)
     protocol-hpack (1.4.2)
-    protocol-http (0.23.1)
+    protocol-http (0.23.4)
     protocol-http1 (0.14.4)
       protocol-http (~> 0.22)
     protocol-http2 (0.14.2)
@@ -157,7 +157,7 @@ GEM
     thor (1.2.1)
     tilt (2.0.10)
     timers (4.3.3)
-    traces (0.4.1)
+    traces (0.6.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)

data/README.md

@@ -249,6 +249,7 @@ Each `return_mode` is mapped to a particular termination step:
 - `add_edge(label, id = nil, from:, to:, start: g, **properties)`
 - `drop_vertex(id, start: g)`
 - `drop_edge(id = nil, from: nil, to: nil, label: nil, start: g)`
+- `drop_in_batches(traversal, batch_size: 10_000)`
 
 and a few methods that emulate upserts:
 - `upsert_vertex(label, id, create_properties: {}, update_properties: {}, on_failure: :retry, start: g, **params)` 

data/lib/grumlin/repository/instance_methods.rb

@@ -2,7 +2,7 @@
 
 module Grumlin
   module Repository
-    module InstanceMethods
+    module InstanceMethods # rubocop:disable Metrics/ModuleLength
       include Grumlin::Expressions
 
       extend Forwardable
@@ -10,7 +10,7 @@ module Grumlin
       UPSERT_RETRY_PARAMS = {
         on: [Grumlin::AlreadyExistsError, Grumlin::ConcurrentModificationError],
         sleep_method: ->(n) { Async::Task.current.sleep(n) },
-        tries: 3,
+        tries: 5,
         sleep: ->(n) { (n**2) + 1 + rand }
       }.freeze
 
@@ -26,6 +26,28 @@ module Grumlin
         start.V(id).drop.iterate
       end
 
+      def drop_in_batches(traversal, batch_size: 10_000) # rubocop:disable Metrics/AbcSize
+        total_count = traversal.count.next
+
+        batches = (total_count / batch_size) + 1
+
+        Console.logger.info(self) do
+          "drop_in_batches: total_count: #{total_count}, batch_size: #{batch_size}, batches: #{batches}"
+        end
+
+        batches.times do |batch|
+          Console.logger.info(self) { "drop_in_batches: deleting batch #{batch + 1}/#{batches}..." }
+          traversal.limit(batch_size).drop.iterate
+          Console.logger.info(self) { "drop_in_batches: batch #{batch + 1}/#{batches} deleted" }
+        end
+
+        return if traversal.count.next.zero?
+
+        drop_in_batches(traversal, batch_size: batch_size)
+
+        Console.logger.info(self) { "drop_in_batches: finished." }
+      end
+
       def drop_edge(id = nil, from: nil, to: nil, label: nil, start: g) # rubocop:disable Metrics/AbcSize
         raise ArgumentError, "either id or from:, to: and label: must be passed" if [id, from, to, label].all?(&:nil?)
         return start.E(id).drop.iterate unless id.nil?

data/lib/grumlin/request_error_factory.rb

@@ -18,11 +18,19 @@ module Grumlin
     # {"detailedMessage":"",
     #  "requestId":"UUID",
     #  "code":"ConcurrentModificationException"}
-    # Currencly we simply search for substings to identify the exact error
+    # Currently we simply search for substrings to identify the exact error
     # TODO: parse json and use `code` instead
+
     VERTEX_ALREADY_EXISTS = "Vertex with id already exists:"
     EDGE_ALREADY_EXISTS = "Edge with id already exists:"
+
     CONCURRENT_VERTEX_INSERT_FAILED = "Failed to complete Insert operation for a Vertex due to conflicting concurrent"
+
+    CONCURRENT_VERTEX_PROPERTY_INSERT_FAILED =
+      "Failed to complete Insert operation for a VertexProperty due to conflicting concurrent"
+    CONCURRENT_EDGE_PROPERTY_INSERT_FAILED =
+      "Failed to complete Insert operation for a EdgeProperty due to conflicting concurrent"
+
     CONCURRENT_EDGE_INSERT_FAILED = "Failed to complete Insert operation for an Edge due to conflicting concurrent"
     CONCURRENCT_MODIFICATION_FAILED = "Failed to complete operation due to conflicting concurrent"
 
@@ -49,9 +57,15 @@ module Grumlin
         return EdgeAlreadyExistsError if status[:message]&.include?(EDGE_ALREADY_EXISTS)
       end
 
-      def concurrent_modification_error(status)
+      def concurrent_modification_error(status) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         return ConcurrentVertexInsertFailedError if status[:message]&.include?(CONCURRENT_VERTEX_INSERT_FAILED)
+        if status[:message]&.include?(CONCURRENT_VERTEX_PROPERTY_INSERT_FAILED)
+          return ConcurrentVertexPropertyInsertFailedError
+        end
         return ConcurrentEdgeInsertFailedError if status[:message]&.include?(CONCURRENT_EDGE_INSERT_FAILED)
+        if status[:message]&.include?(CONCURRENT_EDGE_PROPERTY_INSERT_FAILED)
+          return ConcurrentEdgePropertyInsertFailedError
+        end
         return ConcurrentModificationError if status[:message]&.include?(CONCURRENCT_MODIFICATION_FAILED)
       end
     end

data/lib/grumlin/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Grumlin
-  VERSION = "0.22.0"
+  VERSION = "0.22.3"
 end

data/lib/grumlin.rb

@@ -107,6 +107,9 @@ module Grumlin
   class ConcurrentVertexInsertFailedError < ConcurrentInsertFailedError; end
   class ConcurrentEdgeInsertFailedError < ConcurrentInsertFailedError; end
 
+  class ConcurrentVertexPropertyInsertFailedError < ConcurrentInsertFailedError; end
+  class ConcurrentEdgePropertyInsertFailedError < ConcurrentInsertFailedError; end
+
   class ServerSerializationError < ServerSideError; end
 
   class ServerTimeoutError < ServerSideError; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grumlin
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.22.3
 platform: ruby
 authors:
 - Gleb Sinyavskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-12 00:00:00.000000000 Z
+date: 2022-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-pool