clean up

delta-io · Aug 1, 2023 · 0cff6e1 · 0cff6e1
1 parent 115abb3
commit 0cff6e1
Show file tree

Hide file tree

Showing 39 changed files with 137 additions and 113 deletions.
diff --git a/...rnel/client/DefaultExpressionHandler.java → ...ults/client/DefaultExpressionHandler.java b/...rnel/client/DefaultExpressionHandler.java → ...ults/client/DefaultExpressionHandler.java
@@ -14,24 +14,25 @@
  * limitations under the License.
  */
 
-package io.delta.kernel.client;
+package io.delta.kernel.defaults.client;
 
 import java.sql.Date;
 import java.sql.Timestamp;
 import java.util.Optional;
 
+import io.delta.kernel.client.ExpressionHandler;
 import io.delta.kernel.data.ColumnVector;
 import io.delta.kernel.data.ColumnarBatch;
 import io.delta.kernel.data.Row;
-import io.delta.kernel.data.vector.DefaultBooleanVector;
-import io.delta.kernel.data.vector.DefaultConstantVector;
+import io.delta.kernel.defaults.internal.data.vector.DefaultBooleanVector;
+import io.delta.kernel.defaults.internal.data.vector.DefaultConstantVector;
 import io.delta.kernel.expressions.Expression;
 import io.delta.kernel.expressions.ExpressionEvaluator;
 import io.delta.kernel.expressions.Literal;
 import io.delta.kernel.types.*;
 import io.delta.kernel.utils.CloseableIterator;
-import static io.delta.kernel.DefaultKernelUtils.checkArgument;
-import static io.delta.kernel.DefaultKernelUtils.daysSinceEpoch;
+import static io.delta.kernel.defaults.internal.DefaultKernelUtils.checkArgument;
+import static io.delta.kernel.defaults.internal.DefaultKernelUtils.daysSinceEpoch;
 
 public class DefaultExpressionHandler
     implements ExpressionHandler

diff --git a/...lta/kernel/client/DefaultFileHandler.java → ...l/defaults/client/DefaultFileHandler.java b/...lta/kernel/client/DefaultFileHandler.java → ...l/defaults/client/DefaultFileHandler.java
@@ -13,10 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.delta.kernel.client;
+package io.delta.kernel.defaults.client;
 
 import static java.util.Objects.requireNonNull;
 
+import io.delta.kernel.client.FileHandler;
+import io.delta.kernel.client.FileReadContext;
 import io.delta.kernel.data.Row;
 import io.delta.kernel.expressions.Expression;
 import io.delta.kernel.utils.CloseableIterator;

diff --git a/...kernel/client/DefaultFileReadContext.java → ...faults/client/DefaultFileReadContext.java b/...kernel/client/DefaultFileReadContext.java → ...faults/client/DefaultFileReadContext.java
@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.delta.kernel.client;
+package io.delta.kernel.defaults.client;
 
 import static java.util.Objects.requireNonNull;
 
+import io.delta.kernel.client.FileReadContext;
 import io.delta.kernel.data.Row;
 
 public class DefaultFileReadContext

diff --git a/...ernel/client/DefaultFileSystemClient.java → ...aults/client/DefaultFileSystemClient.java b/...ernel/client/DefaultFileSystemClient.java → ...aults/client/DefaultFileSystemClient.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.delta.kernel.client;
+package io.delta.kernel.defaults.client;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
@@ -27,6 +27,7 @@
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 
+import io.delta.kernel.client.FileSystemClient;
 import io.delta.kernel.fs.FileStatus;
 import io.delta.kernel.utils.CloseableIterator;
 import io.delta.kernel.utils.Tuple2;

diff --git a/...lta/kernel/client/DefaultJsonHandler.java → ...l/defaults/client/DefaultJsonHandler.java b/...lta/kernel/client/DefaultJsonHandler.java → ...l/defaults/client/DefaultJsonHandler.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.delta.kernel.client;
+package io.delta.kernel.defaults.client;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -32,17 +32,19 @@
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 
+import io.delta.kernel.client.FileReadContext;
+import io.delta.kernel.client.JsonHandler;
 import io.delta.kernel.data.ColumnVector;
 import io.delta.kernel.data.ColumnarBatch;
