lz4-ruby 0.1.7 → 0.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NzllZTQyNmZkZjdiNzQ4OTY4ZmU0ZDA4YTlkNzY1MjlmOTE1NjBhYQ==
+  data.tar.gz: !binary |-
+    MTczZDc4OGM2NjhkNWY5MTRiZjZjOTBkOWQ0ZTIwOWNlNWZkZjkwNw==
+SHA512:
+  metadata.gz: !binary |-
+    ZWJmN2Y3NmNmMmI4ODAzY2YzYzEyZWQ1NTFlNDc4YTkzNWU1NGY5ZmFjMmIy
+    YThkM2M2NThmNjZiZGYyMTFhOGVhY2FkNzUzNjE1MjRmNjI1ODFiZjE2MDk2
+    ZmE1NTllNGFkMmMyMzdhOTIyNDNkYTAyNDkyMTZlOWU5YzZkNDI=
+  data.tar.gz: !binary |-
+    Y2IyNWFiMjBiMDdjNGE3NWY4YTcyMGI4ZmU1YWM0MTM4MmUxZTY5MThkZTVj
+    OTg4MjcyZGIyZTA0MmY3YWJjMjI3Mjc4MjE3YTA0Y2M3ZDZlZmZiOTg1M2Fj
+    Mzg3MDk1NWI0YjY2MmY4NDhjOTE1NTgwOTdmMmY1YWYwZDAyNDE=

data/Gemfile

@@ -6,9 +6,9 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "shoulda", ">= 0"
+  gem "rspec"
   gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.0.0"
+  gem "bundler"
   gem "jeweler", "~> 1.8.3"
   gem "rake-compiler", ">= 0"
 end

data/README.rdoc

@@ -33,6 +33,7 @@ Tested on VirtualBox VM : 2-core / 4GB RAM (Host : Core i5-2520M / 8GB RAM).
 
 == TODO
 
+* replace calloc() with xalloc() in lz4hc.c
 * Write API documents.
 
 == Copyright
@@ -40,6 +41,10 @@ Tested on VirtualBox VM : 2-core / 4GB RAM (Host : Core i5-2520M / 8GB RAM).
 Copyright (c) 2012 KOMIYA Atsushi.
 See LICENSE.txt for further details.
 
+== Contributors
+
+* Charles Oliver Nutter <headius at headius.com>
+
 == About LZ4
 
 This Rubygem includes LZ4 codes written by Yann Collet.

data/Rakefile

@@ -36,14 +36,10 @@ Jeweler::RubygemsDotOrgTasks.new
 $gemspec = jeweler_tasks.gemspec
 $gemspec.version = jeweler_tasks.jeweler.version
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
 
-task :default => :test
+task :default => :spec
 
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
@@ -83,15 +79,26 @@ end
 
 task "build:cross" => [:modify_gemspec_for_windows, :cross, :build] do
   file = "pkg/lz4-ruby-#{get_version}.gem"
-  mv file, "#{file.ext}-x86-mingw32.gem"
 end
 
+task "build:jruby" => [:modify_gemspec_for_jruby, :compile_jruby, :build]
+
 task :modify_gemspec_for_windows do
   $gemspec.extensions = []
   $gemspec.files.include("lib/?.?/*.so")
   $gemspec.platform = "x86-mingw32"
 end
 
+task :modify_gemspec_for_jruby do
+  $gemspec.extensions = []
+  $gemspec.files.include("lib/*.jar")
+  $gemspec.platform = "java"
+end
+
+task :compile_jruby do
+  system 'mvn package'
+end
+
 def get_version
   `cat VERSION`.chomp
 end

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.2.0

data/lib/lz4-jruby.rb

@@ -0,0 +1,3 @@
+require 'lz4ruby.jar'
+
+com.headius.jruby.lz4.LZ4Library.new.load(JRuby.runtime, false)

data/lib/lz4-ruby.rb

@@ -2,6 +2,8 @@ if /(mswin|mingw)/ =~ RUBY_PLATFORM
   /(\d+\.\d+)/ =~ RUBY_VERSION
   ver = $1
   require "#{ver}/lz4ruby.so"
+elsif RUBY_PLATFORM == 'java'
+  require 'lz4-jruby'
 else
   require 'lz4ruby'
 end

data/pom.xml

