[GitHub] [carbondata] Indhumathi27 opened a new pull request #4039: [WIP] Refactor and Fix Insert into partition issue with FileMergeSortComparator

classic Classic list List threaded Threaded
35 messages Options
12
Reply | Threaded
Open this post in threaded view
|

[GitHub] [carbondata] CarbonDataQA2 commented on pull request #4039: [CARBONDATA-4077] Refactor and Fix Insert into partition issue with FileMergeSortComparator

GitBox

CarbonDataQA2 commented on pull request #4039:
URL: https://github.com/apache/carbondata/pull/4039#issuecomment-739818831


   Build Failed  with Spark 2.3.4, Please check CI http://121.244.95.60:12545/job/ApacheCarbonPRBuilder2.3/5085/
   


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
[hidden email]


Reply | Threaded
Open this post in threaded view
|

[GitHub] [carbondata] CarbonDataQA2 commented on pull request #4039: [CARBONDATA-4077] Refactor and Fix Insert into partition issue with FileMergeSortComparator

GitBox
In reply to this post by GitBox

CarbonDataQA2 commented on pull request #4039:
URL: https://github.com/apache/carbondata/pull/4039#issuecomment-739819148


   Build Failed  with Spark 2.4.5, Please check CI http://121.244.95.60:12545/job/ApacheCarbon_PR_Builder_2.4.5/3350/
   


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
[hidden email]


Reply | Threaded
Open this post in threaded view
|

[GitHub] [carbondata] brijoobopanna commented on pull request #4039: [CARBONDATA-4077] Refactor and Fix Insert into partition issue with FileMergeSortComparator

GitBox
In reply to this post by GitBox

brijoobopanna commented on pull request #4039:
URL: https://github.com/apache/carbondata/pull/4039#issuecomment-739941231


   retest this please
   


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
[hidden email]


Reply | Threaded
Open this post in threaded view
|

[GitHub] [carbondata] CarbonDataQA2 commented on pull request #4039: [CARBONDATA-4077] Refactor and Fix Insert into partition issue with FileMergeSortComparator

GitBox
In reply to this post by GitBox

CarbonDataQA2 commented on pull request #4039:
URL: https://github.com/apache/carbondata/pull/4039#issuecomment-740009799


   Build Success with Spark 2.3.4, Please check CI http://121.244.95.60:12444/job/ApacheCarbonPRBuilder2.3/5098/
   


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
[hidden email]


Reply | Threaded
Open this post in threaded view
|

[GitHub] [carbondata] CarbonDataQA2 commented on pull request #4039: [CARBONDATA-4077] Refactor and Fix Insert into partition issue with FileMergeSortComparator

GitBox
In reply to this post by GitBox

CarbonDataQA2 commented on pull request #4039:
URL: https://github.com/apache/carbondata/pull/4039#issuecomment-740009950


   Build Success with Spark 2.4.5, Please check CI http://121.244.95.60:12444/job/ApacheCarbon_PR_Builder_2.4.5/3337/
   


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
[hidden email]


Reply | Threaded
Open this post in threaded view
|

[GitHub] [carbondata] kunal642 commented on a change in pull request #4039: [CARBONDATA-4077] Refactor and Fix Insert into partition issue with FileMergeSortComparator

GitBox
In reply to this post by GitBox

kunal642 commented on a change in pull request #4039:
URL: https://github.com/apache/carbondata/pull/4039#discussion_r539852924



