diametric 0.1.2 → 0.1.3

data/lib/diametric/persistence/common.rb

@@ -2,7 +2,6 @@ module Diametric
   module Persistence
     module Common
       def self.included(base)
-        base.send(:extend, ClassMethods)
         base.send(:include, InstanceMethods)
       end
 
@@ -34,49 +33,6 @@ module Diametric
           return true
         end
       end
-
-      module ClassMethods
-        def create_schema(connection=nil)
-          if self.instance_variable_get("@peer")
-            connection ||= Diametric::Persistence::Peer.connect
-            connection.transact(schema)
-          else
-            transact(schema)
-          end
-        end
-
-        def all(connection=nil, resolve=true)
-          if self.instance_variable_get("@peer")
-            connection ||= Diametric::Persistence::Peer.connect
-          end
-          Diametric::Query.new(self, connection, resolve).all
-        end
-
-        def first(conditions = {}, connection=nil, resolve=true)
-          if self.instance_variable_get("@peer")
-            connection ||= Diametric::Persistence::Peer.connect
-          end
-          where(conditions, connection, resolve).first
-        end
-
-        def where(conditions = {}, connection=nil, resolve=true)
-          if self.instance_variable_get("@peer")
-            connection ||= Diametric::Persistence::Peer.connect
-          end
-          query = Diametric::Query.new(self, connection, resolve)
-          query.where(conditions)
-        end
-
-        def filter(*filter)
-          if self.instance_variable_get("@peer")
-            connection = Diametric::Persistence::Peer.connect
-          else
-            connection = nil
-          end
-          query = Diametric::Query.new(self, connection, true)
-          query.filter(*filter)
-        end
-      end
     end
   end
 end

data/lib/diametric/persistence/peer.rb

@@ -3,7 +3,6 @@ require 'diametric/persistence/common'
 module Diametric
   module Persistence
     module Peer
-
       def save(connection=nil)
         return false unless valid?
         return true unless changed?
@@ -12,8 +11,16 @@ module Diametric
         parsed_data = []
         parse_tx_data(tx_data, parsed_data)
 
+        # TODO: exception handling. error message should be found by errors.messages
         map = connection.transact(parsed_data).get
 
+=begin
+    resolve_fn = Java::ClojureLang::RT.var("datomic.api", "resolve-tempid")
+    tempids_key = Java::ClojureLang::Keyword.intern("tempids")
+    ids = map.to_java.get(tempids_key)
+    db  = connection.db.to_java
+    resolve_fn.invoke(db, ids, self.dbid.to_java)
+=end
         resolve_changes([self], map)
 
         map
@@ -122,6 +129,50 @@ module Diametric
       end
 
       module ClassMethods
+
+        # Create a temporary id placeholder.
+        #
+        # @param e [*#to_edn] Elements to put in the placeholder. Should
+        #   be either partition or partition and a negative number to be
+        #   used as a reference.
+        #
+        # @return [Diametric::Persistence::Object] Temporary id placeholder.
+        def tempid(*e)
+          if e.size == 1
+            return Diametric::Persistence::Peer.tempid(e[0])
+          elsif e.size == 2
+            return Diametric::Persistence::Peer.tempid(e[0], e[1])
+          end
+          nil
+        end
+
+        def create_schema(connection=nil)
+          connection ||= Diametric::Persistence::Peer.connect
+          connection.transact(schema)
+        end
+
+        def all(connection=nil, resolve=true)
+          connection ||= Diametric::Persistence::Peer.connect
+          Diametric::Query.new(self, connection, resolve).all
+        end
+
+        def first(conditions = {}, connection=nil, resolve=true)
+          connection ||= Diametric::Persistence::Peer.connect
+          where(conditions, connection, resolve).first
+        end
+
+        def where(conditions = {}, connection=nil, resolve=true)
+          connection ||= Diametric::Persistence::Peer.connect
+          query = Diametric::Query.new(self, connection, resolve)
+          query.where(conditions)
+        end
+
+        def filter(connection, *filter)
+          connection ||= Diametric::Persistence::Peer.connect
+          query = Diametric::Query.new(self, connection, true)
+          query.filter(*filter)
+        end
+
         def get(dbid, connection=nil, resolve=false)
           entity = self.new
           dbid = dbid.to_i if dbid.is_a?(String)