-import io.delta.kernel.data.DefaultJsonRow;
-import io.delta.kernel.data.DefaultRowBasedColumnarBatch;
+import io.delta.kernel.defaults.internal.data.DefaultJsonRow;
+import io.delta.kernel.defaults.internal.data.DefaultRowBasedColumnarBatch;
 import io.delta.kernel.data.FileDataReadResult;
 import io.delta.kernel.data.Row;
 import io.delta.kernel.fs.FileStatus;
 import io.delta.kernel.types.StructType;
 import io.delta.kernel.utils.CloseableIterator;
 import io.delta.kernel.utils.Utils;
-import static io.delta.kernel.DefaultKernelUtils.checkArgument;
+import static io.delta.kernel.defaults.internal.DefaultKernelUtils.checkArgument;
 
 public class DefaultJsonHandler
     extends DefaultFileHandler

diff --git a/.../kernel/client/DefaultParquetHandler.java → ...efaults/client/DefaultParquetHandler.java b/.../kernel/client/DefaultParquetHandler.java → ...efaults/client/DefaultParquetHandler.java
@@ -13,17 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.delta.kernel.client;
+package io.delta.kernel.defaults.client;
 
 import java.io.IOException;
 
 import org.apache.hadoop.conf.Configuration;
 
+import io.delta.kernel.client.FileReadContext;
+import io.delta.kernel.client.ParquetHandler;
 import io.delta.kernel.data.ColumnarBatch;
 import io.delta.kernel.data.FileDataReadResult;
 import io.delta.kernel.data.Row;
 import io.delta.kernel.fs.FileStatus;
-import io.delta.kernel.parquet.ParquetBatchReader;
+import io.delta.kernel.defaults.internal.parquet.ParquetBatchReader;
 import io.delta.kernel.types.StructType;
 import io.delta.kernel.utils.CloseableIterator;
 import io.delta.kernel.utils.Utils;

diff --git a/...lta/kernel/client/DefaultTableClient.java → ...l/defaults/client/DefaultTableClient.java b/...lta/kernel/client/DefaultTableClient.java → ...l/defaults/client/DefaultTableClient.java
@@ -13,10 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.delta.kernel.client;
+package io.delta.kernel.defaults.client;
 
 import org.apache.hadoop.conf.Configuration;
 
