Github user twdsilva commented on a diff in the pull request:
https://github.com/apache/phoenix/pull/304#discussion_r194545366
--- Diff:
phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
---
@@ -767,50 +748,117 @@ private void
modifyColumnFamilyDescriptor(HColumnDescriptor hcd, Map<String,Obje
}
}
+ /**
+ * Check that the specific set of column family properties mentioned
in {@link MetaDataUtil#PROPERTIES_TO_KEEP_IN_SYNC_AMONG_COL_FAMS_AND_INDEXES}
+ * are in sync for the given table (this includes the local index
column family).
+ * @param tableName
+ * @param defaultFamilyBytes
+ * @return default column descriptor used for checking if properties
are synced or not, and the synced table descriptor
+ * @throws SQLException
+ */
+ private Pair<HColumnDescriptor, HTableDescriptor>
ensureTableColumnFamilyPropsInSync(String tableName, byte[] defaultFamilyBytes)
throws SQLException {
+ HTableDescriptor tableDescriptor =
getTableDescriptor(Bytes.toBytes(tableName));
+ HColumnDescriptor[] colFamilies =
tableDescriptor.getColumnFamilies();
+ HColumnDescriptor defaultColDescriptor =
tableDescriptor.getFamily(defaultFamilyBytes);
+ // It's possible that the table has specific column families and
none of them are declared to be the DEFAULT_COLUMN_FAMILY
+ defaultColDescriptor = defaultColDescriptor != null ?
defaultColDescriptor : colFamilies[0];
+
+ for (String propName:
MetaDataUtil.PROPERTIES_TO_KEEP_IN_SYNC_AMONG_COL_FAMS_AND_INDEXES) {
+ if (defaultColDescriptor.getValue(propName) == null) {
+ if (!isUpgradeRequired()) {
+ // We cannot have a null value for any of the
properties that need to be kept in sync amongst all column families
+ logger.error("Cannot have null value for column family
property: " + propName);
+ setUpgradeRequired();
+ throw new UpgradeRequiredException();
+ } else {
+ defaultColDescriptor.setValue(propName,
HColumnDescriptor.getDefaultValues().get(propName));
+ }
+ }
+ }
+ // Used in the upgrade path to actually fix the table descriptor
by syncing properties
+ HTableDescriptor syncedTableDescriptor = new
HTableDescriptor(tableDescriptor);
+ // Check that these properties are in sync amongst all column
families of the table
+ for (HColumnDescriptor family: colFamilies) {
+ if (isUpgradeRequired()) {
+ family = syncedTableDescriptor.getFamily(family.getName());
+ }
+ for (String propName:
MetaDataUtil.PROPERTIES_TO_KEEP_IN_SYNC_AMONG_COL_FAMS_AND_INDEXES) {
+ if
(!family.getValue(propName).toUpperCase(Locale.ROOT).equals(defaultColDescriptor.getValue(propName).toUpperCase(Locale.ROOT)))
{
--- End diff --
Do you need the toUpperCase(Locale.ROOT) ?
---
