pacer-orient 2.1.1-java → 2.1.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2fdd8ddfc4598b083a169ccb43bc73bd5fbeb71
-  data.tar.gz: 927e24d2325d80d8c43bf5dbb02960e9985be2c6
+  metadata.gz: a412d30bbf1e14575ea9d6bb5640370b16777c7c
+  data.tar.gz: 619fcd6eb5f3b707089be17635629cbb7a8392a0
 SHA512:
-  metadata.gz: 4d4f1593a4cbc034406287fe45365626a41a8ed6acea60210927d38a0f0329cf8f01c2ff79016adb31cd4e26f3b3acf086878c04b953dfaed3fc2d97856394b2
-  data.tar.gz: 1df25c40515d3ea6413e77c3f3d23cdc8d89508f383f8338eb0aee770d81998eb78ba5b51e2e7ed2b71d51c5e05572bd765f9ef6ec7adef23266f99f1eb4a634
+  metadata.gz: 95a24e286b6ccd78c0101cc843fb059a95e11e3ce4dbf88e27a5f5240bd35bb4847e5a20936f9c6ff17d9415f07ebec558b64f972e807e6d2ac21aa4df56834f
+  data.tar.gz: bcd6f2b791474497e2d170a4f9c284824f98fa273269503a63976781782e05ac1f068074043329206da4187c44344de788c16e8e72ef6646f8c48bc606d2a67b

data/lib/pacer-orient/encoder.rb

@@ -19,19 +19,19 @@ module Pacer::Orient
         if value.is_a? Bignum
           Marshal.dump(value).to_java_bytes
         else
-          value.to_java
+          value
         end
       when true, false
-        value.to_java
+        value
       when JavaDate
         value
       when Time
-        value.to_java
+        value
       when DateTime
-        value.to_time.to_java
+        value.to_time
       when Date
         t = value.to_time
-        (t + Time.zone_offset(t.zone)).utc.to_java
+        (t + Time.zone_offset(t.zone))
       when Set
         value.map { |x| encode_property(x) }.to_hashset
       when Hash

data/lib/pacer-orient/graph.rb

@@ -5,6 +5,7 @@ require 'pacer-orient/property'
 require 'pacer-orient/encoder'
 require 'pacer-orient/record_id'
 require 'pacer-orient/factory_container'
+require 'pacer-orient/sql_filter'
 
 module Pacer
   module Orient
@@ -25,6 +26,10 @@ 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,
         :date         => OType::DATE,         # use this one
         :datetime     => OType::DATETIME,     # use this one
         :date_time    => OType::DATETIME,
@@ -50,6 +55,7 @@ module Pacer
         :range_fulltext   => OClass::INDEX_TYPE::FULLTEXT,
         :range_full_text  => OClass::INDEX_TYPE::FULLTEXT,
         :range_notunique  => OClass::INDEX_TYPE::NOTUNIQUE,
+        :range_nonunique  => OClass::INDEX_TYPE::NOTUNIQUE,
         :range_not_unique => OClass::INDEX_TYPE::NOTUNIQUE,
         :range_unique     => OClass::INDEX_TYPE::UNIQUE,
         :proxy            => OClass::INDEX_TYPE::PROXY,
@@ -57,11 +63,24 @@ module Pacer
         :fulltext         => OClass::INDEX_TYPE::FULLTEXT_HASH_INDEX,
         :full_text        => OClass::INDEX_TYPE::FULLTEXT_HASH_INDEX,
         :notunique        => OClass::INDEX_TYPE::NOTUNIQUE_HASH_INDEX,
+        :nonunique        => OClass::INDEX_TYPE::NOTUNIQUE_HASH_INDEX,
         :not_unique       => OClass::INDEX_TYPE::NOTUNIQUE_HASH_INDEX,
         :spatial          => OClass::INDEX_TYPE::SPATIAL,
         :unique           => OClass::INDEX_TYPE::UNIQUE_HASH_INDEX
       }
 
