Merge pull request #36 from pocoproject/develop

Sync 3.1.2017

Data/include/Poco/Data/RecordSet.h

@@ -26,10 +26,12 @@
 #include "Poco/Data/BulkExtraction.h"
 #include "Poco/Data/Statement.h"
 #include "Poco/Data/RowIterator.h"
+#include "Poco/Data/RowFilter.h"
 #include "Poco/Data/LOB.h"
 #include "Poco/String.h"
 #include "Poco/Dynamic/Var.h"
 #include "Poco/Exception.h"
+#include "Poco/AutoPtr.h"
 #include <ostream>
 #include <limits>
 
@@ -98,7 +100,6 @@ public:
 		_currentRow(0),
 		_pBegin(new RowIterator(this, 0 == rowsExtracted())),
 		_pEnd(new RowIterator(this, true)),
-		_pFilter(0),
 		_totalRowCount(UNKNOWN_TOTAL_ROW_COUNT)
 		/// Creates the RecordSet.
 	{
@@ -480,17 +481,17 @@ private:
 		/// Returns true if the specified row is allowed by the
 		/// currently active filter.
 
-	void filter(RowFilter* pFilter);
+	void filter(const Poco::AutoPtr<RowFilter>& pFilter);
 		/// Sets the filter for the RecordSet.
 
-	const RowFilter* getFilter() const;
+	const Poco::AutoPtr<RowFilter>& getFilter() const;
 		/// Returns the filter associated with the RecordSet.
 
 	std::size_t  _currentRow;
 	RowIterator* _pBegin;
 	RowIterator* _pEnd;
 	RowMap       _rowMap;
-	RowFilter*   _pFilter;
+	Poco::AutoPtr<RowFilter> _pFilter;
 	std::size_t  _totalRowCount;
 
 	friend class RowIterator;
@@ -656,7 +657,7 @@ inline RecordSet::Iterator RecordSet::end()
 }
 
 
-inline const RowFilter* RecordSet::getFilter() const
+inline const Poco::AutoPtr<RowFilter>& RecordSet::getFilter() const
 {
 	return _pFilter;
 }

Data/include/Poco/Data/RowFilter.h

@@ -21,7 +21,6 @@
 
 
 #include "Poco/Data/Data.h"
-#include "Poco/Data/RecordSet.h"
 #include "Poco/Dynamic/Var.h"
 #include "Poco/Tuple.h"
 #include "Poco/String.h"
