Commit 85e7ea74 authored by yiwenshao's avatar yiwenshao

add redisbio and test_redisbio

parent 0d57098d
...@@ -16,7 +16,7 @@ CXXFLAGS := -g -O0 -fno-strict-aliasing -fno-rtti -fwrapv -fPIC \ ...@@ -16,7 +16,7 @@ CXXFLAGS := -g -O0 -fno-strict-aliasing -fno-rtti -fwrapv -fPIC \
-Wextra -Wmissing-noreturn -Wwrite-strings -Wno-unused-parameter \ -Wextra -Wmissing-noreturn -Wwrite-strings -Wno-unused-parameter \
-Wno-deprecated \ -Wno-deprecated \
-Wmissing-declarations -Woverloaded-virtual \ -Wmissing-declarations -Woverloaded-virtual \
-Wunreachable-code -D_GNU_SOURCE -std=c++0x -I$(TOP) -Wunreachable-code -D_GNU_SOURCE -std=c++11 -I$(TOP)
LDFLAGS := -L$(TOP)/$(OBJDIR) -Wl,--no-undefined LDFLAGS := -L$(TOP)/$(OBJDIR) -Wl,--no-undefined
...@@ -100,6 +100,10 @@ mtl/test_main_exe/%:$(OBJDIR)/test_main/%.o ...@@ -100,6 +100,10 @@ mtl/test_main_exe/%:$(OBJDIR)/test_main/%.o
@mkdir -p $(@D) @mkdir -p $(@D)
$(CXX) -g -o $@ $^ $(CXXFLAGS) $(LDFLAGS) -L/$(MYBUILD)/libmysqld -lmysqld -laio -lz -ldl -lm -lcrypt -lpthread -lcryptdb -ledbcrypto -ledbutil -ledbparser -lntl -lcrypto $(CXX) -g -o $@ $^ $(CXXFLAGS) $(LDFLAGS) -L/$(MYBUILD)/libmysqld -lmysqld -laio -lz -ldl -lm -lcrypt -lpthread -lcryptdb -ledbcrypto -ledbutil -ledbparser -lntl -lcrypto
mtl/test_redisbio_exe/%:$(OBJDIR)/test_redisbio/%.o $(OBJDIR)/libredisbio.so
@mkdir -p $(@D)
$(CXX) -g -o $@ $< $(CXXFLAGS) $(LDFLAGS) -lredisbio
include crypto/Makefrag include crypto/Makefrag
include parser/Makefrag include parser/Makefrag
include main/Makefrag include main/Makefrag
...@@ -113,6 +117,8 @@ include test_parser/Makefrag ...@@ -113,6 +117,8 @@ include test_parser/Makefrag
include test_main/Makefrag include test_main/Makefrag
include wrapper/Makefrag include wrapper/Makefrag
include test_parser_helper/Makefrag include test_parser_helper/Makefrag
include redisbio/Makefrag
include test_redisbio/Makefrag
$(OBJDIR)/.deps: $(foreach dir, $(OBJDIRS), $(wildcard $(OBJDIR)/$(dir)/*.d)) $(OBJDIR)/.deps: $(foreach dir, $(OBJDIRS), $(wildcard $(OBJDIR)/$(dir)/*.d))
@mkdir -p $(@D) @mkdir -p $(@D)
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
oDET: DET RND oDET: DET RND
oOPE: OPE RND oOPE: OPE RND
#oAGG: HOM #oAGG: HOM
#oASHE: ASHE oASHE: ASHE
[end] [end]
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
extern CItemTypesDir itemTypes; extern CItemTypesDir itemTypes;
static std::string embeddedDir="/t/cryt/shadow"; static std::string embeddedDir="/t/cryt/shadow";
//expand the item
template <typename ContainerType> template <typename ContainerType>
void myRewriteInsertHelper(const Item &i, const FieldMeta &fm, Analysis &a, void myRewriteInsertHelper(const Item &i, const FieldMeta &fm, Analysis &a,
ContainerType *const append_list){ ContainerType *const append_list){
......
OBJDIRS += redisbio
REDISBIO_SRCS := token.cc
all: $(OBJDIR)/libredisbio.so
REDISBIO_OBJS := $(patsubst %.cc,$(OBJDIR)/redisbio/%.o,$(REDISBIO_SRCS))
$(OBJDIR)/libredisbio.so: $(REDISBIO_OBJS)
$(CXX) -shared -g -o $@ $(REDISBIO_OBJS) $(LDFLAGS) $(LDRPATH)
install: install_redisbio
.PHONY: install_redisbio
install_redisbio: $(OBJDIR)/libredisbio.so
install -m 644 $(OBJDIR)/libredisbio.so /usr/lib
#pragma once
void
echo();
...@@ -57,6 +57,7 @@ main() { ...@@ -57,6 +57,7 @@ main() {
std::vector<std::string> querys{ std::vector<std::string> querys{
query1, query1,
"SELECT SUM(id) FROM student", "SELECT SUM(id) FROM student",
"SELECT name from student where name like 'stu%'"
}; };
for(auto item:querys){ for(auto item:querys){
std::cout<<item<<std::endl; std::cout<<item<<std::endl;
......
OBJDIRS += test_redisbio
##note that xx=*.cc will not expand. wildcard *.cc will include files from other directories.
##%.o will include testall
TESTREDISBIO_OBJS := $(patsubst %.cc,$(OBJDIR)/%.o,$(wildcard test_redisbio/*.cc))
TESTREDISBIO_EXES := $(patsubst test_redisbio/%.cc,mtl/test_redisbio_exe/%,$(wildcard test_redisbio/*.cc))
all: $(TESTREDISBIO_OBJS) $(TESTREDISBIO_EXES)
#include "redisbio/token.hh"
int main() {
echo();
return 0;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment