rroonga 4.0.7-x64-mingw32 → 4.0.8-x64-mingw32

data/vendor/local/include/lz4hc.h

@@ -105,24 +105,27 @@ They just use the externally allocated memory for state instead of allocating th
 /**************************************
    Experimental Streaming Functions
 **************************************/
-#define LZ4_STREAMHCSIZE_U32 65548
-#define LZ4_STREAMHCSIZE     (LZ4_STREAMHCSIZE_U32 * sizeof(unsigned int))
-typedef struct { unsigned int table[LZ4_STREAMHCSIZE_U32]; } LZ4_streamHC_t;
-
+#define LZ4_STREAMHCSIZE_U64 32774
+#define LZ4_STREAMHCSIZE     (LZ4_STREAMHCSIZE_U64 * sizeof(unsigned long long))
+typedef struct { unsigned long long table[LZ4_STREAMHCSIZE_U64]; } LZ4_streamHC_t;
 /*
+LZ4_streamHC_t
 This structure allows static allocation of LZ4 HC streaming state.
 State must then be initialized using LZ4_resetStreamHC() before first use.
 
-If you prefer dynamic allocation, please refer to functions below.
+Static allocation should only be used with statically linked library.
+If you want to use LZ4 as a DLL, please use construction functions below, which are more future-proof.
 */
 
+
 LZ4_streamHC_t* LZ4_createStreamHC(void);
 int             LZ4_freeStreamHC (LZ4_streamHC_t* LZ4_streamHCPtr);
-
 /*
 These functions create and release memory for LZ4 HC streaming state.
 Newly created states are already initialized.
 Existing state space can be re-used anytime using LZ4_resetStreamHC().
+If you use LZ4 as a DLL, please use these functions instead of direct struct allocation,
+to avoid size mismatch between different versions.
 */
 
 void LZ4_resetStreamHC (LZ4_streamHC_t* LZ4_streamHCPtr, int compressionLevel);
@@ -152,70 +155,18 @@ using LZ4_saveDictHC().
 
 
 /**************************************
-   Deprecated Streaming Functions
-**************************************/
-/* Note : these streaming functions still follows the older model */
+ * Deprecated Streaming Functions
+ * ************************************/
+/* Note : these streaming functions follows the older model, and should no longer be used */
 void* LZ4_createHC (const char* inputBuffer);
-//int   LZ4_compressHC_continue (void* LZ4HC_Data, const char* source, char* dest, int inputSize);
-//int   LZ4_compressHC_limitedOutput_continue (void* LZ4HC_Data, const char* source, char* dest, int inputSize, int maxOutputSize);
 char* LZ4_slideInputBufferHC (void* LZ4HC_Data);
 int   LZ4_freeHC (void* LZ4HC_Data);
 
 int   LZ4_compressHC2_continue (void* LZ4HC_Data, const char* source, char* dest, int inputSize, int compressionLevel);
 int   LZ4_compressHC2_limitedOutput_continue (void* LZ4HC_Data, const char* source, char* dest, int inputSize, int maxOutputSize, int compressionLevel);
 
-/*
-These functions allow the compression of dependent blocks, where each block benefits from prior 64 KB within preceding blocks.
-In order to achieve this, it is necessary to start creating the LZ4HC Data Structure, thanks to the function :
-
-void* LZ4_createHC (const char* inputBuffer);
-The result of the function is the (void*) pointer on the LZ4HC Data Structure.
-This pointer will be needed in all other functions.
-If the pointer returned is NULL, then the allocation has failed, and compression must be aborted.
-The only parameter 'const char* inputBuffer' must, obviously, point at the beginning of input buffer.
-The input buffer must be already allocated, and size at least 192KB.
-'inputBuffer' will also be the 'const char* source' of the first block.
-
-All blocks are expected to lay next to each other within the input buffer, starting from 'inputBuffer'.
-To compress each block, use either LZ4_compressHC_continue() or LZ4_compressHC_limitedOutput_continue().
-Their behavior are identical to LZ4_compressHC() or LZ4_compressHC_limitedOutput(),
-but require the LZ4HC Data Structure as their first argument, and check that each block starts right after the previous one.
-If next block does not begin immediately after the previous one, the compression will fail (return 0).
-
-When it's no longer possible to lay the next block after the previous one (not enough space left into input buffer), a call to :
-char* LZ4_slideInputBufferHC(void* LZ4HC_Data);
-must be performed. It will typically copy the latest 64KB of input at the beginning of input buffer.
-Note that, for this function to work properly, minimum size of an input buffer must be 192KB.
-==> The memory position where the next input data block must start is provided as the result of the function.
-
-Compression can then resume, using LZ4_compressHC_continue() or LZ4_compressHC_limitedOutput_continue(), as usual.
-
-When compression is completed, a call to LZ4_freeHC() will release the memory used by the LZ4HC Data Structure.
-*/
-
-int LZ4_sizeofStreamStateHC(void);
-int LZ4_resetStreamStateHC(void* state, const char* inputBuffer);
-
-/*
-These functions achieve the same result as :
-void* LZ4_createHC (const char* inputBuffer);
-
-They are provided here to allow the user program to allocate memory using its own routines.
-
-To know how much space must be allocated, use LZ4_sizeofStreamStateHC();
-Note also that space must be aligned for pointers (32 or 64 bits).
-
-Once space is allocated, you must initialize it using : LZ4_resetStreamStateHC(void* state, const char* inputBuffer);
-void* state is a pointer to the space allocated.
-It must be aligned for pointers (32 or 64 bits), and be large enough.
-The parameter 'const char* inputBuffer' must, obviously, point at the beginning of input buffer.
-The input buffer must be already allocated, and size at least 192KB.
-'inputBuffer' will also be the 'const char* source' of the first block.
-
-The same space can be re-used multiple times, just by initializing it each time with LZ4_resetStreamState().
-return value of LZ4_resetStreamStateHC() must be 0 is OK.
-Any other value means there was an error (typically, state is not aligned for pointers (32 or 64 bits)).
-*/
+int   LZ4_sizeofStreamStateHC(void);
+int   LZ4_resetStreamStateHC(void* state, const char* inputBuffer);
 
 
 #if defined (__cplusplus)

data/vendor/local/lib/groonga/plugins/query_expanders/tsv.la

@@ -1,5 +1,5 @@
 # tsv.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.10
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -17,7 +17,7 @@ old_library='tsv.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libonig.la -llz4 -lz -lws2_32'
+dependency_libs=' -L/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libonig.la -llz4 -lz -lws2_32'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/query_expanders'
+libdir='/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/query_expanders'

data/vendor/local/lib/groonga/plugins/ruby/eval.la

@@ -1,5 +1,5 @@
 # eval.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.10
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -17,7 +17,7 @@ old_library='eval.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libonig.la -llz4 -lz -lws2_32 /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la'
+dependency_libs=' -L/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libonig.la -llz4 -lz -lws2_32 /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/ruby'
+libdir='/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/ruby'

data/vendor/local/lib/groonga/plugins/ruby/load.la

@@ -1,5 +1,5 @@
 # load.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.10
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -17,7 +17,7 @@ old_library='load.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libonig.la -llz4 -lz -lws2_32 /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la'
+dependency_libs=' -L/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libonig.la -llz4 -lz -lws2_32 /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/ruby'
+libdir='/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/ruby'

data/vendor/local/lib/groonga/plugins/suggest/suggest.la

@@ -1,5 +1,5 @@
 # suggest.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.10
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -17,7 +17,7 @@ old_library='suggest.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libonig.la -llz4 -lz -lws2_32 /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la'
+dependency_libs=' -L/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libonig.la -llz4 -lz -lws2_32 /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/suggest'
+libdir='/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/suggest'

data/vendor/local/lib/groonga/plugins/table/table.la

@@ -1,5 +1,5 @@
 # table.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.10
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -17,7 +17,7 @@ old_library='table.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libonig.la -llz4 -lz -lws2_32 /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la'
+dependency_libs=' -L/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libonig.la -llz4 -lz -lws2_32 /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/table'
+libdir='/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/table'

data/vendor/local/lib/groonga/plugins/token_filters/stop_word.la

@@ -1,5 +1,5 @@
 # stop_word.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.10
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -17,7 +17,7 @@ old_library='stop_word.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libonig.la -llz4 -lz -lws2_32'
+dependency_libs=' -L/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libonig.la -llz4 -lz -lws2_32'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/token_filters'
+libdir='/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/token_filters'

data/vendor/local/lib/groonga/plugins/tokenizers/mecab.la

@@ -1,5 +1,5 @@
 # mecab.la - a libtool library file
-# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
+# Generated by libtool (GNU libtool) 2.4.2 Debian-2.4.2-1.10
 #
 # Please DO NOT delete this file!
 # It is necessary for linking the library.
