Skip to content

Commit

Permalink
UDF changes for Supporting Sql based digest calculation
Browse files Browse the repository at this point in the history
  • Loading branch information
@prasar-ashutosh
prasar-ashutosh committed Sep 24, 2024
1 parent 5a9dab3 commit 7a58119
Show file tree
Hide file tree
Showing 19 changed files with 343 additions and 244 deletions.
1 change: 1 addition & 0 deletions ...finos/legend/engine/persistence/components/ingestmode/digest/DigestGenerationHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ else if (value instanceof StagedFilesFieldValue)
.addAllValues(filteredStagingFieldValues)
.addAllFieldTypes(filteredStagingFieldTypes)
.putAllTypeConversionUdfNames(udfBasedDigestGenStrategy.typeConversionUdfNames())
.columnNameValueConcatUdfName(udfBasedDigestGenStrategy.columnNameValueConcatUdfName())
.build();

String digestField = udfBasedDigestGenStrategy.digestField();
Expand Down
3 changes: 3 additions & 0 deletions ...nd/engine/persistence/components/ingestmode/digest/UDFBasedDigestGenStrategyAbstract.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import org.immutables.value.Value;

import java.util.Map;
import java.util.Optional;
import java.util.Set;

@Value.Immutable
Expand All @@ -38,6 +39,8 @@ public interface UDFBasedDigestGenStrategyAbstract extends DigestGenStrategy

Map<DataType, String> typeConversionUdfNames();

Optional<String> columnNameValueConcatUdfName();

@Override
default <T> T accept(DigestGenStrategyVisitor<T> visitor)
{
Expand Down
3 changes: 3 additions & 0 deletions .../org/finos/legend/engine/persistence/components/logicalplan/values/DigestUdfAbstract.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

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

@org.immutables.value.Value.Immutable
@org.immutables.value.Value.Style(
Expand All @@ -40,4 +41,6 @@ public interface DigestUdfAbstract extends Value
List<FieldType> fieldTypes();

Map<DataType, String> typeConversionUdfNames();

Optional<String> columnNameValueConcatUdfName();
}
1 change: 1 addition & 0 deletions .../java/org/finos/legend/engine/persistence/components/logicalplan/values/FunctionName.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,6 @@ public enum FunctionName
TO_JSON,
CONVERT,
STRUCT,
CONCAT,
APPROX_COUNT_DISTINCT;
}
33 changes: 21 additions & 12 deletions ...s/legend/engine/persistence/components/relational/ansi/sql/visitors/DigestUdfVisitor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@

import org.finos.legend.engine.persistence.components.logicalplan.datasets.DataType;
import org.finos.legend.engine.persistence.components.logicalplan.datasets.FieldType;
import org.finos.legend.engine.persistence.components.logicalplan.values.DigestUdf;
import org.finos.legend.engine.persistence.components.logicalplan.values.StringValue;
import org.finos.legend.engine.persistence.components.logicalplan.values.ToArrayFunction;
import org.finos.legend.engine.persistence.components.logicalplan.values.Value;
import org.finos.legend.engine.persistence.components.logicalplan.values.*;
import org.finos.legend.engine.persistence.components.physicalplan.PhysicalPlanNode;
import org.finos.legend.engine.persistence.components.relational.sqldom.schemaops.values.Udf;
import org.finos.legend.engine.persistence.components.transformer.LogicalPlanVisitor;
Expand All @@ -38,22 +35,34 @@ public VisitorResult visit(PhysicalPlanNode prev, DigestUdf current, VisitorCont
{
Udf udf = new Udf(context.quoteIdentifier(), current.udfName());
prev.push(udf);
List<Value> columnNameList = new ArrayList<>();
List<Value> columnValueList = new ArrayList<>();
List<Value> columns = new ArrayList<>();
for (int i = 0; i < current.values().size(); i++)
{
columnNameList.add(StringValue.of(current.fieldNames().get(i)));
columnValueList.add(getColumnValueAsStringType(current.values().get(i), current.fieldTypes().get(i), current.typeConversionUdfNames()));
Value columnName = StringValue.of(current.fieldNames().get(i));
Value columnValue = getColumnValueAsStringType(current.values().get(i), current.fieldTypes().get(i), current.typeConversionUdfNames());
if (current.columnNameValueConcatUdfName().isPresent())
{
columns.add(org.finos.legend.engine.persistence.components.logicalplan.values.Udf.builder().udfName(current.columnNameValueConcatUdfName().get()).addParameters(columnName, columnValue).build());
}
else
{
columns.add(columnName);
columns.add(columnValue);
}
}

ToArrayFunction toArrayColumnNames = ToArrayFunction.builder().addAllValues(columnNameList).build();
ToArrayFunction toArrayColumnValues = ToArrayFunction.builder().addAllValues(columnValueList).build();
Value mergeFunction = mergeColumnsFunction(columns);
return new VisitorResult(udf, Arrays.asList(mergeFunction));
}

return new VisitorResult(udf, Arrays.asList(toArrayColumnNames, toArrayColumnValues));
protected Value mergeColumnsFunction(List<Value> columns)
{
FunctionImpl concatFunction = FunctionImpl.builder().functionName(FunctionName.CONCAT).addAllValue(columns).build();
return concatFunction;
}

protected Value getColumnValueAsStringType(Value value, FieldType dataType, Map<DataType, String> typeConversionUdfNames)
{
throw new IllegalStateException("UDF is unsupported in ANSI sink");
}
}
}
9 changes: 9 additions & 0 deletions ...egend/engine/persistence/components/relational/bigquery/sql/visitor/DigestUdfVisitor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@

