Skip to content

introduce private method to remove clones #38245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aaaZayne wants to merge 1 commit into
base: master
Choose a base branch
from
Open

introduce private method to remove clones #38245

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 18 additions & 24 deletions ...cloud-platform/src/main/java/org/apache/beam/it/gcp/bigquery/BigQueryResourceManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,20 @@ private synchronized Table getTableIfExists(String tableId) throws IllegalStateE
return table;
}

private void validateTableCreationInputs(String tableName, Schema schema) {
BigQueryResourceManagerUtils.checkValidTableId(tableName);
if (schema == null) {
throw new IllegalArgumentException("A valid schema must be provided to create a table.");
}
}

private void ensureDatasetExists() {
if (dataset == null) {
createDataset(DEFAULT_DATASET_REGION);
}
checkHasDataset();
}

/**
* Helper method for logging individual errors thrown by inserting rows to a table. This method is
* used to log errors thrown by inserting certain rows when other rows were successful.
Expand Down Expand Up @@ -235,18 +249,8 @@ public synchronized TableId createTable(String tableName, Schema schema)
public synchronized TableId createTable(
String tableName, Schema schema, Long expirationTimeMillis)
throws BigQueryResourceManagerException {
// Check table ID
BigQueryResourceManagerUtils.checkValidTableId(tableName);

// Check schema
if (schema == null) {
throw new IllegalArgumentException("A valid schema must be provided to create a table.");
}
// Create a default dataset if this resource manager has not already created one
if (dataset == null) {
createDataset(DEFAULT_DATASET_REGION);
}
checkHasDataset();
validateTableCreationInputs(tableName, schema);
ensureDatasetExists();
LOG.info("Creating table using tableName '{}'.", tableName);

// Create the table if it does not already exist in the dataset
Expand Down Expand Up @@ -313,25 +317,15 @@ public synchronized TableId createTimePartitionedTable(
public synchronized TableId createTimePartitionedTable(
String tableName, Schema schema, TimePartitioning timePartitioning, Long expirationTimeMillis)
throws BigQueryResourceManagerException {
// Check table ID
BigQueryResourceManagerUtils.checkValidTableId(tableName);

// Check schema
if (schema == null) {
throw new IllegalArgumentException("A valid schema must be provided to create a table.");
}
validateTableCreationInputs(tableName, schema);

// Check time partition details
if (timePartitioning == null) {
throw new IllegalArgumentException(
"A valid TimePartition object must be provided to create a time paritioned table. Use createTable instead to create non-partitioned tables.");
}

// Create a default dataset if this resource manager has not already created one
if (dataset == null) {
createDataset(DEFAULT_DATASET_REGION);
}
checkHasDataset();
ensureDatasetExists();

LOG.info(
"Creating time partitioned table using tableName '{}' on field '{}'.",
Expand Down
Loading