Merge pull request #45 from GoogleCloudPlatform/export

Added export format option
GoogleCloudPlatform · Jul 1, 2015 · 4368528 · 4368528
2 parents d2818ba + 771d2fa
commit 4368528
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 8 deletions.
diff --git a/bigquery/samples/export_data_to_cloud_storage.py b/bigquery/samples/export_data_to_cloud_storage.py
@@ -20,19 +20,22 @@
 # [START export_table]
 def export_table(service, cloud_storage_path,
                  projectId, datasetId, tableId,
+                 export_format="CSV",
                  num_retries=5):
     """
     Starts an export job
 
     Args:
         service: initialized and authorized bigquery
-        google-api-client object,
+            google-api-client object.
         cloud_storage_path: fully qualified
-        path to a Google Cloud Storage location,
-        e.g. gs://mybucket/myfolder/
+            path to a Google Cloud Storage location.
+            e.g. gs://mybucket/myfolder/
+        export_format: format to export in;
+            "CSV", "NEWLINE_DELIMITED_JSON", or "AVRO".
 
     Returns: an extract job resource representing the
-    job, see https://cloud.google.com/bigquery/docs/reference/v2/jobs
+        job, see https://cloud.google.com/bigquery/docs/reference/v2/jobs
     """
     # Generate a unique job_id so retries
     # don't accidentally duplicate export
@@ -49,6 +52,7 @@ def export_table(service, cloud_storage_path,
                     'tableId': tableId,
                 },
                 'destinationUris': [cloud_storage_path],
+                'destinationFormat': export_format
             }
         }
     }
@@ -61,11 +65,13 @@ def export_table(service, cloud_storage_path,
 # [START run]
 def run(cloud_storage_path,
         projectId, datasetId, tableId,
-        num_retries, interval):
+        num_retries, interval, export_format="CSV"):
 
     bigquery = get_service()
     resource = export_table(bigquery, cloud_storage_path,
-                            projectId, datasetId, tableId, num_retries)
+                            projectId, datasetId, tableId,
+                            num_retries=num_retries,
+                            export_format=export_format)
     poll_job(bigquery,
              resource['jobReference']['projectId'],
              resource['jobReference']['jobId'],

diff --git a/bigquery/tests/test_export_data_to_cloud_storage.py b/bigquery/tests/test_export_data_to_cloud_storage.py
@@ -22,14 +22,32 @@
 
 class TestExportTableToGCS(CloudBaseTest):
 
-    def test_export_table(self):
+    def test_export_table_csv(self):
         run(self.constants['cloudStorageInputURI'],
             self.constants['projectId'],
             self.constants['datasetId'],
             self.constants['newTableId'],
             5,
-            5)
+            5,
+            export_format="CSV")
+
+    def test_export_table_json(self):
+        run(self.constants['cloudStorageInputURI'],
+            self.constants['projectId'],
+            self.constants['datasetId'],
+            self.constants['newTableId'],
+            5,
+            5,
+            export_format="NEWLINE_DELIMITED_JSON")
 
+    def test_export_table_avro(self):
+        run(self.constants['cloudStorageInputURI'],
+            self.constants['projectId'],
+            self.constants['datasetId'],
+            self.constants['newTableId'],
+            5,
+            5,
+            export_format="AVRO")
 
 if __name__ == '__main__':
     unittest.main()