+      ITYPE_REVERSE = {
+        'DICTIONARY'            => { range: true,   unique: false,  type: :range_dictionary } ,
+        'DICTIONARY_HASH_INDEX' => { range: false,  unique: false,  type: :dictionary       } ,
+        'FULLTEXT'              => { range: true,   unique: false,  type: :range_fulltext   } ,
+        'FULLTEXT_HASH_INDEX'   => { range: false,  unique: false,  type: :fulltext         } ,
+        'NOTUNIQUE'             => { range: true,   unique: false,  type: :range_notunique  } ,
+        'NOTUNIQUE_HASH_INDEX'  => { range: false,  unique: false,  type: :notunique        } ,
+        'PROXY'                 => { range: false,  unique: false,  type: :proxy            } ,
+        'SPATIAL'               => { range: false,  unique: false,  type: :spatial          } ,
+        'UNIQUE'                => { range: true,   unique: true,   type: :range_unique     } ,
+        'UNIQUE_HASH_INDEX'     => { range: false,  unique: true,   type: :unique           } ,
+      }
 
       def orient_graph
         blueprints_graph.raw_graph
@@ -122,13 +141,11 @@ module Pacer
         blueprints_graph.useClassForVertexLabel = b
       end
 
-      def sql(extensions, sql = nil, args)
-        if extensions.is_a? String
-          args = sql
-          sql = extensions
-          extensions = []
-        end
-        sql_command(sql, args).iterator.to_route(based_on: self.v(extensions))
+      def sql(sql = nil, args = nil, opts = {})
+        opts = { back: self, element_type: :vertex }.merge opts
+        chain_route(opts.merge(sql: sql,
+                               query_args: args,
+                               filter: Pacer::Filter::SqlFilter))
       end
 
       def sql_e(extensions, sql = nil, args)
@@ -140,11 +157,16 @@ module Pacer
         sql_command(sql, args).iterator.to_route(based_on: self.e(extensions))
       end
 
-      def sql_command(sql, args)
-        unless args.frozen?
+      def sql_command(sql, args = nil)
+        if args and not args.frozen?
           args = args.map { |a| encoder.encode_property(a) }
         end
-        blueprints_graph.command(OCommandSQL.new(sql)).execute(*args)
+        command = blueprints_graph.command(OCommandSQL.new(sql))
+        if args
+          command.execute(*args)
+        else
+          command.execute
+        end
       end
 
       # Find or create a vertex or edge class
@@ -237,6 +259,79 @@ module Pacer
           end
         end
       end
+
+      def sql_range(k, v, params)
+        params.push v.min
+        params.push v.last
+        "#{k} BETWEEN ? and ?"
+      end
+
+      # Only consider a property indexed if it can look up that type
+      def index_properties(orient_type, filters)
+        filters.properties.select do |k, v|
+          if v
+            p = orient_type.property k
+            if p and p.indexed?
+              if v.is_a? Range or v.class.name == 'RangeSet'
+                p.range_index?
+              else
+                true
+              end
+            elsif v.is_a? Range
+              true
+            end
+          end
+        end
+      end
+
+      def build_query(orient_type, filters)
+        indexed = index_properties orient_type, filters
+        if indexed.any?
+          params = []
+          conds = indexed.map do |k, v|
+            if v.is_a? Range
+              sql_range(k, v, params)
+            elsif v.class.name == 'RangeSet'
+              s = v.ranges.map do |r|
+                sql_range(k, r, params)
+              end.join " OR "
+              "(#{s})"
+            elsif v.is_a? Set
+              params.push v.to_a
+              "#{k} IN ?"
+            else
+              params.push v
+              "#{k} = ?"
+            end
+          end.compact.join(" AND ")
+          ["SELECT FROM #{orient_type.name} WHERE #{conds}", params, indexed]
+        else
+          nil
+        end
+      end
+
+      def indexed_route(element_type, filters, block)
+        if search_manual_indices
+          super
+        else
+          filters.graph = self
+          filters.use_lookup!
+          query = build_query(orient_type(nil, element_type), filters)
+          if query
+            route = sql query[0], query[1], element_type: element_type, extensions: filters.extensions, wrapper: filters.wrapper
+            indexed = query.pop
+            filters.remove_property_keys indexed.map { |x| x.first }
+            if filters.any?
+              Pacer::Route.property_filter(route, filters, block)
+            else
+              route
+            end
+          elsif filters.route_modules.any?
+            mod = filters.route_modules.shift
+            Pacer::Route.property_filter(mod.route(self), filters, block)
+          end
+        end
+      end
     end
   end
 end

