Skip to content

Commit

Permalink
[#10131] Migrate HBase1 API to HBase2 API
Browse files Browse the repository at this point in the history
  • Loading branch information
@emeroad
emeroad committed Jul 20, 2023
1 parent a090cde commit 233e40c
Show file tree
Hide file tree
Showing 13 changed files with 250 additions and 222 deletions.
63 changes: 28 additions & 35 deletions commons-hbase/src/main/java/com/navercorp/pinpoint/common/hbase/HBaseAdminTemplate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,19 @@

package com.navercorp.pinpoint.common.hbase;

import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Objects;

import com.navercorp.pinpoint.common.util.ArrayUtils;
import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HTableDescriptor;
import com.navercorp.pinpoint.common.util.BytesUtils;
import org.apache.hadoop.hbase.NamespaceDescriptor;
import org.apache.hadoop.hbase.NamespaceExistException;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.logging.log4j.Logger;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
import org.apache.hadoop.hbase.client.TableDescriptor;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

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

/**
* @author emeroad
Expand Down Expand Up @@ -78,46 +76,42 @@ public boolean createNamespaceIfNotExists(String namespace, Map<String, String>
}

@Override
public List<HTableDescriptor> getTableDescriptors(String namespace) {
public List<TableDescriptor> getTableDescriptors(String namespace) {
return execute(admin -> {
HTableDescriptor[] htds = admin.listTableDescriptorsByNamespace(namespace);
if (ArrayUtils.isEmpty(htds)) {
return Collections.emptyList();
}
return Arrays.asList(htds);
return admin.listTableDescriptorsByNamespace(BytesUtils.toBytes(namespace));
});
}

@Override
public HTableDescriptor getTableDescriptor(TableName tableName) {
return execute(admin -> admin.getTableDescriptor(tableName));
public TableDescriptor getTableDescriptor(TableName tableName) {
return execute(admin -> admin.getDescriptor(tableName));
}

@Override
public void createTable(HTableDescriptor htd) {
public void createTable(TableDescriptor tableDescriptor) {
execute(admin -> {
admin.createTable(htd);
logger.info("{} table created, htd : {}", htd.getTableName(), htd);
admin.createTable(tableDescriptor);
logger.info("{} table created, tableDescriptor : {}", tableDescriptor.getTableName(), tableDescriptor);
return null;
});
}

@Override
public void createTable(HTableDescriptor htd, byte[][] splitKeys) {
public void createTable(TableDescriptor tableDescriptor, byte[][] splitKeys) {
execute(admin -> {
admin.createTable(htd, splitKeys);
logger.info("{} table created with {} split keys, htd : {}", htd.getTableName(), splitKeys.length + 1, htd);
admin.createTable(tableDescriptor, splitKeys);
logger.info("{} table created with {} split keys, tableDescriptor : {}", tableDescriptor.getTableName(), splitKeys.length + 1, tableDescriptor);
return null;
});
}

@Override
public boolean createTableIfNotExists(HTableDescriptor htd) {
public boolean createTableIfNotExists(TableDescriptor tableDescriptor) {
return execute(admin -> {
TableName tableName = htd.getTableName();
TableName tableName = tableDescriptor.getTableName();
if (!admin.tableExists(tableName)) {
admin.createTable(htd);
logger.info("{} table created, htd : {}", htd.getTableName(), htd);
admin.createTable(tableDescriptor);
logger.info("{} table created, tableDescriptor : {}", tableDescriptor.getTableName(), tableDescriptor);
return true;
}
return false;
Expand Down Expand Up @@ -166,20 +160,19 @@ public void dropTable(TableName tableName) {
}

@Override
public void modifyTable(HTableDescriptor htd) {
final TableName tableName = htd.getTableName();
public void modifyTable(TableDescriptor tableDescriptor) {
execute(admin -> {
admin.modifyTable(tableName, htd);
logger.info("{} table modified, htd : {}", tableName, htd);
admin.modifyTable(tableDescriptor);
logger.info("table modified, tableDescriptor : {}", tableDescriptor);
return null;
});
}

@Override
public void addColumn(TableName tableName, HColumnDescriptor hcd) {
public void addColumn(TableName tableName, ColumnFamilyDescriptor columnDescriptor) {
execute(admin -> {
admin.addColumn(tableName, hcd);
logger.info("{} table added column : {}", tableName, hcd);
admin.addColumnFamily(tableName, columnDescriptor);
logger.info("{} table added column : {}", tableName, columnDescriptor);
return null;
});
}
Expand Down
18 changes: 9 additions & 9 deletions commons-hbase/src/main/java/com/navercorp/pinpoint/common/hbase/HbaseAdminOperation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

package com.navercorp.pinpoint.common.hbase;

import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
import org.apache.hadoop.hbase.client.TableDescriptor;

import java.util.List;
import java.util.Map;
Expand All @@ -32,15 +32,15 @@ public interface HbaseAdminOperation {

boolean createNamespaceIfNotExists(String namespace, Map<String, String> configurations);

List<HTableDescriptor> getTableDescriptors(String namespace);
List<TableDescriptor> getTableDescriptors(String namespace);

HTableDescriptor getTableDescriptor(TableName tableName);
TableDescriptor getTableDescriptor(TableName tableName);

void createTable(HTableDescriptor hTableDescriptor);
void createTable(TableDescriptor tableDescriptor);

void createTable(HTableDescriptor hTableDescriptor, byte[][] splitKeys);
void createTable(TableDescriptor tableDescriptor, byte[][] splitKeys);

boolean createTableIfNotExists(HTableDescriptor hTableDescriptor);
boolean createTableIfNotExists(TableDescriptor tableDescriptor);

boolean tableExists(TableName tableName);

Expand All @@ -50,9 +50,9 @@ public interface HbaseAdminOperation {

void dropTable(TableName tableName);

void modifyTable(HTableDescriptor hTableDescriptor);
void modifyTable(TableDescriptor tableDescriptor);

void addColumn(TableName tableName, HColumnDescriptor hColumnDescriptor);
void addColumn(TableName tableName, ColumnFamilyDescriptor columnDescriptor);

<T> T execute(AdminCallback<T> action);
}
6 changes: 3 additions & 3 deletions ...e-schema-manager/src/main/java/com/navercorp/pinpoint/hbase/manager/config/AppConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import com.navercorp.pinpoint.hbase.schema.service.HbaseSchemaServiceImpl;
import com.navercorp.pinpoint.hbase.schema.service.SchemaChangeLogService;
import com.navercorp.pinpoint.hbase.schema.service.SchemaChangeLogServiceImpl;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.client.TableDescriptor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

Expand All @@ -43,7 +43,7 @@ public HbaseSchemaReader hbaseSchemaReader() {
}

@Bean
public HbaseSchemaVerifier<HTableDescriptor> hbaseSchemaVerifier() {
public HbaseSchemaVerifier<TableDescriptor> hbaseSchemaVerifier() {
return new HtdHbaseSchemaVerifier();
}

Expand All @@ -60,7 +60,7 @@ public SchemaChangeLogService schemaChangeLogService(SchemaChangeLogDao schemaCh
@Bean
public HbaseSchemaService hbaseSchemaService(HbaseAdminOperation hbaseAdminOperation,
SchemaChangeLogService schemaChangeLogService,
HbaseSchemaVerifier<HTableDescriptor> hBaseSchemaVerifier) {
HbaseSchemaVerifier<TableDescriptor> hBaseSchemaVerifier) {
return new HbaseSchemaServiceImpl(hbaseAdminOperation, schemaChangeLogService, hBaseSchemaVerifier);
}
}
32 changes: 16 additions & 16 deletions ...nager/src/main/java/com/navercorp/pinpoint/hbase/manager/hbase/ReadOnlyAdminTemplate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@

import com.navercorp.pinpoint.common.hbase.AdminCallback;
import com.navercorp.pinpoint.common.hbase.HbaseAdminOperation;
import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.TableName;
import org.apache.logging.log4j.Logger;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
import org.apache.hadoop.hbase.client.TableDescriptor;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -60,33 +60,33 @@ public boolean createNamespaceIfNotExists(String namespace, Map<String, String>
}

@Override
public List<HTableDescriptor> getTableDescriptors(String namespace) {
public List<TableDescriptor> getTableDescriptors(String namespace) {
return delegate.getTableDescriptors(namespace);
}

@Override
public HTableDescriptor getTableDescriptor(TableName tableName) {
public TableDescriptor getTableDescriptor(TableName tableName) {
return delegate.getTableDescriptor(tableName);
}

@Override
public void createTable(HTableDescriptor htd) {
logger.info("Creating table : {}.", htd);
public void createTable(TableDescriptor tableDescriptor) {
logger.info("Creating table : {}.", tableDescriptor);
}

@Override
public void createTable(HTableDescriptor htd, byte[][] splitKeys) {
logger.info("Creating table : {} with {} splitKeys.", htd, splitKeys.length);
public void createTable(TableDescriptor tableDescriptor, byte[][] splitKeys) {
logger.info("Creating table : {} with {} splitKeys.", tableDescriptor, splitKeys.length);
}

@Override
public boolean createTableIfNotExists(HTableDescriptor htd) {
TableName tableName = htd.getTableName();
public boolean createTableIfNotExists(TableDescriptor tableDescriptor) {
TableName tableName = tableDescriptor.getTableName();
boolean tableExists = delegate.tableExists(tableName);
if (tableExists) {
return false;
}
this.createTable(htd);
this.createTable(tableDescriptor);
return true;
}

Expand Down Expand Up @@ -127,13 +127,13 @@ public void dropTable(TableName tableName) {
}

@Override
public void modifyTable(HTableDescriptor htd) {
logger.info("Modifying table : {}, desc : {}", htd.getTableName(), htd);
public void modifyTable(TableDescriptor tableDescriptor) {
logger.info("Modifying table : {}, desc : {}", tableDescriptor.getTableName(), tableDescriptor);
}

@Override
public void addColumn(TableName tableName, HColumnDescriptor hcd) {
logger.info("Adding column to table : {}, column : {}", tableName, hcd);
public void addColumn(TableName tableName, ColumnFamilyDescriptor columnDescriptor) {
logger.info("Adding column to table : {}, column : {}", tableName, columnDescriptor);
}

@Override
Expand Down
21 changes: 11 additions & 10 deletions ...schema/src/main/java/com/navercorp/pinpoint/hbase/schema/core/HtdHbaseSchemaVerifier.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@

package com.navercorp.pinpoint.hbase.schema.core;

import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
import org.apache.hadoop.hbase.client.TableDescriptor;
import org.springframework.util.CollectionUtils;

import java.util.HashMap;
Expand All @@ -28,7 +29,7 @@
/**
* @author HyunGil Jeong
*/
public class HtdHbaseSchemaVerifier implements HbaseSchemaVerifier<HTableDescriptor> {
public class HtdHbaseSchemaVerifier implements HbaseSchemaVerifier<TableDescriptor> {

/**
* Returns {@code true} if the schema definitions specified by {@code expectedSchemas} matches those
Expand All @@ -43,22 +44,22 @@ public class HtdHbaseSchemaVerifier implements HbaseSchemaVerifier<HTableDescrip
* @return {@code true} if the actual schema matches the expected schema
*/
@Override
public boolean verifySchemas(List<HTableDescriptor> expectedSchemas, List<HTableDescriptor> actualSchemas) {
public boolean verifySchemas(List<TableDescriptor> expectedSchemas, List<TableDescriptor> actualSchemas) {
if (CollectionUtils.isEmpty(expectedSchemas)) {
return true;
}
if (CollectionUtils.isEmpty(actualSchemas)) {
return false;
}

Map<TableName, HTableDescriptor> actualSchemaMap = new HashMap<>();
for (HTableDescriptor actualSchema : actualSchemas) {
Map<TableName, TableDescriptor> actualSchemaMap = new HashMap<>();
for (TableDescriptor actualSchema : actualSchemas) {
actualSchemaMap.put(actualSchema.getTableName(), actualSchema);
}

for (HTableDescriptor expectedSchema : expectedSchemas) {
for (TableDescriptor expectedSchema : expectedSchemas) {
TableName tableName = expectedSchema.getTableName();
HTableDescriptor actualSchema = actualSchemaMap.get(tableName);
TableDescriptor actualSchema = actualSchemaMap.get(tableName);
if (actualSchema == null) {
return false;
}
Expand All @@ -69,12 +70,12 @@ public boolean verifySchemas(List<HTableDescriptor> expectedSchemas, List<HTable
return true;
}

private boolean verifySchema(HTableDescriptor expected, HTableDescriptor actual) {
private boolean verifySchema(TableDescriptor expected, TableDescriptor actual) {
if (!expected.getTableName().equals(actual.getTableName())) {
return false;
}
for (HColumnDescriptor expectedHcd : expected.getFamilies()) {
if (!actual.hasFamily(expectedHcd.getName())) {
for (ColumnFamilyDescriptor expectedHcd : expected.getColumnFamilies()) {
if (!actual.hasColumnFamily(expectedHcd.getName())) {
return false;
}
}
Expand Down
18 changes: 8 additions & 10 deletions ...ma/src/main/java/com/navercorp/pinpoint/hbase/schema/core/command/CreateTableCommand.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@

import com.navercorp.pinpoint.common.hbase.HbaseAdminOperation;
import com.navercorp.pinpoint.common.util.ArrayUtils;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.TableDescriptor;
import org.apache.hadoop.hbase.io.compress.Compression;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import java.util.Arrays;
import java.util.Objects;
Expand All @@ -37,13 +37,13 @@ public class CreateTableCommand extends TableCommand {
private final byte[][] splitKeys;

CreateTableCommand(TableName tableName, Compression.Algorithm compressionAlgorithm, byte[][] splitKeys) {
super(new HTableDescriptor(Objects.requireNonNull(tableName, "tableName")), compressionAlgorithm);
super(tableName, compressionAlgorithm);
this.splitKeys = Objects.requireNonNull(splitKeys, "splitKeys");
}

@Override
public boolean execute(HbaseAdminOperation hbaseAdminOperation) {
HTableDescriptor htd = getHtd();
TableDescriptor htd = buildDescriptor();
TableName tableName = htd.getTableName();
if (hbaseAdminOperation.tableExists(tableName)) {
return false;
Expand All @@ -61,11 +61,9 @@ public boolean execute(HbaseAdminOperation hbaseAdminOperation) {

@Override
public String toString() {
final StringBuilder sb = new StringBuilder("CreateTableCommand{");
sb.append("htd=").append(getHtd());
sb.append("compressionAlgorithm=").append(getCompressionAlgorithm().getName());
sb.append(", splitKeys=").append(Arrays.toString(splitKeys));
sb.append('}');
return sb.toString();
return "CreateTableCommand{htd=" + buildDescriptor() +
"compressionAlgorithm=" + getCompressionAlgorithm().getName() +
", splitKeys=" + Arrays.toString(splitKeys) +
'}';
}
}
Loading

0 comments on commit 233e40c

Please sign in to comment.