schema: support column compress

groonga · Oct 20, 2015 · 77da933 · 77da933
1 parent 522e4de
commit 77da933
Show file tree

Hide file tree

Showing 7 changed files with 452 additions and 3 deletions.
diff --git a/lib/proc.c b/lib/proc.c
@@ -7865,6 +7865,26 @@ proc_schema_column_output_value_type(grn_ctx *ctx, grn_obj *column)
   proc_schema_output_value_type(ctx, value_type);
 }
 
+static void
+proc_schema_column_output_compress(grn_ctx *ctx, grn_obj *column)
+{
+  const char *compress = NULL;
+
+  if (column->header.type != GRN_COLUMN_INDEX) {
+    if (column->header.flags & GRN_OBJ_COMPRESS_ZLIB) {
+      compress = "zlib";
+    } else if (column->header.flags & GRN_OBJ_COMPRESS_LZ4) {
+      compress = "lz4";
+    }
+  }
+
+  if (compress) {
+    GRN_OUTPUT_CSTR(compress);
+  } else {
+    GRN_OUTPUT_NULL();
+  }
+}
+
 static void
 proc_schema_column_output(grn_ctx *ctx, grn_obj *table, grn_obj *column)
 {
@@ -7874,7 +7894,7 @@ proc_schema_column_output(grn_ctx *ctx, grn_obj *table, grn_obj *column)
 
   proc_schema_output_column_name(ctx, column);
 
-  GRN_OUTPUT_MAP_OPEN("column", 6);
+  GRN_OUTPUT_MAP_OPEN("column", 7);
 
   GRN_OUTPUT_CSTR("name");
   proc_schema_output_column_name(ctx, column);
@@ -7891,6 +7911,9 @@ proc_schema_column_output(grn_ctx *ctx, grn_obj *table, grn_obj *column)
   GRN_OUTPUT_CSTR("value_type");
   proc_schema_column_output_value_type(ctx, column);
 
+  GRN_OUTPUT_CSTR("compress");
+  proc_schema_column_output_compress(ctx, column);
+
   GRN_OUTPUT_MAP_CLOSE();
 }
 

