pacer-titan 0.0.3-java → 0.0.7-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b40a98e250bffdf6433ae98d69776ce674ee354b
-  data.tar.gz: ae75aa50efed7d8e8d116fce3ded4ed7577e0cb1
+  metadata.gz: 36ba877d76765fcb75c5d4b72f8049b6452b52ae
+  data.tar.gz: eda4936a369f18b4b1fa725bf03c77d049a8d3a7
 SHA512:
-  metadata.gz: 5e1d42fa026cb9597cacb9959990a181bb80a1894df1749cda7e0380c9d263513a92c883719d09185ee43fbd1189ff95202d9bba673c3106c8bc71d033b69c92
-  data.tar.gz: 88c89d9a6cb9ee187a08a103ceaedd57ac404f5d3cb1d63f1b29ac34b1d008cf2adcd54aa4ba00235191ee882086acab213520dad379e03c50eccd657d4ce4ae
+  metadata.gz: 8c2fee47309443af0809d067a808f5f8819dd84c09f70e500e6cedab4b1fe30b4e533a8c4fd6bd67ba270e403465d892b04abaf4f7d13ef7eaa768ca0c32c1f9
+  data.tar.gz: 51efc28f0e4965fa2e1d1e6279e9e509ad4fa5520f40217da0d5b7fd65bf72215509e63ebe1dce7d4002d7785c530fad99c2a6303fd1ebb51a6ffcb87603c62d

data/.gitignore

@@ -1,6 +1,4 @@
-*.gem
 .bundle
 Gemfile.lock
