commit | 4fa52727e2c351f6355c1b678060d689cfe1dccb | [log] [tgz] |
---|---|---|
author | jackylk <jacky.likun@huawei.com> | Mon May 22 22:08:58 2017 +0800 |
committer | jackylk <jacky.likun@huawei.com> | Mon May 22 22:08:58 2017 +0800 |
tree | 85b52d2258c5d22e779042e54c97c04ddedebb5b | |
parent | dce1088b8531613b6654262e560b0b73ca040155 [diff] |
move testcase and fix
diff --git a/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/DictionaryBasedResultCollector.java b/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/DictionaryBasedResultCollector.java index a7c93bb..49228eb 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/DictionaryBasedResultCollector.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/DictionaryBasedResultCollector.java
@@ -147,6 +147,7 @@ row[order[i]] = comlexDimensionInfoMap.get(queryDimensions[i].getDimension().getOrdinal()) .getDataBasedOnDataTypeFromSurrogates( ByteBuffer.wrap(complexTypeKeyArray[complexTypeColumnIndex++])); + dictionaryColumnIndex++; } else { row[order[i]] = surrogateResult[actualIndexInSurrogateKey[dictionaryColumnIndex++]]; }
diff --git a/integration/spark/src/test/scala/org/apache/carbondata/integration/spark/testsuite/complexType/TestComplexTypeQuery.scala b/integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/complexType/TestComplexTypeQuery.scala similarity index 100% rename from integration/spark/src/test/scala/org/apache/carbondata/integration/spark/testsuite/complexType/TestComplexTypeQuery.scala rename to integration/spark-common-test/src/test/scala/org/apache/carbondata/integration/spark/testsuite/complexType/TestComplexTypeQuery.scala