HPCC4J-595 Enhance log messages

dfsclient/src/main/java/org/hpccsystems/dfs/client/BinaryRecordReader.java

@@ -271,7 +271,7 @@ public boolean hasNext() throws HpccFileException
     {
         if (this.rootRecordBuilder == null)
         {
-            throw new HpccFileException("RecordReader must be initialized before being used.");
+            throw new HpccFileException("BinaryRecordReader.hasNext(): RecordReader must be initialized before being used. rootRecordBuilder is null, hasNext() failed.");
         }
 
         int nextByte = -1;
@@ -299,7 +299,7 @@ public boolean hasNext() throws HpccFileException
         }
         catch (IOException e)
         {
-            throw new HpccFileException(e);
+            throw new HpccFileException("BinaryRecordReader.hasNext(): failed to peek at the next byte in the input stream:" + e.getMessage(),e);
         }
 
         return nextByte >= 0;
@@ -314,7 +314,7 @@ public Object getNext() throws HpccFileException
     {
         if (this.rootRecordBuilder == null)
         {
-            throw new HpccFileException("RecordReader must be initialized before being used.");
+            throw new HpccFileException("BinaryRecordReader.getNext(): RecordReader must be initialized before being used, rootRecordBuilder is null.");
         }
 
         if (!this.hasNext()) throw new NoSuchElementException("No next record!");
@@ -325,13 +325,13 @@ public Object getNext() throws HpccFileException
             record = parseRecord(this.rootRecordDefinition, this.rootRecordBuilder, this.defaultLE);
             if (record == null)
             {
-                throw new HpccFileException("RecordContent not found, or invalid record structure. Check logs for more information.");
+                throw new HpccFileException("BinaryRecordReader.getNext(): RecordContent not found, or invalid record structure. Check logs for more information.");
             }
 
         }
         catch (Exception e)
         {
-            throw new HpccFileException("Failed to parse next record: " + e.getMessage(), e);
+            throw new HpccFileException("BinaryRecordReader.getNext(): Failed to parse next record: " + e.getMessage(), e);
         }
 
         this.streamPosAfterLastRecord = this.inputStream.getStreamPosition();
@@ -370,7 +370,7 @@ private Object parseFlatField(FieldDef fd, boolean isLittleEndian) throws Unpars
 
         if (fd.isFixed() && fd.getDataLen() > Integer.MAX_VALUE)
         {
-            throw new UnparsableContentException("Data length: " + fd.getDataLen() + " exceeds max supported length: " + Integer.MAX_VALUE);
+            throw new UnparsableContentException("BinaryRecordReader.parseFlatField(): Data length: " + fd.getDataLen() + " exceeds max supported length: " + Integer.MAX_VALUE);
         }
 
         // Embedded field lengths are little endian

dfsclient/src/main/java/org/hpccsystems/dfs/client/DataPartition.java

