Skip to content

Commit c44db24

Browse files
committed
WPI
1 parent 53d6dc0 commit c44db24

File tree

2 files changed

+0
-54
lines changed

2 files changed

+0
-54
lines changed

data-loader/core/src/main/java/com/scalar/db/dataloader/core/dataexport/ExportManager.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ public ExportReport startExport(
7676
try {
7777
validateExportOptions(exportOptions, tableMetadata);
7878
Map<String, DataType> dataTypeByColumnName = tableMetadata.getColumnDataTypes();
79-
handleTransactionMetadata(exportOptions, tableMetadata);
8079
processHeader(exportOptions, tableMetadata, writer);
8180

8281
ExecutorService executorService =
@@ -198,21 +197,6 @@ private void validateExportOptions(ExportOptions exportOptions, TableMetadata ta
198197
ExportOptionsValidator.validate(exportOptions, tableMetadata);
199198
}
200199

201-
/**
202-
* To update projection columns of export options if include metadata options is enabled
203-
*
204-
* @param exportOptions export options
205-
* @param tableMetadata metadata of the table
206-
*/
207-
private void handleTransactionMetadata(ExportOptions exportOptions, TableMetadata tableMetadata) {
208-
if (!exportOptions.getProjectionColumns().isEmpty()) {
209-
List<String> projectionMetadata =
210-
TableMetadataUtil.populateProjectionsWithMetadata(
211-
tableMetadata, exportOptions.getProjectionColumns());
212-
exportOptions.setProjectionColumns(projectionMetadata);
213-
}
214-
}
215-
216200
/**
217201
* To create a scanner object
218202
*
Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
package com.scalar.db.dataloader.core.util;
22

3-
import com.scalar.db.api.TableMetadata;
43
import com.scalar.db.dataloader.core.Constants;
54
import com.scalar.db.dataloader.core.dataimport.controlfile.ControlFileTable;
6-
import com.scalar.db.transaction.consensuscommit.Attribute;
7-
import com.scalar.db.transaction.consensuscommit.ConsensusCommitUtils;
8-
import java.util.ArrayList;
9-
import java.util.List;
105
import lombok.AccessLevel;
116
import lombok.NoArgsConstructor;
127

@@ -38,37 +33,4 @@ public static String getTableLookupKey(ControlFileTable controlFileTable) {
3833
controlFileTable.getNamespace(),
3934
controlFileTable.getTable());
4035
}
41-
42-
/**
43-
* Adds metadata columns to a list of projection columns for a ScalarDB table.
44-
*
45-
* @param tableMetadata The metadata of the ScalarDB table.
46-
* @param projections A list of projection column names.
47-
* @return A new list containing projection columns along with metadata columns.
48-
*/
49-
public static List<String> populateProjectionsWithMetadata(
50-
TableMetadata tableMetadata, List<String> projections) {
51-
List<String> projectionMetadata = new ArrayList<>();
52-
projections.forEach(
53-
projection -> {
54-
projectionMetadata.add(projection);
55-
if (!isKeyColumn(projection, tableMetadata)) {
56-
projectionMetadata.add(Attribute.BEFORE_PREFIX + projection);
57-
}
58-
});
59-
projectionMetadata.addAll(ConsensusCommitUtils.getTransactionMetaColumns().keySet());
60-
return projectionMetadata;
61-
}
62-
63-
/**
64-
* Checks whether a column is a key column (partition key or clustering key) in the table.
65-
*
66-
* @param column The name of the column to check.
67-
* @param tableMetadata The metadata of the ScalarDB table.
68-
* @return {@code true} if the column is a key column; {@code false} otherwise.
69-
*/
70-
private static boolean isKeyColumn(String column, TableMetadata tableMetadata) {
71-
return tableMetadata.getPartitionKeyNames().contains(column)
72-
|| tableMetadata.getClusteringKeyNames().contains(column);
73-
}
7436
}

0 commit comments

Comments
 (0)