Remove native bits of delegate lib.

We implemented portions of the delegate library as a JRuby ext, in order to improve performance and avoid the heavy method_missing logic that used to be in the pure-Ruby version. However, over the years, the delegate library has improved and no longer has the same performance characteristics as it did in 1.8 and earlier. In addition, there have been functionality changes to the pure-Ruby code that we would have to maintain in the extension. Therefore, we have opted to return to just the pure-Ruby delegate library. We will reexamine performance and work with ruby-core to improve the pure-Ruby version before we consider returning to the native version. Fixes #1370.
jruby · Jan 6, 2015 · 2201765 · 2201765
1 parent bb78f8b
commit 2201765
Showing 3 changed files with 0 additions and 142 deletions.
diff --git a/core/src/main/java/org/jruby/Ruby.java b/core/src/main/java/org/jruby/Ruby.java
@@ -1718,7 +1718,6 @@ private void initBuiltins() {
         addLazyBuiltin("io/wait.jar", "io/wait", "org.jruby.ext.io.wait.IOWaitLibrary");
         addLazyBuiltin("etc.jar", "etc", "org.jruby.ext.etc.EtcLibrary");
         addLazyBuiltin("weakref.rb", "weakref", "org.jruby.ext.weakref.WeakRefLibrary");
-        addLazyBuiltin("native_delegate.jar", "native_delegate", "org.jruby.ext.delegate.NativeDelegateLibrary");
         addLazyBuiltin("timeout.rb", "timeout", "org.jruby.ext.timeout.Timeout");
         addLazyBuiltin("socket.jar", "socket", "org.jruby.ext.socket.SocketLibrary");
         addLazyBuiltin("rbconfig.rb", "rbconfig", "org.jruby.ext.rbconfig.RbConfigLibrary");

diff --git a/core/src/main/java/org/jruby/ext/delegate/NativeDelegateLibrary.java b/core/src/main/java/org/jruby/ext/delegate/NativeDelegateLibrary.java
diff --git a/lib/ruby/stdlib/delegate.rb b/lib/ruby/stdlib/delegate.rb
@@ -415,5 +415,3 @@ def __setobj__(obj)  # :nodoc:
   end
   return klass
 end
-
-require 'native_delegate.jar'
-Original file line number
+Diff line change
@@ @@ -415,5 +415,3 @@ def __setobj__(obj) # :nodoc: @@
       end
       return klass
     end
-    require 'native_delegate.jar'