@@ -415,8 +415,7 @@ public DataPartition setFilter(FileFilter filter)
     public String toString()
     {
         StringBuilder sb = new StringBuilder();
-        sb.append(this.getThisPart());
-        sb.append(" copy locations: {");
+        sb.append("part ").append(this.getThisPart()).append(", copy locations: {");
         for (int copyindex = 0; copyindex < getCopyCount(); copyindex++)
         {
             if (copyindex > 0) sb.append(", ");

dfsclient/src/main/java/org/hpccsystems/dfs/client/HpccRemoteFileReader.java

@@ -193,7 +193,36 @@ public HpccRemoteFileReader(DataPartition dp, FieldDef originalRD, IRecordBuilde
      * @throws Exception
      * 			  general exception
      */
-    public HpccRemoteFileReader(DataPartition dp, FieldDef originalRD, IRecordBuilder recBuilder, int connectTimeout, int limit, boolean createPrefetchThread, int readSizeKB, FileReadResumeInfo resumeInfo, int socketOpTimeoutMs) throws Exception
+    public HpccRemoteFileReader(DataPartition dp, FieldDef originalRD, IRecordBuilder recBuilder, int connectTimeout, int limit, boolean createPrefetchThread, int readSizeKB, FileReadResumeInfo resumeInfo, int socketOpTimeoutMs) throws Exception {
+        this(dp, originalRD, recBuilder, connectTimeout, limit, createPrefetchThread, readSizeKB, resumeInfo, RowServiceInputStream.DEFAULT_SOCKET_OP_TIMEOUT_MS,null);
+    }
+    /**
+     * A remote file reader that reads the part identified by the HpccPart object using the record definition provided.
+     *
+     * @param dp
+     *            the part of the file, name and location
+     * @param originalRD
+     *            the record defintion for the dataset
+     * @param recBuilder
+     *            the IRecordBuilder used to construct records
+     * @param connectTimeout
+     *            the connection timeout in milliseconds, -1 for default
+     * @param limit
+     *            the maximum number of records to read from the provided data partition, -1 specifies no limit
+     * @param createPrefetchThread
+     *            the input stream should create and manage prefetching on its own thread. If false prefetch needs to be called on another thread periodically.
+     * @param readSizeKB
+     *            read request size in KB, -1 specifies use default value
+     * @param resumeInfo
+     *            FileReadeResumeInfo data required to restart a read from a particular point in a file, null for reading from start
+     * @param socketOpTimeoutMs
+     *            Socket (read / write) operation timeout in milliseconds
+     * @param fileName
+     *            filename to read
+     * @throws Exception
+     * 			  general exception
+     */
+    public HpccRemoteFileReader(DataPartition dp, FieldDef originalRD, IRecordBuilder recBuilder, int connectTimeout, int limit, boolean createPrefetchThread, int readSizeKB, FileReadResumeInfo resumeInfo, int socketOpTimeoutMs, String fileName) throws Exception
     {
         this.handlePrefetch = createPrefetchThread;
         this.originalRecordDef = originalRD;
@@ -223,7 +252,7 @@ public HpccRemoteFileReader(DataPartition dp, FieldDef originalRD, IRecordBuilde
 
         if (resumeInfo == null)
         {
-            this.inputStream = new RowServiceInputStream(this.dataPartition, this.originalRecordDef, projectedRecordDefinition, connectTimeout, limit, createPrefetchThread, readSizeKB, null, false, socketOpTimeoutMs);
+            this.inputStream = new RowServiceInputStream(this.dataPartition, this.originalRecordDef, projectedRecordDefinition, connectTimeout, limit, createPrefetchThread, readSizeKB, null, false, socketOpTimeoutMs, fileName);
             this.binaryRecordReader = new BinaryRecordReader(this.inputStream);
             this.binaryRecordReader.initialize(this.recordBuilder);
 
@@ -280,8 +309,8 @@ private boolean retryRead()
             try
             {
                 this.inputStream = new RowServiceInputStream(this.dataPartition, this.originalRecordDef,
-                                                            this.recordBuilder.getRecordDefinition(), this.connectTimeout, this.limit, this.createPrefetchThread,
-                                                            this.readSizeKB, restartInfo, false, this.socketOpTimeoutMs);
+                        this.recordBuilder.getRecordDefinition(), this.connectTimeout, this.limit, this.createPrefetchThread,
+                        this.readSizeKB, restartInfo, false, this.socketOpTimeoutMs);
                 long bytesToSkip = resumeInfo.recordReaderStreamPos - resumeInfo.inputStreamPos;
                 if (bytesToSkip < 0)
                 {
@@ -434,7 +463,7 @@ public boolean hasNext()
             if (!retryRead())
             {
                 canReadNext = false;
-                log.error("Read failure for " + this.dataPartition.toString(), e);
+                log.error("Read failure for " + this.dataPartition.toString() +":" + e.getMessage(),e);
                 java.util.NoSuchElementException exception = new java.util.NoSuchElementException("Fatal read error: " + e.getMessage());
                 exception.initCause(e);
                 throw exception;
@@ -554,4 +583,4 @@ public void report()
             log.warn(getRemoteReadMessages());
         }
     }
-}
+}