Skip to content

Commit

Permalink
Merge pull request #12 from databrickslabs/feature/package-rename
Browse files Browse the repository at this point in the history
Move code from io.delta.sharing.java to com.databricks.labs.delta.sha…
  • Loading branch information
nkvuong authored Jun 22, 2022
2 parents 099acbe + a7bcdf5 commit feae990
Show file tree
Hide file tree
Showing 14 changed files with 30 additions and 33 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Delta Sharing Java Connector
<img src="docs/source/images/delta-sharing-java-logo.png" alt="drawing" style="width:50px;"/>
<img src="https://github.com/GIScience/badges/raw/master/status/experimental.svg" alt="drawing" style="width:140px; margin-bottom:15px;"/>
<img src="docs/source/images/delta-sharing-java-logo.png" alt="drawing" style="width:50px; float: left;"/>
<img src="https://github.com/GIScience/badges/raw/master/status/experimental.svg" alt="drawing" style="width:140px; margin-top:15px; float: left;"/>
<br>
<br>

A java connector for [delta-sharing](https://delta.io/sharing/) that allows you to easily ingest data on any JVM.

Expand Down
6 changes: 3 additions & 3 deletions docs/source/usage/DeltaSharing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Examples
.. tabs::
.. code-tab:: java

import io.delta.sharing.java.DeltaSharingFactory;
import io.delta.sharing.java.DeltaSharing;
import com.databricks.labs.delta.sharing.java.DeltaSharingFactory;
import com.databricks.labs.delta.sharing.java.DeltaSharing;

DeltaSharing sharing = DeltaSharingFactory
.create(
Expand All @@ -24,7 +24,7 @@ Examples

.. code-tab:: scala

import io.delta.sharing.java.DeltaSharingFactory
import com.databricks.labs.delta.sharing.java.DeltaSharingFactory

val sharing = DeltaSharingFactory
.create(
Expand Down
2 changes: 1 addition & 1 deletion docs/source/usage/TableReader.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Examples
.. tabs::
.. code-tab:: java

import io.delta.sharing.java.format.parquet.TableReader;
import com.databricks.labs.delta.sharing.java.format.parquet.TableReader;
import org.apache.avro.generic.GenericRecord;

TableReader<GenericRecord> tableReader = sharing.getTableReader(“table.coordinates”);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.delta.sharing.java;
package com.databricks.labs.delta.sharing.java;

import io.delta.sharing.java.format.parquet.TableReader;
import com.databricks.labs.delta.sharing.java.format.parquet.TableReader;
import io.delta.sharing.spark.DeltaSharingFileSystem;
import io.delta.sharing.spark.DeltaSharingProfileProvider;
import io.delta.sharing.spark.DeltaSharingRestClient;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.delta.sharing.java;
package com.databricks.labs.delta.sharing.java;

import io.delta.sharing.java.adaptor.DeltaSharingJsonProvider;
import com.databricks.labs.delta.sharing.java.adaptor.DeltaSharingJsonProvider;
import io.delta.sharing.spark.DeltaSharingProfileProvider;
import io.delta.sharing.spark.DeltaSharingRestClient;
import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.delta.sharing.java.adaptor;
package com.databricks.labs.delta.sharing.java.adaptor;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
Expand All @@ -7,7 +7,7 @@


/**
* Loads {@link io.delta.sharing.spark.DeltaSharingProfileProvider} based on configuration provided
* Loads {@link DeltaSharingProfileProvider} based on configuration provided
* as a JSON document. JSON document has to be a valid profile file document. Required fields are
* checked inside the constructor method and the object creation will fail in case of breaking the
* constraints.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.delta.sharing.java.adaptor;
package com.databricks.labs.delta.sharing.java.adaptor;

import io.delta.sharing.spark.DeltaSharingProfile;
import scala.Option;
Expand Down Expand Up @@ -66,7 +66,7 @@ public void setExpirationTime(String expirationTime) {
* Java wrapper method that can generate Scala paired object. This is need to be able to abstract
* from cross language APIs.
*
* @return An equivalent instance of Scala {@link io.delta.sharing.spark.DeltaSharingProfile}
* @return An equivalent instance of Scala {@link DeltaSharingProfile}
* class.
*/
public DeltaSharingProfile toProfile() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.delta.sharing.java.format.parquet;
package com.databricks.labs.delta.sharing.java.format.parquet;

import java.io.EOFException;
import java.io.FileNotFoundException;
Expand All @@ -13,7 +13,7 @@
* Parquet InputFile with a local java.nio.Path. Adapted from https://github.com/haifengl/smile This
* class is required to instantiate {@link org.apache.parquet.avro.AvroParquetReader} instances.
*/
class LocalInputFile implements InputFile {
public class LocalInputFile implements InputFile {
/** Local file object. */
private final RandomAccessFile input;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.delta.sharing.java.format.parquet;
package com.databricks.labs.delta.sharing.java.format.parquet;

import java.io.IOException;
import java.nio.file.Path;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package io.delta.sharing.java;
package com.databricks.labs.delta.sharing.java;


import io.delta.sharing.java.adaptor.DeltaSharingJsonProvider;
import io.delta.sharing.java.mocks.Mocks;
import com.databricks.labs.delta.sharing.java.adaptor.DeltaSharingJsonProvider;
import com.databricks.labs.delta.sharing.java.mocks.Mocks;
import io.delta.sharing.spark.DeltaSharingProfileProvider;
import io.delta.sharing.spark.model.Table;
import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
package io.delta.sharing.java.adaptor;
package com.databricks.labs.delta.sharing.java.adaptor;

import com.databricks.labs.delta.sharing.java.mocks.Mocks;
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.core.JsonProcessingException;
import io.delta.sharing.java.mocks.Mocks;
import java.util.Objects;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;


/**
* Test cases for Delta Sharing Json Provider.
*
* @throws JsonProcessingException for all problems encountered when processing Json
*/

public class DeltaSharingJsonProviderTestCase {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.delta.sharing.java.mocks;
package com.databricks.labs.delta.sharing.java.mocks;

/**
* Mock for provider json.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package io.delta.sharing.java.format.parquet;
package com.databricks.labs.delta.sharing.java.parquet;

import com.databricks.labs.delta.sharing.java.format.parquet.LocalInputFile;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.file.Path;
Expand All @@ -10,8 +11,6 @@

/**
* Test cases for local Input File.
*
* @throws IOException for all IO problems
*/
public class LocalInputFileTestCase {

Expand Down Expand Up @@ -59,7 +58,7 @@ public void testReadByteBuffers() throws IOException {
ByteBuffer byteBuffer = ByteBuffer.allocateDirect(8192 * 4);
SeekableInputStream stream = localInputFile.newStream();

Assertions.assertDoesNotThrow(() -> stream.reset(), "assert no exception for reset");
Assertions.assertDoesNotThrow(stream::reset, "assert no exception for reset");

Assertions.assertDoesNotThrow(() -> stream.read(byteBuffer),
"assert no exception for read with byte buffer");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package io.delta.sharing.java.format.parquet;
package com.databricks.labs.delta.sharing.java.parquet;

import com.databricks.labs.delta.sharing.java.format.parquet.TableReader;
import java.io.IOException;
import java.nio.file.Path;
import java.nio.file.Paths;
Expand All @@ -12,8 +13,6 @@

/**
* Test cases for Table Reader.
*
* @throws IOException for all IO problems
*/
public class TableReaderTestCase {

Expand Down

0 comments on commit feae990

Please sign in to comment.