@@ -0,0 +1,71 @@
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.headius.jruby.lz4</groupId>
+    <artifactId>lz4ruby</artifactId>
+    <version>0.2.0</version>
+    <packaging>jar</packaging>
+
+    <name>lz4ruby</name>
+    <url>http://maven.apache.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.jpountz.lz4</groupId>
+            <artifactId>lz4</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jruby</groupId>
+            <artifactId>jruby</artifactId>
+            <version>1.7.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+  
+    <build>
+        <plugins>
+	    <plugin>
+	        <artifactId>maven-compiler-plugin</artifactId>
+		<version>3.1</version>
+		<configuration>
+		    <source>1.6</source>
+		    <target>1.6</target>
+		</configuration>
+	    </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.0</version>
+                <configuration>
+                    <relocations>
+                        <relocation>
+                            <pattern>net.jpountz</pattern>
+                            <shadedPattern>com.headius.jruby.lz4.vendor.net.jpountz</shadedPattern>
+                        </relocation>
+                    </relocations>
+                    <outputFile>${basedir}/lib/lz4ruby.jar</outputFile>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

data/{test → spec}/helper.rb

@@ -8,7 +8,6 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 require 'test/unit'
-require 'shoulda'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'ext/lz4ruby'))
@@ -24,5 +23,11 @@ EOS
 
 require 'lz4-ruby'
 
-class Test::Unit::TestCase
+def generate_random_bytes(len)
+  result = []
+  len.times do |t|
+    result << rand(256)
+  end
+  return result.pack("C*")
 end
+

data/spec/lz4_compressHC_spec.rb

@@ -0,0 +1,50 @@
+require './spec/helper'
+
+describe "LZ4::compress" do
+  LOOP_COUNT = 257
+
+  context "give empty text" do
+    compressed = LZ4.compressHC("")
+    uncompressed = LZ4.uncompress(compressed)
+
+    it "should be able to uncompress" do
+      expect(uncompressed).to eql("")
+    end
+  end
+
+  context "give long text" do
+    text = "a" * 131073
+    compressed = LZ4.compressHC(text)
+    uncompressed = LZ4.uncompress(compressed)
+
+    it "should be able to uncompress" do
+      expect(uncompressed).to eql(text)
+    end
+  end
+
+  LOOP_COUNT.times do |t|
+    len = t + 1
+    text = "a" * len
+
+    context "give text of #{len} \"a\"'s" do
+      compressed = LZ4.compressHC(text)
+      uncompressed = LZ4.uncompress(compressed)
+      it "should be able to uncompress" do
+        expect(uncompressed).to eql(text)
+      end
+    end
+  end  
+
+  LOOP_COUNT.times do |t|
+    len = t + 1
+    text = generate_random_bytes(len)
+
+    context "give text of #{len} bytes" do
+      compressed = LZ4.compressHC(text)
+      uncompressed = LZ4.uncompress(compressed)
+      it "should be able to uncompress" do
+        expect(uncompressed).to eql(text)
+      end
+    end
+  end  
+end

data/spec/lz4_compress_spec.rb

@@ -0,0 +1,50 @@
+require './spec/helper'
+
+describe "LZ4::compress" do
+  LOOP_COUNT = 257
+
+  context "give empty text" do
+    compressed = LZ4.compress("")
+    uncompressed = LZ4.uncompress(compressed)
+
+    it "should be able to uncompress" do
+      expect(uncompressed).to eql("")
+    end
+  end
+
+  context "give long text" do
+    text = "a" * 131073
+    compressed = LZ4.compress(text)
+    uncompressed = LZ4.uncompress(compressed)
+
+    it "should be able to uncompress" do
+      expect(uncompressed).to eql(text)
+    end
+  end
+
+  LOOP_COUNT.times do |t|
+    len = t + 1
+    text = "a" * len
+
+    context "give text of #{len} \"a\"'s" do
+      compressed = LZ4.compress(text)
+      uncompressed = LZ4.uncompress(compressed)
+      it "should be able to uncompress" do
+        expect(uncompressed).to eql(text)
+      end
+    end
+  end  
+
+  LOOP_COUNT.times do |t|
+    len = t + 1
+    text = generate_random_bytes(len)
+
+    context "give text of #{len} bytes" do
+      compressed = LZ4.compress(text)
+      uncompressed = LZ4.uncompress(compressed)
+      it "should be able to uncompress" do
+        expect(uncompressed).to eql(text)
+      end
+    end
+  end  
+end

data/src/main/java/com/headius/jruby/lz4/LZ4Internal.java

