This is an automated email from the ASF dual-hosted git repository.
chenliang613 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/carbondata.git
The following commit(s) were added to refs/heads/master by this push:
new 7195869c47 [ISSUE-4342] Fix test case errors (#4343)
7195869c47 is described below
commit 7195869c4733367e4862d5c10bd84beab458d513
Author: david <[email protected]>
AuthorDate: Mon Nov 20 05:03:46 2023 +0800
[ISSUE-4342] Fix test case errors (#4343)
Co-authored-by: QiangCai <[email protected]>
---
.../apache/carbondata/core/index/IndexStoreManager.java | 2 ++
.../java/org/apache/carbondata/core/index/TableIndex.java | 4 ++++
.../org/apache/carbondata/core/index/dev/IndexFactory.java | 4 ++++
.../apache/carbondata/view/rewrite/MVCreateTestCase.scala | 14 +++++++-------
.../apache/carbondata/sdk/file/CarbonWriterBuilder.java | 2 +-
5 files changed, 18 insertions(+), 8 deletions(-)
diff --git
a/core/src/main/java/org/apache/carbondata/core/index/IndexStoreManager.java
b/core/src/main/java/org/apache/carbondata/core/index/IndexStoreManager.java
index d79fedd35e..cdf960e922 100644
--- a/core/src/main/java/org/apache/carbondata/core/index/IndexStoreManager.java
+++ b/core/src/main/java/org/apache/carbondata/core/index/IndexStoreManager.java
@@ -163,6 +163,8 @@ public final class IndexStoreManager {
// contains the stale carbon table schema mismatch exception is thrown. To
avoid such scenarios
// it is always better to update the carbon table object retrieved
index.getIndexFactory().setCarbonTable(table);
+ index.getIndexFactory().setIndexSchema(indexSchema);
+ index.setIndexSchema(indexSchema);
return index;
}
diff --git
a/core/src/main/java/org/apache/carbondata/core/index/TableIndex.java
b/core/src/main/java/org/apache/carbondata/core/index/TableIndex.java
index 5bfe442ecf..97e943815b 100644
--- a/core/src/main/java/org/apache/carbondata/core/index/TableIndex.java
+++ b/core/src/main/java/org/apache/carbondata/core/index/TableIndex.java
@@ -594,6 +594,10 @@ public final class TableIndex extends
OperationEventListener {
return indexSchema;
}
+ public void setIndexSchema(IndexSchema indexSchema) {
+ this.indexSchema = indexSchema;
+ }
+
public IndexFactory getIndexFactory() {
return indexFactory;
}
diff --git
a/core/src/main/java/org/apache/carbondata/core/index/dev/IndexFactory.java
b/core/src/main/java/org/apache/carbondata/core/index/dev/IndexFactory.java
index 922590dee6..561a46515b 100644
--- a/core/src/main/java/org/apache/carbondata/core/index/dev/IndexFactory.java
+++ b/core/src/main/java/org/apache/carbondata/core/index/dev/IndexFactory.java
@@ -63,6 +63,10 @@ public abstract class IndexFactory<T extends Index> {
return indexSchema;
}
+ public void setIndexSchema(IndexSchema indexSchema) {
+ this.indexSchema = indexSchema;
+ }
+
public IndexInputSplitWrapper toDistributableSegment(Segment segment,
IndexSchema schema, AbsoluteTableIdentifier identifier, String uniqueId)
{
return null;
diff --git
a/integration/spark/src/test/scala/org/apache/carbondata/view/rewrite/MVCreateTestCase.scala
b/integration/spark/src/test/scala/org/apache/carbondata/view/rewrite/MVCreateTestCase.scala
index 12b9a5a26c..bccc2ca689 100644
---
a/integration/spark/src/test/scala/org/apache/carbondata/view/rewrite/MVCreateTestCase.scala
+++
b/integration/spark/src/test/scala/org/apache/carbondata/view/rewrite/MVCreateTestCase.scala
@@ -388,12 +388,12 @@ class MVCreateTestCase extends QueryTest with
BeforeAndAfterAll {
}
test("test create materialized view with simple and sub group by query") {
- sql("drop materialized view if exists mv13")
- sql("create materialized view mv13 as select empname, sum(utilization)
from fact_table1 group by empname")
+ sql("drop materialized view if exists mv13_1")
+ sql("create materialized view mv13_1 as select empname, sum(utilization)
from fact_table1 group by empname")
val frame = sql("select sum(utilization) from fact_table1 group by
empname")
- assert(TestUtil.verifyMVHit(frame.queryExecution.optimizedPlan, "mv13"))
+ assert(TestUtil.verifyMVHit(frame.queryExecution.optimizedPlan, "mv13_1"))
checkAnswer(frame, sql("select sum(utilization) from fact_table2 group by
empname"))
- sql(s"drop materialized view mv13")
+ sql(s"drop materialized view mv13_1")
}
test("test create materialized view with simple and sub group by query with
filter on query") {
@@ -858,15 +858,15 @@ class MVCreateTestCase extends QueryTest with
BeforeAndAfterAll {
test("jira carbondata-2523") {
- sql("drop materialized view if exists mv13")
+ sql("drop materialized view if exists mv13_2")
sql("drop table if exists test4")
sql("create table test4 ( name string,age int,salary int) STORED AS
carbondata")
sql(" insert into test4 select 'babu',12,12").collect()
- sql("create materialized view mv13 as select name,sum(salary) from test4
group by name")
+ sql("create materialized view mv13_2 as select name,sum(salary) from test4
group by name")
val frame = sql(
"select name,sum(salary) from test4 group by name")
- assert(TestUtil.verifyMVHit(frame.queryExecution.optimizedPlan, "mv13"))
+ assert(TestUtil.verifyMVHit(frame.queryExecution.optimizedPlan, "mv13_2"))
}
test("jira carbondata-2528-1") {
diff --git
a/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonWriterBuilder.java
b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonWriterBuilder.java
index 4c61bda356..3059336c72 100644
---
a/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonWriterBuilder.java
+++
b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonWriterBuilder.java
@@ -354,7 +354,7 @@ public class CarbonWriterBuilder {
} else if
("local_dictionary_threshold".equalsIgnoreCase(entry.getKey())) {
this.localDictionaryThreshold(Integer.parseInt(entry.getValue()));
} else if ("local_dictionary_enable".equalsIgnoreCase(entry.getKey())) {
- this.enableLocalDictionary(("true".equalsIgnoreCase(entry.getKey())));
+ this.enableLocalDictionary("true".equalsIgnoreCase(entry.getValue()));
} else if ("sort_columns".equalsIgnoreCase(entry.getKey())) {
//sort columns
String[] sortColumns;
