rename array_column in php because of http://php.net/manual/en/function.array-column.php in php5.5. rename python version too for consistency

Johannes Kroll · Johannes Kroll · commit b3cf016bbe43 · 2015-03-10T15:49:05.000+01:00
diff --git a/php/gpClient.php b/php/gpClient.php
@@ -1792,7 +1792,7 @@ public static function new_slave_connection( $command, $cwd = null, $env = null
  * 
  * @return an array consisting of the values of column $col from each row in $a
  */
-function array_column($a, $col) {
+function extract_array_column($a, $col) {
 	$column = array();
 	
 	foreach ( $a as $k => $x ) {
diff --git a/php/test/gpServer.test.php b/php/test/gpServer.test.php
@@ -120,14 +120,14 @@ public function testListGraphs() {
 		$gp2 = $this->newConnection();
 		
 		$graphs = $gp2->capture_list_graphs();
-		$graphs = array_column( $graphs, 0 );
+		$graphs = extract_array_column( $graphs, 0 );
 		$this->assertTrue( in_array( $gpTestGraphName, $graphs ), "test table $gpTestGraphName should be in the list" );
 		
 		$this->gp->drop_graph($gpTestGraphName);
 		$graphs = $gp2->capture_list_graphs();
 		#print "graphs: " . var_export($graphs, true) . "\n";
 		
-		$graphs = array_column( $graphs, 0 );
+		$graphs = extract_array_column( $graphs, 0 );
 		
 		#print "graphs: " . var_export($graphs, true) . "\n";
 		
diff --git a/php/test/gpSlave.test.php b/php/test/gpSlave.test.php
@@ -47,7 +47,7 @@ public function testCapture() {
 		$this->assertNotNull( $a );
 		$this->assertType( 'array', $a );
 		
-		$a = array_column( $a, 0 );
+		$a = extract_array_column( $a, 0 );
 		$this->assertEquals( array(11, 12), $a, "unexpected response for list_successors(1): " . var_export($a, true) );
 
 		// two column data
diff --git a/python/gp/client.py b/python/gp/client.py
@@ -2068,7 +2068,7 @@ def new_slave_connection(command, cwd=None, env=None): #static #OK
         """
         return Connection(SlaveTransport(command, cwd, env))
 
-def array_column(a, col):
+def extract_array_column(a, col):
     """Extracts a column from a tabular structure
  
     @type a:  list/tuple
diff --git a/python/gp/tests/server_test.py b/python/gp/tests/server_test.py
@@ -125,15 +125,15 @@ def test_listGraphs(self):
 
         gp2 = self.newConnection()
         graphs = gp2.capture_list_graphs()
-        graphs = array_column(graphs, 0)
+        graphs = extract_array_column(graphs, 0)
         self.assertTrue( test_graph_name in graphs,
           "test table test_graph_name should be in the list" )
 
         self.gp.drop_graph(test_graph_name)
         graphs = gp2.capture_list_graphs()
         #print "graphs: " . var_export($graphs, true) . "\n"
 
-        graphs = array_column( graphs, 0 )
+        graphs = extract_array_column( graphs, 0 )
 
         #print "graphs: " . var_export($graphs, true) . "\n"
 
diff --git a/python/gp/tests/slave_test.py b/python/gp/tests/slave_test.py
@@ -50,7 +50,7 @@ def test_capture(self):
         self.assertNotNone( a )
         self.assertIsInstance(a, (list,tuple))
         
-        a = array_column( a, 0 )
+        a = extract_array_column( a, 0 )
         self.assertEquals( [11, 12], a,
           "unexpected response for list_successors(1): %s" % a )
         
diff --git a/python/test/ServerTest.py b/python/test/ServerTest.py
@@ -125,15 +125,15 @@ def test_listGraphs(self):
 
         gp2 = self.newConnection()
         graphs = gp2.capture_list_graphs()
-        graphs = array_column(graphs, 0)
+        graphs = extract_array_column(graphs, 0)
         self.assertTrue( TestGraphName in graphs,
           "test table TestGraphName should be in the list" )
 
         self.gp.drop_graph(TestGraphName)
         graphs = gp2.capture_list_graphs()
         #print "graphs: " . var_export($graphs, true) . "\n"
 
-        graphs = array_column( graphs, 0 )
+        graphs = extract_array_column( graphs, 0 )
 
         #print "graphs: " . var_export($graphs, true) . "\n"
 
diff --git a/python/test/SlaveTest.py b/python/test/SlaveTest.py
@@ -50,7 +50,7 @@ def test_capture(self):
         self.assertNotNone( a )
         self.assertIsInstance(a, (list,tuple))
         
-        a = array_column( a, 0 )
+        a = extract_array_column( a, 0 )
         self.assertEquals( [11, 12], a,
           "unexpected response for list_successors(1): %s" % a )
         

Original file line number	Diff line number	Diff line change
`@@ -1792,7 +1792,7 @@ public static function new_slave_connection( $command, $cwd = null, $env = null`
`1792`	`1792`	`*`
`1793`	`1793`	`* @return an array consisting of the values of column $col from each row in $a`
`1794`	`1794`	`*/`
`1795`		`-function array_column($a, $col) {`
	`1795`	`+function extract_array_column($a, $col) {`
`1796`	`1796`	`$column = array();`
`1797`	`1797`
`1798`	`1798`	`foreach ( $a as $k => $x ) {`