@@ -0,0 +1,64 @@
+package com.headius.jruby.lz4;
+
+import net.jpountz.lz4.LZ4Compressor;
+import net.jpountz.lz4.LZ4Factory;
+import org.jruby.RubyInteger;
+import org.jruby.RubyString;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.util.ByteList;
+
+public class LZ4Internal {
+    private static final LZ4Factory FACTORY = LZ4Factory.fastestInstance();
+    
+    public static IRubyObject compress_internal(ThreadContext context, LZ4Compressor compressor, IRubyObject _header, IRubyObject _input, IRubyObject _in_size) {
+        RubyString input = _input.convertToString();
+        RubyString header = _header.convertToString();
+        RubyInteger in_size = _in_size.convertToInteger();
+        
+        ByteList inputBL = input.getByteList();
+        int srcSize = (int)in_size.getLongValue();
+        
+        ByteList headerBL = header.getByteList();
+        int headerSize = headerBL.getRealSize();
+        
+        int bufSize = compressor.maxCompressedLength(srcSize);
+        byte[] buf = new byte[bufSize + headerSize];
+        
+        System.arraycopy(headerBL.getUnsafeBytes(), headerBL.getBegin(), buf, 0, headerSize);
+        
+        compressor.compress(inputBL.getUnsafeBytes(), inputBL.getBegin(), srcSize, buf, headerSize);
+        
+        return RubyString.newStringNoCopy(context.runtime, buf);
+    }
+    
+    @JRubyMethod(module = true)
+    public static IRubyObject compress(ThreadContext context, IRubyObject self, IRubyObject _header, IRubyObject _input, IRubyObject _in_size) {
+        return compress_internal(context, FACTORY.fastCompressor(), _header, _input, _in_size);
+    }
+    
+    @JRubyMethod(module = true)
+    public static IRubyObject compressHC(ThreadContext context, IRubyObject self, IRubyObject _header, IRubyObject _input, IRubyObject _in_size) {
+        return compress_internal(context, FACTORY.highCompressor(), _header, _input, _in_size);
+    }
+    
+    @JRubyMethod(required = 4, module = true)
+    public static IRubyObject uncompress(ThreadContext context, IRubyObject self, IRubyObject[] args) {
+        RubyString input = args[0].convertToString();
+        RubyInteger in_size = args[1].convertToInteger();
+        RubyInteger header_size = args[2].convertToInteger();
+        RubyInteger buf_size = args[3].convertToInteger();
+        
+        ByteList inputBL = input.getByteList();
+        int inSize = (int)in_size.getLongValue();
+        int headerSize = (int)header_size.getLongValue();
+        int bufSize = (int)buf_size.getLongValue();
+        
+        byte[] buf = new byte[bufSize];
+        
+        FACTORY.decompressor().decompress(inputBL.getUnsafeBytes(), inputBL.getBegin() + headerSize, buf, 0, buf.length);
+        
+        return RubyString.newStringNoCopy(context.runtime, buf);
+    }
+}

data/src/main/java/com/headius/jruby/lz4/LZ4Library.java

@@ -0,0 +1,18 @@
+package com.headius.jruby.lz4;
+
+import java.io.IOException;
+import org.jruby.Ruby;
+import org.jruby.RubyModule;
+import org.jruby.runtime.load.Library;
+
+public class LZ4Library implements Library {
+
+    public void load(Ruby runtime, boolean wrap) throws IOException {
+        RubyModule lz4Internal = runtime.defineModule("LZ4Internal");
+        
+        lz4Internal.defineAnnotatedMethods(LZ4Internal.class);
+        
+        lz4Internal.defineClassUnder("Error", runtime.getStandardError(), runtime.getStandardError().getAllocator());
+    }
+    
+}

metadata

@@ -1,107 +1,99 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: lz4-ruby
-version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 7
-  version: 0.1.7
+version: !ruby/object:Gem::Version
+  version: !binary |-
+    MC4yLjA=
 platform: ruby
-authors: 
+authors:
 - KOMIYA Atsushi
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-12-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: shoulda
   prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rdoc
-  prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 3
-        - 12
-        version: "3.12"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          My4xMg==
   type: :development
-  name: bundler
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          My4xMg==
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: jeweler
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 1
-        - 8
-        - 3
-        version: 1.8.3
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MS44LjM=
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MS44LjM=
+- !ruby/object:Gem::Dependency
   name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id005
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby bindings for LZ4. LZ4 is a very fast lossless compression algorithm.
 email: komiya.atsushi@gmail.com
 executables: []
