java_bin 0.3.3 → 0.3.4

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.3.4 (2010/02/06)
+  * remove dependence on glibc byteswap.h
+  * a little performance improve
+
 0.3.3 (2010/02/01)
   * fix iterator false bug
   * performance improve

data/README.rdoc

@@ -74,6 +74,7 @@ This is an Apache Solr JavaBin format (binary format) implementation for Ruby.
 
 == TODO
 
+* max os x supoort
 * more parse speed
 * license
 * shared string over parsing

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/ext/java_bin/ext/byteswap.h

@@ -0,0 +1,17 @@
+// http://koders.com/c/fidB93B34CD44F0ECF724F1A4EAE3854BA2FE692F59.aspx
+#ifndef _BYTESWAP_H
+#define _BYTESWAP_H
+
+static inline unsigned short bswap_16(unsigned short x) {
+  return (x>>8) | (x<<8);
+}
+
+static inline unsigned int bswap_32(unsigned int x) {
+  return (bswap_16(x&0xffff)<<16) | (bswap_16(x>>16));
+}
+
+static inline unsigned long long bswap_64(unsigned long long x) {
+  return (((unsigned long long)bswap_32(x&0xffffffffull))<<32) | (bswap_32(x>>32));
+}
+
+#endif

data/ext/java_bin/ext/extconf.rb

@@ -9,7 +9,6 @@ unless RUBY_PLATFORM =~ /mswin32/ # Linux
   if CONFIG['CC'] =~ /gcc/
     $CFLAGS << ' -Wall'
   end
-  have_header("byteswap.h")
   have_header("sys/types.h")
 else # Windows 
   $CFLAGS.gsub!(/-O2b2xg-/, '/O2b2x')

data/ext/java_bin/ext/parser.c

@@ -183,7 +183,7 @@ static inline VALUE JavaBinParser_read_date(JAVA_BIN_PARSER* ptr) {
   u_int64_t c;
   _readnumeric(ptr, c);
   c = _swap_64(c);
-  return rb_funcall(rb_cTime, i_At, 1, ULL2NUM(*((int64_t*)&c) / 1000));
+  return rb_funcall(rb_cTime, i_At, 1, ULL2NUM(c / 1000));
 }
 
 static inline VALUE JavaBinParser_read_float(JAVA_BIN_PARSER* ptr) {

data/ext/java_bin/ext/parser.h

@@ -2,10 +2,7 @@
 #define _PARSER_H_
 
 #include "ruby.h"
-
-#if HAVE_BYTESWAP_H
-  #include <byteswap.h>
-#endif /* HAVE_BYTESWAP_H */
+#include "byteswap.h"
 
 #if HAVE_SYS_TYPES_H
   #include <sys/types.h>
@@ -114,29 +111,6 @@ typedef struct java_bin_parser {
   typedef unsigned __int64 u_int64_t;
 #endif
 
-//static void JavaBinParser_extend_cache(JAVA_BIN_PARSER* ptr);
-
-//static int32_t JavaBinParser_read_v_int(JAVA_BIN_PARSER* ptr);
-//static int64_t JavaBinParser_read_v_long(JAVA_BIN_PARSER* ptr);
-//static int JavaBinParser_read_size(JAVA_BIN_PARSER* ptr);
-//static VALUE JavaBinParser_read_small_int(JAVA_BIN_PARSER* ptr);
-//static VALUE JavaBinParser_read_small_long(JAVA_BIN_PARSER* ptr);
-//static VALUE JavaBinParser_read_string(JAVA_BIN_PARSER* ptr);
-//static VALUE JavaBinParser_read_array(JAVA_BIN_PARSER* ptr);
-//static VALUE JavaBinParser_read_extern_string(JAVA_BIN_PARSER* ptr);
-//static VALUE JavaBinParser_read_ordered_map(JAVA_BIN_PARSER* ptr); 
-//static VALUE JavaBinParser_read_byte(JAVA_BIN_PARSER* ptr);
-//static VALUE JavaBinParser_read_short(JAVA_BIN_PARSER* ptr);
-//static VALUE JavaBinParser_read_int(JAVA_BIN_PARSER* ptr);
-//static VALUE JavaBinParser_read_long(JAVA_BIN_PARSER* ptr);
-//static VALUE JavaBinParser_read_date(JAVA_BIN_PARSER* ptr);
-//static VALUE JavaBinParser_read_float(JAVA_BIN_PARSER* ptr);
-//static VALUE JavaBinParser_read_double(JAVA_BIN_PARSER* ptr);
-//static VALUE JavaBinParser_read_byte_array(JAVA_BIN_PARSER* ptr);
-//static VALUE JavaBinParser_read_map(JAVA_BIN_PARSER* ptr);
-//static VALUE JavaBinParser_read_iterator(JAVA_BIN_PARSER* ptr);
-//static VALUE JavaBinParser_read_solr_doc_list(JAVA_BIN_PARSER* ptr);
-
 static VALUE JavaBinParser_read_val(JAVA_BIN_PARSER* ptr);
 
 static void JavaBinParser_free(JAVA_BIN_PARSER* ptr);

data/java_bin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{java_bin}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kennyj"]
-  s.date = %q{2010-02-02}
+  s.date = %q{2010-02-06}
   s.description = %q{Apache Solr JavaBin format (binary format) implementation for Ruby.}
   s.email = %q{kennyj@gmail.com}
   s.extensions = ["ext/java_bin/ext/extconf.rb"]
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
+     "ext/java_bin/ext/byteswap.h",
      "ext/java_bin/ext/extconf.rb",
      "ext/java_bin/ext/parser.c",
      "ext/java_bin/ext/parser.h",

data/lib/java_bin/version.rb

@@ -1,7 +1,7 @@
 # vim:fileencoding=utf-8
 module JavaBin
   # JavaBin version
-  VERSION = '0.1.0'
+  VERSION = '0.3.4'
   VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR = VERSION_ARRAY[1] # :nodoc:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: java_bin
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - kennyj
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-02 00:00:00 +09:00
+date: 2010-02-06 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -30,6 +30,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- ext/java_bin/ext/byteswap.h
 - ext/java_bin/ext/extconf.rb
 - ext/java_bin/ext/parser.c
 - ext/java_bin/ext/parser.h