Groonga - fulltext search engine.

[Groonga-commit] groonga/groonga at 8e1f409 [master] package debian: remove needless patch for 8.0.2

Kouhei Sutou null+****@clear*****
Thu Apr 5 10:11:26 JST 2018

• Previous message: [Groonga-commit] Errored: groonga/groonga#9861 (master - a9cee66)
• Next message: [Groonga-commit] groonga/groonga-query-log at 23ddf4b [master] check-crash: show important messages
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Kouhei Sutou	2018-04-05 10:11:26 +0900 (Thu, 05 Apr 2018)

  New Revision: 8e1f409d0d79649db8e054c4a08dee6547a4227d
  https://github.com/groonga/groonga/commit/8e1f409d0d79649db8e054c4a08dee6547a4227d

  Message:
    package debian: remove needless patch for 8.0.2

  Removed files:
    packages/debian/patches/0001-Support-Zstandard-1-again.patch
  Modified files:
    packages/debian/patches/series

  Deleted: packages/debian/patches/0001-Support-Zstandard-1-again.patch (+0 -326) 100644
===================================================================
--- packages/debian/patches/0001-Support-Zstandard-1-again.patch    2018-04-05 09:37:58 +0900 (bd0387ca8)
+++ /dev/null
@@ -1,326 +0,0 @@
-From a9cee6636b2e3859fcffb04a6ed5a87ac5aef449 Mon Sep 17 00:00:00 2001
-From: Kouhei Sutou <kou �� clear-code.com>
-Date: Thu, 5 Apr 2018 09:26:38 +0900
-Subject: [PATCH] Support Zstandard < 1 again
-
----
- lib/store.c | 271 ++++++++++++++++++++++++++++++++--------------------
- 1 file changed, 167 insertions(+), 104 deletions(-)
-
-diff --git a/lib/store.c b/lib/store.c
-index 4fe6444ca..dd4b739ef 100644
---- a/lib/store.c
-+++ b/lib/store.c
-@@ -2156,73 +2156,112 @@ grn_ja_putv_zstd(grn_ctx *ctx,
-   const size_t body_size = body ? GRN_BULK_VSIZE(body) : 0;
-   const size_t footer_size = GRN_BULK_VSIZE(footer);
-   const size_t size = header_size + body_size + footer_size;
--  ZSTD_CStream *zstd_stream = NULL;
--  ZSTD_inBuffer zstd_input;
--  ZSTD_outBuffer zstd_output;
-   int zstd_compression_level = 3;
--  size_t zstd_result;
-+#if ZSTD_VERSION_MAJOR < 1
-+  grn_obj all_value;
-+  void *zstd_value = NULL;
-+
-+  GRN_TEXT_INIT(&all_value, 0);
-+#else /* ZSTD_VERSION_MAJOR < 1 */
-+  ZSTD_CStream *zstd_stream = NULL;
-+  ZSTD_outBuffer zstd_output;
-+
-+  zstd_output.dst = NULL;
-+  zstd_output.pos = 0;
-+#endif /* ZSTD_VERSION_MAJOR < 1 */
- 
-   if (size < COMPRESS_THRESHOLD_BYTE) {
-     return grn_ja_putv_packed(ctx, ja, id, header, body, footer, flags);
-   }
- 
--  zstd_output.dst = NULL;
--  zstd_output.pos = 0;
-+#if ZSTD_VERSION_MAJOR < 1
-+  {
-+    int zstd_value_len_max;
-+    int zstd_value_len_real;
- 
--  zstd_stream = ZSTD_createCStream();
--  if (!zstd_stream) {
--    grn_ja_compress_error(ctx,
--                          ja,
--                          id,
--                          GRN_ZSTD_ERROR,
--                          "[zstd] failed to allocate stream compressor",
--                          NULL);
--    rc = ctx->rc;
--    goto exit;
--  }
-+    zstd_value_len_max = ZSTD_compressBound(size);
-+    zstd_value = GRN_MALLOC(zstd_value_len_max);
-+    if (!zstd_value) {
-+      grn_ja_compress_error(ctx,
-+                            ja,
-+                            id,
-+                            GRN_ZSTD_ERROR,
-+                            "[zstd] failed to allocate compress buffer",
-+                            NULL);
-+      rc = ctx->rc;
-+      goto exit;
-+    }
- 
--  zstd_result = ZSTD_initCStream(zstd_stream, zstd_compression_level);
--  if (ZSTD_isError(zstd_result)) {
--    grn_ja_compress_error(ctx,
--                          ja,
--                          id,
--                          GRN_ZSTD_ERROR,
--                          "[zstd] failed to initialize stream compressor",
--                          ZSTD_getErrorName(zstd_result));
--    rc = ctx->rc;
--    goto exit;
-+    GRN_TEXT_PUT(ctx, &all_value, GRN_TEXT_VALUE(header), header_size);
-+    if (body_size > 0) {
-+      GRN_TEXT_PUT(ctx, &all_value, GRN_TEXT_VALUE(body), body_size);
-+    }
-+    GRN_TEXT_PUT(ctx, &all_value, GRN_TEXT_VALUE(footer), footer_size);
-+    zstd_value_len_real = ZSTD_compress(zstd_value, zstd_value_len_max,
-+                                        GRN_TEXT_VALUE(&all_value), size,
-+                                        zstd_compression_level);
-+    if (ZSTD_isError(zstd_value_len_real)) {
-+      grn_ja_compress_error(ctx,
-+                            ja,
-+                            id,
-+                            GRN_ZSTD_ERROR,
-+                            "[zstd] failed to compress",
-+                            ZSTD_getErrorName(zstd_value_len_real));
-+      rc = ctx->rc;
-+      goto exit;
-+    }
-+    rc = grn_ja_putv_compressed(ctx,
-+                                ja,
-+                                id,
-+                                zstd_value,
-+                                zstd_value_len_real,
-+                                size,
-+                                flags);
-   }
-+#else /* ZSTD_VERSION_MAJOR < 1 */
-+  {
-+    ZSTD_inBuffer zstd_input;
-+    size_t zstd_result;
- 
--  zstd_output.size = ZSTD_compressBound(size);
--  zstd_output.dst = GRN_MALLOC(zstd_output.size);
--  if (!zstd_output.dst) {
--    grn_ja_compress_error(ctx,
--                          ja,
--                          id,
--                          GRN_ZSTD_ERROR,
--                          "[zstd] failed to allocate compress buffer",
--                          NULL);
--    rc = ctx->rc;
--    goto exit;
--  }
-+    zstd_stream = ZSTD_createCStream();
-+    if (!zstd_stream) {
-+      grn_ja_compress_error(ctx,
-+                            ja,
-+                            id,
-+                            GRN_ZSTD_ERROR,
-+                            "[zstd] failed to allocate stream compressor",
-+                            NULL);
-+      rc = ctx->rc;
-+      goto exit;
-+    }
- 
--  zstd_input.src = GRN_BULK_HEAD(header);
--  zstd_input.size = header_size;
--  zstd_input.pos = 0;
--  zstd_result = ZSTD_compressStream(zstd_stream, &zstd_output, &zstd_input);
--  if (ZSTD_isError(zstd_result)) {
--    grn_ja_compress_error(ctx,
--                          ja,
--                          id,
--                          GRN_ZSTD_ERROR,
--                          "[zstd] failed to compress header",
--                          ZSTD_getErrorName(zstd_result));
--    rc = ctx->rc;
--    goto exit;
--  }
--  if (body_size > 0) {
--    zstd_input.src = GRN_BULK_HEAD(body);
--    zstd_input.size = body_size;
-+    zstd_result = ZSTD_initCStream(zstd_stream, zstd_compression_level);
-+    if (ZSTD_isError(zstd_result)) {
-+      grn_ja_compress_error(ctx,
-+                            ja,
-+                            id,
-+                            GRN_ZSTD_ERROR,
-+                            "[zstd] failed to initialize stream compressor",
-+                            ZSTD_getErrorName(zstd_result));
-+      rc = ctx->rc;
-+      goto exit;
-+    }
-+
-+    zstd_output.size = ZSTD_compressBound(size);
-+    zstd_output.dst = GRN_MALLOC(zstd_output.size);
-+    if (!zstd_output.dst) {
-+      grn_ja_compress_error(ctx,
-+                            ja,
-+                            id,
-+                            GRN_ZSTD_ERROR,
-+                            "[zstd] failed to allocate compress buffer",
-+                            NULL);
-+      rc = ctx->rc;
-+      goto exit;
-+    }
-+
-+    zstd_input.src = GRN_BULK_HEAD(header);
-+    zstd_input.size = header_size;
-     zstd_input.pos = 0;
-     zstd_result = ZSTD_compressStream(zstd_stream, &zstd_output, &zstd_input);
-     if (ZSTD_isError(zstd_result)) {
-@@ -2230,68 +2269,92 @@ grn_ja_putv_zstd(grn_ctx *ctx,
-                             ja,
-                             id,
-                             GRN_ZSTD_ERROR,
--                            "[zstd] failed to compress body",
-+                            "[zstd] failed to compress header",
-                             ZSTD_getErrorName(zstd_result));
-       rc = ctx->rc;
-       goto exit;
-     }
--  }
--  if (footer_size > 0) {
--    zstd_input.src = GRN_BULK_HEAD(footer);
--    zstd_input.size = footer_size;
--    zstd_input.pos = 0;
--    zstd_result = ZSTD_compressStream(zstd_stream, &zstd_output, &zstd_input);
--    if (ZSTD_isError(zstd_result)) {
--      grn_ja_compress_error(ctx,
--                            ja,
--                            id,
--                            GRN_ZSTD_ERROR,
--                            "[zstd] failed to compress footer",
--                            ZSTD_getErrorName(zstd_result));
--      rc = ctx->rc;
--      goto exit;
--    }
--  }
--
--  zstd_result = ZSTD_endStream(zstd_stream, &zstd_output);
--  if (ZSTD_isError(zstd_result)) {
--    grn_ja_compress_error(ctx,
--                          ja,
--                          id,
--                          GRN_ZSTD_ERROR,
--                          "[zstd] failed to finish stream compression",
--                          ZSTD_getErrorName(zstd_result));
--    rc = ctx->rc;
--    goto exit;
--  }
--
--  if (zstd_result > 0) {
--    grn_ja_compress_error(ctx,
--                          ja,
--                          id,
--                          GRN_ZSTD_ERROR,
--                          "[zstd] failed to finish stream compression "
--                          "because some data remain buffer",
--                          ZSTD_getErrorName(zstd_result));
--    rc = ctx->rc;
--    goto exit;
--  }
--
--  rc = grn_ja_putv_compressed(ctx,
-+    if (body_size > 0) {
-+      zstd_input.src = GRN_BULK_HEAD(body);
-+      zstd_input.size = body_size;
-+      zstd_input.pos = 0;
-+      zstd_result = ZSTD_compressStream(zstd_stream, &zstd_output, &zstd_input);
-+      if (ZSTD_isError(zstd_result)) {
-+        grn_ja_compress_error(ctx,
-                               ja,
-                               id,
--                              zstd_output.dst,
--                              zstd_output.pos,
--                              size,
--                              flags);
-+                              GRN_ZSTD_ERROR,
-+                              "[zstd] failed to compress body",
-+                              ZSTD_getErrorName(zstd_result));
-+        rc = ctx->rc;
-+        goto exit;
-+      }
-+    }
-+    if (footer_size > 0) {
-+      zstd_input.src = GRN_BULK_HEAD(footer);
-+      zstd_input.size = footer_size;
-+      zstd_input.pos = 0;
-+      zstd_result = ZSTD_compressStream(zstd_stream, &zstd_output, &zstd_input);
-+      if (ZSTD_isError(zstd_result)) {
-+        grn_ja_compress_error(ctx,
-+                              ja,
-+                              id,
-+                              GRN_ZSTD_ERROR,
-+                              "[zstd] failed to compress footer",
-+                              ZSTD_getErrorName(zstd_result));
-+        rc = ctx->rc;
-+        goto exit;
-+      }
-+    }
-+
-+    zstd_result = ZSTD_endStream(zstd_stream, &zstd_output);
-+    if (ZSTD_isError(zstd_result)) {
-+      grn_ja_compress_error(ctx,
-+                            ja,
-+                            id,
-+                            GRN_ZSTD_ERROR,
-+                            "[zstd] failed to finish stream compression",
-+                            ZSTD_getErrorName(zstd_result));
-+      rc = ctx->rc;
-+      goto exit;
-+    }
-+
-+    if (zstd_result > 0) {
-+      grn_ja_compress_error(ctx,
-+                            ja,
-+                            id,
-+                            GRN_ZSTD_ERROR,
-+                            "[zstd] failed to finish stream compression "
-+                            "because some data remain buffer",
-+                            ZSTD_getErrorName(zstd_result));
-+      rc = ctx->rc;
-+      goto exit;
-+    }
-+
-+    rc = grn_ja_putv_compressed(ctx,
-+                                ja,
-+                                id,
-+                                zstd_output.dst,
-+                                zstd_output.pos,
-+                                size,
-+                                flags);
-+  }
-+#endif /* ZSTD_VERSION_MAJOR < 1 */
- 
- exit :
-+#if ZSTD_VERSION_MAJOR < 1
-+  GRN_OBJ_FIN(ctx, &all_value);
-+  if (zstd_value) {
-+    GRN_FREE(zstd_value);
-+  }
-+#else /* ZSTD_VERSION_MAJOR < 1 */
-   if (zstd_stream) {
-     ZSTD_freeCStream(zstd_stream);
-   }
-   if (zstd_output.dst) {
-     GRN_FREE(zstd_output.dst);
-   }
-+#endif /* ZSTD_VERSION_MAJOR < 1 */
- 
-   return rc;
- }
--- 
-2.17.0
-

  Modified: packages/debian/patches/series (+0 -1)
===================================================================
--- packages/debian/patches/series    2018-04-05 09:37:58 +0900 (dba44c8fb)
+++ packages/debian/patches/series    2018-04-05 10:11:26 +0900 (e69de29bb)
@@ -1 +0,0 @@
-0001-Support-Zstandard-1-again.patch
-------------- next part --------------
HTML����������������������������...
URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20180405/ea79ace9/attachment-0001.htm 

• Previous message: [Groonga-commit] Errored: groonga/groonga#9861 (master - a9cee66)
• Next message: [Groonga-commit] groonga/groonga-query-log at 23ddf4b [master] check-crash: show important messages
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]