[prev in list] [next in list] [prev in thread] [next in thread] 

List:       fdo-commits
Subject:    [fdo-commits] r7066 - sandbox/adsk/3.9/Providers/KingOracle/src/Provider
From:       svn_fdo () osgeo ! org
Date:       2014-04-10 19:37:00
Message-ID: 20140410193700.C9BCC3902F4 () trac ! osgeo ! org
[Download RAW message or body]

Author: gregboone
Date: 2014-04-10 12:37:00 -0700 (Thu, 10 Apr 2014)
New Revision: 7066

Modified:
   sandbox/adsk/3.9/Providers/KingOracle/src/Provider/c_FdoOra_API2.cpp
   sandbox/adsk/3.9/Providers/KingOracle/src/Provider/c_FdoOra_API3.cpp
Log:
Ticket #887: Update KingOracle for FDO 3.9.0

Modified: sandbox/adsk/3.9/Providers/KingOracle/src/Provider/c_FdoOra_API2.cpp
===================================================================
--- sandbox/adsk/3.9/Providers/KingOracle/src/Provider/c_FdoOra_API2.cpp	2014-04-10 \
                17:21:15 UTC (rev 7065)
+++ sandbox/adsk/3.9/Providers/KingOracle/src/Provider/c_FdoOra_API2.cpp	2014-04-10 \
19:37:00 UTC (rev 7066) @@ -31,6 +31,7 @@
 
 //#define D_TEST_SHEMASPEED
 
+#ifdef _WIN32
 class c_Timer
 {
   public:
@@ -55,9 +56,9 @@
   protected:    
     LARGE_INTEGER frequency;LARGE_INTEGER t1,t2;double elapsedtime;
 };
+#endif
 
 
-
 c_FdoOra_API2::c_FdoOra_API2(void)
 {
 }
@@ -1634,12 +1635,15 @@
     
     
     
-    #ifdef _DEBUG
+#ifdef _WIN32
+#ifdef _DEBUG
+
     c_Timer time_full;
     time_full.Start();
-    #endif
+
+#endif
+#endif    
     
-    
     while( stm->ReadNext() )
     {
       rec_count++;
@@ -2071,30 +2075,40 @@
         // catch erro returned
         bool table_exists=false;
         
+#ifdef _WIN32
+#ifdef _DEBUG
 
-        #ifdef _DEBUG
            c_Timer time_columns;
            time_columns.Start();
-        #endif
+
+#endif
+#endif        
         
-        
         table_exists = \
DescribeTableProperties(OciConn,ora_tableowner.c_str(),ora_tablename.c_str(),pdc,SC_Collection);
  
-        
-        #ifdef _DEBUG
+#ifdef _WIN32
+#ifdef _DEBUG
+
           time_total_columns += time_columns.Stop();
-        #endif        
+
+#endif
+#endif        
                 
                 
     ////////////////////////////////////////////////////////////////////////////////////////////
  //  Check for primary keys
     //////////////////////////////////////////////////////////////////////////////////////////// \
  std::vector<std::wstring> pcols;
-        #ifdef _DEBUG
+
+#ifdef _WIN32
+#ifdef _DEBUG
+
           c_Timer time_pkeys;
           time_pkeys.Start();
-        #endif
 
+#endif
+#endif
+
         // ckeck for user defined column for identity
         // if defined use it - if not look for primary keys on table
         if( override_identity.length() > 0 )
@@ -2144,9 +2158,15 @@
               }
             }  
           }
-        #ifdef _DEBUG
+
+#ifdef _WIN32
+#ifdef _DEBUG
+
           time_total_pkeys += time_pkeys.Stop();
-        #endif
+
+#endif
+#endif
+
        ////////////////////////////////////////////////////////////////////////////////////////////
  //  Set Oracle Sequence
        //////////////////////////////////////////////////////////////////////////////////////////// \
 @@ -2183,11 +2203,15 @@
     }
     
     
