Remove table module (2nd attempt)

common/transport/pom.xml

@@ -144,7 +144,7 @@
         <executions>
           <execution>
             <goals>
-              <!-- TODO(binfan): re-enabled this check after 301-SNAPSHOT is released -->
+              <!-- TODO(binfan): re-enabled this check -->
               <!-- <goal>backwards-compatibility-check</goal> -->
             </goals>
           </execution>

common/transport/src/main/proto/grpc/table/layout/hive/hive.proto

@@ -8,6 +8,8 @@ package alluxio.grpc.table.layout;
 
 import "grpc/table/table_master.proto";
 
+// TODO(binfan): remove this proto file.
+// it is no longer used but only to keep old Presto/Trino build with Alluxio 3.x client.
 message StorageFormat {
     optional string serde = 1;
     optional string input_format = 2;

common/transport/src/main/proto/grpc/table/table_master.proto

@@ -8,6 +8,8 @@ package alluxio.grpc.table;
 
 import "grpc/job_master.proto";
 
+// TODO(binfan): remove this proto file.
+// it is no longer used but only to keep old Presto/Trino build with Alluxio 3.x client.
 message FieldSchema {
     optional uint32 id = 1;
     optional string name = 2;

common/transport/src/main/proto/proto.lock

@@ -7777,28 +7777,6 @@
               }
             ]
           }
-        ],
-        "imports": [
-          {
-            "path": "grpc/table/table_master.proto"
-          }
-        ],
-        "package": {
-          "name": "alluxio.grpc.table.layout"
-        },
-        "options": [
-          {
-            "name": "java_multiple_files",
-            "value": "true"
-          },
-          {
-            "name": "java_package",
-            "value": "alluxio.grpc.table.layout.hive"
-          },
-          {
-            "name": "java_outer_classname",
-            "value": "HiveLayoutProto"
-          }
         ]
       }
     },

common/transport/src/main/proto/proto/journal/journal.proto

@@ -6,7 +6,6 @@ option java_package = "alluxio.proto.journal";
 import "proto/journal/block.proto";
 import "proto/journal/file.proto";
 import "proto/journal/meta.proto";
-import "proto/journal/table.proto";
 import "proto/journal/job.proto";
 import "proto/journal/policy.proto";
 // Wraps around all types of Alluxio journal entries.
