fix python ruff

Author: jackye1995

.github/workflows/python-integ-hive.yml

@@ -17,8 +17,10 @@ on:
     branches:
       - main
     paths:
-      - python/src/lance_namespace_impls/hive.py
-      - python/tests/test_hive.py
+      - python/src/lance_namespace_impls/hive2.py
+      - python/src/lance_namespace_impls/rest_client.py
+      - python/tests/test_hive2.py
+      - python/tests/test_hive2_integration.py
       - docker/hive2/**
       - .github/workflows/python-integ-hive.yml
   pull_request:
@@ -28,8 +30,10 @@ on:
       - ready_for_review
       - reopened
     paths:
-      - python/src/lance_namespace_impls/hive.py
-      - python/tests/test_hive.py
+      - python/src/lance_namespace_impls/hive2.py
+      - python/src/lance_namespace_impls/rest_client.py
+      - python/tests/test_hive2.py
+      - python/tests/test_hive2_integration.py
       - docker/hive2/**
       - .github/workflows/python-integ-hive.yml
   workflow_dispatch:

Makefile

@@ -156,6 +156,14 @@ python-integ-test:
 python-integ-test-hive:
 	cd python && make integ-test-hive
 
+.PHONY: python-integ-test-hive2
+python-integ-test-hive2:
+	cd python && make integ-test-hive2
+
+.PHONY: python-integ-test-hive3
+python-integ-test-hive3:
+	cd python && make integ-test-hive3
+
 .PHONY: python-integ-test-polaris
 python-integ-test-polaris:
 	cd python && make integ-test-polaris

docker/hive2/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   postgres-hive2:
     image: postgres:15
@@ -21,23 +19,27 @@ services:
       - hive2-network
 
   hive2-metastore:
-    image: apache/hive:2.3.9
+    image: bde2020/hive:2.3.2-postgresql-metastore
     container_name: hive2-metastore
     depends_on:
       postgres-hive2:
         condition: service_healthy
     environment:
-      SERVICE_NAME: metastore
-      DB_DRIVER: postgres
-      SERVICE_OPTS: >-
-        -Djavax.jdo.option.ConnectionDriverName=org.postgresql.Driver
-        -Djavax.jdo.option.ConnectionURL=jdbc:postgresql://postgres-hive2:5432/metastore_db
-        -Djavax.jdo.option.ConnectionUserName=hive
-        -Djavax.jdo.option.ConnectionPassword=hive
+      HIVE_SITE_CONF_javax_jdo_option_ConnectionURL: jdbc:postgresql://postgres-hive2:5432/metastore_db
+      HIVE_SITE_CONF_javax_jdo_option_ConnectionDriverName: org.postgresql.Driver
+      HIVE_SITE_CONF_javax_jdo_option_ConnectionUserName: hive
+      HIVE_SITE_CONF_javax_jdo_option_ConnectionPassword: hive
+      HIVE_SITE_CONF_datanucleus_autoCreateSchema: "true"
+      HIVE_SITE_CONF_datanucleus_schema_autoCreateAll: "true"
+      HIVE_SITE_CONF_hive_metastore_schema_verification: "false"
+      HIVE_SITE_CONF_hive_metastore_uris: thrift://hive2-metastore:9083
+      HIVE_SITE_CONF_hive_metastore_warehouse_dir: file:///user/hive/warehouse
+      CORE_CONF_fs_defaultFS: file:///
+      SERVICE_PRECONDITION: "postgres-hive2:5432"
     ports:
       - "9083:9083"
     volumes:
-      - hive2-warehouse:/opt/hive/data/warehouse
+      - hive2-warehouse:/user/hive/warehouse
       - ./postgresql-42.7.3.jar:/opt/hive/lib/postgres.jar
     networks:
       - hive2-network
@@ -46,7 +48,8 @@ services:
       interval: 10s
       timeout: 10s
       retries: 10
-      start_period: 30s
+      start_period: 60s
+    command: /opt/hive/bin/hive --service metastore
 
 volumes:
   hive2-postgres-data:

docker/hive2/postgresql-42.7.3.jar

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   postgres-hive3:
     image: postgres:15
@@ -21,7 +19,7 @@ services:
       - hive3-network
 
   hive3-metastore:
-    image: apache/hive:4.0.0
+    image: apache/hive:3.1.3
     container_name: hive3-metastore
     depends_on:
       postgres-hive3:
@@ -34,9 +32,11 @@ services:
         -Djavax.jdo.option.ConnectionURL=jdbc:postgresql://postgres-hive3:5432/metastore_db
         -Djavax.jdo.option.ConnectionUserName=hive
         -Djavax.jdo.option.ConnectionPassword=hive
+        -Dhive.metastore.warehouse.dir=file:///opt/hive/data/warehouse
+        -Dfs.defaultFS=file:///
     ports:
       - "9084:9083"
-      - "9001:9001"
+      - "9002:9001"
     volumes:
       - hive3-warehouse:/opt/hive/data/warehouse
       - ./postgresql-42.7.3.jar:/opt/hive/lib/postgres.jar

docker/hive3/docker-compose.yml

@@ -143,11 +143,11 @@ integ-test:
 
 .PHONY: integ-test-hive2
 integ-test-hive2:
-	./mvnw test -pl lance-namespace-hive2 -Dtest="*IntegrationTest" -DfailIfNoTests=false
+	./mvnw test -pl lance-namespace-hive2 -Dtest="*NamespaceIntegration" -DfailIfNoTests=false
 
 .PHONY: integ-test-hive3
 integ-test-hive3:
-	./mvnw test -pl lance-namespace-hive3 -Dtest="*IntegrationTest" -DfailIfNoTests=false
+	./mvnw test -pl lance-namespace-hive3 -Dtest="*NamespaceIntegration" -DfailIfNoTests=false
 
 .PHONY: integ-test-polaris
 integ-test-polaris:

docker/hive3/postgresql-42.7.3.jar

@@ -26,6 +26,8 @@
 import org.lance.namespace.model.CreateEmptyTableResponse;
 import org.lance.namespace.model.CreateNamespaceRequest;
 import org.lance.namespace.model.CreateNamespaceResponse;
+import org.lance.namespace.model.DeregisterTableRequest;
+import org.lance.namespace.model.DeregisterTableResponse;
 import org.lance.namespace.model.DescribeNamespaceRequest;
 import org.lance.namespace.model.DescribeNamespaceResponse;
 import org.lance.namespace.model.DescribeTableRequest;
@@ -203,11 +205,12 @@ public DescribeNamespaceResponse describeNamespace(DescribeNamespaceRequest requ
   public DropNamespaceResponse dropNamespace(DropNamespaceRequest request) {
     ObjectIdentifier id = ObjectIdentifier.of(request.getId());
     String mode = request.getMode() != null ? request.getMode().toLowerCase() : "fail";
+    String behavior = request.getBehavior() != null ? request.getBehavior() : "Restrict";
 
     ValidationUtil.checkArgument(
         !id.isRoot() && id.levels() <= 1, "Expect a 1-level namespace but get %s", id);
 
-    Map<String, String> properties = doDropNamespace(id, mode);
+    Map<String, String> properties = doDropNamespace(id, mode, behavior);
 
     DropNamespaceResponse response = new DropNamespaceResponse();
     response.setProperties(properties);
@@ -302,7 +305,20 @@ public CreateEmptyTableResponse createEmptyTable(CreateEmptyTableRequest request
     return response;
   }
 
-  // Removed: dropTable(DropTableRequest) - using default implementation from interface
+  @Override
+  public DeregisterTableResponse deregisterTable(DeregisterTableRequest request) {
+    ObjectIdentifier tableId = ObjectIdentifier.of(request.getId());
+
+    ValidationUtil.checkArgument(
+        tableId.levels() == 2, "Expect 2-level table identifier but get %s", tableId);
+
+    String location = doDropTable(tableId);
+
+    DeregisterTableResponse response = new DeregisterTableResponse();
+    response.setId(request.getId());
+    response.setLocation(location);
+    return response;
+  }
 
   public void setConf(Configuration conf) {
     this.hadoopConf = conf;
@@ -538,7 +554,7 @@ protected String doDropTable(ObjectIdentifier id) {
     }
   }
 
-  protected Map<String, String> doDropNamespace(ObjectIdentifier id, String mode) {
+  protected Map<String, String> doDropNamespace(ObjectIdentifier id, String mode, String behavior) {
     String db = id.levelAtListPos(0).toLowerCase();
 
     try {
@@ -552,14 +568,17 @@ protected Map<String, String> doDropNamespace(ObjectIdentifier id, String mode)
         }
       }
 
-      // Check if database contains tables (RESTRICT mode only)
-      List<String> tables = doListTables(db);
-      if (!tables.isEmpty()) {
-        throw new InvalidInputException(
-            String.format(
-                "Database %s is not empty. Contains %d tables: %s", db, tables.size(), tables),
-            HiveMetaStoreError.getType(),
-            db);
+      // Check if database contains tables (RESTRICT behavior only, not for Cascade)
+      boolean cascade = "Cascade".equalsIgnoreCase(behavior);
+      if (!cascade) {
+        List<String> tables = doListTables(db);
+        if (!tables.isEmpty()) {
+          throw new InvalidInputException(
+              String.format(
+                  "Database %s is not empty. Contains %d tables: %s", db, tables.size(), tables),
+              HiveMetaStoreError.getType(),
+              db);
+        }
       }
 
       // Collect database properties before dropping
@@ -581,9 +600,10 @@ protected Map<String, String> doDropNamespace(ObjectIdentifier id, String mode)
       }
 
       // Drop the database
+      final boolean cascadeDrop = cascade;
       clientPool.run(
           client -> {
-            client.dropDatabase(db, false, true, false);
+            client.dropDatabase(db, false, true, cascadeDrop);
             return null;
           });
 

java/Makefile

@@ -18,12 +18,12 @@
 import org.lance.namespace.model.CreateEmptyTableResponse;
 import org.lance.namespace.model.CreateNamespaceRequest;
 import org.lance.namespace.model.CreateNamespaceResponse;
+import org.lance.namespace.model.DeregisterTableRequest;
 import org.lance.namespace.model.DescribeNamespaceRequest;
 import org.lance.namespace.model.DescribeNamespaceResponse;
 import org.lance.namespace.model.DescribeTableRequest;
 import org.lance.namespace.model.DescribeTableResponse;
 import org.lance.namespace.model.DropNamespaceRequest;
-import org.lance.namespace.model.DropTableRequest;
 import org.lance.namespace.model.ListNamespacesRequest;
 import org.lance.namespace.model.ListNamespacesResponse;
 import org.lance.namespace.model.ListTablesRequest;
@@ -209,10 +209,10 @@ public void testTableOperations() {
     ListTablesResponse listResponse = namespace.listTables(listRequest);
     assertThat(listResponse.getTables()).contains(tableName);
 
-    // Drop table
-    DropTableRequest dropRequest = new DropTableRequest();
-    dropRequest.setId(Arrays.asList(testDatabase, tableName));
-    namespace.dropTable(dropRequest);
+    // Deregister table
+    DeregisterTableRequest deregisterRequest = new DeregisterTableRequest();
+    deregisterRequest.setId(Arrays.asList(testDatabase, tableName));
+    namespace.deregisterTable(deregisterRequest);
 
     // Verify table doesn't exist
     assertThatThrownBy(() -> namespace.describeTable(describeRequest))

java/lance-namespace-hive2/src/main/java/org/lance/namespace/hive2/Hive2Namespace.java

@@ -0,0 +1,13 @@
+----------------------------------------------------------------
+Tue Dec 30 21:25:14 PST 2025:
+Booting Derby version The Apache Software Foundation - Apache Derby - 10.14.2.0 - (1828579): instance a816c00e-019b-72de-0fb6-00000746a618 
+on database directory /Users/zhaoqinye/oss/lance-namespace-impls/java/lance-namespace-hive3/metastore_db with class loader jdk.internal.loader.ClassLoaders$AppClassLoader@5ffd2b27 
+Loaded from file:/Users/zhaoqinye/.m2/repository/org/apache/derby/derby/10.14.2.0/derby-10.14.2.0.jar
+java.vendor=Amazon.com Inc.
+java.runtime.version=17.0.14+7-LTS
+user.dir=/Users/zhaoqinye/oss/lance-namespace-impls/java/lance-namespace-hive3
+os.name=Mac OS X
+os.arch=aarch64
+os.version=15.5
+derby.system.home=null
+Database Class Loader started - derby.database.classpath=''