-pkg/*
-target/*
-lib/*.jar
+tmp
+pkg

data/Jarfile

@@ -0,0 +1,3 @@
+jar 'com.thinkaurelius.titan:titan-core:0.5.4'
+jar 'com.thinkaurelius.titan:titan-es:0.5.4'
+jar 'com.thinkaurelius.titan:titan-cassandra:0.5.4'

data/README.md

@@ -8,29 +8,11 @@ This is an alpha-version pacer adapter with basic support for a [Titan](http://t
 
 ## Installation
 
-As always: ```gem 'pacer-titan'```, then you will need to load the jars for your storage backend of choice (see below).
-
-If you want to hack at pacer-titan:
-- You will need to install Maven first. 
-- Clone this repository.
-- Run ```rake install``` in its directory to build Titan's jars.
-- Include the gem in your project's gemfile, directing its path to your cloned copy.
+As always: ```gem 'pacer-titan'```.
 
 ## Backends
 
-This gem includes Titan 0.4.2 and its dependencies.
-
-It seems embedded backends (embedded Cassandra, embedded ElasticSearch) do not launch without extra work specifying their class paths when launching your app.
-
-The excellent [jBundler](https://github.com/mkristian/jbundler) does a great job of this for you, simply add any of the following to your Jarfile as needed:
-
-```ruby
-jar 'com.thinkaurelius.titan:titan-es', '~> 0.4.2' # ElasticSearch
-jar 'com.thinkaurelius.titan:titan-cassandra', '~> 0.4.2' # Cassandra
-jar 'com.thinkaurelius.titan:titan-berkeleyje', '~> 0.4.2' # BerkeleyDB
-```
-
-You may find your JRuby JVM crashes under heavy load if you include too many jars; increase your -XX:MaxPermSize
+This gem includes Titan 0.5.4 with the Cassandra backend and ElasticSearch.
 
 ## Usage
 

data/Rakefile

@@ -1,36 +1,3 @@
 require 'bundler'
-Bundler::GemHelper.install_tasks
-
-file 'pom.xml' => 'lib/pacer-titan/version.rb' do
-  pom = File.read 'pom.xml'
-  when_writing('Update pom.xml version number') do
-    open 'pom.xml', 'w' do |f|
-      pom.each_line do |line|
-        line.sub!(%r{<gem.version>.*</gem.version>}, "<gem.version>#{ Pacer::Titan::VERSION }</gem.version>")
-        line.sub!(%r{<blueprints.version>.*</blueprints.version>}, "<blueprints.version>#{ Pacer::Titan::BLUEPRINTS_VERSION }</blueprints.version>")
-        line.sub!(%r{<pipes.version>.*</pipes.version>}, "<pipes.version>#{ Pacer::Titan::PIPES_VERSION }</pipes.version>")
-        line.sub!(%r{<titan.version>.*</titan.version>}, "<titan.version>#{ Pacer::Titan::TITAN_VERSION }</titan.version>")
-        f << line
-      end
-    end
-  end
-end
-
-file Pacer::Titan::JAR_PATH => 'pom.xml' do
-  when_writing("Execute 'mvn package' task") do
-    system('mvn clean package')
-  end
-end
-
-task :note do
-  puts "NOTE: touch lib/pacer-titan/version.rb (or rake touch) to force everything to rebuild"
-end
-
-task :build => [:note, Pacer::Titan::JAR_PATH]
-task :install => [:note, Pacer::Titan::JAR_PATH]
-
-desc 'Touch version.rb so that the jar rebuilds'
-task :touch do
-  system 'touch', 'lib/pacer-titan/version.rb'
-end
 
+Bundler::GemHelper.install_tasks

data/lib/pacer-titan.rb

@@ -4,10 +4,13 @@ lib_path = File.expand_path(File.join(File.dirname(__FILE__), '../lib'))
 $:.unshift lib_path unless $:.any? { |path| path == lib_path }
 
 require 'pacer-titan/version'
-require Pacer::Titan::JAR
+
 require 'pacer-titan/graph'
 require 'pacer-titan/titan_query'
 require 'pacer-titan/external_index_query'
+require 'pacer-titan/create_vertex'
+require 'pacer-titan/encoder'
+require 'pacer-titan/vertex_query'
 
 module Pacer
   class << self
@@ -27,12 +30,8 @@ module Pacer
         Pacer.open_graphs.delete path
       end
 
-      Titan::Graph.new(Pacer::YamlEncoder, open, shutdown)
+      Titan::Graph.new(Pacer::TitanEncoder, open, shutdown)
     end
-    
-    def executing_route(route)
-      Rails.logger.debug "Pacer Titan executing route: #{route.description}" if defined? Rails
-    end	
   end
 end
 

data/lib/pacer-titan/create_vertex.rb

@@ -0,0 +1,42 @@
+module Pacer
+  module Titan
+    class Graph
+      # modified from Pacer - Use titan's add_vertex override to set vertex label when creating
+      # Create a vertex in the graph.
+      #
+      # @overload create_vertex(*args)
+      #   @param [extension, Hash] *args extension (Module/Class) arguments will be
+      #     added to the current vertex. A Hash will be
+      #     treated as element properties.
+      # @overload create_vertex(id, *args)
+      #   @param [element id] id the desired element id. Some graphs
+      #     ignore this.
+      #   @param [extension, Hash] *args extension (Module/Class) arguments will be
+      #     added to the current vertex. A Hash will be
+      #     treated as element properties.
+      def create_vertex(*args)
+        id, wrapper, modules, props = id_modules_properties(args)
+        label = props.delete(:label) if props
+        
+        raw_vertex = creating_elements do
+          if label
+            blueprints_graph.addVertexWithLabel(label)
+          else
+            blueprints_graph.addVertex
+          end
+        end
+        
+        if wrapper
+          vertex = wrapper.new graph, raw_vertex
+        else
+          vertex = base_vertex_wrapper.new graph, raw_vertex
+        end
+        if modules.any?
+          vertex = vertex.add_extensions modules
+        end
+        props.each { |k, v| vertex[k.to_s] = v } if props
+        vertex
+      end
+    end
+  end
+end

data/lib/pacer-titan/encoder.rb

@@ -0,0 +1,90 @@
+require 'yaml'
+
+module Pacer
+  # This encoder was originally part of pacer-neo4j. It uses native data where
+  # Neo4j could and for everything else it uses (slow (but easy))
+  # human-readable YAML encoding.
+  # Modified to convert times to UTC when saving and use Rails' time zone support
+  class TitanEncoder
+    def self.encode_property(value)
+      case value
+      when nil
+        nil
+      when String
+        value = value.strip
+        value = nil if value == ''
+        value
+      when Symbol
+        value.to_s
+      when Numeric
+        if value.is_a? Bignum
+          dump value
+        else
+          value.to_java
+        end
+      when true, false
+        value.to_java
+      when Date
+        value.to_time.strftime ' time %Y-%m-%d'
+      when DateTime, Time
+        value.to_time.utc.strftime ' time %Y-%m-%d %H:%M:%S.%L %z'
+      when Array
+        if value.length == 0
+          value_type = Fixnum
+        else
+          value_type = value.first.class
+          value_type = TrueClass if value_type == FalseClass
+          value.each do |v|
+            if value_type != v.class or (value == true or value == false and value_type == TrueClass)
+              value_type = nil
+              break
+            end
+          end
+        end
+        case value_type
+        when Fixnum
+          value.to_java :long
+        when Float
+          value.to_java :double
+        when TrueClass
+          value.to_java :boolean
+        when String
+          value.to_java :string
+        when Symbol
+          value.to_java :string
+        else
+          dump value
+        end
+      else
+        dump value
+      end
+    end
+
+    def self.decode_property(value)
+      if value.is_a? String and value[0, 1] == ' '
+        if value[1, 4] == 'time'
+          # FIXME: we lose the milliseconds here (and time zone if no Rails)...
+          if defined? Rails
+            Time.zone.parse value[6..-1]
+          else
+            Time.parse value[6..-1]
+          end
+        else
+          YAML.load(value[1..-1])
+        end
+      elsif value.is_a? ArrayJavaProxy
+        value.to_a
+      else
+        value
+      end
+    rescue Psych::SyntaxError
+      value
+    end
+
+    private
+
+    def self.dump(value)
+      " #{ YAML.dump value }"
+    end
+  end
+end

data/lib/pacer-titan/external_index_query.rb

@@ -4,11 +4,11 @@ module Pacer
       # Use Titan's indexQuery to access external indexes using a custom lucene string
       # eg. for grouped words search starting with lorem: g.index_query(:text, '(lorem*)')
       # can also pass an array of properties to hit multiple elasticsearch indices at once
-      def index_query(properties, query, options = {})
+      def index_query(index_name, properties, query, options = {})
         options[:element_type] ||= :vertex
-        options[:index_name] ||= 'search' # name of the external index as configured in the .properties file
         
         chain_route options.merge(
+          index_name: index_name,
           query: query,
           properties: properties,
           filter: :external_index_query,
@@ -40,7 +40,7 @@ module Pacer
         path = path.vertices.collect{ |v| v.get_element }
       end
       
-      # expects query in the form of 'v.text:(lorem*)'
+      # expects query in the form of 'v.text:(lorem*)' to search 'text' vertex property with lucene query syntax '(lorem*)'
       def build_titan_lucene_query(term, property)
         if property.is_a? Array
           queries = []

data/lib/pacer-titan/graph.rb

@@ -1,6 +1,12 @@
 module Pacer
   module Titan
     class Graph < PacerGraph
+    
+      # Include label in key indices so we can limit index queries by vertex label
+      def key_indices(type = nil)
+        indices = super
+        indices.add 'label'
+      end
       
       # Use GraphQuery for index lookups, based on pacer-neo4j's code:
       private
@@ -29,7 +35,6 @@ module Pacer
       def indexed_properties(type, filters)
         filters.properties.select { |k, v| key_indices(type).include?(k) }
       end
-      
     end
   end
 end

data/lib/pacer-titan/rspec.rb

@@ -18,7 +18,7 @@ class RSpec::GraphRunner
 
     def titan_graph_2
       return @titan_graph_2 if @titan_graph_2
-      @dex_graph2 = Pacer.titan('../pacer-titan/config/inmemory.properties')
+      @titan_graph_2 = Pacer.titan('../pacer-titan/config/inmemory.properties')
     end
   end
 end

data/lib/pacer-titan/titan_query.rb

@@ -3,7 +3,7 @@ module Pacer
     class Graph
       # Use Titan's QueryBuilder to access indices when you need to specify other comparison predicates
       # eg: g.query{ has('description', Text::CONTAINS, 'abc').has('login', 'ilya') }.out(:messages)...
-      # be sure to import com.thinkaurelius.titan.core.attribute.Text for the above example
+      # import com.thinkaurelius.titan.core.attribute.Text for the above example
       def query(options = {}, &query)
         options[:element_type] ||= :vertex
         
@@ -73,7 +73,7 @@ module Pacer
       end
       
       def inspect_string
-        "#{ inspect_class_name }"
+        "#{ inspect_class_name } (#{query.inspect})"
       end
     end
   end

data/lib/pacer-titan/version.rb

@@ -1,11 +1,6 @@
 module Pacer
   module Titan
-    VERSION = "0.0.3"
-    JAR = "pacer-titan-#{ VERSION }-standalone.jar"
-    JAR_PATH = "lib/#{ JAR }"
-    BLUEPRINTS_VERSION = "2.4.0"
-    PIPES_VERSION = "2.4.0"
-    TITAN_VERSION = "0.4.2"
-    PACER_REQ = ">= 1.4.0"
+    VERSION = "0.0.7"
+    PACER_REQ = ">= 2.0.6"
   end
 end

data/lib/pacer-titan/vertex_query.rb

@@ -0,0 +1,71 @@
+module Pacer
+  module Core::Graph::VerticesRoute
+    # Helper function to query a vertex-centric index
+    def vertex_query(labels, direction, options={}, &block)
+      options[:element_type] ||= :vertex
+      limit = options.delete(:limit)
+      order_by = options.delete(:order)
+      
+      chain_route options.merge(pipe_class: Pacer::Pipes::VertexQueryPipe,
+                                pipe_args: [labels, direction, options[:element_type], block, limit, order_by], 
+                                route_name: "VertexQuery (#{labels} - #{direction})")
+    end
+  end
+  
+  # Note Gremlin has a VertexQueryPipe, however it does not support Titan's orderBy for vertex-centric indexes, hence ruby implementation:
+  module Pipes
+    class VertexQueryPipe < RubyPipe
+      
+      def initialize(labels, direction, element_type, block=nil, limit=nil, order_by={})
+        super()
+        @labels = labels
+        @block = block
+        @limit = limit
+        @current_iterator = nil
+        @order_by = order_by.keys.first if order_by
+        @order_direction = order_by.values.first if order_by
+        @element_type = element_type
+        
+        case direction.to_sym
+        when :out
+          @direction = com.tinkerpop.blueprints.Direction::OUT
+        when :in
+          @direction = com.tinkerpop.blueprints.Direction::IN
+        when :both
+          @direction = com.tinkerpop.blueprints.Direction::BOTH
+        else
+          raise "Invalid direction to VertexQueryPipe (use :out, :in, or :both)"
+        end
+        
+        case @order_direction.try(:to_sym)
+        when :asc
+          @order_direction = com.thinkaurelius.titan.core.Order::ASC
+        when :desc
+          @order_direction = com.thinkaurelius.titan.core.Order::DESC
+        else
+          @order_direction = nil
+        end
+      end
+      
+      def processNextStart
+        while true
+          if @current_iterator.try(:has_next)
+            return @current_iterator.next
+          else
+            vertex = starts.next
+            query = vertex.query.direction(@direction).labels(@labels)
+            query = query.instance_exec(&@block) if @block
+            query = query.order_by(@order_by.to_s, @order_direction) if @order_by && @order_direction
+            query = query.limit(@limit) if @limit
+            if @element_type == :vertex
+              @current_iterator = query.vertices.iterator
+            else
+              @current_iterator = query.edges.iterator
+            end
+          end
+        end
+      end
+    end
+  end
+end
+

data/pacer-titan.gemspec

@@ -9,12 +9,12 @@ Gem::Specification.new do |s|
   s.authors     = ["Ilya Kardailsky"]
   s.email       = ["ilya.kardailsky@gmail.com"]
   s.homepage    = "http://www.github.com"
-  s.summary     = %q{Titan jars and related code for Pacer}
+  s.summary     = %q{Titan adapter for Pacer}
   s.description = s.summary
 
   s.add_dependency 'pacer', Pacer::Titan::PACER_REQ
 
-  s.files         = `git ls-files`.split("\n") + [Pacer::Titan::JAR_PATH]
+  s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]

metadata

@@ -1,30 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: pacer-titan
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.7
 platform: java
 authors:
 - Ilya Kardailsky
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-03-15 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: pacer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.0
-  type: :runtime
+        version: 2.0.6
+  name: pacer
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.0
-description: Titan jars and related code for Pacer
+        version: 2.0.6
+description: Titan adapter for Pacer
 email:
 - ilya.kardailsky@gmail.com
 executables: []
@@ -33,25 +33,26 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- Jarfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - config/cassandra-es.properties
 - config/inmemory.properties
 - lib/pacer-titan.rb
+- lib/pacer-titan/create_vertex.rb
+- lib/pacer-titan/encoder.rb
 - lib/pacer-titan/external_index_query.rb
 - lib/pacer-titan/graph.rb
 - lib/pacer-titan/rspec.rb
 - lib/pacer-titan/titan_query.rb
 - lib/pacer-titan/version.rb
+- lib/pacer-titan/vertex_query.rb
 - pacer-titan.gemspec
-- pom.xml
-- pom/standalone.xml
-- lib/pacer-titan-0.0.3-standalone.jar
 homepage: http://www.github.com
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -66,9 +67,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.3
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.4.5
+signing_key:
 specification_version: 4
-summary: Titan jars and related code for Pacer
+summary: Titan adapter for Pacer
 test_files: []

data/pom.xml

@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.tinkerpop.pacer</groupId>
-    <artifactId>pacer-titan</artifactId>
-    <!-- NOTE: the following properties are automatically updated based on the values in lib/pacer-titan/version.rb -->
-    <properties>
-      <gem.version>0.0.3</gem.version>
-      <blueprints.version>2.4.0</blueprints.version>
-      <pipes.version>2.4.0</pipes.version>
-      <titan.version>0.4.2</titan.version>
-    </properties>
-    <!-- NOTE: the following properties are automatically updated based on the values in lib/pacer-titan/version.rb -->
-    <version>${gem.version}</version>
-    <packaging>pom</packaging>
-    <url>https://github.com/pangloss/pacer</url>
-    <name>Pacer Titan dependencies and related code.</name>
-    <description>
-    </description>
-    <inceptionYear>2014</inceptionYear>
-    <developers>
-        <developer>
-            <name>Ilya Kardailsky</name>
-            <email>ilya.kardailsky@gmail.com</email>
-            <url>http://github.com</url>
-        </developer>
-    </developers>
-    <dependencies>
-        <!-- PROPERTY GRAPH MODEL SUPPORT -->
-        <dependency>
-            <groupId>com.tinkerpop.blueprints</groupId>
-            <artifactId>blueprints-core</artifactId>
-            <version>${blueprints.version}</version>
-        </dependency>
-        <!-- GRAPH TRAVERSAL SUPPORT -->
-        <dependency>
-            <groupId>com.tinkerpop</groupId>
-            <artifactId>pipes</artifactId>
-            <version>${pipes.version}</version>
-        </dependency>
-        <!-- TITAN SUPPORT -->
-        <dependency>
-            <groupId>com.thinkaurelius.titan</groupId>
-            <artifactId>titan-core</artifactId>
-            <version>${titan.version}</version>
-        </dependency>
-    </dependencies>
-
-    <repositories>
-        <repository>
-            <id>tinkerpop-repository</id>
-            <name>TinkerPop Maven2 Repository</name>
-            <url>http://tinkerpop.com/maven2</url>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-            </snapshots>
-        </repository>
-    </repositories>
-
-    <distributionManagement>
-        <repository>
-            <id>tinkerpop-repository</id>
-            <name>TinkerPop Maven2 Repository</name>
-            <url>ftp://ftp.tinkerpop.com:21/public/maven2/</url>
-        </repository>
-    </distributionManagement>
-
-    <build>
-        <directory>${basedir}/target</directory>
-        <finalName>${project.artifactId}-${project.version}</finalName>
-        <resources>
-            <resource>
-                <directory>${basedir}/src/main/resources
-                </directory>
-            </resource>
-        </resources>
-        <testResources>
-            <testResource>
-                <directory>${basedir}/src/test/resources
-                </directory>
-            </testResource>
-        </testResources>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2-beta-4</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attached</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <descriptors>
-                        <descriptor>pom/standalone.xml</descriptor>
-                    </descriptors>
-                    <finalName>${project.artifactId}-${project.version}</finalName>
-                    <outputDirectory>lib</outputDirectory>
-                    <workDirectory>target/assembly/work</workDirectory>
-                    <tarLongFileMode>warn</tarLongFileMode>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.6.1</version>
-            </plugin>
-        </plugins>
-        <extensions>
-            <extension>
-                <groupId>org.apache.maven.wagon</groupId>
-                <artifactId>wagon-ftp</artifactId>
-                <version>1.0-alpha-6</version>
-            </extension>
-        </extensions>
-    </build>
-
-</project>

data/pom/standalone.xml

@@ -1,22 +0,0 @@
-<assembly>
-    <id>standalone</id>
-    <formats>
-        <format>jar</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-
-    <fileSets>
-        <fileSet>
-            <directory>target/classes</directory>
-            <outputDirectory>/</outputDirectory>
-        </fileSet>
-    </fileSets>
-
-    <dependencySets>
-        <dependencySet>
-            <outputDirectory>/</outputDirectory>
-            <unpack>true</unpack>
-            <scope>runtime</scope>
-        </dependencySet>
-    </dependencySets>
-</assembly>