Skip to content
Snippets Groups Projects
Commit b53903db authored by ocelot-inc's avatar ocelot-inc
Browse files

Merge branch 'master' of https://github.com/tarantool/tarantool

parents 41bfd596 c47a9288
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
doc/www-data.in/_layout/base
+ 2
− 1
View file @ b53903db
......@@ -5,8 +5,9 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link rel="shortcut icon" href="favicon.ico" />
{% if not docs %}
<link rel="stylesheet" type="text/css" href="/global.css" />
<link rel="stylesheet" type="text/css" href="global.css" />
{% endif %}
<link rel="stylesheet" type="text/css" href="styles/default.css" />
{% include "script" ignore missing %}
</head>
<body id="tarantool" class ="{{ page_name }}">
......
doc/www-data.in/_layout/script
+ 2
− 0
View file @ b53903db
......@@ -21,3 +21,5 @@
<img src="http://dd.cd.b2.a2.top.mail.ru/counter?id=2284916;js=na" style="border:0;position:absolute;left:-10000px;" height="1" width="1" alt="" />
</noscript>
<script src="highlight.js"></script>
<script>hljs.initHighlightingOnLoad();</script>
doc/www-data.in/_text/index.md
+ 33
− 22
View file @ b53903db
......@@ -2,39 +2,50 @@ index:
main: |
# Introduction
Tarantool is a NoSQL database running inside a Lua program. It's
created to store and process the most volatile and highly accessible
Web data. Tarantool has been extensively used in production since 2009.
It's **open source**, BSD licensed.
Tarantool is a NoSQL database running inside a Lua program. It
combines the network programming power of Node.JS with data
persistency capabilities of Redis. It's **open source**, BSD licensed.
The latest release is Tarantool 1.6.3, published on July 20, 2014.
# Features
- a drop-in replacement for Lua 5.1, based on LuaJIT 2.0;
simply use *#!/usr/bin/tarantool* instead of *#!/usr/bin/lua* in your script,
- Lua packages for non-blocking I/O, fibers and HTTP,
- [MsgPack](http://msgpack.org) data format and MsgPack based client-server
protocol,
- two data engines: 100% in-memory with optional persistence and a
[2-level disk-based B-tree](http://sphia.org), to use with large data
sets,
- secondary key and index iterators support,
- *secondary key* and index iterators support,
- asynchronous master-master replication,
- authentication and access control,
- [lowest CPU overhead](benchmark.html) to store or serve a
piece of content.
# Get started
``` bash
# apt-get install tarantool
# tarantool
# tarantool> box.cfg{{admin_port=3313}}
# tarantool> myspace = box.schema.create_space('myspace')
# tarantool> myspace:create_index('primary')
# tarantool> tuple = {{ name = 'Tarantool', release = box.info.version,
# type = {{ 'NoSQL database', 'Lua interpreter'}}}}
# tarantool> myspace:auto_increment{{tuple}}
# - [1, {{'release': '1.6.1-445-ge8d3201', 'name': 'Tarantool'
# 'type': ['NoSQL database', 'Lua interpreter']}}]
- authentication and access control.
# Example
``` lua
#!/usr/bin/env tarantool
box.cfg{{}}
hosts = box.space.hosts
if not hosts then
hosts = box.schema.create_space('hosts')
hosts:create_index('primary', {{ parts = {{1, 'STR'}} }})
end
local function handler(self)
local host = self.req.peer.host
local response = {{
host = host;
counter = hosts:inc(host);
}}
self:render({{ json = response }})
end
httpd = require('http.server')
server = httpd.new('127.0.0.1', 8080)
server:route({{ path = '/' }}, handler)
server:start()
```
# Learn more
......
doc/www-data/global.css
+ 1
− 1
View file @ b53903db
......@@ -103,7 +103,7 @@ blockquote {
pre, code, kbd, samp {
font-family: monospace, serif;
_font-family: 'courier new', monospace;
font-size: 80%;
font-size: 100%;
}
......
doc/www-data/highlight.js 0 → 100644
+ 1
− 0
View file @ b53903db
This diff is collapsed.
doc/www-data/styles/default.css 0 → 100644
+ 152
− 0
View file @ b53903db
/*
Original style from softwaremaniacs.org (c) Ivan Sagalaev <Maniac@SoftwareManiacs.Org>
*/
.hljs {
display: block;
overflow-x: auto;
padding: 0.5em;
background: #f0f0f0;
}
.hljs,
.hljs-subst,
.hljs-tag .hljs-title,
.lisp .hljs-title,
.clojure .hljs-built_in,
.nginx .hljs-title {
color: black;
}
.hljs-string,
.hljs-title,
.hljs-constant,
.hljs-parent,
.hljs-tag .hljs-value,
.hljs-rules .hljs-value,
.hljs-preprocessor,
.hljs-pragma,
.haml .hljs-symbol,
.ruby .hljs-symbol,
.ruby .hljs-symbol .hljs-string,
.hljs-template_tag,
.django .hljs-variable,
.smalltalk .hljs-class,
.hljs-addition,
.hljs-flow,
.hljs-stream,
.bash .hljs-variable,
.apache .hljs-tag,
.apache .hljs-cbracket,
.tex .hljs-command,
.tex .hljs-special,
.erlang_repl .hljs-function_or_atom,
.asciidoc .hljs-header,
.markdown .hljs-header,
.coffeescript .hljs-attribute {
color: #800;
}
.smartquote,
.hljs-comment,
.hljs-annotation,
.hljs-template_comment,
.diff .hljs-header,
.hljs-chunk,
.asciidoc .hljs-blockquote,
.markdown .hljs-blockquote {
color: #888;
}
.hljs-number,
.hljs-date,
.hljs-regexp,
.hljs-literal,
.hljs-hexcolor,
.smalltalk .hljs-symbol,
.smalltalk .hljs-char,
.go .hljs-constant,
.hljs-change,
.lasso .hljs-variable,
.makefile .hljs-variable,
.asciidoc .hljs-bullet,
.markdown .hljs-bullet,
.asciidoc .hljs-link_url,
.markdown .hljs-link_url {
color: #080;
}
.hljs-label,
.hljs-javadoc,
.ruby .hljs-string,
.hljs-decorator,
.hljs-filter .hljs-argument,
.hljs-localvars,
.hljs-array,
.hljs-attr_selector,
.hljs-important,
.hljs-pseudo,
.hljs-pi,
.haml .hljs-bullet,
.hljs-doctype,
.hljs-deletion,
.hljs-envvar,
.hljs-shebang,
.apache .hljs-sqbracket,
.nginx .hljs-built_in,
.tex .hljs-formula,
.erlang_repl .hljs-reserved,
.hljs-prompt,
.asciidoc .hljs-link_label,
.markdown .hljs-link_label,
.vhdl .hljs-attribute,
.clojure .hljs-attribute,
.asciidoc .hljs-attribute,
.lasso .hljs-attribute,
.coffeescript .hljs-property,
.hljs-phony {
color: #88f;
}
.hljs-keyword,
.hljs-id,
.hljs-title,
.hljs-built_in,
.css .hljs-tag,
.hljs-javadoctag,
.hljs-phpdoc,
.hljs-yardoctag,
.smalltalk .hljs-class,
.hljs-winutils,
.bash .hljs-variable,
.apache .hljs-tag,
.go .hljs-typename,
.tex .hljs-command,
.asciidoc .hljs-strong,
.markdown .hljs-strong,
.hljs-request,
.hljs-status {
font-weight: bold;
}
.asciidoc .hljs-emphasis,
.markdown .hljs-emphasis {
font-style: italic;
}
.nginx .hljs-built_in {
font-weight: normal;
}
.coffeescript .javascript,
.javascript .xml,
.lasso .markup,
.tex .hljs-formula,
.xml .javascript,
.xml .vbscript,
.xml .css,
.xml .hljs-cdata {
opacity: 0.5;
}
doc/www-data/styles/github.css 0 → 100644
+ 127
− 0
View file @ b53903db
/*
github.com style (c) Vasily Polovnyov <vast@whiteants.net>
*/
.hljs {
display: block;
overflow-x: auto;
padding: 0.5em;
color: #333;
background: #f8f8f8;
}
.hljs-comment,
.hljs-template_comment,
.diff .hljs-header,
.hljs-javadoc {
color: #998;
font-style: italic;
}
.hljs-keyword,
.css .rule .hljs-keyword,
.hljs-winutils,
.javascript .hljs-title,
.nginx .hljs-title,
.hljs-subst,
.hljs-request,
.hljs-status {
color: #333;
font-weight: bold;
}
.hljs-number,
.hljs-hexcolor,
.ruby .hljs-constant {
color: #099;
}
.hljs-string,
.hljs-tag .hljs-value,
.hljs-phpdoc,
.tex .hljs-formula {
color: #d14;
}
.hljs-title,
.hljs-id,
.coffeescript .hljs-params,
.scss .hljs-preprocessor {
color: #900;
font-weight: bold;
}
.javascript .hljs-title,
.lisp .hljs-title,
.clojure .hljs-title,
.hljs-subst {
font-weight: normal;
}
.hljs-class .hljs-title,
.haskell .hljs-type,
.vhdl .hljs-literal,
.tex .hljs-command {
color: #458;
font-weight: bold;
}
.hljs-tag,
.hljs-tag .hljs-title,
.hljs-rules .hljs-property,
.django .hljs-tag .hljs-keyword {
color: #000080;
font-weight: normal;
}
.hljs-attribute,
.hljs-variable,
.lisp .hljs-body {
color: #008080;
}
.hljs-regexp {
color: #009926;
}
.hljs-symbol,
.ruby .hljs-symbol .hljs-string,
.lisp .hljs-keyword,
.tex .hljs-special,
.hljs-prompt {
color: #990073;
}
.hljs-built_in,
.lisp .hljs-title,
.clojure .hljs-built_in {
color: #0086b3;
}
.hljs-preprocessor,
.hljs-pragma,
.hljs-pi,
.hljs-doctype,
.hljs-shebang,
.hljs-cdata {
color: #999;
font-weight: bold;
}
.hljs-deletion {
background: #fdd;
}
.hljs-addition {
background: #dfd;
}
.diff .hljs-change {
background: #0086b3;
}
.hljs-chunk {
color: #aaa;
}
test/unit/CMakeLists.txt
+ 1
− 1
View file @ b53903db
add_compile_flags("C;CXX" "-Wno-unused")
file(GLOB all_sources *.c *.m *.mm)
file(GLOB all_sources *.c *.cc)
set_source_files_compile_flags(${all_sources})
include_directories(${PROJECT_SOURCE_DIR}/src)
......
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