From c4937915616a35590697322d8fca828b4ac701bc Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Sun, 28 Jul 2019 16:35:30 +0000 Subject: [PATCH] Rename read_parquet_columns => list_parquet_columns Signed-off-by: Yong Tang --- tensorflow_io/parquet/__init__.py | 6 +++--- tensorflow_io/parquet/kernels/parquet_kernels.cc | 8 ++++---- tensorflow_io/parquet/ops/parquet_ops.cc | 2 +- tensorflow_io/parquet/python/ops/parquet_ops.py | 8 ++++---- tests/test_parquet_eager.py | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tensorflow_io/parquet/__init__.py b/tensorflow_io/parquet/__init__.py index e64ed8b83a..4f7ca258d5 100644 --- a/tensorflow_io/parquet/__init__.py +++ b/tensorflow_io/parquet/__init__.py @@ -16,7 +16,7 @@ @@ParquetDataset @@read_parquet -@@read_parquet_columns +@@list_parquet_columns """ from __future__ import absolute_import @@ -25,14 +25,14 @@ from tensorflow_io.parquet.python.ops.parquet_ops import ParquetDataset from tensorflow_io.parquet.python.ops.parquet_ops import read_parquet -from tensorflow_io.parquet.python.ops.parquet_ops import read_parquet_columns +from tensorflow_io.parquet.python.ops.parquet_ops import list_parquet_columns from tensorflow.python.util.all_util import remove_undocumented _allowed_symbols = [ "ParquetDataset", "read_parquet", - "read_parquet_columns", + "list_parquet_columns", ] remove_undocumented(__name__, allowed_exception_list=_allowed_symbols) diff --git a/tensorflow_io/parquet/kernels/parquet_kernels.cc b/tensorflow_io/parquet/kernels/parquet_kernels.cc index 13c85ac869..df40937fb1 100644 --- a/tensorflow_io/parquet/kernels/parquet_kernels.cc +++ b/tensorflow_io/parquet/kernels/parquet_kernels.cc @@ -125,9 +125,9 @@ class ParquetRandomAccessFile : public ::arrow::io::RandomAccessFile { int64 size_; }; -class ReadParquetColumnsOp : public OpKernel { +class ListParquetColumnsOp : public OpKernel { public: - explicit ReadParquetColumnsOp(OpKernelConstruction* context) : OpKernel(context) { + explicit ListParquetColumnsOp(OpKernelConstruction* context) : OpKernel(context) { env_ = context->env(); } @@ -309,8 +309,8 @@ class ReadParquetOp : public OpKernel { Env* env_ GUARDED_BY(mu_); }; -REGISTER_KERNEL_BUILDER(Name("ReadParquetColumns").Device(DEVICE_CPU), - ReadParquetColumnsOp); +REGISTER_KERNEL_BUILDER(Name("ListParquetColumns").Device(DEVICE_CPU), + ListParquetColumnsOp); REGISTER_KERNEL_BUILDER(Name("ReadParquet").Device(DEVICE_CPU), ReadParquetOp); diff --git a/tensorflow_io/parquet/ops/parquet_ops.cc b/tensorflow_io/parquet/ops/parquet_ops.cc index dd5e58c894..d12b9b7b25 100644 --- a/tensorflow_io/parquet/ops/parquet_ops.cc +++ b/tensorflow_io/parquet/ops/parquet_ops.cc @@ -19,7 +19,7 @@ limitations under the License. namespace tensorflow { -REGISTER_OP("ReadParquetColumns") +REGISTER_OP("ListParquetColumns") .Input("filename: string") .Input("memory: string") .Output("columns: string") diff --git a/tensorflow_io/parquet/python/ops/parquet_ops.py b/tensorflow_io/parquet/python/ops/parquet_ops.py index 7d4b07781e..1d97f3a210 100644 --- a/tensorflow_io/parquet/python/ops/parquet_ops.py +++ b/tensorflow_io/parquet/python/ops/parquet_ops.py @@ -21,12 +21,12 @@ from tensorflow_io.core.python.ops import core_ops as parquet_ops from tensorflow_io.core.python.ops import data_ops -def read_parquet_columns(filename, **kwargs): - """read_parquet_columns""" +def list_parquet_columns(filename, **kwargs): + """list_parquet_columns""" if not tf.executing_eagerly(): raise NotImplementedError("read_parquet_spect only support eager mode") memory = kwargs.get("memory", "") - columns, dtypes, shapes = parquet_ops.read_parquet_columns( + columns, dtypes, shapes = parquet_ops.list_parquet_columns( filename, memory=memory) entries = zip(tf.unstack(columns), tf.unstack(dtypes), tf.unstack(shapes)) return dict([(column.numpy().decode(), tf.TensorSpec( @@ -58,7 +58,7 @@ def __init__(self, filename, column, batch=None, **kwargs): count = kwargs.get("count") dtype = kwargs.get("dtype") else: - columns = read_parquet_columns(filename) + columns = list_parquet_columns(filename) count = columns[column].shape[0] dtype = columns[column].dtype diff --git a/tests/test_parquet_eager.py b/tests/test_parquet_eager.py index d49c5c2368..ff3e6363ca 100644 --- a/tests/test_parquet_eager.py +++ b/tests/test_parquet_eager.py @@ -47,7 +47,7 @@ def test_parquet(): "parquet_cpp_example.parquet") filename = "file://" + filename - specs = parquet_io.read_parquet_columns(filename) + specs = parquet_io.list_parquet_columns(filename) columns = [ 'boolean_field', 'int32_field',