@@ -17,7 +17,7 @@ old_library='mecab.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=' -L/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libmecab.la /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la /home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/libonig.la -llz4 -lz -lws2_32'
+dependency_libs=' -L/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libmecab.la -lpthread /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libgroonga.la /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libmsgpack.la /home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/libonig.la -llz4 -lz -lws2_32'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''
@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/home/kenhys/work/groonga/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/tokenizers'
+libdir='/home/kou/work/c/groonga.clean/packages/windows/dist-x64/lib/groonga/plugins/tokenizers'

data/vendor/local/lib/groonga/scripts/ruby/command/grndb.rb

@@ -0,0 +1,169 @@
+module Groonga
+  module Command
+    class Grndb
+      def initialize(argv)
+        @command, *@arguments = argv
+        @succeeded = true
+        @executed = false
+        @database_path = nil
+      end
+
+      def run
+        slop = create_slop
+        rest = nil
+        begin
+          rest = slop.parse(@arguments)
+        rescue Slop::Error
+          $stderr.puts($!.message)
+          return false
+        end
+
+        if slop.help?
+          $stdout.puts(slop.help)
+          return true
+        end
+
+        unless @executed
+          if rest.empty?
+            $stderr.puts("No command is specified.")
+          else
+            $stderr.puts("Unknown command: <#{rest.first}>")
+          end
+          return false
+        end
+
+        @succeeded
+      end
+
+      private
+      def create_slop
+        slop = Slop.new
+        command_name = File.basename(@command)
+        slop.banner = "Usage: #{command_name} COMMAND [OPTIONS] DB_PATH"
+        slop_enable_help(slop)
+
+        slop.command "check" do |command|
+          command.description "Check database"
+          slop_enable_help(command)
+
+          command.run do |options, arguments|
+            run_command(options, arguments) do |database, new_arguments|
+              check(database, options, new_arguments)
+            end
+          end
+        end
+
+        slop.command "recover" do |command|
+          command.description "Recover database"
+          slop_enable_help(command)
+
+          command.run do |options, arguments|
+            run_command(options, arguments) do |database, new_arguments|
+              recover(database, options, new_arguments)
+            end
+          end
+        end
+
+        slop
+      end
+
+      def slop_enable_help(slop)
+        slop.on("-h", "--help", "Display this help message.", :tail => true)
+      end
+
+      def open_database(arguments)
+        if arguments.empty?
+          $stderr.puts("Database path is missing")
+          @succeesed = false
+          return
+        end
+
+        database = nil
+        @database_path, *rest_arguments = arguments
+        begin
+          database = Database.open(@database_path)
+        rescue Error => error
+          $stderr.puts("Failed to open database: <#{@database_path}>")
+          $stderr.puts(error.message)
+          @succeeded = false
+          return
+        end
+
+        begin
+          yield(database, rest_arguments)
+        ensure
+          database.close
+        end
+      end
+
+      def run_command(options, arguments)
+        @executed = true
+
+        if options.help?
+          $stdout.puts(options.help)
+          return
+        end
+
+        open_database(arguments) do |database|
+          yield(database)
+        end
+      end
+
+      def recover(database, options, arguments)
+        begin
+          database.recover
+        rescue Error => error
+          $stderr.puts("Failed to recover database: <#{@database_path}>")
+          $stderr.puts(error.message)
+          @succeeded = false
+        end
+      end
+
+      def check(database, options, arguments)
+        if database.locked?
+          message =
+            "Database is locked. " +
+            "It may be broken. " +
+            "Re-create the database."
+          $stdout.puts(message)
+          @succeeded = false
+        end
+
+        database.each do |object|
+          case object
+          when IndexColumn
+            next unless object.locked?
+            message =
+              "[#{object.name}] Index column is locked. " +
+              "It may be broken. " +
+              "Re-create index by '#{@command} recover #{@database_path}'."
+            $stdout.puts(message)
+            @succeeded = false
+          when Column
+            next unless object.locked?
+            name = object.name
+            message =
+              "[#{name}] Data column is locked. " +
+              "It may be broken. " +
+              "(1) Truncate the column (truncate #{name}) or " +
+              "clear lock of the column (lock_clear #{name}) " +
+              "and (2) load data again."
+            $stdout.puts(message)
+            @succeeded = false
+          when Table
+            next unless object.locked?
+            name = object.name
+            message =
+              "[#{name}] Table is locked. " +
+              "It may be broken. " +
+              "(1) Truncate the table (truncate #{name}) or " +
+              "clear lock of the table (lock_clear #{name}) " +
+              "and (2) load data again."
+            $stdout.puts(message)
+            @succeeded = false
+          end
+        end
+      end
+    end
+  end
+end