diff --git a/test/command/suite/schema/tables/columns/compress/lz4.expected b/test/command/suite/schema/tables/columns/compress/lz4.expected
@@ -0,0 +1,208 @@
+table_create Logs TABLE_NO_KEY
+[[0,0.0,0.0],true]
+column_create Logs message COLUMN_SCALAR|COMPRESS_LZ4 Text
+[[0,0.0,0.0],true]
+schema
+[
+  [
+    0,
+    0.0,
+    0.0
+  ],
+  {
+    "plugins": {
+    },
+    "types": {
+      "Bool": {
+        "name": "Bool",
+        "size": 1,
+        "can_be_key_type": true,
+        "can_be_value_type": true
+      },
+      "Float": {
+        "name": "Float",
+        "size": 8,
+        "can_be_key_type": true,
+        "can_be_value_type": true
+      },
+      "Int16": {
+        "name": "Int16",
+        "size": 2,
+        "can_be_key_type": true,
+        "can_be_value_type": true
+      },
+      "Int32": {
+        "name": "Int32",
+        "size": 4,
+        "can_be_key_type": true,
+        "can_be_value_type": true
+      },
+      "Int64": {
+        "name": "Int64",
+        "size": 8,
+        "can_be_key_type": true,
+        "can_be_value_type": true
+      },
+      "Int8": {
+        "name": "Int8",
+        "size": 1,
+        "can_be_key_type": true,
+        "can_be_value_type": true
+      },
+      "LongText": {
+        "name": "LongText",
+        "size": 2147483648,
+        "can_be_key_type": false,
+        "can_be_value_type": false
+      },
+      "Object": {
+        "name": "Object",
+        "size": 8,
+        "can_be_key_type": true,
+        "can_be_value_type": true
+      },
+      "ShortText": {
+        "name": "ShortText",
+        "size": 4096,
+        "can_be_key_type": true,
+        "can_be_value_type": false
+      },
+      "Text": {
+        "name": "Text",
+        "size": 65536,
+        "can_be_key_type": false,
+        "can_be_value_type": false
+      },
+      "Time": {
+        "name": "Time",
+        "size": 8,
+        "can_be_key_type": true,
+        "can_be_value_type": true
+      },
+      "TokyoGeoPoint": {
+        "name": "TokyoGeoPoint",
+        "size": 8,
+        "can_be_key_type": true,
+        "can_be_value_type": true
+      },
+      "UInt16": {
+        "name": "UInt16",
+        "size": 2,
+        "can_be_key_type": true,
+        "can_be_value_type": true
+      },
+      "UInt32": {
+        "name": "UInt32",
+        "size": 4,
+        "can_be_key_type": true,
+        "can_be_value_type": true
+      },
+      "UInt64": {
+        "name": "UInt64",
+        "size": 8,
+        "can_be_key_type": true,
+        "can_be_value_type": true
+      },
+      "UInt8": {
+        "name": "UInt8",
+        "size": 1,
+        "can_be_key_type": true,
+        "can_be_value_type": true
+      },
+      "WGS84GeoPoint": {
+        "name": "WGS84GeoPoint",
+        "size": 8,
+        "can_be_key_type": true,
+        "can_be_value_type": true
+      }
+    },
+    "tokenizers": {
+      "TokenBigram": {
+        "name": "TokenBigram"
+      },
+      "TokenBigramIgnoreBlank": {
+        "name": "TokenBigramIgnoreBlank"
+      },
+      "TokenBigramIgnoreBlankSplitSymbol": {
+        "name": "TokenBigramIgnoreBlankSplitSymbol"
+      },
+      "TokenBigramIgnoreBlankSplitSymbolAlpha": {
+        "name": "TokenBigramIgnoreBlankSplitSymbolAlpha"
+      },
+      "TokenBigramIgnoreBlankSplitSymbolAlphaDigit": {
+        "name": "TokenBigramIgnoreBlankSplitSymbolAlphaDigit"
+      },
+      "TokenBigramSplitSymbol": {
+        "name": "TokenBigramSplitSymbol"
+      },
+      "TokenBigramSplitSymbolAlpha": {
+        "name": "TokenBigramSplitSymbolAlpha"
+      },
+      "TokenBigramSplitSymbolAlphaDigit": {
+        "name": "TokenBigramSplitSymbolAlphaDigit"
+      },
+      "TokenDelimit": {
+        "name": "TokenDelimit"
+      },
+      "TokenDelimitNull": {
+        "name": "TokenDelimitNull"
+      },
+      "TokenMecab": {
+        "name": "TokenMecab"
+      },
+      "TokenRegexp": {
+        "name": "TokenRegexp"
+      },
+      "TokenTrigram": {
+        "name": "TokenTrigram"
+      },
+      "TokenUnigram": {
+        "name": "TokenUnigram"
+      }
+    },
+    "normalizers": {
+      "NormalizerAuto": {
+        "name": "NormalizerAuto"
+      },
+      "NormalizerNFKC51": {
+        "name": "NormalizerNFKC51"
+      }
+    },
+    "token_filters": {
+    },
+    "tables": {
+      "Logs": {
+        "name": "Logs",
+        "type": "array",
+        "key_type": null,
+        "value_type": null,
+        "tokenizer": null,
+        "normalizer": null,
+        "token_filters": [
+
+        ],
+        "command": {
+          "name": "table_create",
+          "arguments": {
+            "name": "Logs",
+            "flags": "TABLE_NO_KEY"
+          },
+          "command_line": "table_create --name Logs --flags TABLE_NO_KEY"
+        },
+        "columns": {
+          "message": {
+            "name": "message",
+            "table": "Logs",
+            "full_name": "Logs.message",
+            "type": "scalar",
+            "value_type": {
+              "name": "Text",
+              "type": "type"
+            },
+            "compress": "lz4"
+          }
+        }
+      }
+    }
+  }
+]
diff --git a/test/command/suite/schema/tables/columns/compress/lz4.test b/test/command/suite/schema/tables/columns/compress/lz4.test
@@ -0,0 +1,4 @@
+table_create Logs TABLE_NO_KEY
+column_create Logs message COLUMN_SCALAR|COMPRESS_LZ4 Text
+
+schema