Deletes unused BigQuery region tags an standardizes remaining ones (GoogleCloudPlatform#602)

alixhami · bshaffer · commit fc6b7aa526dc · 2018-04-24T11:22:43.000-07:00
diff --git a/bigquery/api/src/functions/bigquery_client.php b/bigquery/api/src/functions/bigquery_client.php
@@ -25,11 +25,11 @@
  * $bigQuery = require '/path/to/bigquery_client.php';
  * ```
  */
-# [START build_service]
+# [START bigquery_client_default_credentials]
 use Google\Cloud\BigQuery\BigQueryClient;
 
 $bigQuery = new BigQueryClient([
     'projectId' => $projectId,
 ]);
-# [END build_service]
+# [END bigquery_client_default_credentials]
 return $bigQuery;
diff --git a/bigquery/api/src/functions/browse_table.php b/bigquery/api/src/functions/browse_table.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\BigQuery;
 
-# [START browse_table]
+# [START bigquery_browse_table]
 use Google\Cloud\BigQuery\BigQueryClient;
 
 /**
@@ -63,9 +63,8 @@ function browse_table($projectId, $datasetId, $tableId, $maxResults = 10, $start
 
     return $numRows;
 }
-# [END browse_table]
+# [END bigquery_browse_table]
 
-# [START paginate_table]
 /**
  * Paginate through a bigquery table.
  * Example:
@@ -97,4 +96,3 @@ function paginate_table($projectId, $datasetId, $tableId, $maxResults = 10, $sho
 
     return $totalRows;
 }
-# [END paginate_table]
diff --git a/bigquery/api/src/functions/copy_table.php b/bigquery/api/src/functions/copy_table.php
@@ -24,7 +24,7 @@
 namespace Google\Cloud\Samples\BigQuery;
 
 use Exception;
-# [START copy_table]
+# [START bigquery_copy_table]
 use Google\Cloud\BigQuery\BigQueryClient;
 use Google\Cloud\Core\ExponentialBackoff;
 
@@ -62,4 +62,4 @@ function copy_table($projectId, $datasetId, $sourceTableId, $destinationTableId)
         print('Table copied successfully' . PHP_EOL);
     }
 }
-# [END copy_table]
+# [END bigquery_copy_table]
diff --git a/bigquery/api/src/functions/create_dataset.php b/bigquery/api/src/functions/create_dataset.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\BigQuery;
 
-# [START create_dataset]
+# [START bigquery_create_dataset]
 use Google\Cloud\BigQuery\BigQueryClient;
 
 /**
@@ -38,4 +38,4 @@ function create_dataset($projectId, $datasetId)
     $dataset = $bigQuery->createDataset($datasetId);
     return $dataset;
 }
-# [END create_dataset]
+# [END bigquery_create_dataset]
diff --git a/bigquery/api/src/functions/create_table.php b/bigquery/api/src/functions/create_table.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\BigQuery;
 
-# [START create_table]
+# [START bigquery_create_table]
 use Google\Cloud\BigQuery\BigQueryClient;
 
 /**
@@ -58,4 +58,4 @@ function create_table($projectId, $datasetId, $tableId, $schema)
     $table = $dataset->createTable($tableId, $options);
     return $table;
 }
-# [END create_table]
+# [END bigquery_create_table]
diff --git a/bigquery/api/src/functions/delete_table.php b/bigquery/api/src/functions/delete_table.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\BigQuery;
 
-# [START delete_table]
+# [START bigquery_delete_table]
 use Google\Cloud\BigQuery\BigQueryClient;
 
 /**
@@ -36,10 +36,8 @@ function delete_table($projectId, $datasetId, $tableId)
     $bigQuery = new BigQueryClient([
         'projectId' => $projectId,
     ]);
-    # [START get_table]
     $dataset = $bigQuery->dataset($datasetId);
     $table = $dataset->table($tableId);
-    # [END get_table]
     $table->delete();
 }
-# [END delete_table]
+# [END bigquery_delete_table]
diff --git a/bigquery/api/src/functions/extract_table.php b/bigquery/api/src/functions/extract_table.php
@@ -24,7 +24,7 @@
 namespace Google\Cloud\Samples\BigQuery;
 
 use Exception;
-# [START extract_table]
+# [START bigquery_extract_table]
 use Google\Cloud\BigQuery\BigQueryClient;
 use Google\Cloud\Storage\StorageClient;
 use Google\Cloud\Core\ExponentialBackoff;
@@ -70,4 +70,4 @@ function extract_table($projectId, $datasetId, $tableId, $bucketName, $objectNam
         print('Data extracted successfully' . PHP_EOL);
     }
 }
-# [END extract_table]
+# [END bigquery_extract_table]
diff --git a/bigquery/api/src/functions/import_from_file.php b/bigquery/api/src/functions/import_from_file.php
@@ -25,7 +25,7 @@
 
 use Exception;
 use InvalidArgumentException;
-# [START import_from_file]
+# [START bigquery_load_from_file]
 use Google\Cloud\BigQuery\BigQueryClient;
 use Google\Cloud\Core\ExponentialBackoff;
 
@@ -72,4 +72,4 @@ function import_from_file($projectId, $datasetId, $tableId, $source)
         print('Data imported successfully' . PHP_EOL);
     }
 }
-# [END import_from_file]
+# [END bigquery_load_from_file]
diff --git a/bigquery/api/src/functions/import_from_storage.php b/bigquery/api/src/functions/import_from_storage.php
@@ -24,7 +24,7 @@
 namespace Google\Cloud\Samples\BigQuery;
 
 use Exception;
-# [START import_from_storage]
+# [START bigquery_load_table_gcs_csv]
 use Google\Cloud\BigQuery\BigQueryClient;
 use Google\Cloud\Storage\StorageClient;
 use Google\Cloud\Core\ExponentialBackoff;
@@ -75,4 +75,4 @@ function import_from_storage($projectId, $datasetId, $tableId, $bucketName, $obj
         print('Data imported successfully' . PHP_EOL);
     }
 }
-# [END import_from_storage]
+# [END bigquery_load_table_gcs_csv]
diff --git a/bigquery/api/src/functions/insert_sql.php b/bigquery/api/src/functions/insert_sql.php
@@ -23,7 +23,6 @@
 
 namespace Google\Cloud\Samples\BigQuery;
 
-# [START insert_sql]
 use Google\Cloud\BigQuery\BigQueryClient;
 
 /**
@@ -49,4 +48,3 @@ function insert_sql($projectId, $datasetId, $source)
     }
     print('Data imported successfully' . PHP_EOL);
 }
-# [END insert_sql]
diff --git a/bigquery/api/src/functions/list_datasets.php b/bigquery/api/src/functions/list_datasets.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\BigQuery;
 
-# [START list_datasets]
+# [START bigquery_list_datasets]
 use Google\Cloud\BigQuery\BigQueryClient;
 
 /**
@@ -39,4 +39,4 @@ function list_datasets($projectId)
         print($dataset->id() . PHP_EOL);
     }
 }
-# [END list_datasets]
+# [END bigquery_list_datasets]
diff --git a/bigquery/api/src/functions/list_projects.php b/bigquery/api/src/functions/list_projects.php
@@ -23,7 +23,6 @@
 
 namespace Google\Cloud\Samples\BigQuery;
 
-# [START list_projects]
 use Google\Auth\CredentialsLoader;
 use Google\Cloud\BigQuery\BigQueryClient;
 use Google\Cloud\BigQuery\Connection\Rest;
@@ -43,4 +42,3 @@ function list_projects($maxResults = null)
         print($project['id'] . PHP_EOL);
     }
 }
-# [END list_projects]
diff --git a/bigquery/api/src/functions/list_tables.php b/bigquery/api/src/functions/list_tables.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\BigQuery;
 
-# [START list_tables]
+# [START bigquery_list_tables]
 use Google\Cloud\BigQuery\BigQueryClient;
 
 /**
@@ -55,4 +55,4 @@ function get_table($projectId, $datasetId, $tableId)
     $dataset = $bigQuery->dataset($datasetId);
     return $dataset->table($tableId);
 }
-# [END list_tables]
+# [END bigquery_list_tables]
diff --git a/bigquery/api/src/functions/run_query.php b/bigquery/api/src/functions/run_query.php
@@ -23,7 +23,6 @@
 
 namespace Google\Cloud\Samples\BigQuery;
 
-# [START all]
 use Google\Cloud\BigQuery\BigQueryClient;
 
 /**
@@ -42,17 +41,12 @@
  */
 function run_query($projectId, $query, $useLegacySql)
 {
-    # [START build_service]
     $bigQuery = new BigQueryClient([
         'projectId' => $projectId,
     ]);
-    # [END build_service]
-    # [START run_query]
     $jobConfig = $bigQuery->query($query)->useLegacySql($useLegacySql);
     $queryResults = $bigQuery->runQuery($jobConfig);
-    # [END run_query]
 
-    # [START print_results]
     $i = 0;
     foreach ($queryResults as $row) {
         printf('--- Row %s ---' . PHP_EOL, ++$i);
@@ -61,6 +55,4 @@ function run_query($projectId, $query, $useLegacySql)
         }
     }
     printf('Found %s row(s)' . PHP_EOL, $i);
-    # [END print_results]
 }
-# [END all]
diff --git a/bigquery/api/src/functions/run_query_as_job.php b/bigquery/api/src/functions/run_query_as_job.php
@@ -24,7 +24,7 @@
 namespace Google\Cloud\Samples\BigQuery;
 
 use Exception;
-# [START query_as_job]
+# [START bigquery_query]
 use Google\Cloud\BigQuery\BigQueryClient;
 use Google\Cloud\Core\ExponentialBackoff;
 
@@ -33,8 +33,8 @@
  * Example:
  * ```
  * $query = 'SELECT TOP(corpus, 10) as title, COUNT(*) as unique_words ' .
- *          'FROM [publicdata:samples.shakespeare]';
- * run_query_as_job($projectId, $query, true);
+ *          'FROM `bigquery-public-data.samples.shakespeare`';
+ * run_query_as_job($projectId, $query, false);
  * ```.
  *
  * @param string $projectId The Google project ID.
@@ -69,4 +69,4 @@ function run_query_as_job($projectId, $query, $useLegacySql)
     }
     printf('Found %s row(s)' . PHP_EOL, $i);
 }
-# [END query_as_job]
+# [END bigquery_query]
diff --git a/bigquery/api/src/functions/stream_row.php b/bigquery/api/src/functions/stream_row.php
@@ -23,7 +23,7 @@
 
 namespace Google\Cloud\Samples\BigQuery;
 
-# [START stream_row]
+# [START bigquery_table_insert_rows]
 use Google\Cloud\BigQuery\BigQueryClient;
 
 /**
@@ -66,4 +66,4 @@ function stream_row($projectId, $datasetId, $tableId, $data, $insertId = null)
         }
     }
 }
-# [END stream_row]
+# [END bigquery_table_insert_rows]

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`namespace Google\Cloud\Samples\BigQuery;`
`25`	`25`
`26`	`26`	`use Exception;`
`27`		`-# [START copy_table]`
	`27`	`+# [START bigquery_copy_table]`
`28`	`28`	`use Google\Cloud\BigQuery\BigQueryClient;`
`29`	`29`	`use Google\Cloud\Core\ExponentialBackoff;`
`30`	`30`
`@@ -62,4 +62,4 @@ function copy_table($projectId, $datasetId, $sourceTableId, $destinationTableId)`
`62`	`62`	`print('Table copied successfully' . PHP_EOL);`
`63`	`63`	`}`
`64`	`64`	`}`
`65`		`-# [END copy_table]`
	`65`	`+# [END bigquery_copy_table]`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`
`26`	`26`	`use Exception;`
`27`	`27`	`use InvalidArgumentException;`
`28`		`-# [START import_from_file]`
	`28`	`+# [START bigquery_load_from_file]`
`29`	`29`	`use Google\Cloud\BigQuery\BigQueryClient;`
`30`	`30`	`use Google\Cloud\Core\ExponentialBackoff;`
`31`	`31`
`@@ -72,4 +72,4 @@ function import_from_file($projectId, $datasetId, $tableId, $source)`
`72`	`72`	`print('Data imported successfully' . PHP_EOL);`
`73`	`73`	`}`
`74`	`74`	`}`
`75`		`-# [END import_from_file]`
	`75`	`+# [END bigquery_load_from_file]`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@`
`23`	`23`
`24`	`24`	`namespace Google\Cloud\Samples\BigQuery;`
`25`	`25`
`26`		`-# [START insert_sql]`
`27`	`26`	`use Google\Cloud\BigQuery\BigQueryClient;`
`28`	`27`
`29`	`28`	`/**`
`@@ -49,4 +48,3 @@ function insert_sql($projectId, $datasetId, $source)`
`49`	`48`	`}`
`50`	`49`	`print('Data imported successfully' . PHP_EOL);`
`51`	`50`	`}`
`52`		`-# [END insert_sql]`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`
`24`	`24`	`namespace Google\Cloud\Samples\BigQuery;`
`25`	`25`
`26`		`-# [START list_datasets]`
	`26`	`+# [START bigquery_list_datasets]`
`27`	`27`	`use Google\Cloud\BigQuery\BigQueryClient;`
`28`	`28`
`29`	`29`	`/**`
`@@ -39,4 +39,4 @@ function list_datasets($projectId)`
`39`	`39`	`print($dataset->id() . PHP_EOL);`
`40`	`40`	`}`
`41`	`41`	`}`
`42`		`-# [END list_datasets]`
	`42`	`+# [END bigquery_list_datasets]`