alf-core 0.14.0 → 0.15.0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.15.0 / FIX ME
+
+* Compiler infrastructure entirely rewritten in alf-compiler
+* Changed signature of `Adapter::Connection#cog` and associated `#to_cog`
+* Removed `#bind` of algebra expressions everywhere
+
 # 0.14.0 / 01-10-2013
 
 ## Types
@@ -20,6 +26,10 @@
   the connection and returns the resulting relation. TupleComputation delegates
   accordingly.
 
+## Predicate
+
+* Added support for qualified identifiers and Predicate#qualify.
+
 ## Support
 
 * TupleScope now delegates to_s, inspect and [] to the underlying tuple. This

data/Gemfile

@@ -4,12 +4,13 @@ group :runtime do
   gem "myrrha", "~> 3.0"
   gem "domain", "~> 1.0"
   gem "path", "~> 1.3"
-  gem "sexpr", "~> 0.5.1"
+  gem "sexpr", "~> 0.6.0"
 end
 
 group :test do
   gem "rake", "~> 10.1"
   gem "rspec", "~> 2.14"
+  gem "ruby_cop", "~> 1.0"
 end
 
 group :release do
@@ -17,13 +18,6 @@ group :release do
   gem "rspec", "~> 2.14"
 end
 
-group :doc do
-  gem "yard", "~> 0.8.2"
-  gem "bluecloth", "~> 2.2"
-  gem "redcarpet", "~> 2.2"
-end
-
 group :extra do
   gem "highline", "~> 1.6"
-  gem 'json', :platforms => [:ruby_18, :jruby, :mingw_18]
 end

data/Gemfile.lock

@@ -1,41 +1,33 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    bluecloth (2.2.0)
     diff-lcs (1.2.4)
     domain (1.0.0)
-    highline (1.6.19)
-    json (1.8.0)
-    json (1.8.0-java)
+    highline (1.6.20)
     myrrha (3.0.0)
       domain (~> 1.0)
-    path (1.3.1)
+    path (1.3.3)
     rake (10.1.0)
-    redcarpet (2.3.0)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.4)
-    rspec-expectations (2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.3)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.1)
-    sexpr (0.5.1)
-    yard (0.8.7)
+    rspec-mocks (2.14.4)
+    ruby_cop (1.0.5)
+    sexpr (0.6.0)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
-  bluecloth (~> 2.2)
   domain (~> 1.0)
   highline (~> 1.6)
-  json
   myrrha (~> 3.0)
   path (~> 1.3)
   rake (~> 10.1)
-  redcarpet (~> 2.2)
   rspec (~> 2.14)
-  sexpr (~> 0.5.1)
-  yard (~> 0.8.2)
+  ruby_cop (~> 1.0)
+  sexpr (~> 0.6.0)

data/examples/operators/frame.alf

@@ -0,0 +1,2 @@
+#!/usr/bin/env alf
+(frame suppliers, [[:sid, :asc]], 1, 2)

data/lib/alf-core.rb

@@ -1,30 +1,32 @@
-require_relative 'alf-core/loader'
-require_relative 'alf-core/version'
-require_relative 'alf-core/errors'
-require_relative 'alf-core/ext'
-require_relative 'alf-core/facade'
+require_relative 'alf/core/loader'
+require_relative 'alf/core/version'
+require_relative 'alf/errors'
+require_relative 'alf/ext'
+require_relative 'alf/facade'
 
 module Alf
   TupleLike    = lambda{|t| t.is_a?(Hash) || t.is_a?(Tuple) }
   RelationLike = lambda{|r| Relation===r || Engine::Cog===r || Reader===r || Relvar===r }
 end
 
