pacer-orient 2.1.2-java → 2.2.0.pre-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a412d30bbf1e14575ea9d6bb5640370b16777c7c
-  data.tar.gz: 619fcd6eb5f3b707089be17635629cbb7a8392a0
+  metadata.gz: 9b32edc920ee17066a25d9d17ae4797e4879e52d
+  data.tar.gz: e0122dc83de2028ec05812adb6455d47668bd6e2
 SHA512:
-  metadata.gz: 95a24e286b6ccd78c0101cc843fb059a95e11e3ce4dbf88e27a5f5240bd35bb4847e5a20936f9c6ff17d9415f07ebec558b64f972e807e6d2ac21aa4df56834f
-  data.tar.gz: bcd6f2b791474497e2d170a4f9c284824f98fa273269503a63976781782e05ac1f068074043329206da4187c44344de788c16e8e72ef6646f8c48bc606d2a67b
+  metadata.gz: a36668673a20c99d81a62b97285e80806bb9bf5c2dd956335fb6108a85e81967fe41af13f0864d262f1e292070848e47ea0cc200c232f903849dc096d9511fb7
+  data.tar.gz: 7e321c5921a437089c14fe4f78154f566e1cf39e5b96002ca50f03b200983ac96910795a36e307d1529db74af72ec8cbe73bfa5b59adfff4d7aa7ab5fd343eb4

data/lib/pacer-orient/factory_container.rb

@@ -1,26 +1,88 @@
 module Pacer::Orient
   class FactoryContainer
-    attr_reader :factory
+    attr_reader :factory, :url, :use_pool
+    attr_accessor :encoder, :transactional, :lightweight_edges, :edge_classes, :vertex_classes
 
-    def initialize(f)
+    def initialize(f, url, args)
       @factory = f
+      @url = url
+      Pacer.open_graphs[url] = self
+      if args
+        @transactional     = args[:transactional]
+        @lightweight_edges = args[:lightweight_edges]
+        @edge_classes      = args[:edge_classes]
+        @vertex_classes    = args[:vertex_classes]
+        self.stay_open     = args[:stay_open]
+        @encoder = args.fetch :encoder, Encoder
+        min = args[:pool_min]
+        max = args[:pool_max]
+        if min and max
+          setupPool min, max
+        end
+      end
+    end
+
+    def setupPool(min, max)
+      @use_pool = true
+      factory.setupPool min, max
+    end
+
+    def stay_open=(b)
+      #factory.setLeaveGraphsOpen b
+    end
+
+    def stay_open
+      #factory.getLeaveGraphsOpen
+    end
+
+    def graph
+      # Shutdown releases the graph to the pool in this case.
+      g = Graph.new encoder, proc { get }, proc { |g| g.blueprints_graph.shutdown }
+      if block_given?
+        r = yield g
+        g.shutdown if use_pool
+        r
+      else
+        g
+      end
+    end
+
+    def surrender(g)
+      g.shutdown if use_pool
     end
 
     def get
-      factory.get
+      if transactional == false
+        getNoTx
+      else
+        getTx
+      end
     end
 
     def getTx
-      factory.getTx
+      configure factory.getTx
     end
 
     def getNoTx
-      factory.getNoTx
+      configure factory.getNoTx
     end
 
     # Pacer calls shutdown on all cached graphs when it exits. Orient caches this factory.
     def shutdown
       factory.close
+      Pacer.open_graphs.delete url
+    end
+
+    private
+
+    def configure(bg)
+      bg.setAutoStartTx false
+      bg.setRequireTransaction true
+      bg.rollback # a transaction is auto-started when the graph is opened.
+      bg.setUseLightweightEdges lightweight_edges if lightweight_edges == false
+      bg.setUseClassForEdgeLabel edge_classes if edge_classes == false
+      bg.setUseClassForVertexLabel vertex_classes if vertex_classes == false
+      bg
     end
   end
 end

data/lib/pacer-orient/graph.rb

@@ -13,10 +13,12 @@ module Pacer
       import com.orientechnologies.orient.core.sql.OCommandSQL
       import com.orientechnologies.orient.core.metadata.schema.OType
       import com.orientechnologies.orient.core.metadata.schema.OClass
