[Rename] Rename module and package to pypaimon (#29)

.github/workflows/check-java-bridge-licensing.yml

@@ -40,14 +40,14 @@ jobs:
       - name: Build
         run: |
           set -o pipefail
-          cd paimon_python_java/paimon-python-java-bridge
+          cd pypaimon/py4j/paimon-python-java-bridge
           mvn clean deploy ${{ env.MVN_COMMON_OPTIONS }} -DskipTests \
             -DaltDeploymentRepository=validation_repository::default::file:${{ env.MVN_VALIDATION_DIR }} \
             | tee ${{ env.MVN_BUILD_OUTPUT_FILE }}
 
       - name: Check licensing
         run: |
-          cd paimon_python_java/paimon-python-java-bridge
+          cd pypaimon/py4j/paimon-python-java-bridge
           mvn ${{ env.MVN_COMMON_OPTIONS }} exec:java@check-licensing -N \
             -Dexec.args="${{ env.MVN_BUILD_OUTPUT_FILE }} $(pwd) ${{ env.MVN_VALIDATION_DIR }}" \
             -Dlog4j.configurationFile=file://$(pwd)/tools/ci/log4j.properties

pypaimon/__init__.py

@@ -0,0 +1,21 @@
+################################################################################
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+# limitations under the License.
+#################################################################################
+
+from .api import Schema
+
+__all__ = ['Schema']

paimon_python_api/catalog.py → pypaimon/api/catalog.py

@@ -18,7 +18,7 @@
 
 from abc import ABC, abstractmethod
 from typing import Optional
-from paimon_python_api import Table, Schema
+from pypaimon.api import Table, Schema
 
 
 class Catalog(ABC):

paimon_python_api/read_builder.py → pypaimon/api/read_builder.py

@@ -17,7 +17,7 @@
 #################################################################################
 
 from abc import ABC, abstractmethod
-from paimon_python_api import TableRead, TableScan, Predicate, PredicateBuilder
+from pypaimon.api import TableRead, TableScan, Predicate, PredicateBuilder
 from typing import List
 
 

paimon_python_api/table.py → pypaimon/api/table.py

@@ -19,7 +19,7 @@
 import pyarrow as pa
 
 from abc import ABC, abstractmethod
-from paimon_python_api import ReadBuilder, BatchWriteBuilder
+from pypaimon.api import ReadBuilder, BatchWriteBuilder
 from typing import Optional, List
 
 

paimon_python_api/table_commit.py → pypaimon/api/table_commit.py

@@ -17,7 +17,7 @@
 #################################################################################
 
 from abc import ABC, abstractmethod
-from paimon_python_api import CommitMessage
+from pypaimon.api import CommitMessage
 from typing import List
 
 

paimon_python_api/table_read.py → pypaimon/api/table_read.py

@@ -22,7 +22,7 @@
 
 from abc import ABC, abstractmethod
 from duckdb.duckdb import DuckDBPyConnection
-from paimon_python_api import Split
+from pypaimon.api import Split
 from typing import List, Optional
 
 

paimon_python_api/table_scan.py → pypaimon/api/table_scan.py

@@ -18,7 +18,7 @@
 
 from abc import ABC, abstractmethod
 from typing import List
-from paimon_python_api import Split
+from pypaimon.api import Split
 
 
 class TableScan(ABC):

paimon_python_api/table_write.py → pypaimon/api/table_write.py

@@ -20,7 +20,7 @@
 import pyarrow as pa
 
 from abc import ABC, abstractmethod
-from paimon_python_api import CommitMessage
+from pypaimon.api import CommitMessage
 from typing import List
 
 

paimon_python_api/write_builder.py → pypaimon/api/write_builder.py

@@ -17,7 +17,7 @@
 #################################################################################
 
 from abc import ABC, abstractmethod
-from paimon_python_api import BatchTableCommit, BatchTableWrite
+from pypaimon.api import BatchTableCommit, BatchTableWrite
 from typing import Optional
 
 

paimon_python_java/__init__.py → pypaimon/py4j/__init__.py

@@ -17,9 +17,10 @@
 ################################################################################
 
 from .util import constants
-from .pypaimon import (Catalog, Table, ReadBuilder, TableScan, Plan, Split, TableRead,
-                       BatchWriteBuilder, BatchTableWrite, CommitMessage, BatchTableCommit,
-                       Predicate, PredicateBuilder)
+from .java_implementation import \
+    (Catalog, Table, ReadBuilder, TableScan, Plan, Split,
+     TableRead, BatchWriteBuilder, BatchTableWrite, CommitMessage,
+     BatchTableCommit, Predicate, PredicateBuilder)
 
 __all__ = [
     'constants',

paimon_python_java/gateway_server.py → pypaimon/py4j/gateway_server.py

@@ -22,7 +22,7 @@
 import signal
 
 from subprocess import Popen, PIPE
-from paimon_python_java import constants
+from pypaimon.py4j import constants
 
 
 def on_windows():
@@ -74,7 +74,7 @@ def preexec_func():
                  stdin=PIPE, stderr=PIPE, preexec_fn=preexec_fn, env=env)
 
 
-_JAVA_IMPL_MODULE = 'paimon_python_java'
+_JAVA_IMPL_MODULE = 'pypaimon.py4j'
 _JAVA_DEPS = 'java_dependencies'
 _JAVA_BRIDGE = 'paimon-python-java-bridge'
 

paimon_python_java/java_gateway.py → pypaimon/py4j/java_gateway.py

@@ -26,9 +26,9 @@
                                CallbackServerParameters)
 from threading import RLock
 
