You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by la...@apache.org on 2016/09/08 20:32:26 UTC
phoenix git commit: PHOENIX-3228 Index tables should not be
configured with a custom/smaller MAX_FILESIZE.
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-0.98 118d24bdd -> fb976aa56
PHOENIX-3228 Index tables should not be configured with a custom/smaller MAX_FILESIZE.
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/fb976aa5
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/fb976aa5
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/fb976aa5
Branch: refs/heads/4.x-HBase-0.98
Commit: fb976aa566eecce84a5658c9335deca265e7c6f9
Parents: 118d24b
Author: Lars Hofhansl <la...@apache.org>
Authored: Thu Sep 8 13:34:21 2016 -0700
Committer: Lars Hofhansl <la...@apache.org>
Committed: Thu Sep 8 13:34:21 2016 -0700
----------------------------------------------------------------------
.../query/ConnectionQueryServicesImpl.java | 10 ---------
.../org/apache/phoenix/query/QueryServices.java | 1 -
.../phoenix/query/QueryServicesOptions.java | 1 -
.../apache/phoenix/schema/MetaDataClient.java | 22 --------------------
4 files changed, 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/fb976aa5/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index 7ede6a4..c47b420 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -1270,16 +1270,6 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices implement
}
byte[] physicalIndexName = MetaDataUtil.getViewIndexPhysicalName(physicalTableName);
- int indexMaxFileSizePerc;
- // Get percentage to use from table props first and then fallback to config
- Integer indexMaxFileSizePercProp = (Integer)tableProps.remove(QueryServices.INDEX_MAX_FILESIZE_PERC_ATTRIB);
- if (indexMaxFileSizePercProp == null) {
- indexMaxFileSizePerc = this.props.getInt(QueryServices.INDEX_MAX_FILESIZE_PERC_ATTRIB, QueryServicesOptions.DEFAULT_INDEX_MAX_FILESIZE_PERC);
- } else {
- indexMaxFileSizePerc = indexMaxFileSizePercProp;
- }
- long indexMaxFileSize = maxFileSize * indexMaxFileSizePerc / 100;
- tableProps.put(HTableDescriptor.MAX_FILESIZE, indexMaxFileSize);
tableProps.put(MetaDataUtil.IS_VIEW_INDEX_TABLE_PROP_NAME, TRUE_BYTES_AS_STRING);
HTableDescriptor desc = ensureTableCreated(physicalIndexName, PTableType.TABLE, tableProps, families, splits,
false, isNamespaceMapped);
http://git-wip-us.apache.org/repos/asf/phoenix/blob/fb976aa5/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java
index e2845d7..e8de5a8 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java
@@ -112,7 +112,6 @@ public interface QueryServices extends SQLCloseable {
public static final String ZOOKEEPER_ROOT_NODE_ATTRIB = "zookeeper.znode.parent";
public static final String DISTINCT_VALUE_COMPRESS_THRESHOLD_ATTRIB = "phoenix.distinct.value.compress.threshold";
public static final String SEQUENCE_CACHE_SIZE_ATTRIB = "phoenix.sequence.cacheSize";
- public static final String INDEX_MAX_FILESIZE_PERC_ATTRIB = "phoenix.index.maxDataFileSizePerc";
public static final String MAX_SERVER_METADATA_CACHE_TIME_TO_LIVE_MS_ATTRIB = "phoenix.coprocessor.maxMetaDataCacheTimeToLiveMs";
public static final String MAX_SERVER_METADATA_CACHE_SIZE_ATTRIB = "phoenix.coprocessor.maxMetaDataCacheSize";
public static final String MAX_CLIENT_METADATA_CACHE_SIZE_ATTRIB = "phoenix.client.maxMetaDataCacheSize";
http://git-wip-us.apache.org/repos/asf/phoenix/blob/fb976aa5/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
index 481de0f..09f4769 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
@@ -151,7 +151,6 @@ public class QueryServicesOptions {
public static final long DEFAULT_GROUPBY_MAX_CACHE_MAX = 1024L*1024L*100L; // 100 Mb
public static final long DEFAULT_SEQUENCE_CACHE_SIZE = 100; // reserve 100 sequences at a time
- public static final int DEFAULT_INDEX_MAX_FILESIZE_PERC = 50; // % of data table max file size for index table
public static final long DEFAULT_MAX_SERVER_METADATA_CACHE_TIME_TO_LIVE_MS = 60000 * 30; // 30 mins
public static final long DEFAULT_MAX_SERVER_METADATA_CACHE_SIZE = 1024L*1024L*20L; // 20 Mb
public static final long DEFAULT_MAX_CLIENT_METADATA_CACHE_SIZE = 1024L*1024L*10L; // 10 Mb
http://git-wip-us.apache.org/repos/asf/phoenix/blob/fb976aa5/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
index efe60ac..fd6b48c 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
@@ -2133,28 +2133,6 @@ public class MetaDataClient {
PNameFactory.newName(defaultFamilyName), null,
Boolean.TRUE.equals(disableWAL), false, false, null, indexId, indexType, true, false, 0, 0L, isNamespaceMapped, autoPartitionSeq, isAppendOnlySchema);
connection.addTable(table, MetaDataProtocol.MIN_TABLE_TIMESTAMP);
- } else if (tableType == PTableType.INDEX && indexId == null) {
- if (tableProps.get(HTableDescriptor.MAX_FILESIZE) == null) {
- int nIndexRowKeyColumns = isPK ? 1 : pkColumnsNames.size();
- int nIndexKeyValueColumns = columns.size() - nIndexRowKeyColumns;
- int nBaseRowKeyColumns = parent.getPKColumns().size() - (parent.getBucketNum() == null ? 0 : 1);
- int nBaseKeyValueColumns = parent.getColumns().size() - parent.getPKColumns().size();
- /*
- * Approximate ratio between index table size and data table size:
- * More or less equal to the ratio between the number of key value columns in each. We add one to
- * the key value column count to take into account our empty key value. We add 1/4 for any key
- * value data table column that was moved into the index table row key.
- */
- double ratio = (1+nIndexKeyValueColumns + (nIndexRowKeyColumns - nBaseRowKeyColumns)/4d)/(1+nBaseKeyValueColumns);
- HTableDescriptor descriptor = connection.getQueryServices().getTableDescriptor(parent.getPhysicalName().getBytes());
- if (descriptor != null) { // Is null for connectionless
- long maxFileSize = descriptor.getMaxFileSize();
- if (maxFileSize == -1) { // If unset, use default
- maxFileSize = HConstants.DEFAULT_MAX_FILE_SIZE;
- }
- tableProps.put(HTableDescriptor.MAX_FILESIZE, (long)(maxFileSize * ratio));
- }
- }
}
short nextKeySeq = 0;