-
-extensions: 
+extensions:
 - ext/lz4ruby/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - Gemfile
 - LICENSE.txt
@@ -120,41 +112,36 @@ files:
 - ext/lz4ruby/lz4hc.c
 - ext/lz4ruby/lz4hc.h
 - ext/lz4ruby/lz4ruby.c
+- lib/lz4-jruby.rb
 - lib/lz4-ruby.rb
-- test/helper.rb
-- test/test_lz4-ruby.rb
+- pom.xml
+- spec/helper.rb
+- spec/lz4_compressHC_spec.rb
+- spec/lz4_compress_spec.rb
+- src/main/java/com/headius/jruby/lz4/LZ4Internal.java
+- src/main/java/com/headius/jruby/lz4/LZ4Library.java
 homepage: http://github.com/komiya-atsushi/lz4-ruby
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby bindings for LZ4 (Extremely Fast Compression algorithm).
 test_files: []
-

data/test/test_lz4-ruby.rb

@@ -1,109 +0,0 @@
-require 'helper'
-
-class TestLz4Ruby < Test::Unit::TestCase
-  LOOP_COUNT = 257
-  
-  srand(123)
-
-  def self.random_bytes(len)
-    result = []
-    len.times do |t|
-      result << rand(256)
-    end
-    return result.pack("C*")
-  end
-
-  context "LZ4::compress" do
-    should "empty text" do
-      compressed = LZ4::compress("")
-      uncompressed = LZ4::uncompress(compressed)
-      assert_equal("", uncompressed)
-    end
-
-    should "long text" do
-      text = "a" * 131073
-      compressed = LZ4.compress(text)
-      uncompressed = LZ4.uncompress(compressed)
-      assert_equal(text, uncompressed)
-    end
-
-    LOOP_COUNT.times do |t|
-      len = t + 1
-      text = "a" * len
-
-      should "text of #{len} \"a\"'s" do
-        compressed = LZ4::compress(text)
-        uncompressed = LZ4::uncompress(compressed)
-        assert_equal(text, uncompressed)
-      end
-    end
-
-    LOOP_COUNT.times do |t|
-      len = t + 1
-      text = random_bytes(len)
-      
-      should "random text of #{len} bytes" do
-        compressed = LZ4::compress(text)
-        uncompressed = LZ4::uncompress(compressed)
-        assert_equal(text, uncompressed)
-      end
-    end
-
-    text = "b" * LOOP_COUNT
-    LOOP_COUNT.times do |t|
-      len = t + 1
-      should "#{len} bytes substring of #{LOOP_COUNT} bytes \"b\"'s" do
-        compressed = LZ4::compress(text, len)
-        uncompressed = LZ4::uncompress(compressed)
-        assert_equal(text[0, len], uncompressed)
-      end
-    end
-  end
-
-  context "LZ4::compressHC" do
-    should "empty text" do
-      compressed = LZ4::compressHC("")
-      uncompressed = LZ4::uncompress(compressed)
-      assert_equal("", uncompressed)
-    end
-    
-    should "long text" do
-      text = "a" * 131073
-      compressed = LZ4.compressHC(text)
-      uncompressed = LZ4.uncompress(compressed)
-      assert_equal(text, uncompressed)
-    end
-
-    LOOP_COUNT.times do |t|
-      len = t + 1
-      text = "a" * len
-
-      should "text of #{len} \"a\"'s" do
-        compressed = LZ4::compressHC(text)
-        uncompressed = LZ4::uncompress(compressed)
-        assert_equal(text, uncompressed)
-      end
-    end
-
-    LOOP_COUNT.times do |t|
-      len = t + 1
-      text = random_bytes(len)
-      
-      should "random text of #{len} bytes" do
-        compressed = LZ4::compressHC(text)
-        uncompressed = LZ4::uncompress(compressed)
-        assert_equal(text, uncompressed)
-      end
-    end
-    
-    text = "b" * LOOP_COUNT
-    LOOP_COUNT.times do |t|
-      len = t + 1
-      should "#{len} bytes substring of #{LOOP_COUNT} bytes \"b\"'s" do
-        compressed = LZ4::compressHC(text, len)
-        uncompressed = LZ4::uncompress(compressed)
-        assert_equal(text[0, len], uncompressed)
-      end
-    end
-  end
-end