From 39d76450d5457c466190fb1a4a7ca19347b1c921 Mon Sep 17 00:00:00 2001 From: Bo Xu <601450868@qq.com> Date: Sat, 8 Jul 2023 21:07:49 +0800 Subject: [PATCH] [ISSUE-4313] Add @Override for override method of processing module (#4314) --- .../processing/exception/SliceMergerException.java | 1 + .../processing/loading/csvinput/BlockDetails.java | 1 + .../loading/exception/BadRecordFoundException.java | 1 + .../loading/exception/CarbonDataLoadingException.java | 1 + .../processing/loading/exception/NoRetryException.java | 1 + .../loading/partition/impl/HashPartitionerImpl.java | 2 ++ .../impl/SparkHashExpressionPartitionerImpl.java | 4 ++++ .../sort/unsafe/comparator/UnsafeRowComparator.java | 1 + .../comparator/UnsafeRowComparatorForNormalDims.java | 1 + .../sort/unsafe/holder/UnsafeFinalMergePageHolder.java | 5 +++++ .../loading/sort/unsafe/holder/UnsafeInmemoryHolder.java | 5 +++++ .../sort/unsafe/holder/UnsafeSortTempFileChunkHolder.java | 4 ++++ .../merger/UnsafeSingleThreadFinalSortFilesMerger.java | 3 +++ .../processing/merger/CompactionResultSortProcessor.java | 1 + .../processing/merger/RowResultMergerProcessor.java | 1 + .../sort/exception/CarbonSortKeyAndGroupByException.java | 1 + .../sort/sortdata/InMemorySortTempChunkHolder.java | 5 +++++ .../sort/sortdata/IntermediateSortTempRowComparator.java | 1 + .../processing/sort/sortdata/NewRowComparator.java | 1 + .../sort/sortdata/NewRowComparatorForNormalDims.java | 1 + .../sort/sortdata/SingleThreadFinalSortFilesMerger.java | 4 ++++ .../processing/store/CarbonFactDataHandlerColumnar.java | 4 ++++ .../processing/store/writer/AbstractFactDataWriter.java | 1 + .../store/writer/v3/CarbonFactDataWriterImplV3.java | 1 + .../org/apache/carbondata/sdk/file/AvroCarbonWriter.java | 4 ++-- .../org/apache/carbondata/sdk/file/CSVCarbonWriter.java | 4 ++-- .../apache/carbondata/sdk/file/CarbonReaderBuilder.java | 6 +++--- .../org/apache/carbondata/sdk/file/JsonCarbonWriter.java | 4 ++-- .../carbondata/sdk/file/arrow/ArrowFieldWriter.java | 8 ++++---- 29 files changed, 64 insertions(+), 13 deletions(-) diff --git a/processing/src/main/java/org/apache/carbondata/processing/exception/SliceMergerException.java b/processing/src/main/java/org/apache/carbondata/processing/exception/SliceMergerException.java index f9d1c1da5fc..9fe9e1e5563 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/exception/SliceMergerException.java +++ b/processing/src/main/java/org/apache/carbondata/processing/exception/SliceMergerException.java @@ -50,6 +50,7 @@ public String getLocalizedMessage() { /** * getMessage */ + @Override public String getMessage() { return this.msg; } diff --git a/processing/src/main/java/org/apache/carbondata/processing/loading/csvinput/BlockDetails.java b/processing/src/main/java/org/apache/carbondata/processing/loading/csvinput/BlockDetails.java index 15cabcf3904..6862e53a11b 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/loading/csvinput/BlockDetails.java +++ b/processing/src/main/java/org/apache/carbondata/processing/loading/csvinput/BlockDetails.java @@ -66,6 +66,7 @@ public void setFilePath(String filePath) { this.filePath = filePath; } + @Override public String[] getLocations() { return locations; } diff --git a/processing/src/main/java/org/apache/carbondata/processing/loading/exception/BadRecordFoundException.java b/processing/src/main/java/org/apache/carbondata/processing/loading/exception/BadRecordFoundException.java index c1c5a8f6009..54b33b22730 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/loading/exception/BadRecordFoundException.java +++ b/processing/src/main/java/org/apache/carbondata/processing/loading/exception/BadRecordFoundException.java @@ -51,6 +51,7 @@ public BadRecordFoundException(String msg, Throwable t) { /** * getMessage */ + @Override public String getMessage() { return this.msg; } diff --git a/processing/src/main/java/org/apache/carbondata/processing/loading/exception/CarbonDataLoadingException.java b/processing/src/main/java/org/apache/carbondata/processing/loading/exception/CarbonDataLoadingException.java index 13e75dfbbfb..8bb1fad4d44 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/loading/exception/CarbonDataLoadingException.java +++ b/processing/src/main/java/org/apache/carbondata/processing/loading/exception/CarbonDataLoadingException.java @@ -68,6 +68,7 @@ public String getLocalizedMessage() { /** * getMessage */ + @Override public String getMessage() { return this.msg; } diff --git a/processing/src/main/java/org/apache/carbondata/processing/loading/exception/NoRetryException.java b/processing/src/main/java/org/apache/carbondata/processing/loading/exception/NoRetryException.java index 41256a68cb9..cc501464534 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/loading/exception/NoRetryException.java +++ b/processing/src/main/java/org/apache/carbondata/processing/loading/exception/NoRetryException.java @@ -42,6 +42,7 @@ public NoRetryException(String msg) { /** * getMessage */ + @Override public String getMessage() { return this.msg; } diff --git a/processing/src/main/java/org/apache/carbondata/processing/loading/partition/impl/HashPartitionerImpl.java b/processing/src/main/java/org/apache/carbondata/processing/loading/partition/impl/HashPartitionerImpl.java index c9da2640ca1..1817cd4cff9 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/loading/partition/impl/HashPartitionerImpl.java +++ b/processing/src/main/java/org/apache/carbondata/processing/loading/partition/impl/HashPartitionerImpl.java @@ -75,6 +75,7 @@ private IntegralHash(int index) { this.index = index; } + @Override public int getHash(Object[] value) { return value[index] != null ? Long.valueOf(value[index].toString()).hashCode() : 0; } @@ -88,6 +89,7 @@ private DecimalHash(int index) { this.index = index; } + @Override public int getHash(Object[] value) { return value[index] != null ? Double.valueOf(value[index].toString()).hashCode() : 0; } diff --git a/processing/src/main/java/org/apache/carbondata/processing/loading/partition/impl/SparkHashExpressionPartitionerImpl.java b/processing/src/main/java/org/apache/carbondata/processing/loading/partition/impl/SparkHashExpressionPartitionerImpl.java index 92e1320872a..bce461b4832 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/loading/partition/impl/SparkHashExpressionPartitionerImpl.java +++ b/processing/src/main/java/org/apache/carbondata/processing/loading/partition/impl/SparkHashExpressionPartitionerImpl.java @@ -88,6 +88,7 @@ private IntegralHash(int index) { this.index = index; } + @Override public int getHash(Object[] value) { if (value[index] == null) { return 42; @@ -113,6 +114,7 @@ private LongHash(int index) { this.index = index; } + @Override public int getHash(Object[] value) { if (value[index] == null) { return 42; @@ -135,6 +137,7 @@ private TimestampHash(int index) { this.index = index; } + @Override public int getHash(Object[] value) { if (value[index] == null) { return 42; @@ -153,6 +156,7 @@ private DecimalHash(int index) { this.index = index; } + @Override public int getHash(Object[] value) { if (value[index] == null) { return 42; diff --git a/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/comparator/UnsafeRowComparator.java b/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/comparator/UnsafeRowComparator.java index b0109fa6d16..797d8e6345c 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/comparator/UnsafeRowComparator.java +++ b/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/comparator/UnsafeRowComparator.java @@ -43,6 +43,7 @@ public UnsafeRowComparator(UnsafeCarbonRowPage rowPage) { /** * Below method will be used to compare two mdkey */ + @Override public int compare(UnsafeCarbonRow rowL, UnsafeCarbonRow rowR) { return compare(rowL, baseObject, rowR, baseObject); } diff --git a/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/comparator/UnsafeRowComparatorForNormalDims.java b/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/comparator/UnsafeRowComparatorForNormalDims.java index e9cfb1c166f..c06e7b681ef 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/comparator/UnsafeRowComparatorForNormalDims.java +++ b/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/comparator/UnsafeRowComparatorForNormalDims.java @@ -37,6 +37,7 @@ public UnsafeRowComparatorForNormalDims(UnsafeCarbonRowPage rowPage) { /** * Below method will be used to compare two mdkey */ + @Override public int compare(UnsafeCarbonRow rowL, UnsafeCarbonRow rowR) { int diff = 0; long rowA = rowL.address; diff --git a/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/holder/UnsafeFinalMergePageHolder.java b/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/holder/UnsafeFinalMergePageHolder.java index 7abd3a9f6d3..8c7a9b80850 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/holder/UnsafeFinalMergePageHolder.java +++ b/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/holder/UnsafeFinalMergePageHolder.java @@ -67,6 +67,7 @@ public UnsafeFinalMergePageHolder(UnsafeInMemoryIntermediateDataMerger merger, tableFieldStat.getDictSortColIdxSchemaOrderMapping()); } + @Override public boolean hasNext() { if (counter < actualSize) { return true; @@ -74,11 +75,13 @@ public boolean hasNext() { return false; } + @Override public void readRow() { currentRow = rowPages[rowPageIndexes[counter]].getRow(mergedAddresses[counter]); counter++; } + @Override public IntermediateSortTempRow getRow() { return currentRow; } @@ -107,10 +110,12 @@ public int hashCode() { return super.hashCode(); } + @Override public int numberOfRows() { return actualSize; } + @Override public void close() { for (int i = 0; i < rowPages.length; i++) { rowPages[i].freeMemory(); diff --git a/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/holder/UnsafeInmemoryHolder.java b/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/holder/UnsafeInmemoryHolder.java index a21e8024c17..685577d252d 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/holder/UnsafeInmemoryHolder.java +++ b/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/holder/UnsafeInmemoryHolder.java @@ -55,6 +55,7 @@ public UnsafeInmemoryHolder(UnsafeCarbonRowPage rowPage) { this.rowPage.setReadConvertedNoSortField(); } + @Override public boolean hasNext() { if (counter < actualSize) { return true; @@ -62,12 +63,14 @@ public boolean hasNext() { return false; } + @Override public void readRow() { address = rowPage.getBuffer().get(counter); currentRow = rowPage.getRow(address + rowPage.getDataBlock().getBaseOffset()); counter++; } + @Override public IntermediateSortTempRow getRow() { return currentRow; } @@ -97,10 +100,12 @@ public int hashCode() { return super.hashCode(); } + @Override public int numberOfRows() { return actualSize; } + @Override public void close() { rowPage.freeMemory(); } diff --git a/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/holder/UnsafeSortTempFileChunkHolder.java b/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/holder/UnsafeSortTempFileChunkHolder.java index 77b19f4de78..174cb950040 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/holder/UnsafeSortTempFileChunkHolder.java +++ b/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/holder/UnsafeSortTempFileChunkHolder.java @@ -254,6 +254,7 @@ private IntermediateSortTempRow[] readBatchedRowFromStream(int expected) * * @return row */ + @Override public IntermediateSortTempRow getRow() { return this.returnRow; } @@ -264,6 +265,7 @@ public IntermediateSortTempRow getRow() { * * @return more row present in file */ + @Override public boolean hasNext() { if (prefetch) { return this.prefetchRecordsProceesed < this.entryCount; @@ -274,6 +276,7 @@ public boolean hasNext() { /** * Below method will be used to close streams */ + @Override public void close() { CarbonUtil.closeStreams(stream); if (null != executorService && !executorService.isShutdown()) { @@ -286,6 +289,7 @@ public void close() { * * @return entryCount */ + @Override public int numberOfRows() { return entryCount; } diff --git a/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/merger/UnsafeSingleThreadFinalSortFilesMerger.java b/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/merger/UnsafeSingleThreadFinalSortFilesMerger.java index 6d8df392aa1..059888ee943 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/merger/UnsafeSingleThreadFinalSortFilesMerger.java +++ b/processing/src/main/java/org/apache/carbondata/processing/loading/sort/unsafe/merger/UnsafeSingleThreadFinalSortFilesMerger.java @@ -164,6 +164,7 @@ private List getFilesToMergeSort() { final int rangeId = parameters.getRangeId(); FileFilter fileFilter = new FileFilter() { + @Override public boolean accept(File pathname) { return pathname.getName().startsWith(tableName + '_' + rangeId); } @@ -196,6 +197,7 @@ private void createRecordHolderQueue() { * * @return sorted row */ + @Override public Object[] next() { if (hasNext()) { return sortStepRowHandler.convertIntermediateSortTempRowTo3Parted(getSortedRecordFromFile()); @@ -255,6 +257,7 @@ private IntermediateSortTempRow getSortedRecordFromFile() throws CarbonDataWrite * * @return more element is present */ + @Override public boolean hasNext() { return this.fileCounter > 0; } diff --git a/processing/src/main/java/org/apache/carbondata/processing/merger/CompactionResultSortProcessor.java b/processing/src/main/java/org/apache/carbondata/processing/merger/CompactionResultSortProcessor.java index 98670994c02..a6b178ddaaa 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/merger/CompactionResultSortProcessor.java +++ b/processing/src/main/java/org/apache/carbondata/processing/merger/CompactionResultSortProcessor.java @@ -170,6 +170,7 @@ public CompactionResultSortProcessor(CarbonLoadModel carbonLoadModel, CarbonTabl * @return if the compaction is success or not * @throws Exception */ + @Override public boolean execute(List unsortedResultIteratorList, List sortedResultIteratorList) throws Exception { boolean isCompactionSuccess = false; diff --git a/processing/src/main/java/org/apache/carbondata/processing/merger/RowResultMergerProcessor.java b/processing/src/main/java/org/apache/carbondata/processing/merger/RowResultMergerProcessor.java index 64643060ddf..aa7ca50e6ce 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/merger/RowResultMergerProcessor.java +++ b/processing/src/main/java/org/apache/carbondata/processing/merger/RowResultMergerProcessor.java @@ -105,6 +105,7 @@ private void initRecordHolderHeap(List rawResultIteratorList) * Merge function * */ + @Override public boolean execute(List unsortedResultIteratorList, List sortedResultIteratorList) throws Exception { List finalIteratorList = new ArrayList<>(unsortedResultIteratorList); diff --git a/processing/src/main/java/org/apache/carbondata/processing/sort/exception/CarbonSortKeyAndGroupByException.java b/processing/src/main/java/org/apache/carbondata/processing/sort/exception/CarbonSortKeyAndGroupByException.java index e5783b9ac1f..d55105381c3 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/sort/exception/CarbonSortKeyAndGroupByException.java +++ b/processing/src/main/java/org/apache/carbondata/processing/sort/exception/CarbonSortKeyAndGroupByException.java @@ -82,6 +82,7 @@ public String getLocalizedMessage() { /** * getMessage */ + @Override public String getMessage() { return this.msg; } diff --git a/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/InMemorySortTempChunkHolder.java b/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/InMemorySortTempChunkHolder.java index 4d41fc0917f..af19e492a79 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/InMemorySortTempChunkHolder.java +++ b/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/InMemorySortTempChunkHolder.java @@ -73,6 +73,7 @@ public void initialise() { * 2. Convert it to IntermediateSortTempRow * 3. Store it in memory to read through getRow() method */ + @Override public void readRow() { Object[] row = this.rawResultIterator.next(); //TODO add code to get directly Object[] Instead Of CarbonRow Object @@ -88,6 +89,7 @@ public void readRow() { } + @Override public int getEntryCount() { // this will not be used for intermediate sorting throw new UnsupportedOperationException("Operation Not supported"); @@ -99,6 +101,7 @@ public int getEntryCount() { * * @return more row present in file */ + @Override public boolean hasNext() { return this.rawResultIterator.hasNext(); } @@ -118,6 +121,7 @@ public int hashCode() { /** * Below method will be used to close streams */ + @Override public void closeStream() { rawResultIterator.close(); } @@ -126,6 +130,7 @@ public void closeStream() { * * @return row */ + @Override public IntermediateSortTempRow getRow() { return returnRow; } diff --git a/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/IntermediateSortTempRowComparator.java b/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/IntermediateSortTempRowComparator.java index 62d541fce1a..d4ce2e82b0f 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/IntermediateSortTempRowComparator.java +++ b/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/IntermediateSortTempRowComparator.java @@ -48,6 +48,7 @@ public IntermediateSortTempRowComparator(boolean[] isSortColumnNoDictionary, /** * Below method will be used to compare two sort temp row */ + @Override public int compare(IntermediateSortTempRow rowA, IntermediateSortTempRow rowB) { int diff = 0; int dictIndex = 0; diff --git a/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/NewRowComparator.java b/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/NewRowComparator.java index 09b3a59ac46..89360871f92 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/NewRowComparator.java +++ b/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/NewRowComparator.java @@ -41,6 +41,7 @@ public NewRowComparator(boolean[] noDicSortColumnMapping, /** * Below method will be used to compare two mdkey */ + @Override public int compare(Object[] rowA, Object[] rowB) { int diff = 0; int index = 0; diff --git a/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/NewRowComparatorForNormalDims.java b/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/NewRowComparatorForNormalDims.java index 69ed2fd1316..6f3f381b36d 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/NewRowComparatorForNormalDims.java +++ b/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/NewRowComparatorForNormalDims.java @@ -46,6 +46,7 @@ public NewRowComparatorForNormalDims(int numberOfSortColumns) { * * @see Comparator#compare(Object, Object) */ + @Override public int compare(Object[] rowA, Object[] rowB) { int diff = 0; diff --git a/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SingleThreadFinalSortFilesMerger.java b/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SingleThreadFinalSortFilesMerger.java index c3f45b1c63e..42a742fdd61 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SingleThreadFinalSortFilesMerger.java +++ b/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SingleThreadFinalSortFilesMerger.java @@ -140,6 +140,7 @@ public void addInMemoryRawResultIterator(List sortedRawResult private List getFilesToMergeSort() { final int rangeId = sortParameters.getRangeId(); FileFilter fileFilter = new FileFilter() { + @Override public boolean accept(File pathname) { return pathname.getName().startsWith(tableName + '_' + rangeId); } @@ -246,6 +247,7 @@ private synchronized void notifyFailure(Throwable throwable) { * @return sorted row * @throws CarbonSortKeyAndGroupByException */ + @Override public Object[] next() { if (hasNext()) { IntermediateSortTempRow sortTempRow = getSortedRecordFromFile(); @@ -305,10 +307,12 @@ private IntermediateSortTempRow getSortedRecordFromFile() throws CarbonDataWrite * * @return more element is present */ + @Override public boolean hasNext() { return this.recordHolderHeapLocal != null && this.recordHolderHeapLocal.size() > 0; } + @Override public void close() { if (null != executorService && !executorService.isShutdown()) { executorService.shutdownNow(); diff --git a/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerColumnar.java b/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerColumnar.java index cc056ee76cf..85ba51b9088 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerColumnar.java +++ b/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerColumnar.java @@ -206,6 +206,7 @@ private void setComplexMapSurrogateIndex(int dimensionCount) { * * @throws CarbonDataWriterException */ + @Override public void initialise() throws CarbonDataWriterException { setWritingConfiguration(); } @@ -216,6 +217,7 @@ public void initialise() throws CarbonDataWriterException { * @param row * @throws CarbonDataWriterException */ + @Override public void addDataToStore(CarbonRow row) throws CarbonDataWriterException { int totalComplexColumnDepth = setFlatCarbonRowForComplex(row); if (noDictColumnPageSize == null) { @@ -410,6 +412,7 @@ private TablePage processDataRows(List dataRows) * * @throws CarbonDataWriterException */ + @Override public void finish() throws CarbonDataWriterException { // still some data is present in stores if entryCount is more // than 0 @@ -480,6 +483,7 @@ private void processWriteTaskSubmitList(List> taskList) /** * below method will be used to close the handler */ + @Override public void closeHandler() throws CarbonDataWriterException { if (null != this.dataWriter) { // wait until all blocklets have been finished writing diff --git a/processing/src/main/java/org/apache/carbondata/processing/store/writer/AbstractFactDataWriter.java b/processing/src/main/java/org/apache/carbondata/processing/store/writer/AbstractFactDataWriter.java index 57bf63d9657..088062b5e5e 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/store/writer/AbstractFactDataWriter.java +++ b/processing/src/main/java/org/apache/carbondata/processing/store/writer/AbstractFactDataWriter.java @@ -324,6 +324,7 @@ private void handleEmptyDataFile(String filePath) throws IOException { * * @throws CarbonDataWriterException */ + @Override public void initializeWriter() throws CarbonDataWriterException { this.carbonDataFileName = CarbonTablePath .getCarbonDataFileName(fileCount, model.getCarbonDataFileAttributes().getTaskId(), diff --git a/processing/src/main/java/org/apache/carbondata/processing/store/writer/v3/CarbonFactDataWriterImplV3.java b/processing/src/main/java/org/apache/carbondata/processing/store/writer/v3/CarbonFactDataWriterImplV3.java index dad1f0b5c18..4bc027a7902 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/store/writer/v3/CarbonFactDataWriterImplV3.java +++ b/processing/src/main/java/org/apache/carbondata/processing/store/writer/v3/CarbonFactDataWriterImplV3.java @@ -381,6 +381,7 @@ protected void fillBlockIndexInfoDetails(long numberOfRows, String carbonDataFil * * @throws CarbonDataWriterException */ + @Override public void closeWriter() throws CarbonDataWriterException { CarbonDataWriterException exception = null; try { diff --git a/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/AvroCarbonWriter.java b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/AvroCarbonWriter.java index c3b3c1da388..081bc3c7493 100644 --- a/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/AvroCarbonWriter.java +++ b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/AvroCarbonWriter.java @@ -95,8 +95,8 @@ JobID jobId = new JobID(UUID.randomUUID().toString(), 0); Random random = new Random(); TaskID task = new TaskID(jobId, TaskType.MAP, random.nextInt()); - TaskAttemptID attemptID = new TaskAttemptID(task, random.nextInt()); - TaskAttemptContextImpl context = new TaskAttemptContextImpl(hadoopConf, attemptID); + TaskAttemptID attemptId = new TaskAttemptID(task, random.nextInt()); + TaskAttemptContextImpl context = new TaskAttemptContextImpl(hadoopConf, attemptId); this.recordWriter = format.getRecordWriter(context); this.context = context; this.writable = new ObjectArrayWritable(); diff --git a/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/CSVCarbonWriter.java b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/CSVCarbonWriter.java index 4851e102af9..7a5fe868848 100644 --- a/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/CSVCarbonWriter.java +++ b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/CSVCarbonWriter.java @@ -63,8 +63,8 @@ class CSVCarbonWriter extends CarbonWriter { JobID jobId = new JobID(UUID.randomUUID().toString(), 0); Random random = new Random(); TaskID task = new TaskID(jobId, TaskType.MAP, random.nextInt()); - TaskAttemptID attemptID = new TaskAttemptID(task, random.nextInt()); - TaskAttemptContextImpl context = new TaskAttemptContextImpl(hadoopConf, attemptID); + TaskAttemptID attemptId = new TaskAttemptID(task, random.nextInt()); + TaskAttemptContextImpl context = new TaskAttemptContextImpl(hadoopConf, attemptId); this.recordWriter = format.getRecordWriter(context); this.context = context; this.writable = new ObjectArrayWritable(); diff --git a/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonReaderBuilder.java b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonReaderBuilder.java index 6f4922a26bc..b2427cd6b4b 100644 --- a/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonReaderBuilder.java +++ b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/CarbonReaderBuilder.java @@ -441,19 +441,19 @@ private void totalRowCountInSplits(Job job, List splits, throws IOException, InterruptedException { CarbonFileInputFormat format = this.prepareFileInputFormat(job, false, true); long sum = 0; - boolean isIUDTable = false; + boolean isIudTable = false; if (!StringUtils.isEmpty(this.tablePath)) { // Check if update or delete happened on the table. CarbonFile emptyMetadataFile = FileFactory.getCarbonFile(this.tablePath + CarbonCommonConstants.FILE_SEPARATOR + CarbonCommonConstants.CARBON_SDK_EMPTY_METADATA_PATH, this.hadoopConf); if (emptyMetadataFile.exists() && emptyMetadataFile.isDirectory()) { - isIUDTable = true; + isIudTable = true; } } // if filter exists or IUD happened then read the total number of rows after // building carbon reader else get the row count from the details info of each splits. - if (this.filterExpression != null || isIUDTable) { + if (this.filterExpression != null || isIudTable) { RecordReader reader = null; CarbonReader carbonReader = null; for (InputSplit split : splits) { diff --git a/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/JsonCarbonWriter.java b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/JsonCarbonWriter.java index 560a2924461..6f7aa1c3786 100644 --- a/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/JsonCarbonWriter.java +++ b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/JsonCarbonWriter.java @@ -70,8 +70,8 @@ public class JsonCarbonWriter extends CarbonWriter { JobID jobId = new JobID(UUID.randomUUID().toString(), 0); Random random = new Random(); TaskID task = new TaskID(jobId, TaskType.MAP, random.nextInt()); - TaskAttemptID attemptID = new TaskAttemptID(task, random.nextInt()); - TaskAttemptContextImpl context = new TaskAttemptContextImpl(configuration, attemptID); + TaskAttemptID attemptId = new TaskAttemptID(task, random.nextInt()); + TaskAttemptContextImpl context = new TaskAttemptContextImpl(configuration, attemptId); this.recordWriter = outputFormat.getRecordWriter(context); this.context = context; this.writable = new ObjectArrayWritable(); diff --git a/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/arrow/ArrowFieldWriter.java b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/arrow/ArrowFieldWriter.java index b6443c6227d..35029626afc 100644 --- a/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/arrow/ArrowFieldWriter.java +++ b/sdk/sdk/src/main/java/org/apache/carbondata/sdk/file/arrow/ArrowFieldWriter.java @@ -226,21 +226,21 @@ public void setValue(Object data, int ordinal) { } class TimeStampWriter extends ArrowFieldWriter { - private TimeStampMicroTZVector timeStampMicroTZVector; + private TimeStampMicroTZVector timeStampMicroTzVector; public TimeStampWriter(TimeStampMicroTZVector timeStampMicroTZVector) { super(timeStampMicroTZVector); - this.timeStampMicroTZVector = timeStampMicroTZVector; + this.timeStampMicroTzVector = timeStampMicroTZVector; } @Override public void setNull() { - this.timeStampMicroTZVector.setNull(count); + this.timeStampMicroTzVector.setNull(count); } @Override public void setValue(Object data, int ordinal) { - this.timeStampMicroTZVector.setSafe(count, (long)data); + this.timeStampMicroTzVector.setSafe(count, (long)data); } }