@@ -137,7 +188,7 @@ module Diametric
           else
             db = conn_or_db
           end
-          Diametric::Persistence::Peer.q(query, db, args)
+          Diametric::Persistence::Peer.q(query, db, args.flatten(1))
         end
       end
     end

data/lib/diametric/persistence/rest.rb

@@ -43,10 +43,36 @@ module Diametric
           @database || Diametric::Persistence::REST.database
         end
 
+        def tempid(*e)
+          EDN.tagged_element('db/id', e)
+        end
+
         def transact(data)
           connection.transact(database, data)
         end
 
+        def create_schema
+          transact(schema)
+        end
+
+        def all
+          Diametric::Query.new(self, nil, true).all
+        end
+
+        def first(conditions = {})
+          where(conditions).first
+        end
+
+        def where(conditions = {})
+          query = Diametric::Query.new(self, nil, true)
+          query.where(conditions)
+        end
+
+        def filter(*filter)
+          query = Diametric::Query.new(self, nil, true)
+          query.filter(*filter)
+        end
+
         def get(dbid, conn=nil, resolve=false)
           conn ||= connection
           res = conn.entity(database, dbid.to_i)
@@ -84,7 +110,7 @@ module Diametric
         self.dbid = self.dbid.to_i if self.dbid.class == String
 
         res = self.class.transact(tx_data)
-        if dbid.nil?
+        if dbid.nil? || dbid.is_a?(EDN::Type::Unknown)
           self.dbid = res.data[:tempids].values.first
         end
 

data/lib/diametric/query.rb

@@ -1,4 +1,5 @@
 require 'diametric'
+require 'edn'
 
 module Diametric
   # +Query+ objects are used to generate Datomic queries, whether to
@@ -15,7 +16,7 @@ module Diametric
   class Query
     include Enumerable
 
-    attr_reader :conditions, :filters, :filter_attrs, :model, :connection, :resolve
+    attr_reader :conditions, :filters, :filter_attrs, :filter_values, :model, :connection, :resolve
 
     # Create a new Datomic query.
     #
@@ -26,6 +27,7 @@ module Diametric
       @conditions = {}
       @filters = []
       @filter_attrs = []
+      @filter_values = []
       @conn_or_db = connection_or_database
       @resolve = resolve
     end
@@ -72,7 +74,7 @@ module Diametric
     #   that will be converted into a Datalog query.
     # @return [Query]
     def filter(*filter)
-      return peer_filter(filter) if self.model.instance_variable_get("@peer")
+      return peer_filter(*filter) if self.model.instance_variable_get("@peer")
       query = self.dup
 
       if filter.first.is_a?(EDN::Type::List)
@@ -87,16 +89,19 @@ module Diametric
 
     def peer_filter(*filter)
       query = self.dup
-      if filter.first.is_a?(Array)
-        filter = filter.first
+      query.filter_attrs += (self.model.attribute_names & filter)
+      filter = filter.map do |e|
+        if e.is_a? Symbol
+          convert_filter_element(e)
+        elsif e.is_a? String
+          e
+        else
+          query.filter_values << e
+          ~"?#{query.filter_attrs.last.to_s}value"
+        end
       end
-      filter_attrs << filter[1].to_s
-      query_filter = []
-      query_filter << filter[0].to_s
-      query_filter << "?#{filter[1].to_s}"
-      query_filter << filter[2..-1]
-      query_filter = query_filter.flatten
-      query.filters += [query_filter]
+      filter = EDN::Type::List.new(*filter)
+      query.filters << [Diametric::Persistence::Utils.read_string(filter.to_edn)]
       query
     end
 
@@ -111,7 +116,7 @@ module Diametric
       # an appropriate error if not.
       res = model.q(*data, @conn_or_db)
       collapse_results(res).each do |entity|
-        if self.model.instance_variable_get("@peer") && @resolve
+        if @resolve
           yield model.reify(entity.first, @conn_or_db, @resolve)
         elsif self.model.instance_variable_get("@peer")
           yield entity
@@ -177,31 +182,36 @@ module Diametric
  [(= ?ns ?include-ns)]]
 EOQ
       else