-require_relative 'alf-predicate/alf/predicate'
-require_relative 'alf-support/alf/support'
-require_relative 'alf-types/alf/types'
-require_relative 'alf-aggregator/alf/aggregator'
-require_relative 'alf-algebra/alf/algebra'
-require_relative "alf-engine/alf/engine"
-require_relative 'alf-io/alf/io'
-require_relative 'alf-lang/alf/lang'
-require_relative 'alf-relation/alf/relation'
-require_relative 'alf-relvar/alf/relvar'
-require_relative 'alf-optimizer/alf/optimizer'
-require_relative 'alf-update/alf/update'
-require_relative 'alf-adapter/alf/adapter'
-require_relative 'alf-viewpoint/alf/viewpoint'
-require_relative 'alf-database/alf/database'
-require_relative 'alf-adapter-fs/alf/adapter/fs'
+require_relative 'alf/predicate'
+require_relative 'alf/support'
+require_relative 'alf/types'
+require_relative 'alf/aggregator'
+require_relative 'alf/algebra'
+require_relative 'alf/compiler'
+require_relative "alf/engine"
+require_relative 'alf/reader'
+require_relative 'alf/renderer'
+require_relative 'alf/lang'
+require_relative 'alf/relation'
+require_relative 'alf/relvar'
+require_relative 'alf/optimizer'
+require_relative 'alf/update'
+require_relative 'alf/adapter'
+require_relative 'alf/viewpoint'
+require_relative 'alf/database'
+require_relative 'alf/adapter/fs'
 
 module Alf
   extend Facade
@@ -33,5 +35,5 @@ module Alf
   DEE = Relation::DEE
 end
 
-require_relative 'alf-core/dsl'
+require_relative 'alf/dsl'
 include Alf::Dsl unless defined?(ALF_NO_CORE_EXTENSIONS)

data/lib/{alf-adapter/alf → alf}/adapter/connection.rb

@@ -48,9 +48,10 @@ module Alf
 
       ### read-only methods
 
-      # Returns a cog for a given name
-      def cog(name, expr = nil)
-        raise NotSupportedError, "Unable to serve cog `#{name}` in `#{self}`"
+      # Returns a base cog for the compilation of `expr` inside the compilation
+      # plan `plan`. `expr` is guaranteed to be a `Algebra::Operand::Named`.
+      def cog(plan = nil, expr = nil)
+        raise NotSupportedError, "Unable to serve cog `#{expr}` in `#{self}`"
       end
 
       ### update methods
@@ -75,13 +76,6 @@ module Alf
         raise NotSupportedError, "Unable to update in `#{self}`"
       end
 
-      ### compilation chain
-
-      # Returns a compiler instance
-      def compiler
-        Engine::Compiler.new
-      end
-
     end # class Connection
   end # class Adapter
 end # module Alf

data/lib/{alf-adapter-fs/alf → alf}/adapter/folder/connection.rb

@@ -10,8 +10,9 @@ module Alf
           !find_file(name).nil?
         end
 
-        # Returns a cog for `name`
-        def cog(name, expr = nil)
+        # Returns a cog for `expr` inside the compilation plan `plan`
+        def cog(plan, expr)
+          name = expr.name
           if f = find_file(name)
             reader = Reader.reader(find_file(name))
             Alf::Engine::Leaf.new(reader, expr)

data/lib/{alf-aggregator/alf → alf}/aggregator.rb

@@ -77,10 +77,6 @@ module Alf
         case arg
         when Aggregator
           arg
-        when String
-          agg = instance_eval(arg)
-          agg.source = arg
-          agg
         else
           raise ArgumentError, "Invalid arg `arg` for Aggregator()"
         end
@@ -102,10 +98,17 @@ module Alf
     #
     #   Aggregator.new{ size * price }
     #
-    def initialize(options = {}, &block)
-      options, block = {}, options if options.is_a?(Symbol) && block.nil?
-      @options = default_options.merge(options)
-      @functor = Support.coerce(block, TupleExpression)
+    def initialize(*args, &block)
+      @options = default_options
+      args.push(block) if block
+      args.each do |arg|
+        case arg
+        when Symbol, Proc then @functor = Support.coerce(arg, TupleExpression)
+        when Hash         then @options = @options.merge(arg)
+        else
+          raise ArgumentError, "Unexpected `#{arg}`"
+        end
+      end
     end
 
     # Returns the default options to use
@@ -186,7 +189,7 @@ module Alf
     def to_lispy
       has_source_code!
     rescue NotImplementedError
-      "[lispy code unavailable]"
+      "#{Support.rubycase_name(self.class)}{|t| [code unavailable] }"
     end
 
     # Checks equality with another aggregator

data/lib/{alf-algebra/alf → alf}/algebra.rb

@@ -1,6 +1,7 @@
 require_relative 'algebra/support'
 require_relative 'algebra/operand'
 require_relative 'algebra/operator'