+      import com.orientechnologies.orient.core.db.ODatabaseRecordThreadLocal
 
       # Marked the types that should be most commonly used.
       OTYPES = {
         :any          => OType::ANY,
+        :all          => OType::ANY,
         :boolean      => OType::BOOLEAN,      # use this one
         :bool         => OType::BOOLEAN,
         :short        => OType::SHORT,
@@ -26,10 +28,7 @@ module Pacer
         :float        => OType::FLOAT,
         :double       => OType::DOUBLE,       # use this one
         :decimal      => OType::DECIMAL,      # use this one
-       #If encoding dates to binary
-       #:date         => OType::BINARY,
-       #:datetime     => OType::BINARY,
-       #:date_time    => OType::BINARY,
+        #HINT: If using the BinaryDateEncoder, use :binary instead of the :date or :datetime types.
         :date         => OType::DATE,         # use this one
         :datetime     => OType::DATETIME,     # use this one
         :date_time    => OType::DATETIME,
@@ -83,15 +82,16 @@ module Pacer
       }
 
       def orient_graph
-        blueprints_graph.raw_graph
+        blueprints_graph.getRawGraph
       end
 
       def allow_auto_tx=(b)
+        blueprints_graph.setRequireTransaction !b
         blueprints_graph.setAutoStartTx b
       end
 
       def allow_auto_tx
-        blueprints_graph.autoStartTx
+        blueprints_graph.isAutoStartTx or not blueprints_graph.isRequireTransaction
       end
 
       def on_commit(&block)
@@ -175,14 +175,12 @@ module Pacer
         if r
           r
         else
-          in_pure_transaction do
-            t = if element_type == :vertex
-                  blueprints_graph.createVertexType(t.to_s)
-                elsif element_type == :edge
-                  blueprints_graph.createEdgeType(t.to_s)
-                end
-            OrientType.new self, element_type, t if t
-          end
+          t = if element_type == :vertex
+                blueprints_graph.createVertexType(t.to_s)
+              elsif element_type == :edge
+                blueprints_graph.createEdgeType(t.to_s)
+              end
+          OrientType.new self, element_type, t if t
         end
       end
 
@@ -218,48 +216,59 @@ module Pacer
       end
 
       def add_vertex_types(*types)
-        in_pure_transaction do
-          types.map do |t|
-            existing = orient_type(t, :vertex)
-            if existing
-              existing
-            else
-              t = blueprints_graph.createVertexType(t.to_s)
-              OrientType.new(self, :vertex, t) if t
-            end
+        types.map do |t|
+          existing = orient_type(t, :vertex)
+          if existing
+            existing
+          else
+            t = blueprints_graph.createVertexType(t.to_s)
+            OrientType.new(self, :vertex, t) if t
           end
         end
       end
 
-      def create_key_index(name, element_type = :vertex, itype = :non_unique)
-        type = orient_type(nil, element_type)
-        type.property!(name).create_index!(itype) if type
+      def in_transaction?
+        orient_graph.getTransaction.isActive
       end
 
-      def drop_key_index(name, element_type = :vertex)
-        in_pure_transaction do
-          super
-        end
-      end
-
-      private
-
-      def in_pure_transaction
-        if @in_pure_transaction
+      # Enables using multiple graphs at once.
+      def thread_local(revert = false)
+        orig = ODatabaseRecordThreadLocal.INSTANCE.getIfDefined
+        if orig == orient_graph
           yield
         else
           begin
-            @in_pure_transaction = true
-            transaction do
-              orient_graph.rollback
-              yield
-            end
+            ODatabaseRecordThreadLocal.INSTANCE.set orient_graph
+            yield
           ensure
-            @in_pure_transaction = false
+            ODatabaseRecordThreadLocal.INSTANCE.set orig if revert
           end
         end
       end
 
+      def transaction(opts = {})
+        thread_local do
+          if opts[:schema]
+            begin
+              if in_transaction?
+                in_tx = true
+                blueprints_graph.commit
+              end
+              c, r = nested_tx_finalizers
+              yield c, r
+            ensure
+              blueprints_graph.begin if in_tx
+            end
+          else
+            super
+          end
+        end
+      end
+
+      alias tx transaction
+
+      private
+
       def sql_range(k, v, params)
         params.push v.min
         params.push v.last