-from paimon_python_java.gateway_server import launch_gateway_server_process
-from paimon_python_java import constants
-from paimon_python_java.util.exceptions import install_py4j_hooks
+from pypaimon.py4j.gateway_server import launch_gateway_server_process
+from pypaimon.py4j import constants
+from pypaimon.py4j.util.exceptions import install_py4j_hooks
 
 _gateway = None
 _lock = RLock()

paimon_python_java/pypaimon.py → pypaimon/py4j/java_implementation.py

@@ -16,17 +16,20 @@
 # limitations under the License.
 ################################################################################
 
+# pypaimon.api implementation based on Java code & py4j lib
+
 import duckdb
 import pandas as pd
 import pyarrow as pa
 import ray
 
 from duckdb.duckdb import DuckDBPyConnection
-from paimon_python_java.java_gateway import get_gateway
-from paimon_python_java.util import java_utils, constants
-from paimon_python_api import (catalog, table, read_builder, table_scan, split, table_read,
-                               write_builder, table_write, commit_message, table_commit, Schema,
-                               predicate)
+from pypaimon.py4j.java_gateway import get_gateway
+from pypaimon.py4j.util import java_utils, constants
+from pypaimon.api import \
+    (catalog, table, read_builder, table_scan, split,
+     table_read, write_builder, table_write, commit_message,
+     table_commit, Schema, predicate)
 from typing import List, Iterator, Optional, Any
 
 

paimon_python_java/tests/test_data_types.py → pypaimon/py4j/tests/test_data_types.py

@@ -24,10 +24,10 @@
 import pyarrow as pa
 import unittest
 
-from paimon_python_api import Schema
-from paimon_python_java import Catalog
-from paimon_python_java.tests import utils
-from paimon_python_java.util import java_utils
+from pypaimon import Schema
+from pypaimon.py4j import Catalog
+from pypaimon.py4j.tests import utils
+from pypaimon.py4j.util import java_utils
 from setup_utils import java_setuputils
 
 

paimon_python_java/tests/test_preicates.py → pypaimon/py4j/tests/test_preicates.py

@@ -24,9 +24,9 @@
 import pandas as pd
 import pyarrow as pa
 
-from paimon_python_api import Schema
-from paimon_python_java import Catalog
-from paimon_python_java.tests import utils
+from pypaimon import Schema
+from pypaimon.py4j import Catalog
+from pypaimon.py4j.tests import utils
 from setup_utils import java_setuputils
 
 

paimon_python_java/tests/test_write_and_read.py → pypaimon/py4j/tests/test_write_and_read.py