import org.finos.legend.engine.persistence.components.logicalplan.datasets.DataType;
import org.finos.legend.engine.persistence.components.logicalplan.datasets.FieldType;
import org.finos.legend.engine.persistence.components.logicalplan.values.ToArrayFunction;
import org.finos.legend.engine.persistence.components.logicalplan.values.Value;

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

public class DigestUdfVisitor extends org.finos.legend.engine.persistence.components.relational.ansi.sql.visitors.DigestUdfVisitor
Expand All @@ -35,4 +37,11 @@ protected Value getColumnValueAsStringType(Value value, FieldType dataType, Map<
return value;
}
}

@Override
protected Value mergeColumnsFunction(List<Value> columns)
{
ToArrayFunction toArrayFunction = ToArrayFunction.builder().addAllValues(columns).build();
return toArrayFunction;
}
}
8 changes: 4 additions & 4 deletions .../test/java/org/finos/legend/engine/persistence/components/e2e/AppendOnlyExecutorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,16 +142,16 @@ public void testMilestoningWithDigestGeneration() throws IOException, Interrupte
"AS (\n" +
" CAST(value AS STRING)\n" +
");\n");
runQuery("CREATE FUNCTION demo.stringifyArr(arr1 ARRAY<STRING>, arr2 ARRAY<STRING>)\n" +
runQuery("CREATE FUNCTION demo.stringifyArr(args ARRAY<STRING>)\n" +
" RETURNS STRING\n" +
" LANGUAGE js AS \"\"\"\n" +
" let output = \"\"; \n" +
" for (const [index, element] of arr1.entries()) { output += arr1[index]; output += arr2[index]; }\n" +
" for (const [index, element] of args.entries()) { output += args[index]; }\n" +
" return output;\n" +
" \"\"\"; \n");
runQuery("CREATE FUNCTION demo.LAKEHOUSE_MD5(arr1 ARRAY<STRING>, arr2 ARRAY<STRING>)\n" +
runQuery("CREATE FUNCTION demo.LAKEHOUSE_MD5(args ARRAY<STRING>)\n" +
"AS (\n" +
" TO_HEX(MD5(demo.stringifyArr(arr1, arr2)))\n" +
" TO_HEX(MD5(demo.stringifyArr(args)))\n" +
");\n");

// Pass 1
Expand Down
8 changes: 4 additions & 4 deletions ...test/java/org/finos/legend/engine/persistence/components/e2e/AppendOnlyGeneratorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,16 +111,16 @@ public void testMilestoningWithDigestGenerationWithFieldsToExclude() throws IOEx
"AS (\n" +
" CAST(value AS STRING)\n" +
");\n");
runQuery("CREATE FUNCTION demo.stringifyArr(arr1 ARRAY<STRING>, arr2 ARRAY<STRING>)\n" +
runQuery("CREATE FUNCTION demo.stringifyArr(args ARRAY<STRING>)\n" +
" RETURNS STRING\n" +
" LANGUAGE js AS \"\"\"\n" +
" let output = \"\"; \n" +
" for (const [index, element] of arr1.entries()) { output += arr1[index]; output += arr2[index]; }\n" +
" for (const [index, element] of args.entries()) { output += args[index]; }\n" +
" return output;\n" +
" \"\"\"; \n");
runQuery("CREATE FUNCTION demo.LAKEHOUSE_MD5(arr1 ARRAY<STRING>, arr2 ARRAY<STRING>)\n" +
runQuery("CREATE FUNCTION demo.LAKEHOUSE_MD5(args ARRAY<STRING>)\n" +
"AS (\n" +
" TO_HEX(MD5(demo.stringifyArr(arr1, arr2)))\n" +
" TO_HEX(MD5(demo.stringifyArr(args)))\n" +
");\n");

// Pass 1
Expand Down
8 changes: 4 additions & 4 deletions ...rc/test/java/org/finos/legend/engine/persistence/components/e2e/BulkLoadExecutorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,16 +238,16 @@ public void testMilestoningWithUdfBasedDigestGenerationWithFieldsToExclude() thr
"AS (\n" +
" CAST(value AS STRING)\n" +
");\n");
runQuery("CREATE FUNCTION demo.stringifyArr(arr1 ARRAY<STRING>, arr2 ARRAY<STRING>)\n" +
runQuery("CREATE FUNCTION demo.stringifyArr(args ARRAY<STRING>)\n" +
" RETURNS STRING\n" +
" LANGUAGE js AS \"\"\"\n" +
" let output = \"\"; \n" +
" for (const [index, element] of arr1.entries()) { output += arr1[index]; output += arr2[index]; }\n" +
" for (const [index, element] of args.entries()) { output += args[index]; }\n" +
" return output;\n" +
" \"\"\"; \n");
runQuery("CREATE FUNCTION demo.LAKEHOUSE_MD5(arr1 ARRAY<STRING>, arr2 ARRAY<STRING>)\n" +
runQuery("CREATE FUNCTION demo.LAKEHOUSE_MD5(args ARRAY<STRING>)\n" +
"AS (\n" +
" TO_HEX(MD5(demo.stringifyArr(arr1, arr2)))\n" +
" TO_HEX(MD5(demo.stringifyArr(args)))\n" +
");\n");

RelationalIngestor ingestor = RelationalIngestor.builder()
Expand Down
8 changes: 4 additions & 4 deletions ...c/test/java/org/finos/legend/engine/persistence/components/e2e/BulkLoadGeneratorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,16 +193,16 @@ public void testMilestoningWithDigestGeneration() throws IOException, Interrupte
"AS (\n" +
" CAST(value AS STRING)\n" +
");\n");
runQuery("CREATE FUNCTION demo.stringifyArr(arr1 ARRAY<STRING>, arr2 ARRAY<STRING>)\n" +
runQuery("CREATE FUNCTION demo.stringifyArr(args ARRAY<STRING>)\n" +
" RETURNS STRING\n" +
" LANGUAGE js AS \"\"\"\n" +
" let output = \"\"; \n" +
" for (const [index, element] of arr1.entries()) { output += arr1[index]; output += arr2[index]; }\n" +
" for (const [index, element] of args.entries()) { output += args[index]; }\n" +
" return output;\n" +
" \"\"\"; \n");
runQuery("CREATE FUNCTION demo.LAKEHOUSE_MD5(arr1 ARRAY<STRING>, arr2 ARRAY<STRING>)\n" +
runQuery("CREATE FUNCTION demo.LAKEHOUSE_MD5(args ARRAY<STRING>)\n" +
"AS (\n" +
" TO_HEX(MD5(demo.stringifyArr(arr1, arr2)))\n" +
" TO_HEX(MD5(demo.stringifyArr(args)))\n" +
");\n");

RelationalGenerator generator = RelationalGenerator.builder()
Expand Down
6 changes: 3 additions & 3 deletions ...c/test/java/org/finos/legend/engine/persistence/components/ingestmode/AppendOnlyTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ public void verifyAppendOnlyNoAuditingAllowDuplicatesNoVersioningNoFilterExistin
List<String> milestoningSqlList = operations.ingestSql();

String insertSql = "INSERT INTO `mydb`.`main` (`id`, `name`, `amount`, `biz_date`, `digest`, `batch_id`) " +
"(SELECT stage.`id`,stage.`name`,stage.`amount`,stage.`biz_date`,LAKEHOUSE_MD5(['amount','biz_date','id','name'],[stage.`amount`,stage.`biz_date`,stage.`id`,stage.`name`])," +
"(SELECT stage.`id`,stage.`name`,stage.`amount`,stage.`biz_date`,LAKEHOUSE_MD5(['amount',stage.`amount`,'biz_date',stage.`biz_date`,'id',stage.`id`,'name',stage.`name`])," +
"(SELECT COALESCE(MAX(batch_metadata.`table_batch_id`),0)+1 FROM batch_metadata as batch_metadata WHERE UPPER(batch_metadata.`table_name`) = 'MAIN') " +
"FROM `mydb`.`staging` as stage)";
Assertions.assertEquals(BigQueryTestArtifacts.expectedBaseTableCreateQueryWithNoPKs, preActionsSqlList.get(0));
Expand Down Expand Up @@ -339,7 +339,7 @@ public void verifyAppendOnlyWithAuditingFailOnDuplicatesAllVersionNoFilterExisti
{
String insertSql = "INSERT INTO `mydb`.`main` " +
"(`id`, `name`, `amount`, `biz_date`, `digest`, `batch_update_time`, `batch_id`) " +
"(SELECT stage.`id`,stage.`name`,stage.`amount`,stage.`biz_date`,LAKEHOUSE_MD5(['biz_date','name'],[stage.`biz_date`,stage.`name`]),PARSE_DATETIME('%Y-%m-%d %H:%M:%E6S','2000-01-01 00:00:00.000000')," +
"(SELECT stage.`id`,stage.`name`,stage.`amount`,stage.`biz_date`,LAKEHOUSE_MD5(['biz_date',stage.`biz_date`,'name',stage.`name`]),PARSE_DATETIME('%Y-%m-%d %H:%M:%E6S','2000-01-01 00:00:00.000000')," +
"(SELECT COALESCE(MAX(batch_metadata.`table_batch_id`),0)+1 FROM batch_metadata as batch_metadata WHERE UPPER(batch_metadata.`table_name`) = 'MAIN') " +
"FROM `mydb`.`staging_temp_staging_lp_yosulf` as stage " +
"WHERE (stage.`data_split` >= '{DATA_SPLIT_LOWER_BOUND_PLACEHOLDER}') AND (stage.`data_split` <= '{DATA_SPLIT_UPPER_BOUND_PLACEHOLDER}'))";
Expand Down Expand Up @@ -391,7 +391,7 @@ public void verifyAppendOnlyWithAuditingFailOnDuplicatesAllVersionNoFilterExisti
String insertSql = "INSERT INTO `mydb`.`main` " +
"(`id`, `name`, `amount`, `biz_date`, `digest`, `batch_update_time`, `batch_id`) " +
"(SELECT stage.`id`,stage.`name`,stage.`amount`,stage.`biz_date`," +
"LAKEHOUSE_MD5(['amount','biz_date','name'],[doubleToString(stage.`amount`),dateToString(stage.`biz_date`),stage.`name`]),PARSE_DATETIME('%Y-%m-%d %H:%M:%E6S','2000-01-01 00:00:00.000000')," +
"LAKEHOUSE_MD5(['amount',doubleToString(stage.`amount`),'biz_date',dateToString(stage.`biz_date`),'name',stage.`name`]),PARSE_DATETIME('%Y-%m-%d %H:%M:%E6S','2000-01-01 00:00:00.000000')," +
"(SELECT COALESCE(MAX(batch_metadata.`table_batch_id`),0)+1 FROM batch_metadata as batch_metadata WHERE UPPER(batch_metadata.`table_name`) = 'MAIN') " +
"FROM `mydb`.`staging_temp_staging_lp_yosulf` as stage " +
"WHERE (stage.`data_split` >= '{DATA_SPLIT_LOWER_BOUND_PLACEHOLDER}') AND (stage.`data_split` <= '{DATA_SPLIT_UPPER_BOUND_PLACEHOLDER}'))";
Expand Down
21 changes: 11 additions & 10 deletions ...src/test/java/org/finos/legend/engine/persistence/components/ingestmode/BulkLoadTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -351,11 +351,11 @@ public void testBulkLoadWithDigestGeneratedAuditEnabledNoExtraOptions()
"OPTIONS (uris=['/path/xyz/file1.csv','/path/xyz/file2.csv'], format='CSV')";

String expectedInsertSql = "INSERT INTO `my_db`.`my_name` " +
"(`col_int`, `col_string`, `col_decimal`, `col_datetime`, `col_variant`, `digest`, `batch_id`, `append_time`) " +
"(SELECT legend_persistence_temp.`col_int`,legend_persistence_temp.`col_string`,legend_persistence_temp.`col_decimal`,legend_persistence_temp.`col_datetime`,legend_persistence_temp.`col_variant`," +
"LAKEHOUSE_MD5(['col_datetime','col_decimal','col_int','col_string','col_variant'],[legend_persistence_temp.`col_datetime`,legend_persistence_temp.`col_decimal`,legend_persistence_temp.`col_int`,legend_persistence_temp.`col_string`,legend_persistence_temp.`col_variant`])," +
"(SELECT COALESCE(MAX(batch_metadata.`table_batch_id`),0)+1 FROM batch_metadata as batch_metadata WHERE UPPER(batch_metadata.`table_name`) = 'MY_NAME'),PARSE_DATETIME('%Y-%m-%d %H:%M:%E6S','2000-01-01 00:00:00.000000') " +
"FROM `my_db`.`my_name_temp_lp_yosulf` as legend_persistence_temp)";
"(`col_int`, `col_string`, `col_decimal`, `col_datetime`, `col_variant`, `digest`, `batch_id`, `append_time`) " +
"(SELECT legend_persistence_temp.`col_int`,legend_persistence_temp.`col_string`,legend_persistence_temp.`col_decimal`,legend_persistence_temp.`col_datetime`,legend_persistence_temp.`col_variant`," +
"LAKEHOUSE_MD5(['col_datetime',legend_persistence_temp.`col_datetime`,'col_decimal',legend_persistence_temp.`col_decimal`,'col_int',legend_persistence_temp.`col_int`,'col_string',legend_persistence_temp.`col_string`,'col_variant',legend_persistence_temp.`col_variant`])," +
"(SELECT COALESCE(MAX(batch_metadata.`table_batch_id`),0)+1 FROM batch_metadata as batch_metadata WHERE UPPER(batch_metadata.`table_name`) = 'MY_NAME'),PARSE_DATETIME('%Y-%m-%d %H:%M:%E6S','2000-01-01 00:00:00.000000') " +
"FROM `my_db`.`my_name_temp_lp_yosulf` as legend_persistence_temp)";

Assertions.assertEquals(expectedCreateTableSql, preActionsSql.get(0));
Assertions.assertEquals(expectedCopySql, preActionsSql.get(2));
Expand Down Expand Up @@ -414,10 +414,11 @@ public void testBulkLoadWithDigestGeneratedAuditEnabledNoExtraOptionsUpperCase()
"OPTIONS (uris=['/path/xyz/file1.csv','/path/xyz/file2.csv'], format='CSV')";

String expectedInsertSql = "INSERT INTO `MY_DB`.`MY_NAME` " +
"(`COL_INT`, `COL_STRING`, `COL_DECIMAL`, `COL_DATETIME`, `COL_VARIANT`, `DIGEST`, `BATCH_ID`, `APPEND_TIME`) " +
"(SELECT legend_persistence_temp.`COL_INT`,legend_persistence_temp.`COL_STRING`,legend_persistence_temp.`COL_DECIMAL`,legend_persistence_temp.`COL_DATETIME`,legend_persistence_temp.`COL_VARIANT`," +
"LAKEHOUSE_MD5(['COL_VARIANT'],[legend_persistence_temp.`COL_VARIANT`]),(SELECT COALESCE(MAX(BATCH_METADATA.`TABLE_BATCH_ID`),0)+1 FROM BATCH_METADATA as BATCH_METADATA WHERE UPPER(BATCH_METADATA.`TABLE_NAME`) = 'MY_NAME'),PARSE_DATETIME('%Y-%m-%d %H:%M:%E6S','2000-01-01 00:00:00.000000') " +
"FROM `MY_DB`.`MY_NAME_TEMP_LP_YOSULF` as legend_persistence_temp)";
"(`COL_INT`, `COL_STRING`, `COL_DECIMAL`, `COL_DATETIME`, `COL_VARIANT`, `DIGEST`, `BATCH_ID`, `APPEND_TIME`) " +
"(SELECT legend_persistence_temp.`COL_INT`,legend_persistence_temp.`COL_STRING`,legend_persistence_temp.`COL_DECIMAL`,legend_persistence_temp.`COL_DATETIME`,legend_persistence_temp.`COL_VARIANT`," +
"LAKEHOUSE_MD5(['COL_VARIANT',legend_persistence_temp.`COL_VARIANT`])," +
"(SELECT COALESCE(MAX(BATCH_METADATA.`TABLE_BATCH_ID`),0)+1 FROM BATCH_METADATA as BATCH_METADATA WHERE UPPER(BATCH_METADATA.`TABLE_NAME`) = 'MY_NAME'),PARSE_DATETIME('%Y-%m-%d %H:%M:%E6S','2000-01-01 00:00:00.000000') " +
"FROM `MY_DB`.`MY_NAME_TEMP_LP_YOSULF` as legend_persistence_temp)";

Assertions.assertEquals(expectedCreateTableSql, preActionsSql.get(0));
Assertions.assertEquals(expectedCopySql, preActionsSql.get(2));
Expand Down Expand Up @@ -483,7 +484,7 @@ public void testBulkLoadWithDigestGeneratedAndTypeConversionUdfsAuditEnabledNoEx
String expectedInsertSql = "INSERT INTO `MY_DB`.`MY_NAME` " +
"(`COL_INT`, `COL_STRING`, `COL_DECIMAL`, `COL_DATETIME`, `COL_VARIANT`, `DIGEST`, `BATCH_ID`, `APPEND_TIME`) " +
"(SELECT legend_persistence_temp.`COL_INT`,legend_persistence_temp.`COL_STRING`,legend_persistence_temp.`COL_DECIMAL`,legend_persistence_temp.`COL_DATETIME`,legend_persistence_temp.`COL_VARIANT`," +
"LAKEHOUSE_MD5(['COL_DATETIME','COL_DECIMAL','COL_STRING'],[timestampToString(legend_persistence_temp.`COL_DATETIME`),decimalToString(legend_persistence_temp.`COL_DECIMAL`),legend_persistence_temp.`COL_STRING`])" +
"LAKEHOUSE_MD5(['COL_DATETIME',timestampToString(legend_persistence_temp.`COL_DATETIME`),'COL_DECIMAL',decimalToString(legend_persistence_temp.`COL_DECIMAL`),'COL_STRING',legend_persistence_temp.`COL_STRING`])" +
",(SELECT COALESCE(MAX(BATCH_METADATA.`TABLE_BATCH_ID`),0)+1 FROM BATCH_METADATA as BATCH_METADATA WHERE UPPER(BATCH_METADATA.`TABLE_NAME`) = 'MY_NAME'),PARSE_DATETIME('%Y-%m-%d %H:%M:%E6S','2000-01-01 00:00:00.000000') " +
"FROM `MY_DB`.`MY_NAME_TEMP_LP_YOSULF` as legend_persistence_temp)";

Expand Down
10 changes: 5 additions & 5 deletions .../main/java/org/finos/legend/engine/persistence/components/relational/h2/H2DigestUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,17 @@ public static void registerMD5Udf(JdbcHelper sink, String UdfName)
sink.executeStatement("CREATE ALIAS " + UdfName + " FOR \"org.finos.legend.engine.persistence.components.relational.h2.H2DigestUtil.MD5\";");
}

public static String MD5(String[] columnNameList, String[] columnValueList)
public static String MD5(String[] columnNameAndValueList)
{
return calculateMD5Digest(generateRowMap(columnNameList, columnValueList));
return calculateMD5Digest(generateRowMap(columnNameAndValueList));
}

private static Map<String, Object> generateRowMap(String[] columnNameList, String[] columnValueList)
private static Map<String, Object> generateRowMap(String[] columnNameAndValueList)
{
Map<String, Object> map = new HashMap<>();
for (int i = 0; i < columnNameList.length; i++)
for (int i = 0; i < columnNameAndValueList.length; i++)
{
map.put(columnNameList[i], columnValueList[i]);
map.put(columnNameAndValueList[i], columnNameAndValueList[++i]);
}
return map;
}
Expand Down
Loading

0 comments on commit 7a58119

Please sign in to comment.