@@ -271,9 +280,10 @@ module Pacer
         filters.properties.select do |k, v|
           if v
             p = orient_type.property k
-            if p and p.indexed?
+            if (p and p.indexed?) or key_indices.include?(k)
               if v.is_a? Range or v.class.name == 'RangeSet'
-                p.range_index?
+                # not p just means it is a key index
+                not p or p.range_index?
               else
                 true
               end
@@ -332,6 +342,35 @@ module Pacer
           end
         end
       end
+
+      def finish_transaction!
+      end
+
+      def start_transaction!(opts)
+        if allow_auto_tx
+          base_tx_finalizers
+        elsif in_transaction?
+          nested_tx_finalizers
+        else
+          blueprints_graph.begin
+          base_tx_finalizers
+        end
+      end
+
+      def base_tx_finalizers
+        commit = ->(reopen = true) do
+          puts "transaction committed" if Pacer.verbose == :very
+          blueprints_graph.commit
+          blueprints_graph.begin if reopen
+          on_commit_block.call if on_commit_block
+        end
+        rollback = ->(message = nil) do
+          puts ["transaction rolled back", message].compact.join(': ') if Pacer.verbose == :very
+          blueprints_graph.rollback
+          blueprints_graph.begin unless $!
+        end
+        [commit, rollback]
+      end
     end
   end
 end

data/lib/pacer-orient/orient_type.rb

@@ -45,9 +45,7 @@ module Pacer::Orient
     def property!(name, otype)
       p = raw_property(name)
       unless p
-        p = graph.send(:in_pure_transaction) do
-          type.createProperty(name.to_s, graph.property_type(otype))
-        end
+        p = type.createProperty(name.to_s, graph.property_type(otype))
       end
       Property.new self, p
     end
@@ -59,16 +57,12 @@ module Pacer::Orient
     end
 
     def set_super_class(sc)
-      graph.send(:in_pure_transaction) do
-        type.setSuperClass graph.orient_type(element_type, sc)
-      end
+      type.setSuperClass graph.orient_type(element_type, sc)
       self
     end
 
     def drop_property!(name)
-      graph.send(:in_pure_transaction) do
-        type.dropProperty name
-      end
+      type.dropProperty name
     end
 
     def properties

data/lib/pacer-orient/property.rb

@@ -20,9 +20,7 @@ module Pacer::Orient
 
     def create_index!(index_type = :not_unique)
       unless indexed?
-        graph.send(:in_pure_transaction) do
-          property.createIndex graph.index_type(index_type)
-        end
+        property.createIndex graph.index_type(index_type)
       end
       self
     end

data/lib/pacer-orient/sql_filter.rb

@@ -1,7 +1,26 @@
 module Pacer
   module Filter
     module SqlFilter
-      attr_accessor :sql, :select, :orient_type, :where, :query_args, :order_by, :limit, :offset, :timeout, :parallel
+      attr_accessor :sql, :select, :orient_type, :where, :query_args, :order_by, :timeout, :parallel
+      attr_writer :limit, :offset
+
+      def offset(n = nil)
+        if n
+          @offset = n
+          self
+        else
+          @offset
+        end
+      end
+
+      def limit(n = nil)
+        if n
+          @limit = n
+          self
+        else
+          @limit
+        end
+      end
 
       protected
 

data/lib/pacer-orient/version.rb

@@ -1,10 +1,10 @@
 module Pacer
   module Orient
-    VERSION = "2.1.2"
+    VERSION = "2.2.0.pre"
     JAR = "pacer-orient-#{ VERSION }-standalone.jar"
     JAR_PATH = "lib/#{ JAR }"
-    ORIENT_VERSION = "1.7.8"
-    PIPES_VERSION = "2.5.0"
+    ORIENT_VERSION = "2.0-M2-SNAPSHOT"
+    PIPES_VERSION = "2.6.0"
     PACER_REQ = ">= 1.5.3"
   end
 end

data/lib/pacer-orient.rb

@@ -14,6 +14,32 @@ Pacer::FunctionResolver.clear_cache
 module Pacer
   # Add 'static methods' to the Pacer namespace.
   class << self
