add Geo & Hyperloglog

e3c9bb3a · KernelMaker · 2bc57172 · e3c9bb3a · d8bb7ecb · 6ec4e2f6
隐藏空白更改
内联并排

Showing with 57 addition and 57 deletion

src/pika_command.cc src/pika_command.cc +56 -56

third/nemo third/nemo +1 -1

未找到文件。
--- a/src/pika_command.cc
+++ b/src/pika_command.cc
@@ -378,34 +378,34 @@ void InitCmdInfoTable() {

  //HyperLogLog
  ////PfAdd
-//  CmdInfo* pfaddptr = new CmdInfo(kCmdNamePfAdd, -2, kCmdFlagsWrite | kCmdFlagsHyperLogLog);
-//  cmd_infos.insert(std::pair<std::string, CmdInfo*>(kCmdNamePfAdd, pfaddptr));
-//  ////PfCount
-//  CmdInfo* pfcountptr = new CmdInfo(kCmdNamePfCount, -2, kCmdFlagsRead | kCmdFlagsHyperLogLog);
-//  cmd_infos.insert(std::pair<std::string, CmdInfo*>(kCmdNamePfCount, pfcountptr));
-//  ////PfMerge
-//  CmdInfo* pfmergeptr = new CmdInfo(kCmdNamePfMerge, -3, kCmdFlagsWrite | kCmdFlagsHyperLogLog);
-//  cmd_infos.insert(std::pair<std::string, CmdInfo*>(kCmdNamePfMerge, pfmergeptr));
-//
-//  //GEO
-//  ////GeoAdd
-//  CmdInfo* geoaddptr = new CmdInfo(kCmdNameGeoAdd, -5, kCmdFlagsWrite | kCmdFlagsGeo);
-//  cmd_infos.insert(std::pair<std::string, CmdInfo*>(kCmdNameGeoAdd, geoaddptr));
-//  ////GeoPos
-//  CmdInfo* geoposptr = new CmdInfo(kCmdNameGeoPos, -2, kCmdFlagsRead | kCmdFlagsGeo);
-//  cmd_infos.insert(std::pair<std::string, CmdInfo*>(kCmdNameGeoPos, geoposptr));
-//  ////GeoDist
-//  CmdInfo* geodistptr = new CmdInfo(kCmdNameGeoDist, -4, kCmdFlagsRead | kCmdFlagsGeo);
-//  cmd_infos.insert(std::pair<std::string, CmdInfo*>(kCmdNameGeoDist, geodistptr));
-//  ////GeoHash
-//  CmdInfo* geohashptr = new CmdInfo(kCmdNameGeoHash, -2, kCmdFlagsRead | kCmdFlagsGeo);
-//  cmd_infos.insert(std::pair<std::string, CmdInfo*>(kCmdNameGeoHash, geohashptr));
-//  ////GeoRadius
-//  CmdInfo* georadiusptr = new CmdInfo(kCmdNameGeoRadius, -6, kCmdFlagsRead | kCmdFlagsGeo);
-//  cmd_infos.insert(std::pair<std::string, CmdInfo*>(kCmdNameGeoRadius, georadiusptr));
-//  ////GeoRadiusByMember
-//  CmdInfo* georadiusbymemberptr = new CmdInfo(kCmdNameGeoRadiusByMember, -5, kCmdFlagsRead | kCmdFlagsGeo);
-//  cmd_infos.insert(std::pair<std::string, CmdInfo*>(kCmdNameGeoRadiusByMember, georadiusbymemberptr));
+  CmdInfo* pfaddptr = new CmdInfo(kCmdNamePfAdd, -2, kCmdFlagsWrite | kCmdFlagsHyperLogLog);
+  cmd_infos.insert(std::pair<std::string, CmdInfo*>(kCmdNamePfAdd, pfaddptr));
+  ////PfCount
+  CmdInfo* pfcountptr = new CmdInfo(kCmdNamePfCount, -2, kCmdFlagsRead | kCmdFlagsHyperLogLog);
+  cmd_infos.insert(std::pair<std::string, CmdInfo*>(kCmdNamePfCount, pfcountptr));
+  ////PfMerge
+  CmdInfo* pfmergeptr = new CmdInfo(kCmdNamePfMerge, -3, kCmdFlagsWrite | kCmdFlagsHyperLogLog);
+  cmd_infos.insert(std::pair<std::string, CmdInfo*>(kCmdNamePfMerge, pfmergeptr));
+
+  //GEO
+  ////GeoAdd
+  CmdInfo* geoaddptr = new CmdInfo(kCmdNameGeoAdd, -5, kCmdFlagsWrite | kCmdFlagsGeo);
+  cmd_infos.insert(std::pair<std::string, CmdInfo*>(kCmdNameGeoAdd, geoaddptr));
+  ////GeoPos
+  CmdInfo* geoposptr = new CmdInfo(kCmdNameGeoPos, -2, kCmdFlagsRead | kCmdFlagsGeo);
+  cmd_infos.insert(std::pair<std::string, CmdInfo*>(kCmdNameGeoPos, geoposptr));
+  ////GeoDist
+  CmdInfo* geodistptr = new CmdInfo(kCmdNameGeoDist, -4, kCmdFlagsRead | kCmdFlagsGeo);
+  cmd_infos.insert(std::pair<std::string, CmdInfo*>(kCmdNameGeoDist, geodistptr));
+  ////GeoHash
+  CmdInfo* geohashptr = new CmdInfo(kCmdNameGeoHash, -2, kCmdFlagsRead | kCmdFlagsGeo);
+  cmd_infos.insert(std::pair<std::string, CmdInfo*>(kCmdNameGeoHash, geohashptr));
+  ////GeoRadius
+  CmdInfo* georadiusptr = new CmdInfo(kCmdNameGeoRadius, -6, kCmdFlagsRead | kCmdFlagsGeo);
+  cmd_infos.insert(std::pair<std::string, CmdInfo*>(kCmdNameGeoRadius, georadiusptr));
+  ////GeoRadiusByMember
+  CmdInfo* georadiusbymemberptr = new CmdInfo(kCmdNameGeoRadiusByMember, -5, kCmdFlagsRead | kCmdFlagsGeo);
+  cmd_infos.insert(std::pair<std::string, CmdInfo*>(kCmdNameGeoRadiusByMember, georadiusbymemberptr));
 }

 void DestoryCmdInfoTable() {
@@ -779,34 +779,34 @@ void InitCmdTable(std::unordered_map<std::string, Cmd*> *cmd_table) {

  //HyperLogLog
  ////pfaddCmd
-//  Cmd * pfaddptr = new PfAddCmd();
-//  cmd_table->insert(std::pair<std::string, Cmd*>(kCmdNamePfAdd, pfaddptr));
-//  ////pfcountCmd
-//  Cmd * pfcountptr = new PfCountCmd();
-//  cmd_table->insert(std::pair<std::string, Cmd*>(kCmdNamePfCount, pfcountptr));
-//  ////pfmergeCmd
-//  Cmd * pfmergeptr = new PfMergeCmd();
-//  cmd_table->insert(std::pair<std::string, Cmd*>(kCmdNamePfMerge, pfmergeptr));
-//
-//  //GEO
-//  ////GepAdd
-//  Cmd * geoaddptr = new GeoAddCmd();
-//  cmd_table->insert(std::pair<std::string, Cmd*>(kCmdNameGeoAdd, geoaddptr));
-//  ////GeoPos
-//  Cmd * geoposptr = new GeoPosCmd();
-//  cmd_table->insert(std::pair<std::string, Cmd*>(kCmdNameGeoPos, geoposptr));
-//  ////GeoDist
-//  Cmd * geodistptr = new GeoDistCmd();
-//  cmd_table->insert(std::pair<std::string, Cmd*>(kCmdNameGeoDist, geodistptr));
-//  ////GeoHash
-//  Cmd * geohashptr = new GeoHashCmd();
-//  cmd_table->insert(std::pair<std::string, Cmd*>(kCmdNameGeoHash, geohashptr));
-//  ////GeoRadius
-//  Cmd * georadiusptr = new GeoRadiusCmd();
-//  cmd_table->insert(std::pair<std::string, Cmd*>(kCmdNameGeoRadius, georadiusptr));
-//  ////GeoRadiusByMember
-//  Cmd * georadiusbymemberptr = new GeoRadiusByMemberCmd();
-//  cmd_table->insert(std::pair<std::string, Cmd*>(kCmdNameGeoRadiusByMember, georadiusbymemberptr));
+  Cmd * pfaddptr = new PfAddCmd();
+  cmd_table->insert(std::pair<std::string, Cmd*>(kCmdNamePfAdd, pfaddptr));
+  ////pfcountCmd
+  Cmd * pfcountptr = new PfCountCmd();
+  cmd_table->insert(std::pair<std::string, Cmd*>(kCmdNamePfCount, pfcountptr));
+  ////pfmergeCmd
+  Cmd * pfmergeptr = new PfMergeCmd();
+  cmd_table->insert(std::pair<std::string, Cmd*>(kCmdNamePfMerge, pfmergeptr));
+
+  //GEO
+  ////GepAdd
+  Cmd * geoaddptr = new GeoAddCmd();
+  cmd_table->insert(std::pair<std::string, Cmd*>(kCmdNameGeoAdd, geoaddptr));
+  ////GeoPos
+  Cmd * geoposptr = new GeoPosCmd();
+  cmd_table->insert(std::pair<std::string, Cmd*>(kCmdNameGeoPos, geoposptr));
+  ////GeoDist
+  Cmd * geodistptr = new GeoDistCmd();
+  cmd_table->insert(std::pair<std::string, Cmd*>(kCmdNameGeoDist, geodistptr));
+  ////GeoHash
+  Cmd * geohashptr = new GeoHashCmd();
+  cmd_table->insert(std::pair<std::string, Cmd*>(kCmdNameGeoHash, geohashptr));
+  ////GeoRadius
+  Cmd * georadiusptr = new GeoRadiusCmd();
+  cmd_table->insert(std::pair<std::string, Cmd*>(kCmdNameGeoRadius, georadiusptr));
+  ////GeoRadiusByMember
+  Cmd * georadiusbymemberptr = new GeoRadiusByMemberCmd();
+  cmd_table->insert(std::pair<std::string, Cmd*>(kCmdNameGeoRadiusByMember, georadiusbymemberptr));
 }

 Cmd* GetCmdFromTable(const std::string& opt,

--- a/nemo @ d8bb7ecb
+++ b/nemo @ d8bb7ecb
-Subproject commit 6ec4e2f646eef1c5309574cc544b7db0aa6a282a
+Subproject commit d8bb7ecb7ca27707b712c828607664fdb63616d7