@@ -36,6 +35,9 @@ namespace Poco {
 namespace Data {
 
 
+class RecordSet;
+
+
 class Data_API RowFilter: public RefCountedObject
 	/// RowFilter class provides row filtering functionality.
 	/// A filter contains a set of criteria (field name, value and
@@ -93,7 +95,7 @@ public:
 	void add(const std::string& name, Comparison comparison, const T& value, LogicOperator op = OP_OR)
 		/// Adds value to the filter.
 	{
-		if (_pRecordSet) _pRecordSet->moveFirst();
+		rewindRecordSet();
 		_comparisonMap.insert(ComparisonMap::value_type(toUpper(name),
 			ComparisonEntry(value, comparison, op)));
 	}
@@ -164,6 +166,8 @@ private:
 	RecordSet& recordSet() const;
 
 	Comparison getComparison(const std::string& comp) const;
+	
+	void rewindRecordSet();
 
 	Comparisons        _comparisons;
 	ComparisonMap      _comparisonMap;

Data/src/RecordSet.cpp

@@ -41,7 +41,6 @@ RecordSet::RecordSet(const Statement& rStatement,
 	_currentRow(0),
 	_pBegin(new RowIterator(this, 0 == rowsExtracted())),
 	_pEnd(new RowIterator(this, true)),
-	_pFilter(0),
 	_totalRowCount(UNKNOWN_TOTAL_ROW_COUNT)
 {
 	if (pRowFormatter) setRowFormatter(pRowFormatter);
@@ -55,7 +54,6 @@ RecordSet::RecordSet(Session& rSession,
 	_currentRow(0),
 	_pBegin(new RowIterator(this, 0 == rowsExtracted())),
 	_pEnd(new RowIterator(this, true)),
-	_pFilter(0),
 	_totalRowCount(UNKNOWN_TOTAL_ROW_COUNT)
 {
 	if (pRowFormatter) setRowFormatter(pRowFormatter);
@@ -70,7 +68,6 @@ RecordSet::RecordSet(const RecordSet& other):
 	_pFilter(other._pFilter),
 	_totalRowCount(other._totalRowCount)
 {
-	if (_pFilter) _pFilter->duplicate();
 }
 
 
@@ -80,7 +77,6 @@ RecordSet::~RecordSet()
 	{
 		delete _pBegin;
 		delete _pEnd;
-		if (_pFilter) _pFilter->release();
 
 		RowMap::iterator it = _rowMap.begin();
 		RowMap::iterator itEnd = _rowMap.end();
@@ -395,11 +391,9 @@ std::ostream& RecordSet::copy(std::ostream& os, std::size_t offset, std::size_t
 }
 
 
-void RecordSet::filter(RowFilter* pFilter)
+void RecordSet::filter(const Poco::AutoPtr<RowFilter>& pFilter)
 {
-	if (_pFilter) _pFilter->release();
 	_pFilter = pFilter;
-	if (_pFilter) _pFilter->duplicate();
 }
 
 

Data/src/RowFilter.cpp

@@ -20,6 +20,7 @@
 #include "Poco/Exception.h"
 #include <functional>
 
+
 namespace Poco {
 namespace Data {
 
@@ -53,8 +54,6 @@ void RowFilter::init()
 	_comparisons.insert(Comparisons::value_type("<>", VALUE_NOT_EQUAL));
 	_comparisons.insert(Comparisons::value_type("!=", VALUE_NOT_EQUAL));
 	_comparisons.insert(Comparisons::value_type("IS NULL", VALUE_IS_NULL));
-
-	duplicate();
 }
 
 
@@ -62,7 +61,6 @@ RowFilter::~RowFilter()
 {
 	try
 	{
-		release();
 		if (_pRecordSet) _pRecordSet->filter(0);
 		if (_pParent.get()) _pParent->removeFilter(this);
 	}
@@ -201,6 +199,7 @@ void RowFilter::doCompare(Poco::Dynamic::Var& ret,
 	}
 }
 
+
 RecordSet& RowFilter::recordSet() const
 {
 	if (!_pRecordSet)
@@ -214,4 +213,10 @@ RecordSet& RowFilter::recordSet() const
 }
 
 
+void RowFilter::rewindRecordSet()
+{
+	if (_pRecordSet) _pRecordSet->moveFirst();
+}
+
+
 } } // namespace Poco::Data

Foundation/src/ArchiveStrategy.cpp

@@ -47,28 +47,35 @@ public:
 	{
 	}
 	
-	ActiveMethod<Void, std::string, ArchiveCompressor, ActiveStarter<ActiveDispatcher> > compress;
+	ActiveMethod<void, std::string, ArchiveCompressor, ActiveStarter<ActiveDispatcher> > compress;
 
 protected:
-	Void compressImpl(const std::string& path)
+	void compressImpl(const std::string& path)
 	{
 		std::string gzPath(path);
 		gzPath.append(".gz");
-		FileInputStream istr(path, std::ios::binary | std::ios::in);
-		if (!istr.good()) throw OpenFileException(path);
-		FileOutputStream ostr(gzPath, std::ios::binary | std::ios::out);
-		if (ostr.good())
+		FileInputStream istr(path);
+		FileOutputStream ostr(gzPath);
+		try
 		{
 			DeflatingOutputStream deflater(ostr, DeflatingStreamBuf::STREAM_GZIP);
 			StreamCopier::copyStream(istr, deflater);
+			if (!deflater.good() || !ostr.good()) throw WriteFileException(gzPath);
 			deflater.close();
 			ostr.close();
 			istr.close();
-			File f(path);
-			f.remove();
 		}
-		else throw CreateFileException(gzPath);
-		return Void();
+		catch (Poco::Exception&)
+		{
+			// deflating failed - remove gz file and leave uncompressed log file
+			ostr.close();
+			Poco::File gzf(gzPath);
+			gzf.remove();
+			return;
+		}
+		File f(path);
+		f.remove();
+		return;
 	}
 };
 

JSON/src/ParseHandler.cpp

@@ -133,7 +133,6 @@ void ParseHandler::setValue(const Var& value)
 	}
 	else if ( parent.type() == typeid(Object::Ptr) )
 	{
-		poco_assert_dbg(!_key.empty());
 		Object::Ptr obj = parent.extract<Object::Ptr>();
 		obj->set(_key, value);
 		_key.clear();

JSON/testsuite/src/JSONTest.cpp

@@ -377,6 +377,37 @@ void JSONTest::testEmptyObject()
 }
 
 
+void JSONTest::testEmptyPropertyName()
+{
+	std::string json = "{\"\": 42}";
+	Parser parser;
+	Var result;
+
+	try
+	{
+		result = parser.parse(json);
+	}
+	catch(JSONException& jsone)
+	{
+		std::cout << jsone.message() << std::endl;
+		assert(false);
+	}
+
+	assert(result.type() == typeid(Object::Ptr));
+
+	Object::Ptr object = result.extract<Object::Ptr>();
+	assert(object->size() == 1);
+
+	DynamicStruct ds = *object;
+	assert (ds.size() == 1);
+
+	const DynamicStruct& rds = *object;
+	assert (rds.size() == 1);
+	
+	assert (ds[""] == 42);
+}
+
+
 void JSONTest::testComplexObject()
 {
 	std::string json =
@@ -1889,6 +1920,7 @@ CppUnit::Test* JSONTest::suite()
 #endif
 	CppUnit_addTest(pSuite, JSONTest, testStringProperty);
 	CppUnit_addTest(pSuite, JSONTest, testEmptyObject);
+	CppUnit_addTest(pSuite, JSONTest, testEmptyPropertyName);
 	CppUnit_addTest(pSuite, JSONTest, testComplexObject);
 	CppUnit_addTest(pSuite, JSONTest, testDoubleProperty);
 	CppUnit_addTest(pSuite, JSONTest, testDouble2Property);

JSON/testsuite/src/JSONTest.h

@@ -46,6 +46,7 @@ public:
 #endif
 	void testStringProperty();
 	void testEmptyObject();
+	void testEmptyPropertyName();
 	void testComplexObject();
 	void testDoubleProperty();
 	void testDouble2Property();