summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormartinko2013-04-15 15:54:32 +0000
committermartinko2013-04-15 15:54:32 +0000
commit3e85c9f908912113251562476e65031f7374241d (patch)
tree5fe52dad55df12a79df8dc20476ece0a8446f58e
parent99ef13f2a06a4f8172535332d585f019f52e4a65 (diff)
python: text fixes
-rw-r--r--doc/skytools3.txt33
-rw-r--r--python/londiste/handler.py2
-rw-r--r--python/skytools/gzlog.py7
3 files changed, 20 insertions, 22 deletions
diff --git a/doc/skytools3.txt b/doc/skytools3.txt
index 70a95f79..0d346e4a 100644
--- a/doc/skytools3.txt
+++ b/doc/skytools3.txt
@@ -11,9 +11,9 @@ Keep old design from Skytools 2
- No pushing with LISTEN/NOTIFY is used for data transport.
- Administrative work happens in separate process.
- Can go down anytime, without affecting anything else.
-* Relaxed attitude about tables
- - Tables can be added/removed any time.
- - Inital data sync happens table-by-table, no attempt is made to keep
+* Relaxed attitude about tables.
+ - Tables can be added/removed at any time.
+ - Initial data sync happens table-by-table, no attempt is made to keep
consistent picture between tables during initial copy.
New features in Skytools 3
@@ -26,19 +26,19 @@ New features in Skytools 3
- For terminology and technical details see here: set.notes.txt.
* New Londiste features:
- - Parallel copy - during inital sync several tables can be
- copied at the same time. In 2.x the copy already happened in separate
- process, making it parallel was just a matter of tuning launching/syncing logic.
+ - Parallel copy - during initial sync several tables can be copied
+ at the same time. In 2.x the copy already happened in separate process,
+ making it parallel was just a matter of tuning launching/syncing logic.
- - EXECUTE command, to run random SQL script on all nodes. The script is executed
- in single a TX on root, and inserted as an event into the queue in the same TX.
- The goal is to emulate DDL AFTER TRIGGER that way.
- Londiste itself does no locking and no coordination between nodes. The assumption
- is that the DDL commands themselves do enough locking. If more locking is needed
- is can be added to script.
+ - EXECUTE command, to run random SQL script on all nodes. The script is
+ executed in single TX on root, and inserted as an event into the queue
+ in the same TX. The goal is to emulate DDL AFTER TRIGGER that way.
+ Londiste itself does no locking and no coordination between nodes.
+ The assumption is that the DDL commands themselves do enough locking.
+ If more locking is needed is can be added to script.
- Automatic table or sequence creation by importing the structure
- from provider node. Activeted with --create switch for add-table, add-seq.
+ from provider node. Activated with --create switch for add-table, add-seq.
By default *everything* is copied, including Londiste own triggers.
The basic idea is that the triggers may be customized and that way
we avoid the need to keep track of trigger customizations.
@@ -58,8 +58,8 @@ New features in Skytools 3
- Target table can use different name (--dest-table)
-* New interactive admin console - qadmin. Because long command lines are not very
- user-friendly, this is an experiment on interactive console with
+* New interactive admin console - qadmin. Because long command lines are
+ not very user-friendly, this is an experiment on interactive console with
heavy emphasis on tab-completion.
* New multi-database ticker: `pgqd`. It is possible to set up one process that
@@ -95,7 +95,7 @@ Minor improvements
* Skytools 3 modules are parallel installable with Skytools 2.
Solved via loader module (like http://faq.pygtk.org/index.py?req=all#2.4[pygtk]).
-
+
import pkgloader
pkgloader.require('skytools', '3.0')
import skytools
@@ -105,4 +105,3 @@ Further reading
---------------
* http://skytools.projects.postgresql.org/skytools-3.0/[Documentation] for skytools3.
-
diff --git a/python/londiste/handler.py b/python/londiste/handler.py
index 51fa603a..72d98b43 100644
--- a/python/londiste/handler.py
+++ b/python/londiste/handler.py
@@ -145,7 +145,7 @@ class BaseHandler:
def real_copy(self, src_tablename, src_curs, dst_curs, column_list):
"""do actual table copy and return tuple with number of bytes and rows
- copyed
+ copied
"""
condition = self.get_copy_condition(src_curs, dst_curs)
return skytools.full_copy(src_tablename, src_curs, dst_curs,
diff --git a/python/skytools/gzlog.py b/python/skytools/gzlog.py
index 558e2813..0db40fc3 100644
--- a/python/skytools/gzlog.py
+++ b/python/skytools/gzlog.py
@@ -1,8 +1,8 @@
"""Atomic append of gzipped data.
-The point is - if several gzip streams are concated, they
-are read back as one whose stream.
+The point is - if several gzip streams are concatenated,
+they are read back as one whole stream.
"""
import gzip
@@ -22,7 +22,7 @@ def gzip_append(filename, data, level = 6):
g.write(data)
g.close()
zdata = buf.getvalue()
-
+
# append, safely
f = open(filename, "a+", 0)
f.seek(0, 2)
@@ -36,4 +36,3 @@ def gzip_append(filename, data, level = 6):
f.truncate()
f.close()
raise ex
-