data/lib/pacer-orient/property.rb

@@ -42,6 +42,27 @@ module Pacer::Orient
       nil
     end
 
+    def range_index?
+      if i = index
+        t = Graph::ITYPE_REVERSE[i.getType]
+        t[:range] if t
+      end
+    end
+
+    def unique_index?
+      if i = index
+        t = Graph::ITYPE_REVERSE[i.getType]
+        t[:unique] if t
+      end
+    end
+
+    def index_type
+      if i = index
+        t = Graph::ITYPE_REVERSE[i.getType]
+        t[:type] if t
+      end
+    end
+
     [ :set_name, :set_not_null, :set_collate,
       :set_mandatory, :set_readonly, :set_min, :set_max,
       :set_regexp, :set_custom, :remove_custom, :clear_custom

data/lib/pacer-orient/sql_filter.rb

@@ -0,0 +1,55 @@
+module Pacer
+  module Filter
+    module SqlFilter
+      attr_accessor :sql, :select, :orient_type, :where, :query_args, :order_by, :limit, :offset, :timeout, :parallel
+
+      protected
+
+      def orient_type_name
+        t = graph.orient_type(orient_type, element_type)
+        if t
+          t.name
+        else
+          fail Pacer::ClientError.new "Unknown orient type for #{ element_type }: #{ orient_type }"
+        end
+      end
+
+      def query
+        if sql
+          s = ""
+          s << sql
+        else
+          s = "SELECT "
+          case select
+          when String
+            s << select
+          when Array
+            s << select.join(", ")
+          end
+          s << " FROM #{ orient_type } WHERE "
+          s << where
+          s << "ORDER_BY " if order_by
+          case order_by
+          when String
+            s << order_by
+          when Array
+            s << order_by.join(", ")
+          end
+        end
+        s << " SKIP #{ offset }" if offset
+        s << " LIMIT #{ limit }" if limit
+        s << " TIMEOUT #{ timeout }" if timeout
+        s << " PARALLEL" if parallel
+        s
+      end
+
+      def source_iterator
+        graph.sql_command(query, query_args).iterator
+      end
+
+      def inspect_string
+        "SQL '#{query}' #{query_args}"
+      end
+    end
+  end
+end

data/lib/pacer-orient/version.rb

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

data/pom.xml

@@ -8,7 +8,7 @@
     <!-- 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.1</gem.version>
+      <gem.version>2.1.2</gem.version>
       <pipes.version>2.5.0</pipes.version>
     </properties>
     <!-- NOTE: the following properties are automatically updated based on the values in lib/pacer-orient/version.rb -->

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pacer-orient
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: java
 authors:
 - Darrick Wiebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pacer
@@ -16,12 +16,12 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.5.3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.5.3
   prerelease: false
   type: :runtime
 description: Orient jars and related code for Pacer
@@ -43,11 +43,12 @@ files:
 - lib/pacer-orient/property.rb
 - lib/pacer-orient/record_id.rb
 - lib/pacer-orient/rspec.rb
+- lib/pacer-orient/sql_filter.rb
 - lib/pacer-orient/version.rb
 - pacer-orient.gemspec
 - pom.xml
 - pom/standalone.xml
-- lib/pacer-orient-2.1.1-standalone.jar
+- lib/pacer-orient-2.1.2-standalone.jar
 homepage: http://orientechnologies.com
 licenses: []
 metadata: {}