@@ -24,11 +24,11 @@
 import pyarrow as pa
 from py4j.protocol import Py4JJavaError
 
-from paimon_python_api import Schema
-from paimon_python_java import Catalog
-from paimon_python_java.java_gateway import get_gateway
-from paimon_python_java.tests import utils
-from paimon_python_java.util import java_utils
+from pypaimon import Schema
+from pypaimon.py4j import Catalog
+from pypaimon.py4j.java_gateway import get_gateway
+from pypaimon.py4j.tests import utils
+from pypaimon.py4j.util import java_utils
 from setup_utils import java_setuputils
 
 

paimon_python_java/tests/utils.py → pypaimon/py4j/tests/utils.py

@@ -19,7 +19,7 @@
 import os
 import urllib.request
 
-from paimon_python_java.util import constants
+from pypaimon.py4j import constants
 
 
 def setup_hadoop_bundle_jar(hadoop_dir):

paimon_python_java/util/java_utils.py → pypaimon/py4j/util/java_utils.py

@@ -18,8 +18,8 @@
 
 import pyarrow as pa
 
-from paimon_python_api import Schema
-from paimon_python_java.java_gateway import get_gateway
+from pypaimon import Schema
+from pypaimon.py4j.java_gateway import get_gateway
 
 
 def to_j_catalog_context(catalog_options: dict):

setup.py

@@ -50,13 +50,14 @@ def run(self):
 
 try:
     PACKAGES = [
-        'paimon_python_api',
-        'paimon_python_java',
-        'paimon_python_java.util'
+        'pypaimon',
+        'pypaimon.api',
+        'pypaimon.py4j',
+        'pypaimon.py4j.util'
     ]
 
     PACKAGE_DATA = {
-        'paimon_python_java': java_setuputils.get_package_data()
+        'pypaimon.py4j': java_setuputils.get_package_data()
     }
 
     install_requires = [
@@ -72,7 +73,7 @@ def run(self):
     [Doc](https://paimon.apache.org/docs/master/program-api/python-api/) for usage.'
 
     setup(
-        name='paimon_python',
+        name='pypaimon',
         version=setup_utils.version.__version__,
         packages=PACKAGES,
         include_package_data=True,

setup_utils/java_setuputils.py

@@ -22,7 +22,7 @@
 
 from xml.etree import ElementTree
 
-_JAVA_IMPL_MODULE = 'paimon_python_java'
+_JAVA_IMPL_MODULE = 'pypaimon/py4j'
 _JAVA_DEPS = 'java_dependencies'
 _JAVA_BRIDGE = 'paimon-python-java-bridge'
 

tools/releasing/create_binary_release.sh

@@ -60,7 +60,7 @@ source dev/.conda/bin/activate
 # build
 dev/build-wheels.sh
 
-WHEEL_FILE_NAME="paimon_python-${RELEASE_VERSION}-py3-none-any.whl"
+WHEEL_FILE_NAME="pypaimon-${RELEASE_VERSION}-py3-none-any.whl"
 cp "dist/${WHEEL_FILE_NAME}" "${RELEASE_DIR}/${WHEEL_FILE_NAME}"
 
 cd ${RELEASE_DIR}

tools/releasing/create_source_release.sh

@@ -66,7 +66,7 @@ echo "Creating source package"
 git clone ${PROJECT_ROOT} ${CLONE_DIR}
 
 cd ${CLONE_DIR}
-JAVA_ROOT="paimon_python_java/paimon-python-java-bridge"
+JAVA_ROOT="pypaimon/py4j/paimon-python-java-bridge"
 rsync -a \
   --exclude ".DS_Store" --exclude ".asf.yaml" --exclude ".git" \
   --exclude ".github" --exclude ".gitignore" --exclude ".idea" \

tox.ini

@@ -45,6 +45,6 @@ max-line-length=100
 exclude=.tox/*,dev/*,build/*,dist/*
 
 [mypy]
-files=paimon_python_api/*.py
+files=pypaimon/api/*.py
 ignore_missing_imports = True
 strict_optional=False