compile it~

NOTICE.txt

@@ -1,2 +1 @@
-This project includes code developed by the Apache Software Foundation (http://www.apache.org/),
-especially Apache Cassandra.
+This project includes code developed by the ScyllaDB (http://www.scylladb.com/), especially Scylla.

PEDIS-VERSION-GEN

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+VERSION=2.0.rc2
+
+if test -f version
+then
+	PEDIS_VERSION=$(cat version | awk -F'-' '{print $1}')
+	PEDIS_RELEASE=$(cat version | awk -F'-' '{print $2}')
+else
+	DATE=$(date +%Y%m%d)
+	GIT_COMMIT=$(git log --pretty=format:'%h' -n 1)
+	PEDIS_VERSION=$VERSION
+	# For custom package builds, replace "0" with "counter.your_name",
+	# where counter starts at 1 and increments for successive versions.
+	# This ensures that the package manager will select your custom
+	# package over the standard release.
+	PEDIS_BUILD=0
+	PEDIS_RELEASE=$PEDIS_BUILD.$DATE.$GIT_COMMIT
+fi
+
+echo "$PEDIS_VERSION-$PEDIS_RELEASE"
+mkdir -p build
+echo "$PEDIS_VERSION" > build/PEDIS-VERSION-FILE
+echo "$PEDIS_RELEASE" > build/PEDIS-RELEASE-FILE

README-DPDK.md

@@ -14,16 +14,12 @@ To use your own self-compiled DPDK package, follow this procedure:
    - Ubuntu 
      `sudo apt-get install -y build-essential linux-image-extra-$(uname -r)` 
 2. Prepare a DPDK SDK:
-   - Download the latest DPDK release: `wget http://dpdk.org/browse/dpdk/snapshot/dpdk-1.8.0.tar.gz`
+   - Download the latest DPDK release: `wget http://dpdk.org/browse/dpdk/snapshot/dpdk-2.0.0.tar.gz`
    - Untar it.
-   - Edit config/common_linuxapp: set CONFIG_RTE_MBUF_REFCNT and CONFIG_RTE_LIBRTE_KNI to 'n'.
-   - For DPDK 1.7.x: edit config/common_linuxapp: 
-     - Set CONFIG_RTE_LIBRTE_PMD_BOND  to 'n'.
-     - Set CONFIG_RTE_MBUF_SCATTER_GATHER to 'n'.
-     - Set CONFIG_RTE_LIBRTE_IP_FRAG to 'n'.
+   - Edit config/common_linuxapp: set CONFIG_RTE_MBUF_REFCNT_ATOMIC and CONFIG_RTE_LIBRTE_KNI to 'n'.
    - Start the tools/setup.sh script as root.
    - Compile a linuxapp target (option 9).
-   - Install IGB_UIO module (option 11).
-   - Bind some physical port to IGB_UIO (option 17).
-   - Configure hugepage mappings (option 14/15).
-3. Run a configure.py: `./configure.py --dpdk-target <Path to untared dpdk-1.8.0 above>/x86_64-native-linuxapp-gcc`.
+   - Install IGB_UIO module (option 12).
+   - Bind some physical port to IGB_UIO (option 18).
+   - Configure hugepage mappings (option 15/16).
+3. Run a configure.py: `./configure.py --dpdk-target <Path to untared dpdk-2.0.0 above>/x86_64-native-linuxapp-gcc`.

README.md

@@ -1,7 +1,5 @@
 # Pedis (Parallel Redis)
 
-**It's a new start for Pedis which will be constructed based on Scylla.**
-
 ## What's Pedis?
 
 Pedis is the NoSQL data store using the SEASTAR framework, compatible with REDIS. The name of Pedis is an acronym of **P**arallel r**edis**, which with high throughput and low latency.