-        unless conditions.empty?
-          clauses = conditions.keys.inject("") do |memo, attribute|
-            memo + "[?e " + model.namespace(model.prefix, attribute) + " ?#{attribute} ] "
+        from = conditions.map do |k, v|
+          if v.kind_of? Array
+            [~"?#{k}",
+             Diametric::Persistence::Utils.read_string("...")]
+          else
+            ~"?#{k}"
           end
-          from = conditions.inject("") {|memo, kv| memo + "?#{kv.shift} "}
-          args = conditions.map { |_, v| v }
         end
 
+        keys = conditions.keys
         unless filter_attrs.empty?
-          clauses ||= ""
-          clauses = filter_attrs.inject(clauses) do |memo, attribute|
-            memo + "[?e " + model.namespace(model.prefix, attribute) + " ?#{attribute} ] "
-          end
-          from ||= ""
-          from = filter_attrs.inject(from) {|from, attr| from + "?#{attr}_value "}
-          filter_query =
-            "[" +
-            filters.inject("") {|memo, filter| memo + "(#{filter[0]} #{filter[1]} #{filter[1]}_value) "} +
-            "]"
-          args ||= []
-          args = filters.inject(args) {|args, filter| args + filter[2..-1]}
+          from += filter_attrs.inject([]) { |memo, key| memo << ~"?#{key}value"; memo }
+          keys += filter_attrs
         end
-        query = "[:find ?e :in $ [#{from}] :where #{clauses} #{filter_query}]"
-      end
+        keys.uniq!
+
+        clauses = keys.map { |attribute|
+          [~"?e", model.namespace(model.prefix, attribute), ~"?#{attribute}"]
+        }
+        clauses += filters
 
+        args = conditions.map { |_, v| v }
+        args += filter_values
+
+        query = [
+                 :find, ~"?e",
+                 :in, ~"\$", from.flatten(1),
+                 :where, *clauses
+                ]
+      end
       [query, args]
     end
 
@@ -215,6 +225,14 @@ EOQ
       @filters = filters
     end
 
+    def filter_attrs=(filter_attrs)
+      @filter_attrs = filter_attrs
+    end
+
+    def filter_values=(filter_values)
+      @filter_values = filter_values
+    end
+
     def convert_filter_element(element)
       if element.is_a?(Symbol)
         if model.attribute_names.include?(element) || @conditions.keys.include?(element)

data/lib/diametric/rest_service.rb

@@ -6,7 +6,7 @@ module Diametric
     class << self
       def datomic_command(datomic_home)
         classpath = datomic_classpath(datomic_home)
-        command = ["java -server -Xmx1g", "-cp", classpath, "clojure.main", "-i", "#{datomic_home}/bin/bridge.clj", "--main datomic.rest"].flatten.join(" ")
+        ["java -server -Xmx1g", "-cp", classpath, "clojure.main", "-i", "#{datomic_home}/bin/bridge.clj", "--main datomic.rest"].flatten.join(" ")
       end
     end
 
@@ -14,12 +14,11 @@ module Diametric
     attr_accessor :host, :port, :db_alias, :uri
 
    def initialize(conf="datomic_version.yml", dest="vendor/datomic")
-      @conf = conf
-      @dest = dest
-      @datomic_version = RestService.datomic_version(conf)
-      @datomic_home = File.join(File.dirname(__FILE__), "../..", dest, @datomic_version)
-      @datomic_version_no = RestService.datomic_version_no(@datomic_version)
-      @pid = nil
+     @conf = conf
+     @dest = dest
+     datomic_type, datomic_version = RestService.datomic_version(conf)
+     @datomic_home = File.join(File.dirname(__FILE__), "../..", dest, "datomic-#{datomic_type}-#{datomic_version}")
+     @pid = nil
     end
 
     def start(opts={})
@@ -51,7 +50,7 @@ module Diametric
     end
 
     def port_available?(uri)
-      response = Net::HTTP.get_response(uri)
+      Net::HTTP.get_response(uri)
       false
     rescue Errno::ECONNREFUSED
       true
@@ -60,7 +59,7 @@ module Diametric
     def ready?(uri)
       while true
         begin
-          response = Net::HTTP.get_response(uri)
+          Net::HTTP.get_response(uri)
           return true
         rescue
           sleep 1

data/lib/diametric/service_base.rb

