accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [6/6] accumulo git commit: Merge branch '1.8'
Date Mon, 27 Mar 2017 23:49:55 GMT
Merge branch '1.8'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/07bfa2e5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/07bfa2e5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/07bfa2e5

Branch: refs/heads/master
Commit: 07bfa2e5b687d6fabd107206c525169c321f8707
Parents: b4f86d9 8d6b729
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Mon Mar 27 19:48:48 2017 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Mon Mar 27 19:48:48 2017 -0400

----------------------------------------------------------------------
 core/src/main/java/org/apache/accumulo/core/conf/Property.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/07bfa2e5/core/src/main/java/org/apache/accumulo/core/conf/Property.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 4472a54,333aed6..6b92111
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@@ -458,14 -447,14 +458,14 @@@ public enum Property 
    TABLE_FILE_TYPE("table.file.type", RFile.EXTENSION, PropertyType.STRING, "Change the type
of file a table writes"),
    TABLE_LOAD_BALANCER("table.balancer", "org.apache.accumulo.server.master.balancer.DefaultLoadBalancer",
PropertyType.STRING,
        "This property can be set to allow the LoadBalanceByTable load balancer to change
the called Load Balancer for this table"),
-   TABLE_FILE_COMPRESSION_TYPE("table.file.compress.type", "gz", PropertyType.STRING, "One
of gz,lzo,none"),
+   TABLE_FILE_COMPRESSION_TYPE("table.file.compress.type", "gz", PropertyType.STRING, "One
of gz,snappy,lzo,none"),
 -  TABLE_FILE_COMPRESSED_BLOCK_SIZE("table.file.compress.blocksize", "100K", PropertyType.MEMORY,
 +  TABLE_FILE_COMPRESSED_BLOCK_SIZE("table.file.compress.blocksize", "100K", PropertyType.BYTES,
        "Similar to the hadoop io.seqfile.compress.blocksize setting, so that files have better
query performance. The maximum value for this is "
            + Integer.MAX_VALUE + ". (This setting is the size threshold prior to compression,
and applies even compression is disabled.)"),
 -  TABLE_FILE_COMPRESSED_BLOCK_SIZE_INDEX("table.file.compress.blocksize.index", "128K",
PropertyType.MEMORY,
 +  TABLE_FILE_COMPRESSED_BLOCK_SIZE_INDEX("table.file.compress.blocksize.index", "128K",
PropertyType.BYTES,
        "Determines how large index blocks can be in files that support multilevel indexes.
The maximum value for this is " + Integer.MAX_VALUE + "."
            + " (This setting is the size threshold prior to compression, and applies even
compression is disabled.)"),
 -  TABLE_FILE_BLOCK_SIZE("table.file.blocksize", "0B", PropertyType.MEMORY,
 +  TABLE_FILE_BLOCK_SIZE("table.file.blocksize", "0B", PropertyType.BYTES,
        "Overrides the hadoop dfs.block.size setting so that files have better query performance.
The maximum value for this is " + Integer.MAX_VALUE),
    TABLE_FILE_REPLICATION("table.file.replication", "0", PropertyType.COUNT, "Determines
how many replicas to keep of a tables' files in HDFS. "
        + "When this value is LTE 0, HDFS defaults are used."),


Mime
View raw message