Changeset 2912 for trunk

Timestamp:

04/01/14 13:47:06 (10 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No?

Module(s): Module Names change impacts.

Description: Describe your changes here...

Minor improvement on STIdxIter2.

File:

• trunk/src/STIdxIter.cpp (modified) (2 diffs)

trunk/src/STIdxIter.cpp

@@ -607 +607 @@
 void STIdxIter2::init()
 {
+  num_row_ = table_.nrow();
   for (uInt i = 0; i < cols_.size(); ++i) {
     addSortKey(cols_[i]);
   }
-  num_row_ = table_.nrow();
   sorter_.sort(index_, num_row_);
   num_iter_ = sorter_.unique(unique_, index_);
@@ -653 +653 @@
 void STIdxIter2::addColumnToKey(const string &name)
 {
-  uInt nrow = table_.nrow();
-  void *raw_storage = malloc(sizeof(T) * nrow);
+  void *raw_storage = malloc(sizeof(T) * num_row_);
   T *storage = reinterpret_cast<T*>(raw_storage);
-  Vector<T> array(IPosition(1, nrow), storage, SHARE); 
+  Vector<T> array(IPosition(1, num_row_), storage, SHARE); 
   ROScalarColumn<T> col(table_, name);
   col.getColumn(array);