From 77fdb33cf734c271111c87d3cb81d4ba1b97e9ac Mon Sep 17 00:00:00 2001 From: Nitish Date: Fri, 3 Jan 2025 20:20:15 +0530 Subject: [PATCH] Ftd optimization (#994) * blocking tree changes * moved the set logic to block * reverted back tests * reverted back test data * removed unused code * added back commented code * ftd changes * refactor * simplified if-else * removed unused imports * ftd changes * changed absolute path * refactored class naming * config changes * changed tot this() * changes directory structure --- .../test/java/zingg/common/core/block/TestBlockingTreeUtil.java | 2 +- .../java/zingg/common/core/block/TestSparkBlockingTreeUtil.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/core/src/test/java/zingg/common/core/block/TestBlockingTreeUtil.java b/common/core/src/test/java/zingg/common/core/block/TestBlockingTreeUtil.java index 17749eb24..36b90c687 100644 --- a/common/core/src/test/java/zingg/common/core/block/TestBlockingTreeUtil.java +++ b/common/core/src/test/java/zingg/common/core/block/TestBlockingTreeUtil.java @@ -75,7 +75,7 @@ public void testSameBlockingTree(ZFrame zFrameTest, ZFrame zFr setTestDataBaseLocation(); HashUtil hashUtil = getHashUtil(); String configFile = Objects.requireNonNull(getClass().getClassLoader().getResource(TEST_DATA_BASE_LOCATION + "/" + CONFIG_FILE)).getFile(); - IArguments args = new ArgumentsUtil(Arguments.class).createArgumentsFromJSON( + IArguments args = new ArgumentsUtil(Arguments.class).createArgumentsFromJSON( configFile, ""); args.setBlockSize(8); diff --git a/spark/core/src/test/java/zingg/common/core/block/TestSparkBlockingTreeUtil.java b/spark/core/src/test/java/zingg/common/core/block/TestSparkBlockingTreeUtil.java index d74216278..edf5ef8e9 100644 --- a/spark/core/src/test/java/zingg/common/core/block/TestSparkBlockingTreeUtil.java +++ b/spark/core/src/test/java/zingg/common/core/block/TestSparkBlockingTreeUtil.java @@ -6,7 +6,6 @@ import org.apache.spark.sql.SparkSession; import org.apache.spark.sql.types.DataType; import org.junit.jupiter.api.extension.ExtendWith; -import zingg.TestSparkBase; import zingg.common.client.ZFrame; import zingg.common.client.util.DFObjectUtil; import zingg.common.client.util.IWithSession; @@ -17,6 +16,7 @@ import zingg.common.core.util.HashUtil; import zingg.spark.client.util.SparkDFObjectUtil; import zingg.spark.client.util.SparkPipeUtil; +import zingg.spark.core.TestSparkBase; import zingg.spark.core.block.SparkBlock; import zingg.spark.core.util.SparkBlockingTreeUtil; import zingg.spark.core.util.SparkHashUtil;