-    #ifdef _DEBUG
-        time_full.Stop();
-        printf(" Describe: %.4lf (cols: %.4lf , pkeys: %.2lf) \
                ",time_full.GetElapsedTime(),time_total_columns,time_total_pkeys);
-    #endif
+#ifdef _WIN32
+#ifdef _DEBUG
     
+    time_full.Stop();
+    printf(" Describe: %.4lf (cols: %.4lf , pkeys: %.2lf) \
",time_full.GetElapsedTime(),time_total_columns,time_total_pkeys); +
+#endif
+#endif
+
     class_count = FdoClasses->GetCount();
     
     OciConn->TerminateStatement(stm);

Modified: sandbox/adsk/3.9/Providers/KingOracle/src/Provider/c_FdoOra_API3.cpp
===================================================================
--- sandbox/adsk/3.9/Providers/KingOracle/src/Provider/c_FdoOra_API3.cpp	2014-04-10 \
                17:21:15 UTC (rev 7065)
+++ sandbox/adsk/3.9/Providers/KingOracle/src/Provider/c_FdoOra_API3.cpp	2014-04-10 \
19:37:00 UTC (rev 7066) @@ -31,6 +31,7 @@
 
 //#define D_TEST_SHEMASPEED
 
+#ifdef _WIN32
 class c_Timer
 {
   public:
@@ -55,9 +56,9 @@
   protected:    
     LARGE_INTEGER frequency;LARGE_INTEGER t1,t2;double elapsedtime;
 };
+#endif
 
 
-
 class c_MapOraNameToFdoClass
 {
 public:
@@ -2064,10 +2065,12 @@
    
     std::wstring override_spatial_owner,override_spatial_table;
     
-    #ifdef _DEBUG
+#ifdef _WIN32
+#ifdef _DEBUG
     c_Timer time_full;
     time_full.Start();
-    #endif
+#endif
+#endif
     
     
     while( stm->ReadNext() )
@@ -2541,10 +2544,14 @@
     }
     
     
-    #ifdef _DEBUG
+#ifdef _WIN32
+#ifdef _DEBUG
+
         time_full.Stop();
         printf(" Describe: %.4lf (cols: %.4lf , pkeys: %.2lf) \
                ",time_full.GetElapsedTime(),time_total_columns,time_total_pkeys);
-    #endif
+
+#endif
+#endif
     
     class_count = FdoClasses->GetCount();
     
@@ -2552,27 +2559,49 @@
     
     // table describe
     {
-      #ifdef _DEBUG
+#ifdef _WIN32
+#ifdef _DEBUG
+
             c_Timer time_columns;
             time_columns.Start();
-      #endif
+
+#endif
+#endif
+
             DescribeTableProperties(OciConn,SqlColumns, BindOwner,Owner \
                ,maporatoclass);
-      #ifdef _DEBUG
+
+#ifdef _WIN32
+#ifdef _DEBUG
+
             time_total_columns += time_columns.Stop();
-      #endif        
+
+#endif        
+#endif        
     }
   // primary key describe
     {
     
       std::vector<std::wstring> pcols;
-      #ifdef _DEBUG
+
+#ifdef _WIN32
+#ifdef _DEBUG
+
         c_Timer time_pkeys;
         time_pkeys.Start();
-      #endif
+
+#endif
+#endif
+
       DescribeTablePrimaryKey(OciConn,SqlPkey,BindOwner,Owner,maporatoclass);
-    #ifdef _DEBUG
+
+#ifdef _WIN32
+#ifdef _DEBUG
+
       time_total_pkeys += time_pkeys.Stop();
-    #endif        
+
+#endif        
+#endif        
+
     }
     
     OciConn->TerminateStatement(stm);

_______________________________________________
fdo-commits mailing list
fdo-commits@lists.osgeo.org
http://lists.osgeo.org/mailman/listinfo/fdo-commits


[prev in list] [next in list] [prev in thread] [next in thread]