+import io.delta.kernel.client.ExpressionHandler;
+import io.delta.kernel.client.FileSystemClient;
+import io.delta.kernel.client.JsonHandler;
+import io.delta.kernel.client.ParquetHandler;
+import io.delta.kernel.client.TableClient;
+
 public class DefaultTableClient
         implements TableClient
 {

diff --git a/...a/io/delta/kernel/DefaultKernelUtils.java → ...defaults/internal/DefaultKernelUtils.java b/...a/io/delta/kernel/DefaultKernelUtils.java → ...defaults/internal/DefaultKernelUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.delta.kernel;
+package io.delta.kernel.defaults.internal;
 
 import java.sql.Date;
 import java.time.LocalDate;

diff --git a/...lta/kernel/data/DefaultColumnarBatch.java → ...s/internal/data/DefaultColumnarBatch.java b/...lta/kernel/data/DefaultColumnarBatch.java → ...s/internal/data/DefaultColumnarBatch.java
@@ -13,13 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.delta.kernel.data;
+package io.delta.kernel.defaults.internal.data;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import io.delta.kernel.data.ColumnVector;
+import io.delta.kernel.data.ColumnarBatch;
 import io.delta.kernel.types.StructField;
 import io.delta.kernel.types.StructType;
 

diff --git a/.../io/delta/kernel/data/DefaultJsonRow.java → ...efaults/internal/data/DefaultJsonRow.java b/.../io/delta/kernel/data/DefaultJsonRow.java → ...efaults/internal/data/DefaultJsonRow.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.delta.kernel.data;
+package io.delta.kernel.defaults.internal.data;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -25,6 +25,7 @@
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
+import io.delta.kernel.data.Row;
 import io.delta.kernel.types.ArrayType;
 import io.delta.kernel.types.BooleanType;
 import io.delta.kernel.types.DataType;

diff --git a/...el/data/DefaultRowBasedColumnarBatch.java → ...al/data/DefaultRowBasedColumnarBatch.java b/...el/data/DefaultRowBasedColumnarBatch.java → ...al/data/DefaultRowBasedColumnarBatch.java
@@ -13,15 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.delta.kernel.data;
+package io.delta.kernel.defaults.internal.data;
 
 import java.util.List;
 import java.util.Map;
 
+import io.delta.kernel.data.ColumnVector;
+import io.delta.kernel.data.ColumnarBatch;
+import io.delta.kernel.data.Row;
 import io.delta.kernel.types.DataType;
 import io.delta.kernel.types.StructField;
 import io.delta.kernel.types.StructType;
-import static io.delta.kernel.DefaultKernelUtils.checkArgument;
+import static io.delta.kernel.defaults.internal.DefaultKernelUtils.checkArgument;
 
 /**
  * {@link ColumnarBatch} wrapper around list of {@link Row} objects.

diff --git a/...nel/data/vector/AbstractColumnVector.java → ...nal/data/vector/AbstractColumnVector.java b/...nel/data/vector/AbstractColumnVector.java → ...nal/data/vector/AbstractColumnVector.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.delta.kernel.data.vector;
+package io.delta.kernel.defaults.internal.data.vector;
 
 import java.util.List;
 import java.util.Map;
@@ -23,7 +23,7 @@
 import io.delta.kernel.data.ColumnVector;
 import io.delta.kernel.data.Row;
 import io.delta.kernel.types.DataType;
-import static io.delta.kernel.DefaultKernelUtils.checkArgument;
+import static io.delta.kernel.defaults.internal.DefaultKernelUtils.checkArgument;
 
 /**
  * Abstract implementation of {@link ColumnVector} that provides the default functionality

diff --git a/...ernel/data/vector/DefaultArrayVector.java → ...ernal/data/vector/DefaultArrayVector.java b/...ernel/data/vector/DefaultArrayVector.java → ...ernal/data/vector/DefaultArrayVector.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.delta.kernel.data.vector;
+package io.delta.kernel.defaults.internal.data.vector;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -22,7 +22,7 @@
 
 import io.delta.kernel.data.ColumnVector;
 import io.delta.kernel.types.DataType;
-import static io.delta.kernel.DefaultKernelUtils.checkArgument;
+import static io.delta.kernel.defaults.internal.DefaultKernelUtils.checkArgument;
 
 /**
  * {@link io.delta.kernel.data.ColumnVector} implementation for array type data.

diff --git a/...rnel/data/vector/DefaultBinaryVector.java → ...rnal/data/vector/DefaultBinaryVector.java b/...rnel/data/vector/DefaultBinaryVector.java → ...rnal/data/vector/DefaultBinaryVector.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.delta.kernel.data.vector;
+package io.delta.kernel.defaults.internal.data.vector;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
@@ -23,7 +23,7 @@
 import io.delta.kernel.types.BinaryType;
 import io.delta.kernel.types.DataType;
 import io.delta.kernel.types.StringType;
-import static io.delta.kernel.DefaultKernelUtils.checkArgument;
+import static io.delta.kernel.defaults.internal.DefaultKernelUtils.checkArgument;
 
 /**
  * {@link io.delta.kernel.data.ColumnVector} implementation for binary type data.

diff --git a/...nel/data/vector/DefaultBooleanVector.java → ...nal/data/vector/DefaultBooleanVector.java b/...nel/data/vector/DefaultBooleanVector.java → ...nal/data/vector/DefaultBooleanVector.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.delta.kernel.data.vector;
+package io.delta.kernel.defaults.internal.data.vector;
 
 import java.util.Optional;
 import static java.util.Objects.requireNonNull;
 
 import io.delta.kernel.types.BooleanType;
-import static io.delta.kernel.DefaultKernelUtils.checkArgument;
+import static io.delta.kernel.defaults.internal.DefaultKernelUtils.checkArgument;
 
 /**
  * {@link io.delta.kernel.data.ColumnVector} implementation for boolean type data.

diff --git a/...kernel/data/vector/DefaultByteVector.java → ...ternal/data/vector/DefaultByteVector.java b/...kernel/data/vector/DefaultByteVector.java → ...ternal/data/vector/DefaultByteVector.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.delta.kernel.data.vector;
+package io.delta.kernel.defaults.internal.data.vector;
 
 import java.util.Optional;
 import static java.util.Objects.requireNonNull;
 
 import io.delta.kernel.types.ByteType;
-import static io.delta.kernel.DefaultKernelUtils.checkArgument;
+import static io.delta.kernel.defaults.internal.DefaultKernelUtils.checkArgument;
 
 /**
  * {@link io.delta.kernel.data.ColumnVector} implementation for byte type data.

diff --git a/...el/data/vector/DefaultConstantVector.java → ...al/data/vector/DefaultConstantVector.java b/...el/data/vector/DefaultConstantVector.java → ...al/data/vector/DefaultConstantVector.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.delta.kernel.data.vector;
+package io.delta.kernel.defaults.internal.data.vector;
 
 import java.util.List;
 import java.util.Map;

diff --git a/...rnel/data/vector/DefaultDoubleVector.java → ...rnal/data/vector/DefaultDoubleVector.java b/...rnel/data/vector/DefaultDoubleVector.java → ...rnal/data/vector/DefaultDoubleVector.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.delta.kernel.data.vector;
+package io.delta.kernel.defaults.internal.data.vector;
 
 import java.util.Optional;
 import static java.util.Objects.requireNonNull;
 
 import io.delta.kernel.types.DoubleType;
-import static io.delta.kernel.DefaultKernelUtils.checkArgument;
+import static io.delta.kernel.defaults.internal.DefaultKernelUtils.checkArgument;
 
 /**
  * {@link io.delta.kernel.data.ColumnVector} implementation for double type data.

diff --git a/...ernel/data/vector/DefaultFloatVector.java → ...ernal/data/vector/DefaultFloatVector.java b/...ernel/data/vector/DefaultFloatVector.java → ...ernal/data/vector/DefaultFloatVector.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.delta.kernel.data.vector;
+package io.delta.kernel.defaults.internal.data.vector;
 
 import java.util.Optional;
 import static java.util.Objects.requireNonNull;
 
 import io.delta.kernel.types.FloatType;
-import static io.delta.kernel.DefaultKernelUtils.checkArgument;
+import static io.delta.kernel.defaults.internal.DefaultKernelUtils.checkArgument;
 
 /**
  * {@link io.delta.kernel.data.ColumnVector} implementation for float type data.

diff --git a/.../kernel/data/vector/DefaultIntVector.java → ...nternal/data/vector/DefaultIntVector.java b/.../kernel/data/vector/DefaultIntVector.java → ...nternal/data/vector/DefaultIntVector.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.delta.kernel.data.vector;
+package io.delta.kernel.defaults.internal.data.vector;
 
 import java.util.Optional;
 import static java.util.Objects.requireNonNull;
 
 import io.delta.kernel.types.DataType;
 import io.delta.kernel.types.DateType;
 import io.delta.kernel.types.IntegerType;
-import static io.delta.kernel.DefaultKernelUtils.checkArgument;
+import static io.delta.kernel.defaults.internal.DefaultKernelUtils.checkArgument;
 
 /**
  * {@link io.delta.kernel.data.ColumnVector} implementation for integer type data.

diff --git a/...kernel/data/vector/DefaultLongVector.java → ...ternal/data/vector/DefaultLongVector.java b/...kernel/data/vector/DefaultLongVector.java → ...ternal/data/vector/DefaultLongVector.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.delta.kernel.data.vector;
+package io.delta.kernel.defaults.internal.data.vector;
 
 import java.util.Optional;
 import static java.util.Objects.requireNonNull;
 
 import io.delta.kernel.types.LongType;
-import static io.delta.kernel.DefaultKernelUtils.checkArgument;
+import static io.delta.kernel.defaults.internal.DefaultKernelUtils.checkArgument;
 
 /**
  * {@link io.delta.kernel.data.ColumnVector} implementation for long type data.

diff --git a/.../kernel/data/vector/DefaultMapVector.java → ...nternal/data/vector/DefaultMapVector.java b/.../kernel/data/vector/DefaultMapVector.java → ...nternal/data/vector/DefaultMapVector.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.delta.kernel.data.vector;
+package io.delta.kernel.defaults.internal.data.vector;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -22,7 +22,7 @@
 
 import io.delta.kernel.data.ColumnVector;
 import io.delta.kernel.types.DataType;
-import static io.delta.kernel.DefaultKernelUtils.checkArgument;
+import static io.delta.kernel.defaults.internal.DefaultKernelUtils.checkArgument;
 
 /**
  * {@link io.delta.kernel.data.ColumnVector} implementation for map type data.