Changeset 2283 for branches

Timestamp:

08/30/11 10:27:22 (13 years ago)

Author:

KohjiNakamura

Message:

Non-PlainColumn supported by TableTraverse

Location:

branches/parallel/src

Files:

• TableTraverse.cpp (modified) (4 diffs)
• TableTraverse.h (modified) (2 diffs)

branches/parallel/src/TableTraverse.cpp

@@ +1 @@
+//
+// C++ Interface: Scantable
+//
+// Description:
+//
+// Copyright: See COPYING file that comes with this distribution
+//
+
 #include <stdio.h>
 #include <stdlib.h>
+#include <TableTraverse.h>
+#include <tables/Tables/TableColumn.h>
+#include <tables/Tables/PlainColumn.h>
+#include <tables/Tables/DataManager.h>
+
+#define TIMING 0
+
+#if TIMING
 #include <sys/time.h>
-#include <TableTraverse.h>
-
-#define TIMING 0
+#endif
+
+static const char version[] = "$Id$";
 
 using namespace casa;
@@ -119 +135 @@
   };
 
+  static void copyColumnData(void *colValues, size_t elementSize, uInt nRows,
+                             BaseColumn *refCol)
+  {
+    char *base = (char *)colValues;
+    for (uInt i = 0; i < nRows; i++) {
+      refCol->get(i, &base[elementSize * i]);
+    }
+  }
+
   void traverseTable(const Table &table,
                      const char *const columnNames[],
@@ -145 +170 @@
       colValues[i] = typeManagers[i]->allocArray(nRows);
       sizes[i] = typeManagers[i]->sizeOf();
-      PlainColumn *col = dynamic_cast <PlainColumn *>(
-        ROTableColumnBackDoor::baseColumnPtr(cols[i]));
+      BaseColumn *baseCol = ROTableColumnBackDoor::baseColumnPtr(cols[i]);
+      PlainColumn *col = dynamic_cast <PlainColumn *>(baseCol);
       if (col) {
         const uInt gotRows = col->dataManagerColumn()->
@@ -152 +177 @@
         DebugAssert(gotRows == nRows, AipsError);
       } else {
-        for (uInt i = 0; i < colCount; i++) {
-          typeManagers[i]->freeArray(colValues[i]);
-          delete cols[i];
-        }
-        throw AipsError("Invalid type of column specified." ) ;
+        copyColumnData(colValues[i], typeManagers[i]->sizeOf(), nRows, baseCol);
       }
     }

branches/parallel/src/TableTraverse.h

@@ +1 @@
+//
+// C++ Interface: TableTraverse
+//
+// Description:
+//
+// Copyright: See COPYING file that comes with this distribution
+//
+
+// $Id$
+
+#ifndef ASAP_TABLETRAVERSE_H
+#define ASAP_TABLETRAVERSE_H
 
 #include <casa/aips.h>
 #include <tables/Tables/BaseTable.h>
 #include <tables/Tables/Table.h>
-#include <tables/Tables/PlainColumn.h>
-#include <tables/Tables/DataManager.h>
-#include <tables/Tables/ScalarColumn.h>
-#include <tables/Tables/ArrayColumn.h>
 
 namespace asap {
@@ -96 +104 @@
 
 }
+
+#endif