+    def orient_factory(url = nil, args = {})
+      if url.nil?
+        url = "memory:#{ next_orient_name }"
+      elsif url.is_a? String and url !~ /^(plocal|local|remote|memory):/
+        url = "plocal:#{ url }"
+      end
+      if url
+        factory = Pacer.open_graphs[url]
+        if factory
+          factory
+        else
+          if args
+            username = args[:username]
+            password = args[:password]
+          end
+          factory =
+            if username
+              com.tinkerpop.blueprints.impls.orient.OrientGraphFactory.new url, username, password
+            else
+              com.tinkerpop.blueprints.impls.orient.OrientGraphFactory.new url
+            end
+          Pacer::Orient::FactoryContainer.new(factory, url, args)
+        end
+      end
+    end
+
     # Return a graph for the given path. Will create a graph if none exists at
     # that location.
     #
@@ -21,52 +47,18 @@ module Pacer
     # Ruby's at_exit callback, but if an already open graph is given, it will
     # not.
     def orient(url = nil, args = nil)
-      if url.nil?
-        url = "memory:#{ next_orient_name }"
-      elsif url.is_a? String and url !~ /^(plocal|local|remote|memory):/
-        url = "plocal:#{ url }"
-      end
-      if args
-        username          = args.delete :username
-        password          = args.delete :password
-        transactional     = args.delete :transactional
-        lightweight_edges = args.delete :lightweight_edges
-        edge_classes      = args.delete :edge_classes
-        vertex_classes    = args.delete :vertex_classes
-      end
-      if url.is_a? String
+      if url.is_a? Pacer::Graph
+        # Don't register the new graph so that it won't be automatically closed.
+        Orient::Graph.new Pacer::Orient::Encoder, proc { url }
+      else
         open = proc do
-          # TODO: can / should I cache connections? Is it essential to shut down Orient?
-          factory = Pacer.open_graphs[[url, username]]
-          unless factory
-            factory =
-              if username
-                com.tinkerpop.blueprints.impls.orient.OrientGraphFactory.new url, username, password
-              else
-                com.tinkerpop.blueprints.impls.orient.OrientGraphFactory.new url
-              end
-            Pacer.open_graphs[[url, username]] = Pacer::Orient::FactoryContainer.new(factory)
-          end
-          if transactional == false
-            graph = factory.getNoTx()
-          else
-            graph = factory.getTx()
-          end
-          graph.useLightweightEdges = lightweight_edges if lightweight_edges == false
-          graph.useClassForEdgeLabel = edge_classes if edge_classes == false
-          graph.useClassForVertexLabel = vertex_classes if vertex_classes == false
-          #graph.setAutoStartTx false
-          graph
+          orient_factory(url, args).get
         end
         shutdown = proc do |g|
-          factory = Pacer.open_graphs.delete [url, username]
+          factory = Pacer.open_graphs.delete url
           factory.shutdown if factory
         end
         Orient::Graph.new(Pacer::Orient::Encoder, open, shutdown)
-      else
-        # Don't register the new graph so that it won't be automatically closed.
-        graph = url
-        Orient::Graph.new Pacer::Orient::Encoder, proc { graph }
       end
     end
 

data/pom.xml

@@ -7,9 +7,9 @@
     <artifactId>pacer-orient</artifactId>
     <!-- NOTE: the following properties are automatically updated based on the values in lib/pacer-orient/version.rb -->
     <properties>
-      <orient.version>1.7.8</orient.version>
-      <gem.version>2.1.2</gem.version>
-      <pipes.version>2.5.0</pipes.version>
+      <orient.version>2.0-M2-SNAPSHOT</orient.version>
+      <gem.version>2.2.0.pre</gem.version>
+      <pipes.version>2.6.0</pipes.version>
     </properties>
     <!-- NOTE: the following properties are automatically updated based on the values in lib/pacer-orient/version.rb -->
     <version>${gem.version}</version>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pacer-orient
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0.pre
 platform: java
 authors:
 - Darrick Wiebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pacer
@@ -48,7 +48,7 @@ files:
 - pacer-orient.gemspec
 - pom.xml
 - pom/standalone.xml
-- lib/pacer-orient-2.1.2-standalone.jar
+- lib/pacer-orient-2.2.0.pre-standalone.jar
 homepage: http://orientechnologies.com
 licenses: []
 metadata: {}
@@ -63,9 +63,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: pacer-orient
 rubygems_version: 2.1.9