Issue 173 struct evolution #174
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| /** | ||
| * Copyright (C) 2016-2020 Expedia, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.hotels.bdp.circustrain.core.replica.hive; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.function.Function; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| import org.apache.hadoop.hive.metastore.api.FieldSchema; | ||
| import org.apache.hadoop.hive.metastore.api.Table; | ||
| import org.apache.thrift.TException; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import com.hotels.hcommon.hive.metastore.client.api.CloseableMetaStoreClient; | ||
|
|
||
| public class AlterTableService { | ||
|
|
||
| private static final Logger LOG = LoggerFactory.getLogger(AlterTableService.class); | ||
massdosage marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| private DropTableService dropTableService; | ||
| private CopyPartitionsOperation copyPartitionsOperation; | ||
| private RenameTableOperation renameTableOperation; | ||
|
|
||
| public AlterTableService( | ||
| DropTableService dropTableService, | ||
| CopyPartitionsOperation copyPartitionsOperation, | ||
| RenameTableOperation renameTableOperation) { | ||
| this.dropTableService = dropTableService; | ||
| this.copyPartitionsOperation = copyPartitionsOperation; | ||
| this.renameTableOperation = renameTableOperation; | ||
| } | ||
|
|
||
| public void alterTable(CloseableMetaStoreClient client, Table oldTable, Table newTable) throws TException { | ||
| List<FieldSchema> oldColumns = oldTable.getSd().getCols(); | ||
| List<FieldSchema> newColumns = newTable.getSd().getCols(); | ||
| if (hasAnyChangedColumns(oldColumns, newColumns)) { | ||
| LOG | ||
| .info("Found columns that have changed type, attempting to recreate target table with the new columns." | ||
| + "Old columns: {}, new columns: {}", oldColumns, newColumns); | ||
| Table tempTable = new Table(newTable); | ||
|
There was a problem hiding this comment. Does this copy all the table properties? There was a problem hiding this comment. It does indeed. We can either (1) scrub all the table params here, or (2) I've created a There was a problem hiding this comment. OK so if we removed the params here then we don't have to worry about the potential of Beekeeper picking up the drop of the temp table etc.? I think I prefer that approach unless some of the params are useful to have on the temp table? I don't think any of the intermediate operations use them in any way so probably not? And to be clear, the original table params will be kept on the final end result table? There was a problem hiding this comment. Okay cool, I'm happy to do this, I'll remove the DropTableService, and just remove the params as part of this service. The intermediate ops dont use the params, but i think beekeeper may pick up on the alter partition events (though will ignore them as the location doesnt change). And yes, the original params will be on the final table - i'll add some tests for this. There was a problem hiding this comment. Tried this out, and actually it doesn't seem possible. We can't do an alter table on the table as it still has the old schema, so it fails with the same error. So the DropTableService looks better as we do the alter/drop once everything has been updated. There was a problem hiding this comment. OK, let's go with that for now and keep an eye on it when this is in use. |
||
| String tempName = newTable.getTableName() + "_temp"; | ||
| tempTable.setTableName(tempName); | ||
| try { | ||
| client.createTable(tempTable); | ||
| copyPartitionsOperation.execute(client, newTable, tempTable); | ||
| renameTableOperation.execute(client, tempTable, newTable); | ||
| } finally { | ||
| dropTableService.removeCustomParamsAndDrop(client, tempTable.getDbName(), tempName); | ||
| } | ||
| } else { | ||
| client.alter_table(newTable.getDbName(), newTable.getTableName(), newTable); | ||
| } | ||
| } | ||
|
|
||
| private boolean hasAnyChangedColumns(List<FieldSchema> oldColumns, List<FieldSchema> newColumns) { | ||
| Map<String, FieldSchema> oldColumnsMap = oldColumns.stream() | ||
| .collect(Collectors.toMap(FieldSchema::getName, Function.identity())); | ||
| for (FieldSchema newColumn : newColumns) { | ||
| if (oldColumnsMap.containsKey(newColumn.getName())) { | ||
| FieldSchema oldColumn = oldColumnsMap.get(newColumn.getName()); | ||
| if (!oldColumn.getType().equals(newColumn.getType())) { | ||
| return true; | ||
| } | ||
| } | ||
| } | ||
| return false; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| /** | ||
| * Copyright (C) 2016-2020 Expedia, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.hotels.bdp.circustrain.core.replica.hive; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| import org.apache.hadoop.hive.metastore.api.Partition; | ||
| import org.apache.hadoop.hive.metastore.api.StorageDescriptor; | ||
| import org.apache.hadoop.hive.metastore.api.Table; | ||
| import org.apache.thrift.TException; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import com.google.common.annotations.VisibleForTesting; | ||
|
|
||
| import com.hotels.hcommon.hive.metastore.client.api.CloseableMetaStoreClient; | ||
| import com.hotels.hcommon.hive.metastore.iterator.PartitionIterator; | ||
|
|
||
| public class CopyPartitionsOperation { | ||
|
|
||
| private static final Logger LOG = LoggerFactory.getLogger(CopyPartitionsOperation.class); | ||
| private static final short DEFAULT_BATCH_SIZE = 1000; | ||
|
|
||
| private short partitionBatchSize; | ||
|
|
||
| public CopyPartitionsOperation() { | ||
| this(DEFAULT_BATCH_SIZE); | ||
| } | ||
|
|
||
| @VisibleForTesting | ||
| CopyPartitionsOperation(short partitionBatchSize) { | ||
| this.partitionBatchSize = partitionBatchSize; | ||
| } | ||
|
|
||
| /** | ||
| * Copies partitions from oldTable to newTable, partitions copied are modified to take the schema of newTable | ||
| */ | ||
| public void execute(CloseableMetaStoreClient client, Table oldTable, Table newTable) throws TException { | ||
| int count = 0; | ||
| String databaseName = newTable.getDbName(); | ||
| String tableName = newTable.getTableName(); | ||
| PartitionIterator partitionIterator = new PartitionIterator(client, oldTable, partitionBatchSize); | ||
| while (partitionIterator.hasNext()) { | ||
| List<Partition> batch = new ArrayList<>(); | ||
| for (int i = 0; i < partitionBatchSize && partitionIterator.hasNext(); i++) { | ||
| Partition partition = partitionIterator.next(); | ||
| count++; | ||
| Partition copy = new Partition(partition); | ||
| copy.setDbName(databaseName); | ||
| copy.setTableName(tableName); | ||
| StorageDescriptor sd = new StorageDescriptor(partition.getSd()); | ||
| sd.setCols(newTable.getSd().getCols()); | ||
| copy.setSd(sd); | ||
| batch.add(copy); | ||
| } | ||
| LOG.info("Copying batch of size {} to {}.{}", batch.size(), databaseName, tableName); | ||
| client.add_partitions(batch); | ||
| } | ||
| LOG.info("Copied {} partitions to {}.{}", count, databaseName, tableName); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /** | ||
| * Copyright (C) 2016-2020 Expedia, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.hotels.bdp.circustrain.core.replica.hive; | ||
|
|
||
| import java.util.Map; | ||
|
|
||
| import org.apache.hadoop.hive.metastore.api.NoSuchObjectException; | ||
| import org.apache.hadoop.hive.metastore.api.Table; | ||
| import org.apache.thrift.TException; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import com.hotels.bdp.circustrain.core.transformation.TableParametersTransformation; | ||
| import com.hotels.hcommon.hive.metastore.client.api.CloseableMetaStoreClient; | ||
|
|
||
| public class DropTableService { | ||
|
|
||
| private static final Logger LOG = LoggerFactory.getLogger(DropTableService.class); | ||
|
|
||
| private TableParametersTransformation tableParametersTransformation; | ||
|
|
||
| public DropTableService(TableParametersTransformation tableParametersTransformation) { | ||
| this.tableParametersTransformation = tableParametersTransformation; | ||
| } | ||
|
|
||
| public void removeCustomParamsAndDrop( | ||
| CloseableMetaStoreClient client, | ||
| String databaseName, | ||
| String tableName) throws TException { | ||
| Table table; | ||
| try { | ||
| table = client.getTable(databaseName, tableName); | ||
| } catch (NoSuchObjectException e) { | ||
| return; | ||
| } | ||
| Map<String, String> tableParameters = table.getParameters(); | ||
| if (tableParameters != null && !tableParameters.isEmpty()) { | ||
| Map<String, String> transformationTableParameters = tableParametersTransformation.getTableParameters(); | ||
| if (!transformationTableParameters.isEmpty()) { | ||
| transformationTableParameters.entrySet().forEach(parameter -> { | ||
| tableParameters.remove(parameter.getKey(), parameter.getValue()); | ||
| }); | ||
| table.setParameters(tableParameters); | ||
| client.alter_table(databaseName, tableName, table); | ||
| } | ||
| } | ||
| LOG | ||
| .info("Dropping table '{}.{}'.", table.getDbName(), table.getTableName()); | ||
| client.dropTable(table.getDbName(), table.getTableName(), false, true); | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done :)