Skip to content

Commit

Permalink
[590] Add RunCatalogSync utility for synchronizing tables across cata…
Browse files Browse the repository at this point in the history
…logs
  • Loading branch information
vinishjail97 committed Dec 26, 2024
1 parent fb724f0 commit eefbdd2
Show file tree
Hide file tree
Showing 18 changed files with 1,178 additions and 63 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package org.apache.xtable.conversion;

import java.util.List;
import java.util.Map;

import lombok.Builder;
import lombok.NonNull;
Expand All @@ -34,14 +35,21 @@ public class ConversionConfig {
@NonNull SourceTable sourceTable;
// One or more targets to sync the table metadata to
List<TargetTable> targetTables;
// Each target table can be synced to multiple target catalogs, this is map from
// targetTable to target catalogs.
Map<TargetTable, List<TargetCatalogConfig>> targetCatalogs;
// The mode, incremental or snapshot
SyncMode syncMode;

@Builder
ConversionConfig(
@NonNull SourceTable sourceTable, List<TargetTable> targetTables, SyncMode syncMode) {
@NonNull SourceTable sourceTable,
List<TargetTable> targetTables,
Map<TargetTable, List<TargetCatalogConfig>> targetCatalogs,
SyncMode syncMode) {
this.sourceTable = sourceTable;
this.targetTables = targetTables;
this.targetCatalogs = targetCatalogs;
Preconditions.checkArgument(
targetTables != null && !targetTables.isEmpty(),
"Please provide at-least one format to sync");
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
/*
* 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.
*/

package org.apache.xtable.conversion;

import java.util.Collections;
import java.util.Map;

import lombok.Builder;
import lombok.NonNull;
import lombok.Value;

/**
* Defines the configuration for an external catalog, user needs to populate at-least one of {@link
* ExternalCatalogConfig#catalogType} or {@link ExternalCatalogConfig#catalogSyncClientImpl}
*/
@Value
@Builder
public class ExternalCatalogConfig {
/**
* A user-defined unique identifier for the catalog, allows user to sync table to multiple
* catalogs of the same name/type eg: HMS catalog with url1, HMS catalog with url2
*/
@NonNull String catalogId;

/**
* The type of the catalog. If the catalogType implementation exists in XTable, the implementation
* class will be inferred.
*/
String catalogType;

/**
* (Optional) A fully qualified class name that implements the interface for {@link
* org.apache.xtable.spi.sync.CatalogSyncClient}, it can be used if the implementation for
* catalogType doesn't exist in XTable.
*/
String catalogSyncClientImpl;

/**
* (Optional) A fully qualified class name that implements the interface for {@link
* org.apache.xtable.spi.extractor.CatalogConversionSource} it can be used if the implementation
* for catalogType doesn't exist in XTable.
*/
String catalogConversionSourceImpl;

/**
* The properties for each catalog, used for providing any custom behaviour during catalog sync
*/
@NonNull @Builder.Default Map<String, String> catalogProperties = Collections.emptyMap();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/*
* 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.
*/

package org.apache.xtable.conversion;

import lombok.Builder;
import lombok.NonNull;
import lombok.Value;

import org.apache.xtable.model.catalog.CatalogTableIdentifier;

/**
* TargetCatalogConfig contains the parameters that are required when syncing {@link TargetTable} to
* a catalog.
*/
@Value
@Builder
public class TargetCatalogConfig {
/**
* The tableIdentifiers(catalogName.databaseName.tableName) that will be used when syncing {@link
* TargetTable} to the catalog.
*/
@NonNull CatalogTableIdentifier catalogTableIdentifier;

/** Configuration for the catalog. */
@NonNull ExternalCatalogConfig catalogConfig;
}
20 changes: 20 additions & 0 deletions xtable-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -174,4 +174,24 @@
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
<phase>test-compile</phase>
</execution>
</executions>
<configuration>
<skip>false</skip>
</configuration>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
/*
* 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.
*/

package org.apache.xtable.catalog;

import org.apache.hadoop.conf.Configuration;

import org.apache.xtable.conversion.ExternalCatalogConfig;
import org.apache.xtable.reflection.ReflectionUtils;
import org.apache.xtable.spi.extractor.CatalogConversionSource;
import org.apache.xtable.spi.sync.CatalogSyncClient;

public class CatalogConversionFactory {
private static final CatalogConversionFactory INSTANCE = new CatalogConversionFactory();

public static CatalogConversionFactory getInstance() {
return INSTANCE;
}

/**
* Returns an implementation class for {@link CatalogConversionSource} that's used for converting
* table definitions in the catalog to {@link org.apache.xtable.conversion.SourceTable} object.
*
* @param sourceCatalogConfig configuration for the source catalog
* @param configuration hadoop configuration
*/
public static CatalogConversionSource createCatalogConversionSource(
ExternalCatalogConfig sourceCatalogConfig, Configuration configuration) {
return ReflectionUtils.createInstanceOfClass(
sourceCatalogConfig.getCatalogConversionSourceImpl(), sourceCatalogConfig, configuration);
}

/**
* Returns an implementation class for {@link CatalogSyncClient} that's used for syncing {@link
* org.apache.xtable.conversion.TargetTable} to a catalog.
*
* @param targetCatalogConfig configuration for the target catalog
* @param configuration hadoop configuration
*/
public CatalogSyncClient createCatalogSyncClient(
ExternalCatalogConfig targetCatalogConfig, String tableFormat, Configuration configuration) {
return ReflectionUtils.createInstanceOfClass(
targetCatalogConfig.getCatalogSyncClientImpl(),
targetCatalogConfig,
tableFormat,
configuration);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/*
* 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.
*/

package org.apache.xtable.catalog;

import java.util.Map;

import org.apache.xtable.conversion.ExternalCatalogConfig;

/** A factory class which returns {@link ExternalCatalogConfig} based on catalogType. */
public class ExternalCatalogConfigFactory {

public static ExternalCatalogConfig fromCatalogType(
String catalogType, String catalogId, Map<String, String> properties) {
// TODO: Choose existing implementation based on catalogType.
String catalogSyncClientImpl = "";
String catalogConversionSourceImpl = "";
return ExternalCatalogConfig.builder()
.catalogType(catalogType)
.catalogSyncClientImpl(catalogSyncClientImpl)
.catalogConversionSourceImpl(catalogConversionSourceImpl)
.catalogId(catalogId)
.catalogProperties(properties)
.build();
}
}
Loading

0 comments on commit eefbdd2

Please sign in to comment.