@@ -32,20 +31,16 @@ message JournalEntry {
   optional JournalOpPId operationId = 52;
   // action fields.
   optional ActiveSyncTxIdEntry active_sync_tx_id = 34;
-  optional AddTableEntry add_table = 43;
-  optional AddTablePartitionsEntry add_table_partitions = 51;
   optional AddSyncPointEntry add_sync_point = 32;
   optional AddMountPointEntry add_mount_point = 2;
   optional AsyncPersistRequestEntry async_persist_request = 16;
-  optional AttachDbEntry attach_db = 44;
   optional BlockContainerIdGeneratorEntry block_container_id_generator = 3;
   optional BlockInfoEntry block_info = 4;
   optional ClusterInfoEntry cluster_info = 42;
   optional CompleteFileEntry complete_file = 5;
   optional DeleteBlockEntry delete_block = 29;
   optional DeleteFileEntry delete_file = 6;
   optional DeleteMountPointEntry delete_mount_point = 8;
-  optional DetachDbEntry detach_db = 45;
   optional InodeDirectoryEntry inode_directory = 9;
   optional InodeDirectoryIdGeneratorEntry inode_directory_id_generator = 10;
   optional InodeFileEntry inode_file = 11;
@@ -54,15 +49,10 @@ message JournalEntry {
   optional PathPropertiesEntry path_properties = 40;
   optional PersistDirectoryEntry persist_directory = 15;
   optional RemovePathPropertiesEntry remove_path_properties = 41;
-  optional RemoveTableEntry remove_table = 50;
-  optional RemoveTransformJobInfoEntry remove_transform_job_info = 47;
   optional RemoveSyncPointEntry remove_sync_point = 33;
   optional RenameEntry rename = 19;
   optional SetAclEntry set_acl = 31;
   optional SetAttributeEntry set_attribute = 27;
-  optional AddTransformJobInfoEntry add_transform_job_info = 46;
-  optional CompleteTransformTableEntry complete_transform_table = 48;
-  optional UpdateDatabaseInfoEntry update_database_info = 49;
   optional UpdateUfsModeEntry update_ufs_mode = 30;
   optional UpdateInodeEntry update_inode = 35;
   optional UpdateInodeDirectoryEntry update_inode_directory = 36;

dora/table/client/src/main/java/alluxio/client/table/RetryHandlingTableMasterClient.java → dora/core/client/fs/src/main/java/alluxio/client/table/RetryHandlingTableMasterClient.java

@@ -12,7 +12,6 @@
 package alluxio.client.table;
 
 import alluxio.AbstractMasterClient;
-import alluxio.Constants;
 import alluxio.exception.status.AlluxioStatusException;
 import alluxio.grpc.ServiceType;
 import alluxio.grpc.table.AttachDatabasePRequest;
@@ -47,11 +46,17 @@
 
 /**
  * A wrapper for the gRPC client to interact with the table master.
+ *
+ * TODO(binfan): Remove this class.
+ * it is no longer used but only to keep old Presto/Trino build with Alluxio 3.x client.
  */
 @ThreadSafe
 public final class RetryHandlingTableMasterClient extends AbstractMasterClient
     implements TableMasterClient {
   private static final Logger RPC_LOG = LoggerFactory.getLogger(TableMasterClient.class);
+  private static final String TABLE_MASTER_NAME = "TableMaster";
+  private static final String TABLE_MASTER_CLIENT_SERVICE_NAME = "TableMasterClient";
+  private static final long TABLE_MASTER_CLIENT_SERVICE_VERSION = 1;
   private TableMasterClientServiceGrpc.TableMasterClientServiceBlockingStub mClient = null;
 
   /**
@@ -70,12 +75,12 @@ protected ServiceType getRemoteServiceType() {
 
   @Override
   protected String getServiceName() {
-    return Constants.TABLE_MASTER_CLIENT_SERVICE_NAME;
+    return TABLE_MASTER_CLIENT_SERVICE_NAME;
   }
 
   @Override
   protected long getServiceVersion() {
-    return Constants.TABLE_MASTER_CLIENT_SERVICE_VERSION;
+    return TABLE_MASTER_CLIENT_SERVICE_VERSION;
   }
 
   @Override

dora/table/client/src/main/java/alluxio/client/table/TableMasterClient.java → dora/core/client/fs/src/main/java/alluxio/client/table/TableMasterClient.java

@@ -28,6 +28,9 @@
 
 /**
  * A client to use for interacting with a table master.
+ *
+ * TODO(binfan): Remove this class.
+ * it is no longer used but only to keep old Presto/Trino build with Alluxio 3.x client.
  */
 @ThreadSafe
 public interface TableMasterClient extends Client {

dora/table/base/src/main/java/alluxio/table/ProtoUtils.java → dora/core/client/fs/src/main/java/alluxio/table/ProtoUtils.java

@@ -23,6 +23,9 @@
 
 /**
  * Protobuf related utils.
+ *
+ * TODO(binfan): Remove this class.
+ * it is no longer used but only to keep old Presto/Trino build with Alluxio 3.x client.
  */
 public final class ProtoUtils {
   /**

dora/core/common/src/main/java/alluxio/Constants.java

@@ -224,11 +224,6 @@ public final class Constants {
   public static final int PERSISTENCE_INVALID_JOB_ID = -1;
   public static final String PERSISTENCE_INVALID_UFS_PATH = "";
 
-  // Table service
-  public static final String TABLE_MASTER_NAME = "TableMaster";
-  public static final String TABLE_MASTER_CLIENT_SERVICE_NAME = "TableMasterClient";
-  public static final long TABLE_MASTER_CLIENT_SERVICE_VERSION = 1;
-
   // Medium name
   public static final String MEDIUM_MEM = "MEM";
   public static final String MEDIUM_HDD = "HDD";

dora/core/common/src/main/java/alluxio/conf/PropertyKey.java

@@ -2404,8 +2404,7 @@ public String toString() {
       dataSizeBuilder(Name.MASTER_EMBEDDED_JOURNAL_ENTRY_SIZE_MAX)
           .setDefaultValue("10MB")
           .setDescription("The maximum single journal entry size allowed to be flushed. "
-              + "This value should be smaller than 30MB. Set to a larger value to allow larger "
-              + "journal entries when using the Alluxio Catalog service.")
+              + "This value should be smaller than 30MB.")
           .setConsistencyCheckLevel(ConsistencyCheckLevel.WARN)
           .setScope(Scope.MASTER)
           .build();
@@ -7650,77 +7649,6 @@ public String toString() {
           .setScope(Scope.WORKER)
           .build();
 
-  //
-  // Table service properties
-  //
-  public static final PropertyKey TABLE_ENABLED =
-      booleanBuilder(Name.TABLE_ENABLED)
-          .setDefaultValue(true)
-          .setDescription("(Experimental) Enables the table service.")
-          .setConsistencyCheckLevel(ConsistencyCheckLevel.WARN)
-          .setScope(Scope.MASTER)
-          .build();
-  public static final PropertyKey TABLE_CATALOG_PATH =
-      stringBuilder(Name.TABLE_CATALOG_PATH)
-          .setDefaultValue("/catalog")
-          .setDescription("The Alluxio file path for the table catalog metadata.")
-          .setConsistencyCheckLevel(ConsistencyCheckLevel.WARN)
-          .setScope(Scope.MASTER)
-          .build();
-  public static final PropertyKey TABLE_CATALOG_UDB_SYNC_TIMEOUT =
-      durationBuilder(Name.TABLE_CATALOG_UDB_SYNC_TIMEOUT)
-          .setDefaultValue("1h")
-          .setDescription("The timeout period for a db sync to finish in the catalog. If a sync"
-              + "takes longer than this timeout, the sync will be terminated.")
-          .setConsistencyCheckLevel(ConsistencyCheckLevel.WARN)
-          .setScope(Scope.MASTER)
-          .build();
-  public static final PropertyKey TABLE_JOURNAL_PARTITIONS_CHUNK_SIZE =
-      intBuilder(Name.TABLE_JOURNAL_PARTITIONS_CHUNK_SIZE)
-          .setDefaultValue(500)
-          .setDescription("The maximum table partitions number in a single journal entry.")
-          .setConsistencyCheckLevel(ConsistencyCheckLevel.WARN)
-          .setScope(Scope.MASTER)
-          .build();
-  public static final PropertyKey TABLE_TRANSFORM_MANAGER_JOB_MONITOR_INTERVAL =
-      durationBuilder(Name.TABLE_TRANSFORM_MANAGER_JOB_MONITOR_INTERVAL)
-          .setDefaultValue("10s")
-          .setDescription("Job monitor is a heartbeat thread in the transform manager, "
-              + "this is the time interval in milliseconds the job monitor heartbeat is run to "
-              + "check the status of the transformation jobs and update table and partition "
-              + "locations after transformation.")
-          .setConsistencyCheckLevel(ConsistencyCheckLevel.WARN)
-          .setScope(Scope.MASTER)
-          .build();
-  public static final PropertyKey TABLE_TRANSFORM_MANAGER_JOB_HISTORY_RETENTION_TIME =
-      durationBuilder(Name.TABLE_TRANSFORM_MANAGER_JOB_HISTORY_RETENTION_TIME)
-          .setDefaultValue("300sec")
-          .setDescription("The length of time the Alluxio Table Master should keep information "
-              + "about finished transformation jobs before they are discarded.")
-          .setConsistencyCheckLevel(ConsistencyCheckLevel.WARN)
-          .setScope(Scope.MASTER)
-          .build();
-  public static final PropertyKey TABLE_UDB_HIVE_CLIENTPOOL_MIN =
-      intBuilder(Name.TABLE_UDB_HIVE_CLIENTPOOL_MIN)
-          .setDefaultValue(16)
-          .setDescription("The minimum capacity of the hive client pool per hive metastore")
-          .setConsistencyCheckLevel(ConsistencyCheckLevel.WARN)
-          .setScope(Scope.MASTER)
-          .build();
-  public static final PropertyKey TABLE_UDB_HIVE_CLIENTPOOL_MAX =
-      intBuilder(Name.TABLE_UDB_HIVE_CLIENTPOOL_MAX)
-          .setDefaultValue(256)
-          .setDescription("The maximum capacity of the hive client pool per hive metastore")
-          .setConsistencyCheckLevel(ConsistencyCheckLevel.WARN)
-          .setScope(Scope.MASTER)
-          .build();
-  public static final PropertyKey TABLE_LOAD_DEFAULT_REPLICATION =
-      intBuilder(Name.TABLE_LOAD_DEFAULT_REPLICATION)
-          .setDefaultValue(1)
-          .setDescription("The default replication number of files under the SDS table after "
-                  + "load option.")
-          .setScope(Scope.CLIENT)
-          .build();
   public static final PropertyKey HADOOP_SECURITY_AUTHENTICATION =
       stringBuilder(Name.HADOOP_SECURITY_AUTHENTICATION)
           .setDescription("HDFS authentication method.")
@@ -9518,26 +9446,6 @@ public static final class Name {
     public static final String STANDALONE_FUSE_JVM_MONITOR_ENABLED
         = "alluxio.standalone.fuse.jvm.monitor.enabled";
 
-    //
-    // Table service properties
-    //
-    public static final String TABLE_ENABLED = "alluxio.table.enabled";
-    public static final String TABLE_CATALOG_PATH = "alluxio.table.catalog.path";
-    public static final String TABLE_CATALOG_UDB_SYNC_TIMEOUT =
-        "alluxio.table.catalog.udb.sync.timeout";
-    public static final String TABLE_JOURNAL_PARTITIONS_CHUNK_SIZE =
-        "alluxio.table.journal.partitions.chunk.size";
-    public static final String TABLE_TRANSFORM_MANAGER_JOB_MONITOR_INTERVAL =
-        "alluxio.table.transform.manager.job.monitor.interval";
-    public static final String TABLE_TRANSFORM_MANAGER_JOB_HISTORY_RETENTION_TIME =
-        "alluxio.table.transform.manager.job.history.retention.time";
-    public static final String TABLE_UDB_HIVE_CLIENTPOOL_MIN =
-        "alluxio.table.udb.hive.clientpool.min";
-    public static final String TABLE_UDB_HIVE_CLIENTPOOL_MAX =
-        "alluxio.table.udb.hive.clientpool.MAX";
-    public static final String TABLE_LOAD_DEFAULT_REPLICATION =
-        "alluxio.table.load.default.replication";
-
     public static final String HADOOP_SECURITY_AUTHENTICATION =
         "alluxio.hadoop.security.authentication";
 

dora/core/common/src/main/java/alluxio/grpc/ServiceVersionClientServiceHandler.java

@@ -115,9 +115,6 @@ public void getServiceVersion(GetServiceVersionPRequest request,
       case JOURNAL_MASTER_CLIENT_SERVICE:
         serviceVersion = Constants.JOURNAL_MASTER_CLIENT_SERVICE_VERSION;
         break;
-      case TABLE_MASTER_CLIENT_SERVICE:
-        serviceVersion = Constants.TABLE_MASTER_CLIENT_SERVICE_VERSION;
-        break;
       case RAFT_JOURNAL_SERVICE:
         serviceVersion = Constants.RAFT_JOURNAL_SERVICE_VERSION;
         break;