+require_relative 'algebra/shortcut'
 module Alf
   module Algebra
 

data/lib/{alf-algebra/alf → alf}/algebra/operand.rb

@@ -1,7 +1,6 @@
 module Alf
   module Algebra
     module Operand
-      include Support::Bindable
 
       def self.coerce(op)
         case op
@@ -32,18 +31,26 @@ module Alf
         raise NotSupportedError, "Key inference unsupported on `#{self}`"
       end
 
+      def type_check(options = {strict: false})
+        heading
+      end
+
+      def resulting_type
+        Relation[heading]
+      end
+
       ### to_xxx
 
-      def to_cog
-        to_relvar.to_cog
+      def to_cog(plan = nil)
+        raise NotSupportedError, "Compilation unsupported on `#{self}`"
       end
 
       def to_relation
-        to_relvar.to_relation
+        to_cog.to_relation
       end
 
-      def to_dot(buffer = "")
-        Algebra::ToDot.new.call(self, buffer)
+      def to_ascii_tree(buffer = "")
+        Support::Tree.new(self).to_text(buffer)
       end
 
     end # module Operand

data/lib/{alf-algebra/alf → alf}/algebra/operand/fake.rb

@@ -4,9 +4,15 @@ module Alf
       class Fake
         include Operand
 
-        def initialize(connection = nil)
+        def initialize(connection = nil, cog = nil)
           @connection = connection
           @attributes = {}
+          @cog = cog
+        end
+        attr_accessor :connection
+
+        def with_connection(conn)
+          dup.tap{|d| d.connection = conn }
         end
 
         def with_heading(h)
@@ -37,11 +43,19 @@ module Alf
         end
 
         def to_relvar
-          Relvar::Fake.new(self, heading)
+          if connection && name
+            Operand::Named.new(name, connection).to_relvar
+          else
+            Relvar::Fake.new(self, heading)
+          end
+        end
+
+        def to_cog(plan = nil)
+          @cog || Engine::Leaf.new([], self)
         end
 
-        def to_cog
-          Engine::Leaf.new([], self)
+        def to_s
+          name.to_s
         end
 
         def to_lispy

data/lib/alf/algebra/operand/named.rb

@@ -0,0 +1,65 @@
+module Alf
+  module Algebra
+    module Operand
+      class Named
+        include Operand
+
+        def initialize(name, connection = nil)
+          @name = name
+          @connection = connection
+        end
+        attr_reader :name, :connection
+
+        def connection!
+          raise UnboundError, "Expression not bound `#{name}`" unless connection
+          connection
+        end
+
+        def type_check(options = {strict: false})
+          return heading if connection!.knows?(name)
+          raise TypeCheckError, "No such relvar `#{name}`"
+        end
+
+        def keys
+          connection!.keys(name)
+        end
+
+        def heading
+          connection!.heading(name)
+        end
+
+        def hash
+          @hash ||= name.hash + 37*connection.hash
+        end
+
+        def ==(other)
+          super || (other.is_a?(Named) &&
+                    other.name==name   &&
+                    other.connection == connection)
+        end
+        alias :eql? :==
+
+        def to_cog(plan = Alf::Compiler::Plan.new)
+          connection!.cog(plan, self)
+        end
+
+        def to_relvar
+          Relvar::Base.new(self)
+        end
+
+        def to_s
+          name.to_s
+        end
+
+        def inspect
+          "Operand::Named(#{name.inspect})"
+        end
+
+        def to_lispy
+          name.to_s
+        end
+
+      end # Named
+    end # module Operand
+  end # module Algebra
+end # module Alf

data/lib/{alf-algebra/alf → alf}/algebra/operand/proxy.rb

@@ -19,17 +19,21 @@ module Alf
           super
         end
 
-        def to_cog
-          return subject.to_cog if subject.respond_to?(:to_cog)
+        def to_cog(*args, &bl)
+          return subject.to_cog(*args, &bl) if subject.respond_to?(:to_cog)
           Alf::Engine::Leaf.new(subject)
         end
 
         def to_relvar
           return subject.to_relvar if subject.respond_to?(:to_relvar)
-          super
+          Relvar::ReadOnly.new(self)
         end
 
         def to_s
+          subject.to_s
+        end
+
+        def inspect
           "Operand::Proxy(#{subject})"
         end