Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,26 @@ deps
!codis/cmd/fe/assets/**

tests/tmp

git.sh
tools/pika_batch_ingest/vscode/
tools/pika_batch_ingest/build/
tools/pika_batch_ingest/data/
tools/pika_batch_ingest/mock/
tools/pika_batch_ingest/third/
tools/pika_batch_ingest/src/s3put/include/proto/manifest.pb.h
tools/pika_batch_ingest/src/s3put/include/proto/manifest.pb.cc
tools/pika_batch_ingest/vendor/lib/
conf/pika_slave.conf
conf/pika_master.conf
conf/pika_master.conftests/integration/pika
tests/integration/pika
src/redis-server
tools/pika_batch_ingest/third/redis
tools/pika_batch_ingest/third/ThreadPool

pika.py
sample_mock.py
tools/pika_batch_ingest/d100
tools/pika_batch_ingest/test.sh
tools/pika_batch_ingest/info_rocksdb.txt
4 changes: 3 additions & 1 deletion .gitmodule
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@
url = https://github.com/Qihoo360/glog.git
[submodule "tools/pika_migrate/third/rocksdb"]
url = https://github.com/facebook/rocksdb.git

[submodule "tools/pika_batch_ingest/third/redis"]
path = tools/pika_batch_ingest/third/redis
url = https://github.com/redis/redis.git
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[submodule "tools/pika_batch_ingest/third/ThreadPool"]
path = tools/pika_batch_ingest/third/ThreadPool
url = https://github.com/progschj/ThreadPool.git
[submodule "tools/pika_batch_ingest/third/redis"]
path = tools/pika_batch_ingest/third/redis
url = https://github.com/redis/redis.git
Loading