hawq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hubertzh...@apache.org
Subject incubator-hawq git commit: Revert "check null cond for explain analyse"
Date Mon, 07 Mar 2016 07:12:04 GMT
Repository: incubator-hawq
Updated Branches:
  refs/heads/master 0bf50ef93 -> a9d747db4


Revert "check null cond for explain analyse"

This reverts commit 0bf50ef93ffcbf6fd44abd1966bcd21c8b993526.


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/a9d747db
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/a9d747db
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/a9d747db

Branch: refs/heads/master
Commit: a9d747db4809f2c19969f4d99af45b1353779011
Parents: 0bf50ef
Author: hubertzhang <hzhang@pivotal.io>
Authored: Mon Mar 7 15:11:34 2016 +0800
Committer: hubertzhang <hzhang@pivotal.io>
Committed: Mon Mar 7 15:11:34 2016 +0800

----------------------------------------------------------------------
 src/backend/cdb/cdbexplain.c       | 6 +++---
 src/backend/cdb/cdbmetadatacache.c | 8 ++------
 2 files changed, 5 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/a9d747db/src/backend/cdb/cdbexplain.c
----------------------------------------------------------------------
diff --git a/src/backend/cdb/cdbexplain.c b/src/backend/cdb/cdbexplain.c
index 7985d68..cb3f55e 100644
--- a/src/backend/cdb/cdbexplain.c
+++ b/src/backend/cdb/cdbexplain.c
@@ -1147,8 +1147,8 @@ cdbexplain_depositStatsToNode(PlanState *planstate, CdbExplain_RecvStatCtx
*ctx)
       instr->firsttuple       = ntuples.nsimax->firsttuple;
       instr->startup          = ntuples.nsimax->startup;
       instr->total            = ntuples.nsimax->total;
-      instr->startupLast      = ntuples.nsiLast ? ntuples.nsiLast->startup : ntuples.nsimax->startup;
-      instr->totalLast        = ntuples.nsiLast ? ntuples.nsiLast->total : ntuples.nsimax->total;
+      instr->startupLast      = ntuples.nsiLast->startup;
+      instr->totalLast        = ntuples.nsiLast->total;
       instr->ntuples          = ntuples.nsimax->ntuples;
       instr->nloops           = ntuples.nsimax->nloops;
       instr->execmemused      = ntuples.nsimax->execmemused;
@@ -1157,7 +1157,7 @@ cdbexplain_depositStatsToNode(PlanState *planstate, CdbExplain_RecvStatCtx
*ctx)
       instr->workfileReused   = ntuples.nsimax->workfileReused;
       instr->workfileCreated  = ntuples.nsimax->workfileCreated;
       instr->firststart       = ntuples.nsimax->firststart;
-      instr->firststartLast       = ntuples.nsiLast ? ntuples.nsiLast->firststart :
ntuples.nsimax->firststart;
+      instr->firststartLast       = ntuples.nsiLast->firststart;
     }
 
     /* Save extra message text for the most interesting winning qExecs. */

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/a9d747db/src/backend/cdb/cdbmetadatacache.c
----------------------------------------------------------------------
diff --git a/src/backend/cdb/cdbmetadatacache.c b/src/backend/cdb/cdbmetadatacache.c
index 08fd618..74f4869 100644
--- a/src/backend/cdb/cdbmetadatacache.c
+++ b/src/backend/cdb/cdbmetadatacache.c
@@ -163,13 +163,13 @@ static HTAB                     *RevertBlockNamesMap = NULL;
 static HTAB                     *RevertBlockTopologyPathsMap = NULL;
 
 //static BlockLocation *CreateHdfsFileBlockLocations(BlockLocation *hdfs_locations, int block_num);
-//static BlockLocation *MergeHdfsFileBlockLocations(BlockLocation *locations1, int block_num1,
BlockLocation *locations2, int block_num2);
+static BlockLocation *MergeHdfsFileBlockLocations(BlockLocation *locations1, int block_num1,
BlockLocation *locations2, int block_num2);
 
 
 // create block locations for user
 static BlockLocation *GetHdfsFileBlockLocationsNoCache(const HdfsFileInfo *file_info, uint64_t
filesize, int *block_num);
 static BlockLocation *GetHdfsFileBlockLocationsFromCache(MetadataCacheEntry *entry, uint64_t
filesize, int *block_num);
-//static BlockLocation *AppendHdfsFileBlockLocationsToCache(const HdfsFileInfo *file_info,
MetadataCacheEntry *entry, uint64_t filesize, int *block_num, double *hit_ratio);
+static BlockLocation *AppendHdfsFileBlockLocationsToCache(const HdfsFileInfo *file_info,
MetadataCacheEntry *entry, uint64_t filesize, int *block_num, double *hit_ratio);
 
 /*
  *  Estimate metadata cache shared memory size
@@ -895,7 +895,6 @@ err:
 /*
  *  Get hdfs block locations from cache and fetch extra part from hadoop hdfs
  */
-/*
 BlockLocation *
 AppendHdfsFileBlockLocationsToCache(const HdfsFileInfo *file_info, MetadataCacheEntry *entry,
uint64_t filesize, int *block_num, double *hit_ratio)
 {
@@ -1029,7 +1028,6 @@ done:
 
     return locations;
 }
-*/
 
 /*
  * Free hdf file block location which create from GetHdfsFileBlockLocations
@@ -1119,7 +1117,6 @@ CreateHdfsFileBlockLocations(BlockLocation *hdfs_locations, int block_num)
     return locations;
 }
 
-/*
 BlockLocation *
 MergeHdfsFileBlockLocations(BlockLocation *locations1, int block_num1, BlockLocation *locations2,
int block_num2)
 {
@@ -1167,7 +1164,6 @@ MergeHdfsFileBlockLocations(BlockLocation *locations1, int block_num1,
BlockLoca
     return locations;
 
 }
-*/
 
 void 
 DumpHdfsFileBlockLocations(BlockLocation *locations, int block_num)


Mime
View raw message