HBase improvements (small refactorings, add comments)
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/cd755a1c Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/cd755a1c Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/cd755a1c Branch: refs/heads/master Commit: cd755a1cf5ea3762463c577dd220162dee14dfd9 Parents: 703fb40 Author: Gerard Dellemann <[email protected]> Authored: Thu May 31 14:10:13 2018 +0200 Committer: Gerard Dellemann <[email protected]> Committed: Thu May 31 14:10:13 2018 +0200 ---------------------------------------------------------------------- .../org/apache/metamodel/hbase/HBaseClient.java | 23 ++++--- .../hbase/HBaseRowInsertionBuilder.java | 7 +-- .../org/apache/metamodel/hbase/HBaseTable.java | 2 +- .../apache/metamodel/hbase/CreateTableTest.java | 8 +-- .../apache/metamodel/hbase/DeleteRowTest.java | 42 ++++++++++--- .../apache/metamodel/hbase/DropTableTest.java | 2 +- .../apache/metamodel/hbase/HBaseTestCase.java | 10 ++- .../hbase/HBaseUpdateCallbackTest.java | 64 ++++++++++++++++++-- .../apache/metamodel/hbase/InsertRowTest.java | 44 +++++++------- 9 files changed, 147 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/cd755a1c/hbase/src/main/java/org/apache/metamodel/hbase/HBaseClient.java ---------------------------------------------------------------------- diff --git a/hbase/src/main/java/org/apache/metamodel/hbase/HBaseClient.java b/hbase/src/main/java/org/apache/metamodel/hbase/HBaseClient.java index 979322e..8eda465 100644 --- a/hbase/src/main/java/org/apache/metamodel/hbase/HBaseClient.java +++ b/hbase/src/main/java/org/apache/metamodel/hbase/HBaseClient.java @@ -93,14 +93,19 @@ public final class HBaseClient { if (tableName == null || rowKey == null) { throw new IllegalArgumentException("Can't delete a row without having tableName or rowKey"); } - try (final Table table = _connection.getTable(TableName.valueOf(tableName));) { - if (rowExists(table, rowKey) == true) { - table.delete(new Delete(Bytes.toBytes(rowKey.toString()))); - } else { - logger.warn("Rowkey with value " + rowKey.toString() + " doesn't exist in the table"); + byte[] rowKeyAsByteArray = Bytes.toBytes(rowKey.toString()); + if (rowKeyAsByteArray.length > 0) { + try (final Table table = _connection.getTable(TableName.valueOf(tableName));) { + if (rowExists(table, rowKeyAsByteArray) == true) { + table.delete(new Delete(rowKeyAsByteArray)); + } else { + logger.warn("Rowkey with value " + rowKey.toString() + " doesn't exist in the table"); + } + } catch (IOException e) { + throw new MetaModelException(e); } - } catch (IOException e) { - throw new MetaModelException(e); + } else { + logger.info("Have not deleted a row, which has an empty (\"\") rowKey."); } } @@ -111,8 +116,8 @@ public final class HBaseClient { * @return boolean * @throws IOException */ - private boolean rowExists(Table table, Object rowKey) throws IOException { - final Get get = new Get(Bytes.toBytes(rowKey.toString())); + private boolean rowExists(Table table, byte[] rowKey) throws IOException { + final Get get = new Get(rowKey); return !table.get(get).isEmpty(); } http://git-wip-us.apache.org/repos/asf/metamodel/blob/cd755a1c/hbase/src/main/java/org/apache/metamodel/hbase/HBaseRowInsertionBuilder.java ---------------------------------------------------------------------- diff --git a/hbase/src/main/java/org/apache/metamodel/hbase/HBaseRowInsertionBuilder.java b/hbase/src/main/java/org/apache/metamodel/hbase/HBaseRowInsertionBuilder.java index 9091788..4ae97c1 100644 --- a/hbase/src/main/java/org/apache/metamodel/hbase/HBaseRowInsertionBuilder.java +++ b/hbase/src/main/java/org/apache/metamodel/hbase/HBaseRowInsertionBuilder.java @@ -63,13 +63,12 @@ public class HBaseRowInsertionBuilder extends AbstractRowInsertionBuilder<HBaseU } /** - * Returns the index of the ID-column (see {@link HBaseDataContext#FIELD_ID}) in an array of HBaseColumns. When no - * ID-column is found, then null is returned. + * Returns the index of the ID-column (see {@link HBaseDataContext#FIELD_ID}) in an array of HBaseColumns. * * @param columns - * @return {@link Integer} + * @return index of the ID-column */ - private static Integer getIndexOfIdColumn(final List<HBaseColumn> columns) { + private static int getIndexOfIdColumn(final List<HBaseColumn> columns) { for (int i = 0; i < columns.size(); i++) { if (HBaseDataContext.FIELD_ID.equals(columns.get(i).getColumnFamily())) { return i; http://git-wip-us.apache.org/repos/asf/metamodel/blob/cd755a1c/hbase/src/main/java/org/apache/metamodel/hbase/HBaseTable.java ---------------------------------------------------------------------- diff --git a/hbase/src/main/java/org/apache/metamodel/hbase/HBaseTable.java b/hbase/src/main/java/org/apache/metamodel/hbase/HBaseTable.java index 0dd2558..c080856 100644 --- a/hbase/src/main/java/org/apache/metamodel/hbase/HBaseTable.java +++ b/hbase/src/main/java/org/apache/metamodel/hbase/HBaseTable.java @@ -151,7 +151,7 @@ final class HBaseTable extends MutableTable { /** * Returns the column families for this HBase table. * - * @return {@link Set} + * @return {@link Set}<{@link String}> of columnFamilies */ Set<String> getColumnFamilies() { return getColumnsInternal() http://git-wip-us.apache.org/repos/asf/metamodel/blob/cd755a1c/hbase/src/test/java/org/apache/metamodel/hbase/CreateTableTest.java ---------------------------------------------------------------------- diff --git a/hbase/src/test/java/org/apache/metamodel/hbase/CreateTableTest.java b/hbase/src/test/java/org/apache/metamodel/hbase/CreateTableTest.java index 9ea04df..789b4bd 100644 --- a/hbase/src/test/java/org/apache/metamodel/hbase/CreateTableTest.java +++ b/hbase/src/test/java/org/apache/metamodel/hbase/CreateTableTest.java @@ -118,7 +118,7 @@ public class CreateTableTest extends HBaseUpdateCallbackTest { if (isConfigured()) { final HBaseTable table = createHBaseTable(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR, null); final LinkedHashMap<HBaseColumn, Object> row = createRow(table, null, CF_FOO, CF_BAR); - final Set<String> columnFamilies = getColumnFamilies(getHBaseColumnsFromMap(row)); + final Set<String> columnFamilies = getColumnFamilies(getHBaseColumnsFromRow(row)); try { final HBaseCreateTableBuilder hBaseCreateTableBuilder = (HBaseCreateTableBuilder) getUpdateCallback() .createTable(getSchema(), TABLE_NAME); @@ -196,7 +196,7 @@ public class CreateTableTest extends HBaseUpdateCallbackTest { if (isConfigured()) { final HBaseTable table = createHBaseTable(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR, null); final LinkedHashMap<HBaseColumn, Object> row = createRow(table, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR); - final Set<String> columnFamilies = getColumnFamilies(getHBaseColumnsFromMap(row)); + final Set<String> columnFamilies = getColumnFamilies(getHBaseColumnsFromRow(row)); try { final HBaseCreateTableBuilder hBaseCreateTableBuilder = (HBaseCreateTableBuilder) getUpdateCallback() .createTable(getSchema(), TABLE_NAME); @@ -220,7 +220,7 @@ public class CreateTableTest extends HBaseUpdateCallbackTest { if (isConfigured()) { final HBaseTable table = createHBaseTable(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR, null); final LinkedHashMap<HBaseColumn, Object> row = createRow(table, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR); - final Set<String> columnFamilies = getColumnFamilies(getHBaseColumnsFromMap(row)); + final Set<String> columnFamilies = getColumnFamilies(getHBaseColumnsFromRow(row)); try { getUpdateCallback().createTable(getSchema(), TABLE_NAME, columnFamilies).execute(); checkSuccesfullyInsertedTable(); @@ -237,7 +237,7 @@ public class CreateTableTest extends HBaseUpdateCallbackTest { * Creates a set of columnFamilies out of a list of hbaseColumns * * @param columns - * @return {@link LinkedHashSet} + * @return {@link Set}<{@link String}> of columnFamilies */ private static Set<String> getColumnFamilies(List<HBaseColumn> columns) { return columns.stream().map(HBaseColumn::getColumnFamily).distinct().collect(Collectors.toSet()); http://git-wip-us.apache.org/repos/asf/metamodel/blob/cd755a1c/hbase/src/test/java/org/apache/metamodel/hbase/DeleteRowTest.java ---------------------------------------------------------------------- diff --git a/hbase/src/test/java/org/apache/metamodel/hbase/DeleteRowTest.java b/hbase/src/test/java/org/apache/metamodel/hbase/DeleteRowTest.java index 893b956..ef594c8 100644 --- a/hbase/src/test/java/org/apache/metamodel/hbase/DeleteRowTest.java +++ b/hbase/src/test/java/org/apache/metamodel/hbase/DeleteRowTest.java @@ -64,8 +64,8 @@ public class DeleteRowTest extends HBaseUpdateCallbackTest { public void testHBaseClientNullAtBuilder() throws IOException { if (isConfigured()) { try { - final HBaseTable existingTable = createAndInsertTable(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, - CF_BAR); + final HBaseTable existingTable = createAndAddTableToDatastore(TABLE_NAME, HBaseDataContext.FIELD_ID, + CF_FOO, CF_BAR); new HBaseRowDeletionBuilder(null, existingTable); fail("Should get an exception that hBaseClient can't be null."); } catch (IllegalArgumentException e) { @@ -84,8 +84,8 @@ public class DeleteRowTest extends HBaseUpdateCallbackTest { public void testNotSettingRowkey() throws IOException { if (isConfigured()) { try { - final HBaseTable existingTable = createAndInsertTable(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, - CF_BAR); + final HBaseTable existingTable = createAndAddTableToDatastore(TABLE_NAME, HBaseDataContext.FIELD_ID, + CF_FOO, CF_BAR); getUpdateCallback().deleteFrom(existingTable).execute(); fail("Should get an exception that the columnFamily doesn't exist."); } catch (MetaModelException e) { @@ -137,8 +137,8 @@ public class DeleteRowTest extends HBaseUpdateCallbackTest { public void testDeletingNotExistingRow() { if (isConfigured()) { try { - final HBaseTable existingTable = createAndInsertTable(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, - CF_BAR); + final HBaseTable existingTable = createAndAddTableToDatastore(TABLE_NAME, HBaseDataContext.FIELD_ID, + CF_FOO, CF_BAR); checkRows(false); final HBaseRowDeletionBuilder rowDeletionBuilder = (HBaseRowDeletionBuilder) getUpdateCallback() @@ -156,16 +156,40 @@ public class DeleteRowTest extends HBaseUpdateCallbackTest { } /** + * Goodflow. Deleting a row, which has an empty rowKey value, should not throw an exception + */ + public void testUsingAnEmptyRowKeyValue() { + if (isConfigured()) { + try { + final HBaseTable existingTable = createAndAddTableToDatastore(TABLE_NAME, HBaseDataContext.FIELD_ID, + CF_FOO, CF_BAR); + + checkRows(false); + final HBaseRowDeletionBuilder rowDeletionBuilder = (HBaseRowDeletionBuilder) getUpdateCallback() + .deleteFrom(existingTable); + rowDeletionBuilder.setKey(""); + rowDeletionBuilder.execute(); + checkRows(false); + } catch (Exception e) { + fail("Should not get an exception that the rowkey is empty."); + } + } else { + warnAboutANotExecutedTest(getClass().getName(), new Object() { + }.getClass().getEnclosingMethod().getName()); + } + } + + /** * Goodflow. Deleting a row succesfully. */ public void testDeleteRowSuccesfully() { if (isConfigured()) { try { - final HBaseTable existingTable = createAndInsertTable(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, - CF_BAR); + final HBaseTable existingTable = createAndAddTableToDatastore(TABLE_NAME, HBaseDataContext.FIELD_ID, + CF_FOO, CF_BAR); final LinkedHashMap<HBaseColumn, Object> row = createRow(existingTable, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR); - final List<HBaseColumn> columns = getHBaseColumnsFromMap(row); + final List<HBaseColumn> columns = getHBaseColumnsFromRow(row); checkRows(false); final HBaseRowInsertionBuilder rowInsertionBuilder = getUpdateCallback().insertInto(existingTable, http://git-wip-us.apache.org/repos/asf/metamodel/blob/cd755a1c/hbase/src/test/java/org/apache/metamodel/hbase/DropTableTest.java ---------------------------------------------------------------------- diff --git a/hbase/src/test/java/org/apache/metamodel/hbase/DropTableTest.java b/hbase/src/test/java/org/apache/metamodel/hbase/DropTableTest.java index 39bb06d..afcc4eb 100644 --- a/hbase/src/test/java/org/apache/metamodel/hbase/DropTableTest.java +++ b/hbase/src/test/java/org/apache/metamodel/hbase/DropTableTest.java @@ -80,7 +80,7 @@ public class DropTableTest extends HBaseUpdateCallbackTest { public void testDropTableSuccesfully() throws IOException { if (isConfigured()) { try { - final HBaseTable existingTable = createAndInsertTable(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, + final HBaseTable existingTable = createAndAddTableToDatastore(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR); getUpdateCallback().dropTable(existingTable).execute(); try (final Admin admin = getDataContext().getAdmin()) { http://git-wip-us.apache.org/repos/asf/metamodel/blob/cd755a1c/hbase/src/test/java/org/apache/metamodel/hbase/HBaseTestCase.java ---------------------------------------------------------------------- diff --git a/hbase/src/test/java/org/apache/metamodel/hbase/HBaseTestCase.java b/hbase/src/test/java/org/apache/metamodel/hbase/HBaseTestCase.java index 70fd2e3..5f494b7 100644 --- a/hbase/src/test/java/org/apache/metamodel/hbase/HBaseTestCase.java +++ b/hbase/src/test/java/org/apache/metamodel/hbase/HBaseTestCase.java @@ -28,6 +28,10 @@ import org.junit.AfterClass; import junit.framework.TestCase; +/** + * Properly configure before executing these tests. + * See the {@link HBaseTestCase#setUp()} and {@link HBaseTestCase#getPropertyFilePath()} methods. + */ public abstract class HBaseTestCase extends TestCase { // TableName @@ -93,7 +97,11 @@ public abstract class HBaseTestCase extends TestCase { _dataContext.getConnection().close(); } - private String getPropertyFilePath() { + /** + * Get's the test configuration file. An example file can be found at the root folder of this project. + * @return Location of the configuration file. + */ + protected String getPropertyFilePath() { String userHome = System.getProperty("user.home"); return userHome + "/metamodel-integrationtest-configuration.properties"; } http://git-wip-us.apache.org/repos/asf/metamodel/blob/cd755a1c/hbase/src/test/java/org/apache/metamodel/hbase/HBaseUpdateCallbackTest.java ---------------------------------------------------------------------- diff --git a/hbase/src/test/java/org/apache/metamodel/hbase/HBaseUpdateCallbackTest.java b/hbase/src/test/java/org/apache/metamodel/hbase/HBaseUpdateCallbackTest.java index 60a5ba6..5085689 100644 --- a/hbase/src/test/java/org/apache/metamodel/hbase/HBaseUpdateCallbackTest.java +++ b/hbase/src/test/java/org/apache/metamodel/hbase/HBaseUpdateCallbackTest.java @@ -68,6 +68,10 @@ public abstract class HBaseUpdateCallbackTest extends HBaseTestCase { super.tearDown(); } + /** + * Drop the table if it exists. + * After that check in the schema and the datastore if the actions have been executed succesfully. + */ protected void dropTableIfItExists() { final Table table = schema.getTableByName(TABLE_NAME); if (table != null) { @@ -83,6 +87,11 @@ public abstract class HBaseUpdateCallbackTest extends HBaseTestCase { } } + /** + * Check if the table has been inserted succesfully. + * Checks are performed in the schema and the datastore. + * @throws IOException because the admin object needs to be created + */ protected void checkSuccesfullyInsertedTable() throws IOException { // Check the schema assertNotNull(schema.getTableByName(TABLE_NAME)); @@ -94,8 +103,17 @@ public abstract class HBaseUpdateCallbackTest extends HBaseTestCase { } } - protected HBaseTable createAndInsertTable(final String tableName, final String idColumn, final String columnFamily1, - final String columnFamily2) throws IOException { + /** + * Create a test HBase table and add it to the datastore + * @param tableName name of the table + * @param idColumn required ID-column + * @param columnFamily1 required columnFamily 1 + * @param columnFamily2 required columnFamily 2 + * @return created and add {@link HBaseTable} + * @throws IOException + */ + protected HBaseTable createAndAddTableToDatastore(final String tableName, final String idColumn, + final String columnFamily1, final String columnFamily2) throws IOException { final LinkedHashSet<String> columnFamilies = new LinkedHashSet<>(); columnFamilies.add(idColumn); columnFamilies.add(columnFamily1); @@ -105,6 +123,15 @@ public abstract class HBaseUpdateCallbackTest extends HBaseTestCase { return (HBaseTable) getDataContext().getDefaultSchema().getTableByName(tableName); } + /** + * Create a test HBase table + * @param tableName name of the table + * @param idColumn required ID-column + * @param columnFamily1 required columnFamily 1 + * @param columnFamily2 required columnFamily 2 + * @param columnFamily3 columnFamily 3 is not required and can be used to test errors + * @return created {@link HBaseTable} + */ protected HBaseTable createHBaseTable(final String tableName, final String idColumn, final String columnFamily1, final String columnFamily2, final String columnFamily3) { String[] columnNames; @@ -121,6 +148,14 @@ public abstract class HBaseUpdateCallbackTest extends HBaseTestCase { return new HBaseTable(getDataContext(), tableDef, schema, ColumnType.STRING); } + /** + * Creates a map that represents a row + * @param table HBaseTable + * @param idColumn required ID-column + * @param columnFamily1 required columnFamily 1 + * @param columnFamily2 required columnFamily 1 + * @return {@link LinkedHashMap}<{@link HBaseColumn}, {@link Object}> + */ protected static LinkedHashMap<HBaseColumn, Object> createRow(final HBaseTable table, final String idColumn, final String columnFamily1, final String columnFamily2) { final LinkedHashMap<HBaseColumn, Object> map = new LinkedHashMap<>(); @@ -153,12 +188,22 @@ public abstract class HBaseUpdateCallbackTest extends HBaseTestCase { return map; } - protected static List<HBaseColumn> getHBaseColumnsFromMap(final LinkedHashMap<HBaseColumn, Object> map) { + /** + * Get the HBaseColumns out of a mapped row + * @param row {@link LinkedHashMap}<{@link HBaseColumn}, {@link Object}> + * @return {@link List}<{@link HBaseColumn}> + */ + protected static List<HBaseColumn> getHBaseColumnsFromRow(final LinkedHashMap<HBaseColumn, Object> row) { final List<HBaseColumn> columns = new ArrayList<>(); - columns.addAll(map.keySet()); + columns.addAll(row.keySet()); return columns; } + /** + * Set the values of a {@link HBaseRowInsertionBuilder} from the values in the mapped row + * @param row {@link LinkedHashMap}<{@link HBaseColumn}, {@link Object}> containing the values + * @param rowInsertionBuilder insertionBuilder to be set + */ protected void setValuesInInsertionBuilder(final LinkedHashMap<HBaseColumn, Object> row, final HBaseRowInsertionBuilder rowInsertionBuilder) { int i = 0; @@ -168,6 +213,11 @@ public abstract class HBaseUpdateCallbackTest extends HBaseTestCase { } } + /** + * Checks that the table does or doesn't have rows, depending on the rowsExists parameter + * @param rowsExist true, check that the rows exists. false, check that the result is empty. + * @throws IOException + */ protected void checkRows(final boolean rowsExist) throws IOException { try (org.apache.hadoop.hbase.client.Table table = getDataContext().getConnection().getTable(TableName.valueOf( TABLE_NAME))) { @@ -186,6 +236,12 @@ public abstract class HBaseUpdateCallbackTest extends HBaseTestCase { } } + /** + * Warn that the test(method) of a class is not executed, because the test-file hasn't been set. + * See {@link HBaseTestCase#getPropertyFilePath} + * @param className + * @param methodName + */ protected void warnAboutANotExecutedTest(String className, String methodName) { String logWarning = "Test \"" + className + "#" + methodName + "()\" is not executed, because the HBasetest is not configured."; http://git-wip-us.apache.org/repos/asf/metamodel/blob/cd755a1c/hbase/src/test/java/org/apache/metamodel/hbase/InsertRowTest.java ---------------------------------------------------------------------- diff --git a/hbase/src/test/java/org/apache/metamodel/hbase/InsertRowTest.java b/hbase/src/test/java/org/apache/metamodel/hbase/InsertRowTest.java index 1a9a424..db04527 100644 --- a/hbase/src/test/java/org/apache/metamodel/hbase/InsertRowTest.java +++ b/hbase/src/test/java/org/apache/metamodel/hbase/InsertRowTest.java @@ -48,7 +48,7 @@ public class InsertRowTest extends HBaseUpdateCallbackTest { public void testOnlyUsingTableParameter() throws IOException { if (isConfigured()) { try { - final HBaseTable existingTable = createAndInsertTable(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, + final HBaseTable existingTable = createAndAddTableToDatastore(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR); getUpdateCallback().insertInto(existingTable); fail("Should get an exception that this method is not supported"); @@ -69,11 +69,11 @@ public class InsertRowTest extends HBaseUpdateCallbackTest { if (isConfigured()) { final MutableTable mutableTable = new MutableTable(); try { - final HBaseTable existingTable = createAndInsertTable(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, + final HBaseTable existingTable = createAndAddTableToDatastore(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR); final LinkedHashMap<HBaseColumn, Object> row = createRow(existingTable, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR); - final List<HBaseColumn> columns = getHBaseColumnsFromMap(row); + final List<HBaseColumn> columns = getHBaseColumnsFromRow(row); getUpdateCallback().insertInto(mutableTable, columns); fail("Should get an exception that the type of the table is wrong."); } catch (IllegalArgumentException e) { @@ -92,7 +92,7 @@ public class InsertRowTest extends HBaseUpdateCallbackTest { public void testColumnsNullAtUpdateCallBack() throws IOException { if (isConfigured()) { try { - final HBaseTable existingTable = createAndInsertTable(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, + final HBaseTable existingTable = createAndAddTableToDatastore(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR); getUpdateCallback().insertInto(existingTable, null); fail("Should get an exception that the columns list is null."); @@ -112,7 +112,7 @@ public class InsertRowTest extends HBaseUpdateCallbackTest { public void testColumnsEmptyAtUpdateCallBack() throws IOException { if (isConfigured()) { try { - final HBaseTable existingTable = createAndInsertTable(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, + final HBaseTable existingTable = createAndAddTableToDatastore(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR); getUpdateCallback().insertInto(existingTable, new ArrayList<HBaseColumn>()); fail("Should get an exception that the columns list is empty."); @@ -132,7 +132,7 @@ public class InsertRowTest extends HBaseUpdateCallbackTest { public void testColumnsEmptyAtBuilder() throws IOException { if (isConfigured()) { try { - final HBaseTable existingTable = createAndInsertTable(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, + final HBaseTable existingTable = createAndAddTableToDatastore(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR); List<HBaseColumn> emptyList = new ArrayList<>(); new HBaseRowInsertionBuilder(getUpdateCallback(), existingTable, emptyList); @@ -155,11 +155,11 @@ public class InsertRowTest extends HBaseUpdateCallbackTest { final HBaseTable wrongTable = createHBaseTable("NewTableNotInSchema", HBaseDataContext.FIELD_ID, "cf1", "cf2", null); try { - final HBaseTable existingTable = createAndInsertTable(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, + final HBaseTable existingTable = createAndAddTableToDatastore(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR); final LinkedHashMap<HBaseColumn, Object> row = createRow(existingTable, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR); - final List<HBaseColumn> columns = getHBaseColumnsFromMap(row); + final List<HBaseColumn> columns = getHBaseColumnsFromRow(row); getUpdateCallback().insertInto(wrongTable, columns); fail("Should get an exception that the table isn't in the schema."); } catch (MetaModelException e) { @@ -179,10 +179,10 @@ public class InsertRowTest extends HBaseUpdateCallbackTest { public void testIDColumnDoesntExistInColumnsArray() throws IOException { if (isConfigured()) { try { - final HBaseTable existingTable = createAndInsertTable(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, + final HBaseTable existingTable = createAndAddTableToDatastore(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR); final LinkedHashMap<HBaseColumn, Object> row = createRow(existingTable, null, CF_FOO, CF_BAR); - final List<HBaseColumn> columns = getHBaseColumnsFromMap(row); + final List<HBaseColumn> columns = getHBaseColumnsFromRow(row); getUpdateCallback().insertInto(existingTable, columns); fail("Should get an exception that ID-column doesn't exist."); } catch (MetaModelException e) { @@ -202,11 +202,11 @@ public class InsertRowTest extends HBaseUpdateCallbackTest { if (isConfigured()) { final String wrongColumnFamily = "wrongColumnFamily"; try { - final HBaseTable existingTable = createAndInsertTable(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, + final HBaseTable existingTable = createAndAddTableToDatastore(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR); final LinkedHashMap<HBaseColumn, Object> row = createRow(existingTable, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR); - final List<HBaseColumn> columns = getHBaseColumnsFromMap(row); + final List<HBaseColumn> columns = getHBaseColumnsFromRow(row); final HBaseTable wrongTable = createHBaseTable(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, wrongColumnFamily, null); getUpdateCallback().insertInto(wrongTable, columns); @@ -229,11 +229,11 @@ public class InsertRowTest extends HBaseUpdateCallbackTest { if (isConfigured()) { final String wrongColumnFamily = "newColumnFamily"; try { - final HBaseTable existingTable = createAndInsertTable(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, + final HBaseTable existingTable = createAndAddTableToDatastore(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR); final LinkedHashMap<HBaseColumn, Object> row = createRow(existingTable, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR); - final List<HBaseColumn> columns = getHBaseColumnsFromMap(row); + final List<HBaseColumn> columns = getHBaseColumnsFromRow(row); final HBaseTable wrongTable = createHBaseTable(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR, wrongColumnFamily); getUpdateCallback().insertInto(wrongTable, columns); @@ -257,7 +257,7 @@ public class InsertRowTest extends HBaseUpdateCallbackTest { final HBaseTable table = createHBaseTable(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR, null); final LinkedHashMap<HBaseColumn, Object> row = createRow(table, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR); - final HBaseColumn[] columns = convertToHBaseColumnsArray(getHBaseColumnsFromMap(row)); + final HBaseColumn[] columns = convertToHBaseColumnsArray(getHBaseColumnsFromRow(row)); final Object[] values = new String[] { "Values" }; new HBaseClient(getDataContext().getConnection()).insertRow(null, columns, values, 0); fail("Should get an exception that tableName is null"); @@ -301,7 +301,7 @@ public class InsertRowTest extends HBaseUpdateCallbackTest { final HBaseTable table = createHBaseTable(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR, null); final LinkedHashMap<HBaseColumn, Object> row = createRow(table, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR); - final HBaseColumn[] columns = convertToHBaseColumnsArray(getHBaseColumnsFromMap(row)); + final HBaseColumn[] columns = convertToHBaseColumnsArray(getHBaseColumnsFromRow(row)); new HBaseClient(getDataContext().getConnection()).insertRow(table.getName(), columns, null, 0); fail("Should get an exception that values is null"); } catch (IllegalArgumentException e) { @@ -324,7 +324,7 @@ public class InsertRowTest extends HBaseUpdateCallbackTest { final HBaseTable table = createHBaseTable(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR, null); final LinkedHashMap<HBaseColumn, Object> row = createRow(table, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR); - final HBaseColumn[] columns = convertToHBaseColumnsArray(getHBaseColumnsFromMap(row)); + final HBaseColumn[] columns = convertToHBaseColumnsArray(getHBaseColumnsFromRow(row)); final Object[] values = new String[] { "Values" }; new HBaseClient(getDataContext().getConnection()).insertRow(table.getName(), columns, values, 10); fail("Should get an exception that the indexOfIdColumn is incorrect"); @@ -348,7 +348,7 @@ public class InsertRowTest extends HBaseUpdateCallbackTest { final HBaseTable table = createHBaseTable(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR, null); final LinkedHashMap<HBaseColumn, Object> row = createRow(table, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR); - final HBaseColumn[] columns = convertToHBaseColumnsArray(getHBaseColumnsFromMap(row)); + final HBaseColumn[] columns = convertToHBaseColumnsArray(getHBaseColumnsFromRow(row)); final Object[] values = new String[] { null }; new HBaseClient(getDataContext().getConnection()).insertRow(table.getName(), columns, values, 0); fail("Should get an exception that the indexOfIdColumn is incorrect"); @@ -369,11 +369,11 @@ public class InsertRowTest extends HBaseUpdateCallbackTest { public void testInsertIntoWithoutExecute() { if (isConfigured()) { try { - final HBaseTable existingTable = createAndInsertTable(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, + final HBaseTable existingTable = createAndAddTableToDatastore(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR); final LinkedHashMap<HBaseColumn, Object> row = createRow(existingTable, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR); - final List<HBaseColumn> columns = getHBaseColumnsFromMap(row); + final List<HBaseColumn> columns = getHBaseColumnsFromRow(row); getUpdateCallback().insertInto(existingTable, columns); } catch (Exception e) { fail("No exception should be thrown, when inserting into an existing table."); @@ -416,11 +416,11 @@ public class InsertRowTest extends HBaseUpdateCallbackTest { public void testInsertingSuccesfully() { if (isConfigured()) { try { - final HBaseTable existingTable = createAndInsertTable(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, + final HBaseTable existingTable = createAndAddTableToDatastore(TABLE_NAME, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR); final LinkedHashMap<HBaseColumn, Object> row = createRow(existingTable, HBaseDataContext.FIELD_ID, CF_FOO, CF_BAR); - final List<HBaseColumn> columns = getHBaseColumnsFromMap(row); + final List<HBaseColumn> columns = getHBaseColumnsFromRow(row); checkRows(false); final HBaseRowInsertionBuilder rowInsertionBuilder = getUpdateCallback().insertInto(existingTable,
