chore: cleanup

delta-io · Aug 30, 2022 · 8d6e435 · 8d6e435
1 parent 17999d2
commit 8d6e435
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 205 deletions.
diff --git a/README.adoc b/README.adoc
@@ -29,7 +29,7 @@ link:https://github.com/rajasekarv/vega[vega], etc. It also provides bindings to
 
 * Local file system
 * AWS S3
-* Azure Data Lake Storage Gen 2 (link:docs/ADLSGen2-HOWTO.md[HOW-TO])
+* Azure Blob Storage / Azure Datalake Storage Gen2
 * Google Cloud Storage
 
 .Support features

diff --git a/TODO b/TODO
diff --git a/build/setup_localstack.sh b/build/setup_localstack.sh
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -24,17 +24,3 @@ services:
     image: mcr.microsoft.com/azure-storage/azurite
     ports:
       - 10000:10000
-
-  # setup-localstack:
-  #   image: localstack/localstack:0.14.4
-  #   depends_on:
-  #     - localstack
-  #   entrypoint: "/bin/bash"
-  #   command:
-  #     - /setup_localstack.sh
-  #   volumes:
-  #     - "./build/setup_localstack.sh:/setup_localstack.sh"
-  #     - "./rust/tests/data/golden:/data/golden"
-  #     - "./rust/tests/data/simple_table:/data/simple_table"
-  #     - "./rust/tests/data/simple_commit:/data/simple_commit"
-  #     - "./rust/tests/data/concurrent_workers:/data/concurrent_workers"
diff --git a/docs/ADLSGen2-HOWTO.md b/docs/ADLSGen2-HOWTO.md
diff --git a/rust/src/delta_dataframe.rs b/rust/src/delta_dataframe.rs
diff --git a/rust/src/lib.rs b/rust/src/lib.rs
@@ -97,8 +97,6 @@ pub mod vacuum;
 pub mod checkpoints;
 #[cfg(all(feature = "arrow", feature = "parquet"))]
 pub mod delta_arrow;
-#[cfg(feature = "rust-dataframe-ext")]
-mod delta_dataframe;
 #[cfg(feature = "datafusion-ext")]
 pub mod delta_datafusion;
 #[cfg(feature = "datafusion-ext")]

diff --git a/rust/tests/integration_object_store.rs b/rust/tests/integration_object_store.rs
@@ -62,8 +62,6 @@ async fn test_object_store(integration: StorageIntegration, skip_copy: bool) ->
 }
 
 async fn put_get_delete_list(storage: &DynObjectStore) -> TestResult {
-    let store_str = storage.to_string();
-
     delete_fixtures(storage).await?;
 
     let content_list = flatten_list_stream(storage, None).await?;
@@ -121,26 +119,16 @@ async fn put_get_delete_list(storage: &DynObjectStore) -> TestResult {
     let out_of_range = 200..300;
     let out_of_range_result = storage.get_range(&location, out_of_range).await;
 
-    if store_str.starts_with("MicrosoftAzureEmulator") {
-        // Azurite doesn't support x-ms-range-get-content-crc64 set by Azure SDK
-        // https://github.com/Azure/Azurite/issues/444
-        let err = range_result.unwrap_err().to_string();
-        assert!(err.contains("x-ms-range-get-content-crc64 header or parameter is not supported in Azurite strict mode"), "{}", err);
-
-        let err = out_of_range_result.unwrap_err().to_string();
-        assert!(err.contains("x-ms-range-get-content-crc64 header or parameter is not supported in Azurite strict mode"), "{}", err);
-    } else {
-        let bytes = range_result?;
-        assert_eq!(bytes, expected_data.slice(range));
-
-        // Should be a non-fatal error
-        out_of_range_result.unwrap_err();
-
-        let ranges = vec![0..1, 2..3, 0..5];
-        let bytes = storage.get_ranges(&location, &ranges).await?;
-        for (range, bytes) in ranges.iter().zip(bytes) {
-            assert_eq!(bytes, expected_data.slice(range.clone()))
-        }
+    let bytes = range_result?;
+    assert_eq!(bytes, expected_data.slice(range));
+
+    // Should be a non-fatal error
+    out_of_range_result.unwrap_err();
+
+    let ranges = vec![0..1, 2..3, 0..5];
+    let bytes = storage.get_ranges(&location, &ranges).await?;
+    for (range, bytes) in ranges.iter().zip(bytes) {
+        assert_eq!(bytes, expected_data.slice(range.clone()))
     }
 
     let head = storage.head(&location).await?;