pacer-orient 2.3.5.pre-java → 2.3.6-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9c7d2aa3b41a64d13e63ba3a3f41287f2996839
-  data.tar.gz: 225013020bb4a8e2b148e4d0428258a97fe05812
+  metadata.gz: 431a9d6fc8dc4106ace2a03d972d376e3404c2eb
+  data.tar.gz: dcbdd2a50f3a70592a15767349095f854a3d4883
 SHA512:
-  metadata.gz: 7a395f7d574bc1102d78936297b63a7d652866a308039e48a68070ddeca017ffa6d1488f7f84edf007b67f9614b7a69bfce4b85f41711bcaeae504fdb83c5dbb
-  data.tar.gz: 7f1bf3b3f0d5aff96c6f7dfb3990ee0a071456860c548f8c34d54213327c3d70829cfa0bd9c7561d54bd648fb92fdd6b2bf5c6ff4b717510a3642828e9d056d3
+  metadata.gz: 06a158c20ac2db724c21090ede95ddb38f5ca6e9a12faed8e41ea8363dd68f4af9c4be474e7e5a52911ad6525ec9972e91242423c24e6436121309c4d681169c
+  data.tar.gz: a86e276402fa8b6939d3c966168b9baff4987da55a868ea10dd6a57f06a4dff8a55ba639a841cf740ce4331d1c8672ea5938082ab77703add9f78e13fe8c85ee

data/Jarfile

@@ -1,2 +1,2 @@
-jar "com.orientechnologies:orientdb-core:2.0-rc1"
-jar "com.orientechnologies:orientdb-graphdb:2.0-rc1"
+jar "com.orientechnologies:orientdb-core:2.0.1"
+jar "com.orientechnologies:orientdb-graphdb:2.0.1"

data/lib/pacer-orient/db_listener.rb

@@ -5,21 +5,13 @@ module Pacer
     class DbListener
       include ODatabaseListener
 
-      attr_reader :graph, :ident
+      attr_reader :graph
 
       def initialize(graph)
-        @ident = :"listener#{rand}"
+        # TDOO: use graph factory?
         @graph = graph
       end
 
-      def data=(x)
-        Thread.current[ident] = x
-      end
-
-      def data
-        Thread.current[ident]
-      end
-
       def onCreate(db)
       end
 
@@ -39,6 +31,17 @@ module Pacer
       end
 
       def onBeforeTxCommit(db)
+        data = TxDataWrapper.new db, graph
+        pp transaction: { getAllRecordEntries: data.entries,
+                          length: data.entries.length,
+                          contents: data.entries.to_a }
+        pp created_v: data.created_v
+        pp created_e: data.created_e
+        pp changed_v: data.changed_v
+        pp changed_e: data.changed_e
+        pp deleted_v: data.deleted_v
+        pp deleted_e: data.deleted_e
+
       end
 
       def onAfterTxCommit(db)
@@ -52,32 +55,6 @@ module Pacer
       end
     end
 
-    class DbCommitListener < DbListener
-      attr_reader :on_commit
-
-      def initialize(graph, on_commit)
-        @on_commit = on_commit
-        super graph
-      end
-
-      def onBeforeTxCommit(db)
-        self.data = CachedTxDataWrapper.new db, graph
-      rescue Exception => e
-        puts "Exception: #{ e.message }"
-        pp e.backtrace
-        nil
-      end
-
-      def onAfterTxCommit(db)
-        on_commit.call self.data
-      rescue Exception => e
-        puts "Exception: #{ e.message }"
-        pp e.backtrace
-        nil
-      ensure
-        self.data = nil
-      end
-    end
   end
 end
 

data/lib/pacer-orient/factory_container.rb

@@ -19,6 +19,8 @@ module Pacer::Orient
         if min and max
           setupPool min, max
         end
+      else
+        @encoder = Encoder
       end
     end
 

data/lib/pacer-orient/graph.rb

@@ -6,8 +6,6 @@ require 'pacer-orient/encoder'
 require 'pacer-orient/record_id'
 require 'pacer-orient/factory_container'
 require 'pacer-orient/sql_filter'
-require 'pacer-orient/db_listener'
-require 'pacer-orient/tx_data_wrapper'
 
 module Pacer
   module Orient
@@ -98,7 +96,7 @@ module Pacer
 
       def on_commit(&block)
         return unless block
-        orient_graph.registerListener(DbCommitListener.new(self, block))
+        # todo
       end
 
       def on_commit_failed(&block)

data/lib/pacer-orient/tx_data_wrapper.rb

@@ -1,20 +1,5 @@
 module Pacer
   module Orient
-    class CachedTxDataWrapper
-      attr_reader :created_v, :deleted_v, :changed_v, :created_e, :deleted_e, :changed_e, :entries
-
-      def initialize(db, graph)
-        w = TxDataWrapper.new(db, graph)
-        @created_v = w.created_v
-        @deleted_v = w.deleted_v
-        @changed_v = w.changed_v
-        @created_e = w.created_e
-        @deleted_e = w.deleted_e
-        @changed_e = w.changed_e
-        @entries = w.entries
-      end
-    end
-
     class TxDataWrapper
       import com.orientechnologies.orient.core.db.record.ORecordOperation
 
@@ -88,17 +73,8 @@ module Pacer
       def keep(op, klass)
         return unless entries
         entries.map do |e|
-          if e.type == op
-            sc = e.getRecord.getSchemaClass
-            if sc
-              if sc.isSubClassOf(klass)
-                yield e.getRecord
-              end
-            else
-              if klass == v_base
-                yield e.getRecord
-              end
-            end
+          if e.type == op and e.getRecord.getSchemaClass.isSubClassOf(klass)
+            yield e.getRecord
           end
         end.compact
       end

data/lib/pacer-orient/version.rb

@@ -1,6 +1,6 @@
 module Pacer
   module Orient
-    VERSION = "2.3.5.pre"
+    VERSION = "2.3.6"
     PACER_REQ = ">= 2.0.6"
   end
 end

data/pacer-orient.gemspec

@@ -13,7 +13,6 @@ Gem::Specification.new do |s|
   s.description = s.summary
 
   s.add_dependency 'pacer', Pacer::Orient::PACER_REQ
-  s.add_dependency "lock_jar", "~> 0.10.1"
 
   s.add_development_dependency 'xn_gem_release_tasks'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pacer-orient
 version: !ruby/object:Gem::Version
-  version: 2.3.5.pre
+  version: 2.3.6
 platform: java
 authors:
 - Darrick Wiebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pacer
@@ -24,20 +24,6 @@ dependencies:
         version: 2.0.6
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: lock_jar
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.10.1
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.10.1
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: xn_gem_release_tasks
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,9 +77,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: pacer-orient
 rubygems_version: 2.4.5