Merge pull request #5 from meeeejin/develop

Author: meeeejin

README.md

@@ -21,10 +21,10 @@ The above command will compile and build the source code with the default option
 | Option     | Description |
 | :--------- | :---------- |
 | --origin   | No caching (Vanilla version)                        										 |
-| --nc-ol    | Caching New-Orders and Order-Line pages (`default`) 										 |
-| --nc-st    | Caching New-Orders and Stock pages                  										 |
-| --nc-ol-st | Caching New-Orders, Order-Line and Stock pages      										 |
-| --mtr 		 | Caching New-Orders, Order-Line and Stock pages with mtr logging enabled |
+| --nc    | Caching New-Orders and Order-Line pages (`default`) 										 |
+| --nc-st    | Caching New-Orders, Order-Line and Stock pages                  										 |
+| --nc-st-od | Caching New-Orders, Order-Line, Stock and Orders pages      										 |
+| --mtr 		 | Caching New-Orders, Order-Line, Stock and Orders pages with mtr logging enabled |
 
 If you want the vanilla version, you can run the script as follows:
 

build.sh

@@ -9,38 +9,39 @@ if [ ! -d "$BUILD_DIR" ]; then
     mkdir bld
 fi
 
-#cd $BASE_DIR
 cd $BUILD_DIR
+
 rm -rf CMakeCache.txt
 sudo rm -rf CMakeFiles/*
 
 # Build and install the source code
 if [ "$1" = "--origin" ]; then
     # No caching
     BUILD_FLAGS=""
-elif [ "$1" = "--nc-ol" ]; then
+elif [ "$1" = "--nc" ]; then
     # Cache New-Orders and Order-Line pages
-    BUILD_FLAGS="-DUNIV_NVDIMM_CACHE -DUNIV_NVDIMM_CACHE_NO -DUNIV_NVDIMM_CACHE_OL"
+    BUILD_FLAGS="-DUNIV_NVDIMM_CACHE"
 elif [ "$1" = "--nc-st" ]; then
-    # Cache New-Orders and Stock pages
-    BUILD_FLAGS="-DUNIV_NVDIMM_CACHE -DUNIV_NVDIMM_CACHE_NO -DUNIV_NVDIMM_CACHE_ST"
-elif [ "$1" = "--nc-ol-st" ]; then
     # Cache New-Orders, Order-Line and Stock pages
-    BUILD_FLAGS="-DUNIV_NVDIMM_CACHE -DUNIV_NVDIMM_CACHE_NO -DUNIV_NVDIMM_CACHE_OL -DUNIV_NVDIMM_CACHE_ST"
+    BUILD_FLAGS="-DUNIV_NVDIMM_CACHE -DUNIV_NVDIMM_CACHE_ST"
+elif [ "$1" = "--nc-st-od" ]; then
+    # Cache New-Orders, Order-Line, Stock and Orders pages
+    BUILD_FLAGS="-DUNIV_NVDIMM_CACHE -DUNIV_NVDIMM_CACHE_ST -DUNIV_NVDIMM_CACHE_OD"
 elif [ "$1" = "--mtr" ]; then
- 		# Cache New-Orders, Order-Line with mtr-logging enabled
-		BUILD_FLAGS="-DUNIV_NVDIMM_CACHE -DUNIV_NVDIMM_CACHE_NO -DUNIV_NVDIMM_CACHE_OL -DUNIV_LOG_HEADER"
+    # Cache New-Orders, Order-Line, Stock and Orders pages with mtr-logging enabled
+    BUILD_FLAGS="-DUNIV_NVDIMM_CACHE -DUNIV_NVDIMM_CACHE_ST -DUNIV_NVDIMM_CACHE_OD -DUNIV_LOG_HEADER"
 else
     # Cache New-Orders and Order-Line pages (default)
-    BUILD_FLAGS="-DUNIV_NVDIMM_CACHE -DUNIV_NVDIMM_CACHE_NO -DUNIV_NVDIMM_CACHE_OL"
+    BUILD_FLAGS="-DUNIV_NVDIMM_CACHE"
 fi
 
 echo "Start build using $BUILD_FLAGS"
 
-cmake .. -DWITH_DEBUG=0 -DCMAKE_C_FLAGS="$BUILD_FLAGS" -DCMAKE_CXX_FLAGS="$BUILD_FLAGS" \
--DDOWNLOAD_BOOST=ON -DWITH_BOOST=$BASE_DIR/boost -DENABLED_LOCAL_INFILE=1 -DCMAKE_INSTALL_PREFIX=$BUILD_DIR \
--DWITH_RAPID=OFF
-#-DWITH_INNOBASE_STORAGE_ENGINE=1 -DWITH_ARCHIVE_STORAGE_ENGINE=1
+cd $BASE_DIR
+
+cmake -DWITH_DEBUG=0 -DCMAKE_C_FLAGS="$BUILD_FLAGS" -DCMAKE_CXX_FLAGS="$BUILD_FLAGS" \
+-DDOWNLOAD_BOOST=ON -DWITH_BOOST=$BASE_DIR/boost -DENABLED_LOCAL_INFILE=1 \
+-DCMAKE_INSTALL_PREFIX=$BUILD_DIR
 
 make -j8
 sudo make install

my-origin.cnf

@@ -46,7 +46,7 @@ innodb_page_size=4KB
 innodb_file_per_table=1
 
 #buffer settings
-innodb_buffer_pool_size=5000M
+innodb_buffer_pool_size=6G
 innodb_buffer_pool_instances=8
 innodb_max_dirty_pages_pct_lwm=0
 
@@ -64,7 +64,7 @@ innodb_log_buffer_size=32M
 innodb_flush_neighbors=0
 
 #doublewrite and flush method
-innodb_doublewrite=OFF
+innodb_doublewrite=ON
 innodb_flush_method=O_DIRECT
 
 #AIO control

my.cnf

@@ -46,7 +46,7 @@ innodb_page_size=4KB
 innodb_file_per_table=1
 
 #buffer settings
-innodb_buffer_pool_size=5G
+innodb_buffer_pool_size=4G
 innodb_buffer_pool_instances=8
 innodb_max_dirty_pages_pct_lwm=0
 
@@ -56,9 +56,10 @@ innodb_page_cleaners=8
 
 #nvdimm settings
 innodb_use_nvdimm_buffer=true
-innodb_nvdimm_buffer_pool_size=1G
-innodb_nvdimm_buffer_pool_instances=1
-innodb_nvdimm_pc_threshold_pct=5
+innodb_nvdimm_buffer_pool_size=2G
+innodb_nvdimm_buffer_pool_instances=2
+innodb_nvdimm_pc_threshold_pct=15
+innodb_nvdimm_home_dir=/mnt/pmem
 
 #transaction log settings
 innodb_log_file_size=2G
@@ -70,7 +71,7 @@ innodb_log_buffer_size=32M
 innodb_flush_neighbors=0
 
 #doublewrite and flush method
-innodb_doublewrite=OFF
+innodb_doublewrite=ON
 innodb_flush_method=O_DIRECT
 
 #AIO control