T

Author: yuzelin

pypaimon/py4j/gateway_server.py

@@ -80,12 +80,15 @@ def preexec_func():
 def _get_classpath(env):
     classpath = []
 
-    jars = importlib.resources.files(_JAVA_DEPS_PACKAGE)
-    one_jar = next(iter(jars.iterdir()), None)
-    if not one_jar:
-        raise ValueError("Haven't found necessary python-java-bridge jar, this is unexpected.")
-    builtin_java_classpath = os.path.join(os.path.dirname(str(one_jar)), '*')
-    classpath.append(builtin_java_classpath)
+    # note that jars are not packaged in test
+    test_mode = os.environ.get(constants.PYPAIMON4J_TEST_MODE)
+    if not test_mode or test_mode.lower() != "true":
+        jars = importlib.resources.files(_JAVA_DEPS_PACKAGE)
+        one_jar = next(iter(jars.iterdir()), None)
+        if not one_jar:
+            raise ValueError("Haven't found necessary python-java-bridge jar, this is unexpected.")
+        builtin_java_classpath = os.path.join(os.path.dirname(str(one_jar)), '*')
+        classpath.append(builtin_java_classpath)
 
     # user defined
     if constants.PYPAIMON_JAVA_CLASSPATH in env:

pypaimon/py4j/tests/__init__.py

@@ -54,15 +54,18 @@ def _setup_bridge_jar(bridge_dir):
     if not os.path.exists(bridge_dir):
         os.mkdir(bridge_dir)
 
+    jar_path = os.path.join(bridge_dir, "paimon-python-java-bridge.jar")
     shutil.copy(
         os.path.join(java_bridge_module, 'target/{}-{}.jar'
                      .format('paimon-python-java-bridge', _extract_bridge_version())),
-        bridge_dir
+        jar_path
     )
 
+    os.environ[constants.PYPAIMON_JAVA_CLASSPATH] = jar_path
+
 
 def _extract_bridge_version():
-    pom_path = os.path.join(_find_java_bridge_module(), 'paimon-python-java-bridge', 'pom.xml')
+    pom_path = os.path.join(_find_java_bridge_module(), 'pom.xml')
     return ElementTree.parse(pom_path).getroot().find(
         'POM:version',
         namespaces={
@@ -89,7 +92,8 @@ def setUpClass(cls):
         _setup_hadoop_bundle_jar(cls.tempdir)
         _setup_bridge_jar(cls.tempdir)
 
-        cls.catalog = Catalog.create({'warehouse': os.path.join(cls.tempdir, 'warehouse')})
+        cls.warehouse = os.path.join(cls.tempdir, 'warehouse')
+        cls.catalog = Catalog.create({'warehouse': cls.warehouse})
         cls.catalog.create_database('default', False)
 
     @classmethod

pypaimon/py4j/tests/test_data_types.py

@@ -29,6 +29,7 @@ class DataTypesTest(PypaimonTestBase):
 
     @classmethod
     def setUpClass(cls):
+        super().setUpClass()
         cls.simple_pa_schema = pa.schema([
             ('f0', pa.int32()),
             ('f1', pa.string())

pypaimon/py4j/tests/test_preicates.py

@@ -41,6 +41,7 @@ class PredicateTest(PypaimonTestBase):
 
     @classmethod
     def setUpClass(cls):
+        super().setUpClass()
         pa_schema = pa.schema([
             ('f0', pa.int64()),
             ('f1', pa.string()),

pypaimon/py4j/tests/test_write_and_read.py

@@ -16,10 +16,6 @@
 # limitations under the License.
 ################################################################################
 
-import os
-import shutil
-import tempfile
-import unittest
 import pandas as pd
 import pyarrow as pa
 from py4j.protocol import Py4JJavaError
@@ -35,6 +31,7 @@ class TableWriteReadTest(PypaimonTestBase):
 
     @classmethod
     def setUpClass(cls):
+        super().setUpClass()
         cls.simple_pa_schema = pa.schema([
             ('f0', pa.int32()),
             ('f1', pa.string())