##########
File path: processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/FileMergeSortComparator.java
##########
@@ -78,49 +83,43 @@ public int compare(IntermediateSortTempRow rowA, IntermediateSortTempRow rowB) {
     int nonDictIndex = 0;
     int noDicTypeIdx = 0;
     int schemaRowIdx = 0;
-    int sortIndex = 0;
 
-    for (Map.Entry<Integer, List<Boolean>> schemaEntry : sortColumnSchemaOrderMap.entrySet()) {
-      boolean isSortColumn = schemaEntry.getValue().get(0);
-      boolean isDictColumn = schemaEntry.getValue().get(1);
-      if (isSortColumn) {
-        if (isSortColumnNoDictionary[sortIndex++]) {
-          if (DataTypeUtil.isPrimitiveColumn(noDictDataTypes[noDicTypeIdx])) {
-            // use data types based comparator for the no dictionary measure columns
-            SerializableComparator comparator =
-                org.apache.carbondata.core.util.comparator.Comparator
-                    .getComparator(noDictDataTypes[noDicTypeIdx]);
-            int difference = comparator
-                .compare(rowA.getNoDictSortDims()[noDictPrimitiveIndex[schemaRowIdx]],
-                    rowB.getNoDictSortDims()[noDictPrimitiveIndex[schemaRowIdx]]);
-            schemaRowIdx++;
-            if (difference != 0) {
-              return difference;
-            }
-          } else {
-            byte[] byteArr1 = (byte[]) rowA.getNoDictSortDims()[nonDictIndex];
-            byte[] byteArr2 = (byte[]) rowB.getNoDictSortDims()[nonDictIndex];
-
-            int difference = ByteUtil.UnsafeComparer.INSTANCE.compareTo(byteArr1, byteArr2);
-            if (difference != 0) {
-              return difference;
-            }
+    for (boolean isNoDictionary : isSortColumnNoDictionary) {

Review comment:
       i think now "isSortColumnNoDictionary" is not needed as dict and noDict Order mappings are kept separately.




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
[hidden email]


Reply | Threaded
Open this post in threaded view
|

[GitHub] [carbondata] Indhumathi27 commented on a change in pull request #4039: [CARBONDATA-4077] Refactor and Fix Insert into partition issue with FileMergeSortComparator

GitBox
In reply to this post by GitBox

Indhumathi27 commented on a change in pull request #4039:
URL: https://github.com/apache/carbondata/pull/4039#discussion_r539876147



##########
File path: processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/FileMergeSortComparator.java
##########
@@ -78,49 +83,43 @@ public int compare(IntermediateSortTempRow rowA, IntermediateSortTempRow rowB) {
     int nonDictIndex = 0;
     int noDicTypeIdx = 0;
     int schemaRowIdx = 0;
-    int sortIndex = 0;
 
-    for (Map.Entry<Integer, List<Boolean>> schemaEntry : sortColumnSchemaOrderMap.entrySet()) {
-      boolean isSortColumn = schemaEntry.getValue().get(0);
-      boolean isDictColumn = schemaEntry.getValue().get(1);
-      if (isSortColumn) {
-        if (isSortColumnNoDictionary[sortIndex++]) {
-          if (DataTypeUtil.isPrimitiveColumn(noDictDataTypes[noDicTypeIdx])) {
-            // use data types based comparator for the no dictionary measure columns
-            SerializableComparator comparator =
-                org.apache.carbondata.core.util.comparator.Comparator
-                    .getComparator(noDictDataTypes[noDicTypeIdx]);
-            int difference = comparator
-                .compare(rowA.getNoDictSortDims()[noDictPrimitiveIndex[schemaRowIdx]],
-                    rowB.getNoDictSortDims()[noDictPrimitiveIndex[schemaRowIdx]]);
-            schemaRowIdx++;
-            if (difference != 0) {
-              return difference;
-            }
-          } else {
-            byte[] byteArr1 = (byte[]) rowA.getNoDictSortDims()[nonDictIndex];
-            byte[] byteArr2 = (byte[]) rowB.getNoDictSortDims()[nonDictIndex];
-
-            int difference = ByteUtil.UnsafeComparer.INSTANCE.compareTo(byteArr1, byteArr2);
-            if (difference != 0) {
-              return difference;
-            }
+    for (boolean isNoDictionary : isSortColumnNoDictionary) {

Review comment:
       yes. Removed it




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
[hidden email]


Reply | Threaded
Open this post in threaded view
|

[GitHub] [carbondata] CarbonDataQA2 commented on pull request #4039: [CARBONDATA-4077] Refactor and Fix Insert into partition issue with FileMergeSortComparator

GitBox
In reply to this post by GitBox

CarbonDataQA2 commented on pull request #4039:
URL: https://github.com/apache/carbondata/pull/4039#issuecomment-742330700


   Build Success with Spark 2.3.4, Please check CI http://121.244.95.60:12444/job/ApacheCarbonPRBuilder2.3/5134/
   


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
[hidden email]


Reply | Threaded
Open this post in threaded view
|

[GitHub] [carbondata] CarbonDataQA2 commented on pull request #4039: [CARBONDATA-4077] Refactor and Fix Insert into partition issue with FileMergeSortComparator

GitBox
In reply to this post by GitBox

CarbonDataQA2 commented on pull request #4039:
URL: https://github.com/apache/carbondata/pull/4039#issuecomment-742337441


   Build Success with Spark 2.4.5, Please check CI http://121.244.95.60:12444/job/ApacheCarbon_PR_Builder_2.4.5/3372/
   


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
[hidden email]


Reply | Threaded
Open this post in threaded view
|

[GitHub] [carbondata] Indhumathi27 commented on pull request #4039: [CARBONDATA-4077] Refactor and Fix Insert into partition issue with FileMergeSortComparator

GitBox
In reply to this post by GitBox

Indhumathi27 commented on pull request #4039:
URL: https://github.com/apache/carbondata/pull/4039#issuecomment-745974311


   @kunal642 Please review


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
[hidden email]


Reply | Threaded
Open this post in threaded view
|

[GitHub] [carbondata] Indhumathi27 commented on pull request #4039: [CARBONDATA-4077] Refactor and Fix Insert into partition issue with FileMergeSortComparator

GitBox
In reply to this post by GitBox

Indhumathi27 commented on pull request #4039:
URL: https://github.com/apache/carbondata/pull/4039#issuecomment-745974586


   retest this please


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
[hidden email]


Reply | Threaded
Open this post in threaded view
|

[GitHub] [carbondata] CarbonDataQA2 commented on pull request #4039: [CARBONDATA-4077] Refactor and Fix Insert into partition issue with FileMergeSortComparator

GitBox
In reply to this post by GitBox

CarbonDataQA2 commented on pull request #4039:
URL: https://github.com/apache/carbondata/pull/4039#issuecomment-746104802


   Build Success with Spark 2.3.4, Please check CI http://121.244.95.60:12444/job/ApacheCarbonPRBuilder2.3/5180/
   


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
[hidden email]


Reply | Threaded
Open this post in threaded view
|

[GitHub] [carbondata] CarbonDataQA2 commented on pull request #4039: [CARBONDATA-4077] Refactor and Fix Insert into partition issue with FileMergeSortComparator

GitBox
In reply to this post by GitBox

CarbonDataQA2 commented on pull request #4039:
URL: https://github.com/apache/carbondata/pull/4039#issuecomment-746116752


   Build Success with Spark 2.4.5, Please check CI http://121.244.95.60:12444/job/ApacheCarbon_PR_Builder_2.4.5/3418/
   


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
[hidden email]


Reply | Threaded
Open this post in threaded view
|

[GitHub] [carbondata] kunal642 commented on pull request #4039: [CARBONDATA-4077] Refactor and Fix Insert into partition issue with FileMergeSortComparator

GitBox
In reply to this post by GitBox

kunal642 commented on pull request #4039:
URL: https://github.com/apache/carbondata/pull/4039#issuecomment-747391818


   LGTM


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
[hidden email]


Reply | Threaded
Open this post in threaded view
|

[GitHub] [carbondata] asfgit closed pull request #4039: [CARBONDATA-4077] Refactor and Fix Insert into partition issue with FileMergeSortComparator

GitBox
In reply to this post by GitBox

asfgit closed pull request #4039:
URL: https://github.com/apache/carbondata/pull/4039


   


----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
[hidden email]


12