@@ -21,12 +21,12 @@ module Diametric
           datomic_names = File.read(File.join(File.dirname(__FILE__), "../..", conf))
           datomic_versions = YAML.load(datomic_names)
           if ENV['DIAMETRIC_ENV'] && (ENV['DIAMETRIC_ENV'] == "pro")
-            datomic_versions["pro"]
+            return "pro", datomic_versions["pro"]
           else
-            datomic_versions["free"]
+            return "free", datomic_versions["free"]
           end
         else
-          conf
+          return "free", conf
         end
       end
 
@@ -35,17 +35,17 @@ module Diametric
       end
 
       def downloaded?(conf="datomic_version.yml", dest="vendor/datomic")
-        datomic_home = datomic_version(conf)
+        datomic_type, datomic_version = datomic_version(conf)
         if Pathname.new(dest).relative?
           dest = File.join(File.dirname(__FILE__), "..", "..", dest)
         end
-        File.exists?(File.join(dest, datomic_home))
+        File.exists?(File.join(dest, "datomic-#{datomic_type}-#{datomic_version}"))
       end
 
       def download(conf="datomic_version.yml", dest="vendor/datomic")
         return true if downloaded?(conf, dest)
-        version = datomic_version(conf)
-        url = "http://downloads.datomic.com/#{datomic_version_no(version)}/#{version}.zip"
+        type, version = datomic_version(conf)
+        url = "https://my.datomic.com/downloads/#{type}/#{version}"
         if Pathname.new(dest).relative?
           dest = File.join(File.dirname(__FILE__), "../..", dest)
         end

data/lib/diametric/transactor.rb

@@ -8,7 +8,7 @@ module Diametric
     class << self
       def datomic_command(datomic_home)
         classpath = datomic_classpath(datomic_home)
-        java_opts = "-XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+CMSParallelRemarkEnabled -XX:CMSInitiatingOccupancyFraction=75 -XX:+UseCMSInitiatingOccupancyOnly"
+        java_opts='-XX:NewRatio=4 -XX:SurvivorRatio=8 -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+CMSParallelRemarkEnabled -XX:CMSInitiatingOccupancyFraction=60 -XX:+UseCMSInitiatingOccupancyOnly -XX:+CMSScavengeBeforeRemark'
         command = ["java -server -Xmx1g -Xms1g", java_opts, "-cp", classpath, "clojure.main", "--main datomic.launcher"].flatten.join(" ")
       end
     end
@@ -19,13 +19,14 @@ module Diametric
     def initialize(conf="datomic_version.yml", dest="vendor/datomic")
       @conf = conf
       @dest = dest
-      @datomic_version = Transactor.datomic_version(conf)
+      datomic_type, datomic_version = Transactor.datomic_version(conf)
+      datomic_path = "datomic-#{datomic_type}-#{datomic_version}"
       if Pathname.new(dest).relative?
-        @datomic_home = File.join(File.dirname(__FILE__), "../..", dest, @datomic_version)
+        @datomic_home = File.join(File.dirname(__FILE__), "../..", dest, datomic_path)
       else
-        @datomic_home = File.join(dest, @datomic_version)
+        @datomic_home = File.join(dest, datomic_path)
       end
-      @datomic_version_no = Transactor.datomic_version_no(@datomic_version)
+      #@datomic_version_no = Transactor.datomic_version_no(@datomic_version)
       @hostname = nil
       @port = nil
       @pid = nil

data/lib/diametric/version.rb

@@ -1,3 +1,3 @@
 module Diametric
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/config/free-transactor-template.properties

@@ -23,9 +23,9 @@ port=39082
 
 
 # Recommended settings for -Xmx4g, ongoing usage.
-memory-index-threshold=32m
-memory-index-max=128m
-object-cache-max=1g
+# memory-index-threshold=32m
+# memory-index-max=128m
+# object-cache-max=1g
 
 # Recommended settings for -Xmx4g import jobs.
 # memory-index-threshold=512m
@@ -33,9 +33,9 @@ object-cache-max=1g
 # object-cache-max=1g
 
 # Recommended settings for -Xmx1g usage, e.g. dev laptops.
-# memory-index-threshold=32m
-# memory-index-max=128m
-# object-cache-max=128m
+memory-index-threshold=32m
+memory-index-max=128m
+object-cache-max=128m